diff --git a/.gitignore b/.gitignore index 2ec5af2b9b..a66c1086a7 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,6 @@ run.sh CuraEngine /.coverage + +#Prevents import failures when plugin running tests +plugins/__init__.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77920d547e..6c5bc61cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ image: registry.gitlab.com/ultimaker/cura/cura-build-environment:centos7 stages: - build - build and test linux: stage: build tags: diff --git a/CMakeLists.txt b/CMakeLists.txt index d5109f0f7b..b516de6b63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,10 +22,10 @@ set(CURA_VERSION "master" CACHE STRING "Version name of Cura") set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") +set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version") configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) - configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 73eb9bb288..eeb283a72b 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -9,7 +9,7 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False -DEFAULT_CURA_SDK_VERSION = "6.1.0" +DEFAULT_CURA_SDK_VERSION = "6.2.0" try: from cura.CuraVersion import CuraAppName # type: ignore @@ -45,4 +45,4 @@ except ImportError: # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "6.1.0" +CuraSDKVersion = "6.2.0" diff --git a/cura/Arranging/ShapeArray.py b/cura/Arranging/ShapeArray.py index 9227e446fb..403db5e706 100644 --- a/cura/Arranging/ShapeArray.py +++ b/cura/Arranging/ShapeArray.py @@ -1,5 +1,5 @@ -#Copyright (c) 2019 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. import numpy import copy @@ -10,6 +10,7 @@ from UM.Math.Polygon import Polygon if TYPE_CHECKING: from UM.Scene.SceneNode import SceneNode + ## Polygon representation as an array for use with Arrange class ShapeArray: def __init__(self, arr: numpy.array, offset_x: float, offset_y: float, scale: float = 1) -> None: @@ -101,7 +102,9 @@ class ShapeArray: # Create check array for each edge segment, combine into fill array for k in range(vertices.shape[0]): - fill = numpy.all([fill, cls._check(vertices[k - 1], vertices[k], base_array)], axis=0) + check_array = cls._check(vertices[k - 1], vertices[k], base_array) + if check_array is not None: + fill = numpy.all([fill, check_array], axis=0) # Set all values inside polygon to one base_array[fill] = 1 @@ -117,9 +120,9 @@ class ShapeArray: # \param p2 2-tuple with x, y for point 2 # \param base_array boolean array to project the line on @classmethod - def _check(cls, p1: numpy.array, p2: numpy.array, base_array: numpy.array) -> bool: + def _check(cls, p1: numpy.array, p2: numpy.array, base_array: numpy.array) -> Optional[numpy.array]: if p1[0] == p2[0] and p1[1] == p2[1]: - return False + return None idxs = numpy.indices(base_array.shape) # Create 3D array of indices p1 = p1.astype(float) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index bf38e6e562..6bcc5988f9 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -64,7 +64,7 @@ class BuildVolume(SceneNode): self._origin_mesh = None # type: Optional[MeshData] self._origin_line_length = 20 - self._origin_line_width = 0.5 + self._origin_line_width = 1.5 self._grid_mesh = None # type: Optional[MeshData] self._grid_shader = None @@ -258,7 +258,7 @@ class BuildVolume(SceneNode): node.setOutsideBuildArea(True) continue - if node.collidesWithArea(self.getDisallowedAreas()): + if node.collidesWithAreas(self.getDisallowedAreas()): node.setOutsideBuildArea(True) continue # If the entire node is below the build plate, still mark it as outside. @@ -312,7 +312,7 @@ class BuildVolume(SceneNode): node.setOutsideBuildArea(True) return - if node.collidesWithArea(self.getDisallowedAreas()): + if node.collidesWithAreas(self.getDisallowedAreas()): node.setOutsideBuildArea(True) return @@ -770,7 +770,7 @@ class BuildVolume(SceneNode): self._has_errors = len(self._error_areas) > 0 - self._disallowed_areas = [] # type: List[Polygon] + self._disallowed_areas = [] for extruder_id in result_areas: self._disallowed_areas.extend(result_areas[extruder_id]) self._disallowed_areas_no_brim = [] diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 91e0966fed..20c44c7916 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -3,7 +3,7 @@ from PyQt5.QtCore import QObject, QUrl from PyQt5.QtGui import QDesktopServices -from typing import List, TYPE_CHECKING, cast +from typing import List, cast from UM.Event import CallFunctionEvent from UM.FlameProfiler import pyqtSlot @@ -23,9 +23,8 @@ from cura.Settings.ExtruderManager import ExtruderManager from cura.Operations.SetBuildPlateNumberOperation import SetBuildPlateNumberOperation from UM.Logger import Logger +from UM.Scene.SceneNode import SceneNode -if TYPE_CHECKING: - from UM.Scene.SceneNode import SceneNode class CuraActions(QObject): def __init__(self, parent: QObject = None) -> None: diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5af33b82c9..c9d2163609 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -146,7 +146,7 @@ class CuraApplication(QtApplication): # SettingVersion represents the set of settings available in the machine/extruder definitions. # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible # changes of the settings. - SettingVersion = 8 + SettingVersion = 9 Created = False @@ -425,7 +425,7 @@ class CuraApplication(QtApplication): # Add empty variant, material and quality containers. # Since they are empty, they should never be serialized and instead just programmatically created. # We need them to simplify the switching between materials. - self.empty_container = cura.Settings.cura_empty_instance_containers.empty_container # type: EmptyInstanceContainer + self.empty_container = cura.Settings.cura_empty_instance_containers.empty_container self._container_registry.addContainer( cura.Settings.cura_empty_instance_containers.empty_definition_changes_container) @@ -1266,7 +1266,7 @@ class CuraApplication(QtApplication): @pyqtSlot() def arrangeObjectsToAllBuildPlates(self) -> None: nodes_to_arrange = [] - for node in DepthFirstIterator(self.getController().getScene().getRoot()): # type: ignore + for node in DepthFirstIterator(self.getController().getScene().getRoot()): if not isinstance(node, SceneNode): continue @@ -1293,7 +1293,7 @@ class CuraApplication(QtApplication): def arrangeAll(self) -> None: nodes_to_arrange = [] active_build_plate = self.getMultiBuildPlateModel().activeBuildPlate - for node in DepthFirstIterator(self.getController().getScene().getRoot()): # type: ignore + for node in DepthFirstIterator(self.getController().getScene().getRoot()): if not isinstance(node, SceneNode): continue @@ -1331,7 +1331,7 @@ class CuraApplication(QtApplication): Logger.log("i", "Reloading all loaded mesh data.") nodes = [] has_merged_nodes = False - for node in DepthFirstIterator(self.getController().getScene().getRoot()): # type: ignore + for node in DepthFirstIterator(self.getController().getScene().getRoot()): if not isinstance(node, CuraSceneNode) or not node.getMeshData(): if node.getName() == "MergedMesh": has_merged_nodes = True @@ -1343,9 +1343,9 @@ class CuraApplication(QtApplication): return for node in nodes: - file_name = node.getMeshData().getFileName() - if file_name: - job = ReadMeshJob(file_name) + mesh_data = node.getMeshData() + if mesh_data and mesh_data.getFileName(): + job = ReadMeshJob(mesh_data.getFileName()) job._node = node # type: ignore job.finished.connect(self._reloadMeshFinished) if has_merged_nodes: diff --git a/cura/Layer.py b/cura/Layer.py index 9cd45380fc..73fda64a45 100644 --- a/cura/Layer.py +++ b/cura/Layer.py @@ -1,14 +1,20 @@ -from UM.Mesh.MeshBuilder import MeshBuilder +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import List import numpy +from UM.Mesh.MeshBuilder import MeshBuilder +from UM.Mesh.MeshData import MeshData +from cura.LayerPolygon import LayerPolygon + class Layer: - def __init__(self, layer_id): + def __init__(self, layer_id: int) -> None: self._id = layer_id self._height = 0.0 self._thickness = 0.0 - self._polygons = [] + self._polygons = [] # type: List[LayerPolygon] self._element_count = 0 @property @@ -20,7 +26,7 @@ class Layer: return self._thickness @property - def polygons(self): + def polygons(self) -> List[LayerPolygon]: return self._polygons @property @@ -33,14 +39,14 @@ class Layer: def setThickness(self, thickness): self._thickness = thickness - def lineMeshVertexCount(self): + def lineMeshVertexCount(self) -> int: result = 0 for polygon in self._polygons: result += polygon.lineMeshVertexCount() return result - def lineMeshElementCount(self): + def lineMeshElementCount(self) -> int: result = 0 for polygon in self._polygons: result += polygon.lineMeshElementCount() @@ -57,18 +63,18 @@ class Layer: result_index_offset += polygon.lineMeshElementCount() self._element_count += polygon.elementCount - return (result_vertex_offset, result_index_offset) + return result_vertex_offset, result_index_offset - def createMesh(self): + def createMesh(self) -> MeshData: return self.createMeshOrJumps(True) - def createJumps(self): + def createJumps(self) -> MeshData: return self.createMeshOrJumps(False) # Defines the two triplets of local point indices to use to draw the two faces for each line segment in createMeshOrJump __index_pattern = numpy.array([[0, 3, 2, 0, 1, 3]], dtype = numpy.int32 ) - def createMeshOrJumps(self, make_mesh): + def createMeshOrJumps(self, make_mesh: bool) -> MeshData: builder = MeshBuilder() line_count = 0 @@ -79,14 +85,14 @@ class Layer: for polygon in self._polygons: line_count += polygon.jumpCount - # Reserve the neccesary space for the data upfront + # Reserve the necessary space for the data upfront builder.reserveFaceAndVertexCount(2 * line_count, 4 * line_count) for polygon in self._polygons: - # Filter out the types of lines we are not interesed in depending on whether we are drawing the mesh or the jumps. + # Filter out the types of lines we are not interested in depending on whether we are drawing the mesh or the jumps. index_mask = numpy.logical_not(polygon.jumpMask) if make_mesh else polygon.jumpMask - # Create an array with rows [p p+1] and only keep those we whant to draw based on make_mesh + # Create an array with rows [p p+1] and only keep those we want to draw based on make_mesh points = numpy.concatenate((polygon.data[:-1], polygon.data[1:]), 1)[index_mask.ravel()] # Line types of the points we want to draw line_types = polygon.types[index_mask] diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index ddf1450664..a62083945b 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Application import Application @@ -61,19 +61,19 @@ class LayerPolygon: # When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType # Should be generated in better way, not hardcoded. - self._isInfillOrSkinTypeMap = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1], dtype=numpy.bool) + self._isInfillOrSkinTypeMap = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype = numpy.bool) self._build_cache_line_mesh_mask = None # type: Optional[numpy.ndarray] self._build_cache_needed_points = None # type: Optional[numpy.ndarray] def buildCache(self) -> None: # For the line mesh we do not draw Infill or Jumps. Therefore those lines are filtered out. - self._build_cache_line_mesh_mask = numpy.ones(self._jump_mask.shape, dtype=bool) + self._build_cache_line_mesh_mask = numpy.ones(self._jump_mask.shape, dtype = bool) mesh_line_count = numpy.sum(self._build_cache_line_mesh_mask) self._index_begin = 0 self._index_end = mesh_line_count - self._build_cache_needed_points = numpy.ones((len(self._types), 2), dtype=numpy.bool) + self._build_cache_needed_points = numpy.ones((len(self._types), 2), dtype = numpy.bool) # Only if the type of line segment changes do we need to add an extra vertex to change colors self._build_cache_needed_points[1:, 0][:, numpy.newaxis] = self._types[1:] != self._types[:-1] # Mark points as unneeded if they are of types we don't want in the line mesh according to the calculated mask @@ -136,9 +136,9 @@ class LayerPolygon: self._index_begin += index_offset self._index_end += index_offset - indices[self._index_begin:self._index_end, :] = numpy.arange(self._index_end-self._index_begin, dtype=numpy.int32).reshape((-1, 1)) + indices[self._index_begin:self._index_end, :] = numpy.arange(self._index_end-self._index_begin, dtype = numpy.int32).reshape((-1, 1)) # When the line type changes the index needs to be increased by 2. - indices[self._index_begin:self._index_end, :] += numpy.cumsum(needed_points_list[line_mesh_mask.ravel(), 0], dtype=numpy.int32).reshape((-1, 1)) + indices[self._index_begin:self._index_end, :] += numpy.cumsum(needed_points_list[line_mesh_mask.ravel(), 0], dtype = numpy.int32).reshape((-1, 1)) # Each line segment goes from it's starting point p to p+1, offset by the vertex index. # The -1 is to compensate for the neccecarily True value of needed_points_list[0,0] which causes an unwanted +1 in cumsum above. indices[self._index_begin:self._index_end, :] += numpy.array([self._vertex_begin - 1, self._vertex_begin]) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index 857f0bc1c4..964331909c 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -127,7 +127,7 @@ class MachineErrorChecker(QObject): # Populate the (stack, key) tuples to check self._stacks_and_keys_to_check = deque() - for stack in [global_stack] + list(global_stack.extruders.values()): + for stack in global_stack.extruders.values(): for key in stack.getAllKeys(): self._stacks_and_keys_to_check.append((stack, key)) diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index 803e1d21ba..33e0b7a4d9 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -75,7 +75,7 @@ class DiscoveredPrinter(QObject): def readableMachineType(self) -> str: from cura.CuraApplication import CuraApplication machine_manager = CuraApplication.getInstance().getMachineManager() - # In ClusterUM3OutputDevice, when it updates a printer information, it updates the machine type using the field + # In LocalClusterOutputDevice, when it updates a printer information, it updates the machine type using the field # "machine_variant", and for some reason, it's not the machine type ID/codename/... but a human-readable string # like "Ultimaker 3". The code below handles this case. if self._hasHumanReadableMachineTypeName(self._machine_type): diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 67853bb9c7..c80545145f 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -93,7 +93,14 @@ class VariantManager: if variant_definition not in self._machine_to_buildplate_dict_map: self._machine_to_buildplate_dict_map[variant_definition] = OrderedDict() - variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0] + try: + variant_container = container_registry.findContainers(type = "variant", id = variant_metadata["id"])[0] + except IndexError as e: + # It still needs to break, but we want to know what variant ID made it break. + msg = "Unable to find build plate variant with the id [%s]" % variant_metadata["id"] + Logger.logException("e", msg) + raise IndexError(msg) + buildplate_type = variant_container.getProperty("machine_buildplate_type", "value") if buildplate_type not in self._machine_to_buildplate_dict_map[variant_definition]: self._machine_to_variant_dict_map[variant_definition][buildplate_type] = dict() diff --git a/cura/MultiplyObjectsJob.py b/cura/MultiplyObjectsJob.py index e71bbf6668..5c25f70336 100644 --- a/cura/MultiplyObjectsJob.py +++ b/cura/MultiplyObjectsJob.py @@ -2,10 +2,12 @@ # Cura is released under the terms of the LGPLv3 or higher. import copy +from typing import List from UM.Job import Job from UM.Operations.GroupedOperation import GroupedOperation from UM.Message import Message +from UM.Scene.SceneNode import SceneNode from UM.i18n import i18nCatalog i18n_catalog = i18nCatalog("cura") @@ -23,7 +25,7 @@ class MultiplyObjectsJob(Job): self._count = count self._min_offset = min_offset - def run(self): + def run(self) -> None: status_message = Message(i18n_catalog.i18nc("@info:status", "Multiplying and placing objects"), lifetime=0, dismissable=False, progress=0, title = i18n_catalog.i18nc("@info:title", "Placing Objects")) status_message.show() @@ -33,13 +35,15 @@ class MultiplyObjectsJob(Job): current_progress = 0 global_container_stack = Application.getInstance().getGlobalContainerStack() + if global_container_stack is None: + return # We can't do anything in this case. machine_width = global_container_stack.getProperty("machine_width", "value") machine_depth = global_container_stack.getProperty("machine_depth", "value") root = scene.getRoot() scale = 0.5 arranger = Arrange.create(x = machine_width, y = machine_depth, scene_root = root, scale = scale, min_offset = self._min_offset) - processed_nodes = [] + processed_nodes = [] # type: List[SceneNode] nodes = [] not_fit_count = 0 @@ -67,7 +71,11 @@ class MultiplyObjectsJob(Job): new_node = copy.deepcopy(node) solution_found = False if not node_too_big: - solution_found = arranger.findNodePlacement(new_node, offset_shape_arr, hull_shape_arr) + if offset_shape_arr is not None and hull_shape_arr is not None: + solution_found = arranger.findNodePlacement(new_node, offset_shape_arr, hull_shape_arr) + else: + # The node has no shape, so no need to arrange it. The solution is simple: Do nothing. + solution_found = True if node_too_big or not solution_found: found_solution_for_all = False diff --git a/cura/OAuth2/LocalAuthorizationServer.py b/cura/OAuth2/LocalAuthorizationServer.py index 25b2435012..a80b0deb28 100644 --- a/cura/OAuth2/LocalAuthorizationServer.py +++ b/cura/OAuth2/LocalAuthorizationServer.py @@ -63,6 +63,10 @@ class LocalAuthorizationServer: Logger.log("d", "Stopping local oauth2 web server...") if self._web_server: - self._web_server.server_close() + try: + self._web_server.server_close() + except OSError: + # OS error can happen if the socket was already closed. We really don't care about that case. + pass self._web_server = None self._web_server_thread = None diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index d9876b3b36..d084c0dbf4 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -49,18 +49,20 @@ class PlatformPhysics: return root = self._controller.getScene().getRoot() + build_volume = Application.getInstance().getBuildVolume() + build_volume.updateNodeBoundaryCheck() # Keep a list of nodes that are moving. We use this so that we don't move two intersecting objects in the # same direction. transformed_nodes = [] - # We try to shuffle all the nodes to prevent "locked" situations, where iteration B inverts iteration A. - # By shuffling the order of the nodes, this might happen a few times, but at some point it will resolve. nodes = list(BreadthFirstIterator(root)) # Only check nodes inside build area. nodes = [node for node in nodes if (hasattr(node, "_outside_buildarea") and not node._outside_buildarea)] + # We try to shuffle all the nodes to prevent "locked" situations, where iteration B inverts iteration A. + # By shuffling the order of the nodes, this might happen a few times, but at some point it will resolve. random.shuffle(nodes) for node in nodes: if node is root or not isinstance(node, SceneNode) or node.getBoundingBox() is None: @@ -160,7 +162,6 @@ class PlatformPhysics: op.push() # After moving, we have to evaluate the boundary checks for nodes - build_volume = Application.getInstance().getBuildVolume() build_volume.updateNodeBoundaryCheck() def _onToolOperationStarted(self, tool): diff --git a/cura/PreviewPass.py b/cura/PreviewPass.py index 49e2befd28..8465af4b83 100644 --- a/cura/PreviewPass.py +++ b/cura/PreviewPass.py @@ -1,7 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING, cast + from UM.Application import Application from UM.Resources import Resources @@ -12,6 +13,7 @@ from UM.View.RenderBatch import RenderBatch from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator +from cura.Scene.CuraSceneNode import CuraSceneNode if TYPE_CHECKING: from UM.View.GL.ShaderProgram import ShaderProgram @@ -44,9 +46,9 @@ class PreviewPass(RenderPass): self._renderer = Application.getInstance().getRenderer() - self._shader = None #type: Optional[ShaderProgram] - self._non_printing_shader = None #type: Optional[ShaderProgram] - self._support_mesh_shader = None #type: Optional[ShaderProgram] + self._shader = None # type: Optional[ShaderProgram] + self._non_printing_shader = None # type: Optional[ShaderProgram] + self._support_mesh_shader = None # type: Optional[ShaderProgram] self._scene = Application.getInstance().getController().getScene() # Set the camera to be used by this render pass @@ -83,8 +85,8 @@ class PreviewPass(RenderPass): batch_support_mesh = RenderBatch(self._support_mesh_shader) # 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 hasattr(node, "_outside_buildarea") and not node._outside_buildarea: + for node in DepthFirstIterator(self._scene.getRoot()): + if hasattr(node, "_outside_buildarea") and not getattr(node, "_outside_buildarea"): if node.callDecoration("isSliceable") and node.getMeshData() and node.isVisible(): per_mesh_stack = node.callDecoration("getStack") if node.callDecoration("isNonThumbnailVisibleMesh"): @@ -94,7 +96,7 @@ class PreviewPass(RenderPass): # Support mesh uniforms = {} shade_factor = 0.6 - diffuse_color = node.getDiffuseColor() + diffuse_color = cast(CuraSceneNode, node).getDiffuseColor() diffuse_color2 = [ diffuse_color[0] * shade_factor, diffuse_color[1] * shade_factor, @@ -106,7 +108,7 @@ class PreviewPass(RenderPass): else: # Normal scene node uniforms = {} - uniforms["diffuse_color"] = prettier_color(node.getDiffuseColor()) + uniforms["diffuse_color"] = prettier_color(cast(CuraSceneNode, node).getDiffuseColor()) batch.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = uniforms) self.bind() diff --git a/cura/PrinterOutput/GenericOutputController.py b/cura/PrinterOutput/GenericOutputController.py index e770fc79a1..c160459776 100644 --- a/cura/PrinterOutput/GenericOutputController.py +++ b/cura/PrinterOutput/GenericOutputController.py @@ -55,7 +55,7 @@ class GenericOutputController(PrinterOutputController): self._preheat_hotends_timer.stop() for extruder in self._preheat_hotends: extruder.updateIsPreheating(False) - self._preheat_hotends = set() # type: Set[ExtruderOutputModel] + self._preheat_hotends = set() def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed) -> None: self._output_device.sendCommand("G91") @@ -159,7 +159,7 @@ class GenericOutputController(PrinterOutputController): def _onPreheatHotendsTimerFinished(self) -> None: for extruder in self._preheat_hotends: self.setTargetHotendTemperature(extruder.getPrinter(), extruder.getPosition(), 0) - self._preheat_hotends = set() #type: Set[ExtruderOutputModel] + self._preheat_hotends = set() # Cancel any ongoing preheating timers, without setting back the temperature to 0 # This can be used eg at the start of a print @@ -167,7 +167,7 @@ class GenericOutputController(PrinterOutputController): if self._preheat_hotends_timer.isActive(): for extruder in self._preheat_hotends: extruder.updateIsPreheating(False) - self._preheat_hotends = set() #type: Set[ExtruderOutputModel] + self._preheat_hotends = set() self._preheat_hotends_timer.stop() diff --git a/cura/PrinterOutput/Models/PrinterOutputModel.py b/cura/PrinterOutput/Models/PrinterOutputModel.py index 4004a90a33..13fe85e674 100644 --- a/cura/PrinterOutput/Models/PrinterOutputModel.py +++ b/cura/PrinterOutput/Models/PrinterOutputModel.py @@ -2,13 +2,13 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl -from typing import List, Dict, Optional +from typing import List, Dict, Optional, TYPE_CHECKING from UM.Math.Vector import Vector +from cura.PrinterOutput.Peripheral import Peripheral from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel from cura.PrinterOutput.Models.ExtruderOutputModel import ExtruderOutputModel -MYPY = False -if MYPY: +if TYPE_CHECKING: from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.PrinterOutputController import PrinterOutputController @@ -45,6 +45,7 @@ class PrinterOutputModel(QObject): self._is_preheating = False self._printer_type = "" self._buildplate = "" + self._peripherals = [] # type: List[Peripheral] self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._extruders] @@ -294,4 +295,18 @@ class PrinterOutputModel(QObject): def printerConfiguration(self) -> Optional[PrinterConfigurationModel]: if self._printer_configuration.isValid(): return self._printer_configuration - return None \ No newline at end of file + return None + + peripheralsChanged = pyqtSignal() + + @pyqtProperty(str, notify = peripheralsChanged) + def peripherals(self) -> str: + return ", ".join(*[peripheral.name for peripheral in self._peripherals]) + + def addPeripheral(self, peripheral: Peripheral) -> None: + self._peripherals.append(peripheral) + self.peripheralsChanged.emit() + + def removePeripheral(self, peripheral: Peripheral) -> None: + self._peripherals.remove(peripheral) + self.peripheralsChanged.emit() \ No newline at end of file diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 86da9bf57f..e23341ba8a 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -60,8 +60,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): self._gcode = [] # type: List[str] self._connection_state_before_timeout = None # type: Optional[ConnectionState] - def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, - file_handler: Optional[FileHandler] = None, **kwargs: str) -> None: + def requestWrite(self, nodes: List["SceneNode"], file_name: Optional[str] = None, limit_mimetypes: bool = False, + file_handler: Optional["FileHandler"] = None, filter_by_machine: bool = False, **kwargs) -> None: raise NotImplementedError("requestWrite needs to be implemented") def setAuthenticationState(self, authentication_state: AuthState) -> None: diff --git a/cura/PrinterOutput/Peripheral.py b/cura/PrinterOutput/Peripheral.py new file mode 100644 index 0000000000..2693b82c36 --- /dev/null +++ b/cura/PrinterOutput/Peripheral.py @@ -0,0 +1,16 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + + +## Data class that represents a peripheral for a printer. +# +# Output device plug-ins may specify that the printer has a certain set of +# peripherals. This set is then possibly shown in the interface of the monitor +# stage. +class Peripheral: + ## Constructs the peripheral. + # \param type A unique ID for the type of peripheral. + # \param name A human-readable name for the peripheral. + def __init__(self, peripheral_type: str, name: str) -> None: + self.type = peripheral_type + self.name = name diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index 8e1b220a86..d4a37b3d68 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -144,7 +144,7 @@ class PrinterOutputDevice(QObject, OutputDevice): return None def requestWrite(self, nodes: List["SceneNode"], file_name: Optional[str] = None, limit_mimetypes: bool = False, - file_handler: Optional["FileHandler"] = None, **kwargs: str) -> None: + file_handler: Optional["FileHandler"] = None, filter_by_machine: bool = False, **kwargs) -> None: raise NotImplementedError("requestWrite needs to be implemented") @pyqtProperty(QObject, notify = printersChanged) diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 38a988f982..4215c8fa84 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -6,13 +6,13 @@ from typing import cast, Dict, List, Optional from UM.Application import Application from UM.Math.AxisAlignedBox import AxisAlignedBox -from UM.Math.Polygon import Polygon #For typing. +from UM.Math.Polygon import Polygon # For typing. from UM.Scene.SceneNode import SceneNode -from UM.Scene.SceneNodeDecorator import SceneNodeDecorator #To cast the deepcopy of every decorator back to SceneNodeDecorator. +from UM.Scene.SceneNodeDecorator import SceneNodeDecorator # To cast the deepcopy of every decorator back to SceneNodeDecorator. -import cura.CuraApplication #To get the build plate. -from cura.Settings.ExtruderStack import ExtruderStack #For typing. -from cura.Settings.SettingOverrideDecorator import SettingOverrideDecorator #For per-object settings. +import cura.CuraApplication # To get the build plate. +from cura.Settings.ExtruderStack import ExtruderStack # For typing. +from cura.Settings.SettingOverrideDecorator import SettingOverrideDecorator # For per-object settings. ## Scene nodes that are models are only seen when selecting the corresponding build plate @@ -21,7 +21,7 @@ class CuraSceneNode(SceneNode): def __init__(self, parent: Optional["SceneNode"] = None, visible: bool = True, name: str = "", no_setting_override: bool = False) -> None: super().__init__(parent = parent, visible = visible, name = name) if not no_setting_override: - self.addDecorator(SettingOverrideDecorator()) # now we always have a getActiveExtruderPosition, unless explicitly disabled + self.addDecorator(SettingOverrideDecorator()) # Now we always have a getActiveExtruderPosition, unless explicitly disabled self._outside_buildarea = False def setOutsideBuildArea(self, new_value: bool) -> None: @@ -59,7 +59,7 @@ class CuraSceneNode(SceneNode): if extruder_id is not None: if extruder_id == extruder.getId(): return extruder - else: # If the id is unknown, then return the extruder in the position 0 + else: # If the id is unknown, then return the extruder in the position 0 try: if extruder.getMetaDataEntry("position", default = "0") == "0": # Check if the position is zero return extruder @@ -87,13 +87,13 @@ class CuraSceneNode(SceneNode): ] ## Return if any area collides with the convex hull of this scene node - def collidesWithArea(self, areas: List[Polygon]) -> bool: + def collidesWithAreas(self, areas: List[Polygon]) -> bool: convex_hull = self.callDecoration("getConvexHull") if convex_hull: if not convex_hull.isValid(): return False - # Check for collisions between disallowed areas and the object + # Check for collisions between provided areas and the object for area in areas: overlap = convex_hull.intersectsPolygon(area) if overlap is None: diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 8e7c403f20..bc0d99ead9 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -5,10 +5,11 @@ import os import re import configparser -from typing import Any, cast, Dict, Optional +from typing import Any, cast, Dict, Optional, List, Union from PyQt5.QtWidgets import QMessageBox from UM.Decorators import override +from UM.PluginObject import PluginObject from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.Interfaces import ContainerInterface from UM.Settings.ContainerRegistry import ContainerRegistry @@ -22,6 +23,7 @@ from UM.Platform import Platform from UM.PluginRegistry import PluginRegistry # For getting the possible profile writers to write with. from UM.Util import parseBool from UM.Resources import Resources +from cura.ReaderWriters.ProfileWriter import ProfileWriter from . import ExtruderStack from . import GlobalStack @@ -50,10 +52,10 @@ class CuraContainerRegistry(ContainerRegistry): # This will also try to convert a ContainerStack to either Extruder or # Global stack based on metadata information. @override(ContainerRegistry) - def addContainer(self, container): + def addContainer(self, container: ContainerInterface) -> None: # Note: Intentional check with type() because we want to ignore subclasses if type(container) == ContainerStack: - container = self._convertContainerStack(container) + container = self._convertContainerStack(cast(ContainerStack, container)) if isinstance(container, InstanceContainer) and type(container) != type(self.getEmptyInstanceContainer()): # Check against setting version of the definition. @@ -61,7 +63,7 @@ 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 # Don't add. super().addContainer(container) @@ -71,9 +73,9 @@ class CuraContainerRegistry(ContainerRegistry): # \param new_name \type{string} Base name, which may not be unique # \param fallback_name \type{string} Name to use when (stripped) new_name is empty # \return \type{string} Name that is unique for the specified type and name/id - def createUniqueName(self, container_type, current_name, new_name, fallback_name): + def createUniqueName(self, container_type: str, current_name: str, new_name: str, fallback_name: str) -> str: new_name = new_name.strip() - num_check = re.compile("(.*?)\s*#\d+$").match(new_name) + num_check = re.compile(r"(.*?)\s*#\d+$").match(new_name) if num_check: new_name = num_check.group(1) if new_name == "": @@ -92,7 +94,7 @@ class CuraContainerRegistry(ContainerRegistry): # Both the id and the name are checked, because they may not be the same and it is better if they are both unique # \param container_type \type{string} Type of the container (machine, quality, ...) # \param container_name \type{string} Name to check - def _containerExists(self, container_type, container_name): + def _containerExists(self, container_type: str, container_name: str): container_class = ContainerStack if container_type == "machine" else InstanceContainer return self.findContainersMetadata(container_type = container_class, id = container_name, type = container_type, ignore_case = True) or \ @@ -100,11 +102,11 @@ class CuraContainerRegistry(ContainerRegistry): ## Exports an profile to a file # - # \param instance_ids \type{list} the IDs of the profiles to export. + # \param container_list \type{list} the containers to export # \param file_name \type{str} the full path and filename to export to. # \param file_type \type{str} the file type with the format " (*.)" # \return True if the export succeeded, false otherwise. - def exportQualityProfile(self, container_list, file_name, file_type) -> bool: + def exportQualityProfile(self, container_list: List[InstanceContainer], file_name: str, file_type: str) -> bool: # Parse the fileType to deduce what plugin can save the file format. # fileType has the format " (*.)" split = file_type.rfind(" (*.") # Find where the description ends and the extension starts. @@ -126,6 +128,8 @@ class CuraContainerRegistry(ContainerRegistry): profile_writer = self._findProfileWriter(extension, description) try: + if profile_writer is None: + raise Exception("Unable to find a profile writer") success = profile_writer.write(file_name, container_list) except Exception as e: Logger.log("e", "Failed to export profile to %s: %s", file_name, str(e)) @@ -150,7 +154,7 @@ class CuraContainerRegistry(ContainerRegistry): # \param extension # \param description # \return The plugin object matching the given extension and description. - def _findProfileWriter(self, extension, description): + def _findProfileWriter(self, extension: str, description: str) -> Optional[ProfileWriter]: plugin_registry = PluginRegistry.getInstance() for plugin_id, meta_data in self._getIOPlugins("profile_writer"): for supported_type in meta_data["profile_writer"]: # All file types this plugin can supposedly write. @@ -158,7 +162,7 @@ class CuraContainerRegistry(ContainerRegistry): if supported_extension == extension: # This plugin supports a file type with the same extension. supported_description = supported_type.get("description", None) if supported_description == description: # The description is also identical. Assume it's the same file type. - return plugin_registry.getPluginObject(plugin_id) + return cast(ProfileWriter, plugin_registry.getPluginObject(plugin_id)) return None ## Imports a profile from a file @@ -324,7 +328,7 @@ class CuraContainerRegistry(ContainerRegistry): return {"status": "error", "message": catalog.i18nc("@info:status", "Profile {0} has an unknown file type or is corrupted.", file_name)} @override(ContainerRegistry) - def load(self): + def load(self) -> None: super().load() self._registerSingleExtrusionMachinesExtruderStacks() self._connectUpgradedExtruderStacksToMachines() @@ -406,7 +410,7 @@ class CuraContainerRegistry(ContainerRegistry): return result ## Convert an "old-style" pure ContainerStack to either an Extruder or Global stack. - def _convertContainerStack(self, container): + def _convertContainerStack(self, container: ContainerStack) -> Union[ExtruderStack.ExtruderStack, GlobalStack.GlobalStack]: assert type(container) == ContainerStack container_type = container.getMetaDataEntry("type") @@ -430,14 +434,14 @@ class CuraContainerRegistry(ContainerRegistry): return new_stack - def _registerSingleExtrusionMachinesExtruderStacks(self): + def _registerSingleExtrusionMachinesExtruderStacks(self) -> None: machines = self.findContainerStacks(type = "machine", machine_extruder_trains = {"0": "fdmextruder"}) for machine in machines: extruder_stacks = self.findContainerStacks(type = "extruder_train", machine = machine.getId()) if not extruder_stacks: self.addExtruderStackForSingleExtrusionMachine(machine, "fdmextruder") - def _onContainerAdded(self, container): + def _onContainerAdded(self, container: ContainerInterface) -> None: # We don't have all the machines loaded in the beginning, so in order to add the missing extruder stack # for single extrusion machines, we subscribe to the containerAdded signal, and whenever a global stack # is added, we check to see if an extruder stack needs to be added. @@ -671,7 +675,7 @@ class CuraContainerRegistry(ContainerRegistry): return extruder_stack - def _findQualityChangesContainerInCuraFolder(self, name): + def _findQualityChangesContainerInCuraFolder(self, name: str) -> Optional[InstanceContainer]: quality_changes_dir = Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.QualityChangesInstanceContainer) instance_container = None @@ -684,7 +688,7 @@ class CuraContainerRegistry(ContainerRegistry): parser = configparser.ConfigParser(interpolation = None) try: parser.read([file_path]) - except: + except Exception: # Skip, it is not a valid stack file continue @@ -716,7 +720,7 @@ class CuraContainerRegistry(ContainerRegistry): # due to problems with loading order, some stacks may not have the proper next stack # set after upgrading, because the proper global stack was not yet loaded. This method # makes sure those extruders also get the right stack set. - def _connectUpgradedExtruderStacksToMachines(self): + def _connectUpgradedExtruderStacksToMachines(self) -> None: extruder_stacks = self.findContainers(container_type = ExtruderStack.ExtruderStack) for extruder_stack in extruder_stacks: if extruder_stack.getNextStack(): diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 014bd9adb8..115daf8e3f 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -121,8 +121,9 @@ class CuraStackBuilder: extruder_definition = registry.findDefinitionContainers(id = extruder_definition_id)[0] except IndexError as e: # It still needs to break, but we want to know what extruder ID made it break. - Logger.log("e", "Unable to find extruder with the id %s", extruder_definition_id) - raise e + msg = "Unable to find extruder definition with the id [%s]" % extruder_definition_id + Logger.logException("e", msg) + raise IndexError(msg) # get material container for extruders material_container = application.empty_material_container diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 7674aa05b9..2fa90f9636 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -12,7 +12,7 @@ from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator from UM.Settings.ContainerRegistry import ContainerRegistry # Finding containers by ID. -from UM.Settings.ContainerStack import ContainerStack +from UM.Decorators import deprecated from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING, Union @@ -95,6 +95,7 @@ class ExtruderManager(QObject): # # \param index The index of the extruder whose name to get. @pyqtSlot(int, result = str) + @deprecated("Use Cura.MachineManager.activeMachine.extruders[index].name instead", "4.3") def getExtruderName(self, index: int) -> str: try: return self.getActiveExtruderStacks()[index].getName() @@ -114,7 +115,7 @@ class ExtruderManager(QObject): selected_nodes = [] # type: List["SceneNode"] for node in Selection.getAllSelectedObjects(): if node.callDecoration("isGroup"): - for grouped_node in BreadthFirstIterator(node): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for grouped_node in BreadthFirstIterator(node): if grouped_node.callDecoration("isGroup"): continue @@ -131,7 +132,7 @@ class ExtruderManager(QObject): elif current_extruder_trains: object_extruders.add(current_extruder_trains[0].getId()) - self._selected_object_extruders = list(object_extruders) # type: List[Union[str, "ExtruderStack"]] + self._selected_object_extruders = list(object_extruders) return self._selected_object_extruders @@ -140,7 +141,7 @@ class ExtruderManager(QObject): # This will trigger a recalculation of the extruders used for the # selection. def resetSelectedObjectExtruders(self) -> None: - self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] + self._selected_object_extruders = [] self.selectedObjectExtrudersChanged.emit() @pyqtSlot(result = QObject) @@ -380,7 +381,13 @@ class ExtruderManager(QObject): elif extruder_stack_0.definition.getId() != expected_extruder_definition_0_id: Logger.log("e", "Single extruder printer [{printer}] expected extruder [{expected}], but got [{got}]. I'm making it [{expected}].".format( printer = global_stack.getId(), expected = expected_extruder_definition_0_id, got = extruder_stack_0.definition.getId())) - extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] + try: + extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] + except IndexError as e: + # It still needs to break, but we want to know what extruder ID made it break. + msg = "Unable to find extruder definition with the id [%s]" % expected_extruder_definition_0_id + Logger.logException("e", msg) + raise IndexError(msg) extruder_stack_0.definition = extruder_definition ## Get all extruder values for a certain setting. diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 3502088e2d..7efc263180 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -118,7 +118,7 @@ class GlobalStack(CuraContainerStack): ## \sa configuredConnectionTypes def removeConfiguredConnectionType(self, connection_type: int) -> None: configured_connection_types = self.configuredConnectionTypes - if connection_type in self.configured_connection_types: + if connection_type in configured_connection_types: # Store the values as a string. configured_connection_types.remove(connection_type) self.setMetaDataEntry("connection_type", ",".join([str(c_type) for c_type in configured_connection_types])) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7573e3309a..5c4ff603c4 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -22,8 +22,8 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique -from cura.Machines.MaterialManager import MaterialManager from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager +from cura.Machines.MaterialManager import MaterialManager from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel @@ -40,11 +40,10 @@ from .CuraStackBuilder import CuraStackBuilder from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") - +from cura.Settings.GlobalStack import GlobalStack if TYPE_CHECKING: from cura.CuraApplication import CuraApplication from cura.Settings.CuraContainerStack import CuraContainerStack - from cura.Settings.GlobalStack import GlobalStack from cura.Machines.ContainerNode import ContainerNode from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityGroup import QualityGroup @@ -377,7 +376,7 @@ class MachineManager(QObject): machines = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter) for machine in machines: if machine.definition.getId() == definition_id: - return machine + return cast(GlobalStack, machine) return None @pyqtSlot(str) @@ -588,7 +587,7 @@ class MachineManager(QObject): def activeStack(self) -> Optional["ExtruderStack"]: return self._active_container_stack - @pyqtProperty(str, notify=activeMaterialChanged) + @pyqtProperty(str, notify = activeMaterialChanged) def activeMaterialId(self) -> str: if self._active_container_stack: material = self._active_container_stack.material @@ -939,7 +938,7 @@ class MachineManager(QObject): # Check to see if any objects are set to print with an extruder that will no longer exist root_node = self._application.getController().getScene().getRoot() - for node in DepthFirstIterator(root_node): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(root_node): if node.getMeshData(): extruder_nr = node.callDecoration("getActiveExtruderPosition") @@ -975,10 +974,13 @@ class MachineManager(QObject): self._application.globalContainerStackChanged.emit() self.forceUpdateAllSettings() - # Note that this function is deprecated, but the decorators for this don't play well together! - # @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2") @pyqtSlot(int, result = QObject) def getExtruder(self, position: int) -> Optional[ExtruderStack]: + return self._getExtruder(position) + + # This is a workaround for the deprecated decorator and the pyqtSlot not playing well together. + @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2") + def _getExtruder(self, position) -> Optional[ExtruderStack]: if self._global_container_stack: return self._global_container_stack.extruders.get(str(position)) return None @@ -1101,9 +1103,17 @@ class MachineManager(QObject): def _onRootMaterialChanged(self) -> None: self._current_root_material_id = {} + changed = False + if self._global_container_stack: for position in self._global_container_stack.extruders: - self._current_root_material_id[position] = self._global_container_stack.extruders[position].material.getMetaDataEntry("base_file") + material_id = self._global_container_stack.extruders[position].material.getMetaDataEntry("base_file") + if position not in self._current_root_material_id or material_id != self._current_root_material_id[position]: + changed = True + self._current_root_material_id[position] = material_id + + if changed: + self.activeMaterialChanged.emit() @pyqtProperty("QVariant", notify = rootMaterialChanged) def currentRootMaterialId(self) -> Dict[str, str]: diff --git a/cura/UI/ObjectsModel.py b/cura/UI/ObjectsModel.py index f3983e7965..5526b41098 100644 --- a/cura/UI/ObjectsModel.py +++ b/cura/UI/ObjectsModel.py @@ -50,6 +50,7 @@ class ObjectsModel(ListModel): Application.getInstance().getController().getScene().sceneChanged.connect(self._updateSceneDelayed) Application.getInstance().getPreferences().preferenceChanged.connect(self._updateDelayed) + Selection.selectionChanged.connect(self._updateDelayed) self._update_timer = QTimer() self._update_timer.setInterval(200) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index be5f72a82f..ed758abd2d 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -419,13 +419,17 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if parser.has_option("metadata", "enabled"): extruder_info.enabled = parser["metadata"]["enabled"] if variant_id not in ("empty", "empty_variant"): - extruder_info.variant_info = instance_container_info_dict[variant_id] + if variant_id in instance_container_info_dict: + extruder_info.variant_info = instance_container_info_dict[variant_id] + 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 + definition_changes_id = parser["containers"][str(_ContainerIndexes.DefinitionChanges)] if definition_changes_id not in ("empty", "empty_definition_changes"): extruder_info.definition_changes_info = instance_container_info_dict[definition_changes_id] + user_changes_id = parser["containers"][str(_ContainerIndexes.UserChanges)] if user_changes_id not in ("empty", "empty_user_changes"): extruder_info.user_changes_info = instance_container_info_dict[user_changes_id] @@ -905,6 +909,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader): continue extruder_info = self._machine_info.extruder_info_dict[position] if extruder_info.variant_info is None: + # If there is no variant_info, try to use the default variant. Otherwise, leave it be. + node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE, global_stack) + if node is not None and node.getContainer() is not None: + extruder_stack.variant = node.getContainer() continue parser = extruder_info.variant_info.parser diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 6b558bc65b..ae18e76e5a 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -369,7 +369,7 @@ class CuraEngineBackend(QObject, Backend): elif job.getResult() == StartJobResult.ObjectSettingError: errors = {} - for node in DepthFirstIterator(self._application.getController().getScene().getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._application.getController().getScene().getRoot()): stack = node.callDecoration("getStack") if not stack: continue @@ -438,7 +438,7 @@ class CuraEngineBackend(QObject, Backend): if not self._application.getPreferences().getValue("general/auto_slice"): enable_timer = False - for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._scene.getRoot()): if node.callDecoration("isBlockSlicing"): enable_timer = False self.setState(BackendState.Disabled) @@ -460,7 +460,7 @@ class CuraEngineBackend(QObject, Backend): ## Return a dict with number of objects per build plate def _numObjectsPerBuildPlate(self) -> Dict[int, int]: num_objects = defaultdict(int) #type: Dict[int, int] - for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._scene.getRoot()): # Only count sliceable objects if node.callDecoration("isSliceable"): build_plate_number = node.callDecoration("getBuildPlateNumber") @@ -548,10 +548,11 @@ class CuraEngineBackend(QObject, Backend): # Clear out any old gcode self._scene.gcode_dict = {} # type: ignore - for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._scene.getRoot()): if node.callDecoration("getLayerData"): if not build_plate_numbers or node.callDecoration("getBuildPlateNumber") in build_plate_numbers: - node.getParent().removeChild(node) + # We can asume that all nodes have a parent as we're looping through the scene (and filter out root) + cast(SceneNode, node.getParent()).removeChild(node) def markSliceAll(self) -> None: for build_plate_number in range(self._application.getMultiBuildPlateModel().maxBuildPlate + 1): diff --git a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py index ed4f556cc9..32d60eb68b 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py @@ -1,4 +1,4 @@ -#Copyright (c) 2017 Ultimaker B.V. +#Copyright (c) 2019 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. import gc @@ -136,23 +136,23 @@ class ProcessSlicedLayersJob(Job): extruder = polygon.extruder - line_types = numpy.fromstring(polygon.line_type, dtype="u1") # Convert bytearray to numpy array + line_types = numpy.fromstring(polygon.line_type, dtype = "u1") # Convert bytearray to numpy array line_types = line_types.reshape((-1,1)) - points = numpy.fromstring(polygon.points, dtype="f4") # Convert bytearray to numpy array + points = numpy.fromstring(polygon.points, dtype = "f4") # Convert bytearray to numpy array if polygon.point_type == 0: # Point2D points = points.reshape((-1,2)) # We get a linear list of pairs that make up the points, so make numpy interpret them correctly. else: # Point3D points = points.reshape((-1,3)) - line_widths = numpy.fromstring(polygon.line_width, dtype="f4") # Convert bytearray to numpy array + line_widths = numpy.fromstring(polygon.line_width, dtype = "f4") # Convert bytearray to numpy array line_widths = line_widths.reshape((-1,1)) # We get a linear list of pairs that make up the points, so make numpy interpret them correctly. - line_thicknesses = numpy.fromstring(polygon.line_thickness, dtype="f4") # Convert bytearray to numpy array + line_thicknesses = numpy.fromstring(polygon.line_thickness, dtype = "f4") # Convert bytearray to numpy array line_thicknesses = line_thicknesses.reshape((-1,1)) # We get a linear list of pairs that make up the points, so make numpy interpret them correctly. - line_feedrates = numpy.fromstring(polygon.line_feedrate, dtype="f4") # Convert bytearray to numpy array + line_feedrates = numpy.fromstring(polygon.line_feedrate, dtype = "f4") # Convert bytearray to numpy array line_feedrates = line_feedrates.reshape((-1,1)) # We get a linear list of pairs that make up the points, so make numpy interpret them correctly. # Create a new 3D-array, copy the 2D points over and insert the right height. @@ -194,7 +194,7 @@ class ProcessSlicedLayersJob(Job): manager = ExtruderManager.getInstance() extruders = manager.getActiveExtruderStacks() if extruders: - material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32) + material_color_map = numpy.zeros((len(extruders), 4), dtype = numpy.float32) for extruder in extruders: position = int(extruder.getMetaDataEntry("position", default = "0")) try: @@ -206,8 +206,8 @@ class ProcessSlicedLayersJob(Job): material_color_map[position, :] = color else: # Single extruder via global stack. - material_color_map = numpy.zeros((1, 4), dtype=numpy.float32) - color_code = global_container_stack.material.getMetaDataEntry("color_code", default="#e0e000") + material_color_map = numpy.zeros((1, 4), dtype = numpy.float32) + color_code = global_container_stack.material.getMetaDataEntry("color_code", default = "#e0e000") color = colorCodeToRGBA(color_code) material_color_map[0, :] = color diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index fc4de3dfa5..b973a0775a 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -11,6 +11,7 @@ import Arcus #For typing. from UM.Job import Job from UM.Logger import Logger +from UM.Scene.SceneNode import SceneNode from UM.Settings.ContainerStack import ContainerStack #For typing. from UM.Settings.SettingRelation import SettingRelation #For typing. @@ -133,6 +134,14 @@ class StartSliceJob(Job): self.setResult(StartJobResult.BuildPlateError) return + # Wait for error checker to be done. + while CuraApplication.getInstance().getMachineErrorChecker().needToWaitForResult: + time.sleep(0.1) + + if CuraApplication.getInstance().getMachineErrorChecker().hasError: + self.setResult(StartJobResult.SettingError) + return + # Don't slice if the buildplate or the nozzle type is incompatible with the materials if not CuraApplication.getInstance().getMachineManager().variantBuildplateCompatible and \ not CuraApplication.getInstance().getMachineManager().variantBuildplateUsable: @@ -150,7 +159,7 @@ class StartSliceJob(Job): # Don't slice if there is a per object setting with an error value. - for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._scene.getRoot()): if not isinstance(node, CuraSceneNode) or not node.isSelectable(): continue @@ -160,15 +169,16 @@ class StartSliceJob(Job): with self._scene.getSceneLock(): # Remove old layer data. - for node in DepthFirstIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in DepthFirstIterator(self._scene.getRoot()): if node.callDecoration("getLayerData") and node.callDecoration("getBuildPlateNumber") == self._build_plate_number: - node.getParent().removeChild(node) + # Singe we walk through all nodes in the scene, they always have a parent. + cast(SceneNode, node.getParent()).removeChild(node) break # Get the objects in their groups to print. object_groups = [] if stack.getProperty("print_sequence", "value") == "one_at_a_time": - for node in OneAtATimeIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax. + for node in OneAtATimeIterator(self._scene.getRoot()): temp_list = [] # Node can't be printed, so don't bother sending it. @@ -183,7 +193,8 @@ class StartSliceJob(Job): children = node.getAllChildren() children.append(node) for child_node in children: - if child_node.getMeshData() and child_node.getMeshData().getVertices() is not None: + mesh_data = child_node.getMeshData() + if mesh_data and mesh_data.getVertices() is not None: temp_list.append(child_node) if temp_list: @@ -194,8 +205,9 @@ class StartSliceJob(Job): else: temp_list = [] has_printing_mesh = False - 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.getMeshData().getVertices() is not None: + for node in DepthFirstIterator(self._scene.getRoot()): + mesh_data = node.getMeshData() + if node.callDecoration("isSliceable") and mesh_data and mesh_data.getVertices() is not None: is_non_printing_mesh = bool(node.callDecoration("isNonPrintingMesh")) # Find a reason not to add the node @@ -210,7 +222,7 @@ class StartSliceJob(Job): Job.yieldThread() - #If the list doesn't have any model with suitable settings then clean the list + # If the list doesn't have any model with suitable settings then clean the list # otherwise CuraEngine will crash if not has_printing_mesh: temp_list.clear() @@ -261,10 +273,14 @@ class StartSliceJob(Job): for group in filtered_object_groups: group_message = self._slice_message.addRepeatedMessage("object_lists") - if group[0].getParent() is not None and group[0].getParent().callDecoration("isGroup"): - self._handlePerObjectSettings(group[0].getParent(), group_message) + parent = group[0].getParent() + if parent is not None and parent.callDecoration("isGroup"): + self._handlePerObjectSettings(cast(CuraSceneNode, parent), group_message) + for object in group: mesh_data = object.getMeshData() + if mesh_data is None: + continue rot_scale = object.getWorldTransformation().getTransposed().getData()[0:3, 0:3] translate = object.getWorldTransformation().getData()[:3, 3] @@ -288,7 +304,7 @@ class StartSliceJob(Job): obj.vertices = flat_verts - self._handlePerObjectSettings(object, obj) + self._handlePerObjectSettings(cast(CuraSceneNode, object), obj) Job.yieldThread() diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index daab73abc2..92f2c31a8c 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -8,6 +8,7 @@ from UM.PluginRegistry import PluginRegistry from UM.Logger import Logger from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make. +from cura.CuraApplication import CuraApplication from cura.ReaderWriters.ProfileReader import ProfileReader import zipfile @@ -67,9 +68,10 @@ class CuraProfileReader(ProfileReader): return [] version = int(parser["general"]["version"]) + setting_version = int(parser["metadata"].get("setting_version", "0")) if InstanceContainer.Version != version: name = parser["general"]["name"] - return self._upgradeProfileVersion(serialized, name, version) + return self._upgradeProfileVersion(serialized, name, version, setting_version) else: return [(serialized, profile_id)] @@ -83,7 +85,7 @@ class CuraProfileReader(ProfileReader): profile = InstanceContainer(profile_id) profile.setMetaDataEntry("type", "quality_changes") try: - profile.deserialize(serialized) + profile.deserialize(serialized, file_name = profile_id) except ContainerFormatError as e: Logger.log("e", "Error in the format of a container: %s", str(e)) return None @@ -98,19 +100,27 @@ class CuraProfileReader(ProfileReader): # \param profile_id The name of the profile. # \param source_version The profile version of 'serialized'. # \return List of serialized profile strings and matching profile names. - def _upgradeProfileVersion(self, serialized: str, profile_id: str, source_version: int) -> List[Tuple[str, str]]: - converter_plugins = PluginRegistry.getInstance().getAllMetaData(filter = {"version_upgrade": {} }, active_only = True) + def _upgradeProfileVersion(self, serialized: str, profile_id: str, main_version: int, setting_version: int) -> List[Tuple[str, str]]: + source_version = main_version * 1000000 + setting_version - source_format = ("profile", source_version) - profile_convert_funcs = [plugin["version_upgrade"][source_format][2] for plugin in converter_plugins - if source_format in plugin["version_upgrade"] and plugin["version_upgrade"][source_format][1] == InstanceContainer.Version] - - if not profile_convert_funcs: - Logger.log("w", "Unable to find an upgrade path for the profile [%s]", profile_id) + from UM.VersionUpgradeManager import VersionUpgradeManager + results = VersionUpgradeManager.getInstance().updateFilesData("quality_changes", source_version, [serialized], [profile_id]) + if results is None: return [] - filenames, outputs = profile_convert_funcs[0](serialized, profile_id) - if filenames is None and outputs is None: - Logger.log("w", "The conversion failed to return any usable data for [%s]", profile_id) + serialized = results.files_data[0] + + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + if "general" not in parser: + Logger.log("w", "Missing required section 'general'.") return [] - return list(zip(outputs, filenames)) + + new_source_version = results.version + if int(new_source_version / 1000000) != InstanceContainer.Version or new_source_version % 1000000 != CuraApplication.SettingVersion: + Logger.log("e", "Failed to upgrade profile [%s]", profile_id) + + if int(parser["general"]["version"]) != InstanceContainer.Version: + Logger.log("e", "Failed to upgrade profile [%s]", profile_id) + return [] + return [(serialized, profile_id)] diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 9e719ddb43..7c0a20ef66 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -97,7 +97,7 @@ Rectangle horizontalCenter: parent.horizontalCenter } visible: isNetworkConfigured && !isConnected - text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.") + text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers.") font: UM.Theme.getFont("medium") color: UM.Theme.getColor("monitor_text_primary") wrapMode: Text.WordWrap @@ -166,4 +166,4 @@ Rectangle } } } -} \ No newline at end of file +} diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml index 559ad2bf81..7c6ece12db 100644 --- a/plugins/PerObjectSettingsTool/PerObjectItem.qml +++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml @@ -29,6 +29,17 @@ UM.TooltipArea UM.ActiveTool.forceUpdate(); } } + + // When the user removes settings from the list addedSettingsModel, we need to recheck if the + // setting is visible or not to show a mark in the CheckBox. + Connections + { + target: addedSettingsModel + onVisibleCountChanged: + { + check.checked = addedSettingsModel.getVisible(model.key) + } + } } diff --git a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py index 3ab20b8297..25194568e7 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py @@ -1,10 +1,13 @@ # Cura PostProcessingPlugin # Author: Amanda de Castilho # Date: August 28, 2018 +# Modified: November 16, 2018 by Joshua Pope-Lewis -# Description: This plugin inserts a line at the start of each layer, -# M117 - displays the filename and layer height to the LCD -# Alternatively, user can override the filename to display alt text + layer height +# Description: This plugin shows custom messages about your print on the Status bar... +# Please look at the 3 options +# - Scolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you arent printing a small item select this option. +# - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - Type a custom name in here +# - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!) from ..Script import Script from UM.Application import Application @@ -15,35 +18,72 @@ class DisplayFilenameAndLayerOnLCD(Script): def getSettingDataString(self): return """{ - "name": "Display filename and layer on LCD", + "name": "Display Filename And Layer On LCD", "key": "DisplayFilenameAndLayerOnLCD", "metadata": {}, "version": 2, "settings": { + "scroll": + { + "label": "Scroll enabled/Small layers?", + "description": "If SCROLL_LONG_FILENAMES is enabled select this setting however, if the model is small disable this setting!", + "type": "bool", + "default_value": false + }, "name": { - "label": "text to display:", + "label": "Text to display:", "description": "By default the current filename will be displayed on the LCD. Enter text here to override the filename and display something else.", "type": "str", "default_value": "" + }, + "startNum": + { + "label": "Initial layer number:", + "description": "Choose which number you prefer for the initial layer, 0 or 1", + "type": "int", + "default_value": 0, + "minimum_value": 0, + "maximum_value": 1 + }, + "maxlayer": + { + "label": "Display max layer?:", + "description": "Display how many layers are in the entire print on status bar?", + "type": "bool", + "default_value": true } } }""" def execute(self, data): + max_layer = 0 if self.getSettingValueByKey("name") != "": name = self.getSettingValueByKey("name") else: - name = Application.getInstance().getPrintInformation().jobName - lcd_text = "M117 " + name + " layer " - i = 0 + name = Application.getInstance().getPrintInformation().jobName + if not self.getSettingValueByKey("scroll"): + if self.getSettingValueByKey("maxlayer"): + lcd_text = "M117 Layer " + else: + lcd_text = "M117 Printing Layer " + else: + lcd_text = "M117 Printing " + name + " - Layer " + i = self.getSettingValueByKey("startNum") for layer in data: - display_text = lcd_text + str(i) + display_text = lcd_text + str(i) + " " + name layer_index = data.index(layer) lines = layer.split("\n") for line in lines: + if line.startswith(";LAYER_COUNT:"): + max_layer = line + max_layer = max_layer.split(":")[1] if line.startswith(";LAYER:"): + if self.getSettingValueByKey("maxlayer"): + display_text = display_text + " of " + max_layer + else: + display_text = display_text + "!" line_index = lines.index(line) lines.insert(line_index + 1, display_text) i += 1 diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 8b50a88b7f..45dc9a22ff 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -1,15 +1,16 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from ..Script import Script from UM.Application import Application #To get the current printer's settings. +from typing import List, Tuple class PauseAtHeight(Script): - def __init__(self): + def __init__(self) -> None: super().__init__() - def getSettingDataString(self): + def getSettingDataString(self) -> str: return """{ "name": "Pause at height", "key": "PauseAtHeight", @@ -113,11 +114,9 @@ class PauseAtHeight(Script): } }""" - def getNextXY(self, layer: str): - """ - Get the X and Y values for a layer (will be used to get X and Y of - the layer after the pause - """ + ## Get the X and Y values for a layer (will be used to get X and Y of the + # layer after the pause). + def getNextXY(self, layer: str) -> Tuple[float, float]: lines = layer.split("\n") for line in lines: if self.getValue(line, "X") is not None and self.getValue(line, "Y") is not None: @@ -126,8 +125,10 @@ class PauseAtHeight(Script): return x, y return 0, 0 - def execute(self, data: list): - """data is a list. Each index contains a layer""" + ## Inserts the pause commands. + # \param data: List of layers. + # \return New list of layers. + def execute(self, data: List[str]) -> List[str]: pause_at = self.getSettingValueByKey("pause_at") pause_height = self.getSettingValueByKey("pause_height") pause_layer = self.getSettingValueByKey("pause_layer") diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index 13b41eaacd..20eef60ef2 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -128,9 +128,26 @@ class Stretcher(): onestep = GCodeStep(0, in_relative_movement) onestep.copyPosFrom(current) elif _getValue(line, "G") == 1: + last_x = current.step_x + last_y = current.step_y + last_z = current.step_z + last_e = current.step_e current.readStep(line) - onestep = GCodeStep(1, in_relative_movement) - onestep.copyPosFrom(current) + if (current.step_x == last_x and current.step_y == last_y and + current.step_z == last_z and current.step_e != last_e + ): + # It's an extruder only move. Preserve it rather than process it as an + # extruded move. Otherwise, the stretched output might contain slight + # motion in X and Y in addition to E. This can cause problems with + # firmwares that implement pressure advance. + onestep = GCodeStep(-1, in_relative_movement) + onestep.copyPosFrom(current) + # Rather than copy the original line, write a new one with consistent + # extruder coordinates + onestep.comment = "G1 F{} E{}".format(onestep.step_f, onestep.step_e) + else: + onestep = GCodeStep(1, in_relative_movement) + onestep.copyPosFrom(current) # end of relative movement elif _getValue(line, "G") == 90: diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 3b2db2efac..20471f9763 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -218,10 +218,10 @@ class SimulationView(CuraView): if theme is not None: self._ghost_shader.setUniformValue("u_color", Color(*theme.getColor("layerview_ghost").getRgb())) - for node in DepthFirstIterator(scene.getRoot()): # type: ignore + for node in DepthFirstIterator(scene.getRoot()): # We do not want to render ConvexHullNode as it conflicts with the bottom layers. # However, it is somewhat relevant when the node is selected, so do render it then. - if type(node) is ConvexHullNode and not Selection.isSelected(node.getWatchedNode()): + if type(node) is ConvexHullNode and not Selection.isSelected(cast(ConvexHullNode, node).getWatchedNode()): continue if not node.render(renderer): @@ -572,14 +572,14 @@ class SimulationView(CuraView): self._current_layer_jumps = job.getResult().get("jumps") self._controller.getScene().sceneChanged.emit(self._controller.getScene().getRoot()) - self._top_layers_job = None # type: Optional["_CreateTopLayersJob"] + self._top_layers_job = None def _updateWithPreferences(self) -> None: self._solid_layers = int(Application.getInstance().getPreferences().getValue("view/top_layer_count")) self._only_show_top_layers = bool(Application.getInstance().getPreferences().getValue("view/only_show_top_layers")) self._compatibility_mode = self._evaluateCompatibilityMode() - self.setSimulationViewType(int(float(Application.getInstance().getPreferences().getValue("layerview/layer_view_type")))); + self.setSimulationViewType(int(float(Application.getInstance().getPreferences().getValue("layerview/layer_view_type")))) for extruder_nr, extruder_opacity in enumerate(Application.getInstance().getPreferences().getValue("layerview/extruder_opacities").split("|")): try: diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 7501429796..9308719227 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -126,6 +126,10 @@ class SliceInfo(QObject, Extension): else: data["active_mode"] = "custom" + data["camera_view"] = application.getPreferences().getValue("general/camera_perspective_mode") + if data["camera_view"] == "orthographic": + data["camera_view"] = "orthogonal" #The database still only recognises the old name "orthogonal". + definition_changes = global_stack.definitionChanges machine_settings_changed_by_user = False if definition_changes.getId() != "empty": diff --git a/plugins/SliceInfoPlugin/SliceInfoJob.py b/plugins/SliceInfoPlugin/SliceInfoJob.py index a5667c1c13..50d6b560f1 100644 --- a/plugins/SliceInfoPlugin/SliceInfoJob.py +++ b/plugins/SliceInfoPlugin/SliceInfoJob.py @@ -8,6 +8,8 @@ import ssl import urllib.request import urllib.error +import certifi + class SliceInfoJob(Job): def __init__(self, url, data): @@ -20,11 +22,14 @@ class SliceInfoJob(Job): Logger.log("e", "URL or DATA for sending slice info was not set!") return - # Submit data - kwoptions = {"data" : self._data, "timeout" : 5} + # CURA-6698 Create an SSL context and use certifi CA certificates for verification. + context = ssl.SSLContext(protocol = ssl.PROTOCOL_TLSv1_2) + context.load_verify_locations(cafile = certifi.where()) - if Platform.isOSX(): - kwoptions["context"] = ssl._create_unverified_context() + # Submit data + kwoptions = {"data": self._data, + "timeout": 5, + "context": context} Logger.log("i", "Sending anonymous slice info to [%s]...", self._url) @@ -35,4 +40,4 @@ class SliceInfoJob(Job): except urllib.error.HTTPError: Logger.logException("e", "An HTTP error occurred while trying to send slice information") except Exception: # We don't want any exception to cause problems - Logger.logException("e", "An exception occurred while trying to send slice information") \ No newline at end of file + Logger.logException("e", "An exception occurred while trying to send slice information") diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index d15d98eed7..f70dab03d8 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -48,32 +48,32 @@ Window ToolboxLoadingPage { id: viewLoading - visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading" + visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "loading" } ToolboxErrorPage { id: viewErrored - visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored" + visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "errored" } ToolboxDownloadsPage { id: viewDownloads - visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview" + visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "overview" } ToolboxDetailPage { id: viewDetail - visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail" + visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "detail" } ToolboxAuthorPage { id: viewAuthor - visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author" + visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "author" } ToolboxInstalledPage { id: installedPluginList - visible: toolbox.viewCategory == "installed" + visible: toolbox.viewCategory === "installed" } } diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml index db4e8c628f..1d1344fa9a 100644 --- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml @@ -1,9 +1,9 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 + import UM 1.1 as UM Item @@ -11,48 +11,17 @@ Item id: base property var packageData - property var technicalDataSheetUrl: - { - var link = undefined - if ("Technical Data Sheet" in packageData.links) - { - // HACK: This is the way the old API (used in 3.6-beta) used to do it. For safety it's still here, - // but it can be removed over time. - link = packageData.links["Technical Data Sheet"] - } - else if ("technicalDataSheet" in packageData.links) - { - link = packageData.links["technicalDataSheet"] - } - return link - } - property var safetyDataSheetUrl: - { - var sds_name = "safetyDataSheet" - return (sds_name in packageData.links) ? packageData.links[sds_name] : undefined - } - property var printingGuidelinesUrl: - { - var pg_name = "printingGuidelines" - return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined - } + property var technicalDataSheetUrl: packageData.links.technicalDataSheet + property var safetyDataSheetUrl: packageData.links.safetyDataSheet + property var printingGuidelinesUrl: packageData.links.printingGuidelines + property var materialWebsiteUrl: packageData.links.website - property var materialWebsiteUrl: - { - var pg_name = "website" - return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined - } - anchors.topMargin: UM.Theme.getSize("default_margin").height - height: visible ? childrenRect.height : 0 + height: childrenRect.height + onVisibleChanged: packageData.type === "material" && (compatibilityItem.visible || dataSheetLinks.visible) - visible: packageData.type == "material" && - (packageData.has_configs || technicalDataSheetUrl !== undefined || - safetyDataSheetUrl !== undefined || printingGuidelinesUrl !== undefined || - materialWebsiteUrl !== undefined) - - Item + Column { - id: combatibilityItem + id: compatibilityItem visible: packageData.has_configs width: parent.width // This is a bit of a hack, but the whole QML is pretty messy right now. This needs a big overhaul. @@ -61,7 +30,6 @@ Item Label { id: heading - anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width text: catalog.i18nc("@label", "Compatibility") wrapMode: Text.WordWrap @@ -73,8 +41,6 @@ Item TableView { id: table - anchors.top: heading.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width frameVisible: false @@ -155,32 +121,32 @@ Item TableViewColumn { role: "machine" - title: "Machine" + title: catalog.i18nc("@label:table_header", "Machine") width: Math.floor(table.width * 0.25) delegate: columnTextDelegate } TableViewColumn { role: "print_core" - title: "Print Core" + title: catalog.i18nc("@label:table_header", "Print Core") width: Math.floor(table.width * 0.2) } TableViewColumn { role: "build_plate" - title: "Build Plate" + title: catalog.i18nc("@label:table_header", "Build Plate") width: Math.floor(table.width * 0.225) } TableViewColumn { role: "support_material" - title: "Support" + title: catalog.i18nc("@label:table_header", "Support") width: Math.floor(table.width * 0.225) } TableViewColumn { role: "quality" - title: "Quality" + title: catalog.i18nc("@label:table_header", "Quality") width: Math.floor(table.width * 0.1) } } @@ -188,13 +154,14 @@ Item Label { - id: data_sheet_links - anchors.top: combatibilityItem.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height / 2 + id: dataSheetLinks + anchors.top: compatibilityItem.bottom + anchors.topMargin: UM.Theme.getSize("narrow_margin").height visible: base.technicalDataSheetUrl !== undefined || - base.safetyDataSheetUrl !== undefined || base.printingGuidelinesUrl !== undefined || - base.materialWebsiteUrl !== undefined - height: visible ? contentHeight : 0 + base.safetyDataSheetUrl !== undefined || + base.printingGuidelinesUrl !== undefined || + base.materialWebsiteUrl !== undefined + text: { var result = "" diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml index 4e44ea7d0b..22c6b6045f 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml @@ -1,9 +1,8 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import UM 1.1 as UM Item @@ -11,10 +10,9 @@ Item id: detailList ScrollView { - frameVisible: false + clip: true anchors.fill: detailList - style: UM.Theme.styles.scrollview - flickableItem.flickableDirection: Flickable.VerticalFlick + Column { anchors diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml index c7bb1f60ac..5badc6b66d 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml @@ -1,30 +1,30 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 +import QtQuick.Controls 2.3 + import UM 1.1 as UM Item { id: tile width: detailList.width - UM.Theme.getSize("wide_margin").width - height: normalData.height + compatibilityChart.height + 4 * UM.Theme.getSize("default_margin").height - Item + height: normalData.height + 2 * UM.Theme.getSize("wide_margin").height + Column { id: normalData - height: childrenRect.height + anchors { + top: parent.top left: parent.left right: controls.left - rightMargin: UM.Theme.getSize("default_margin").width * 2 + UM.Theme.getSize("toolbox_loader").width - top: parent.top + rightMargin: UM.Theme.getSize("wide_margin").width } + Label { - id: packageName width: parent.width height: UM.Theme.getSize("toolbox_property_label").height text: model.name @@ -33,9 +33,9 @@ Item font: UM.Theme.getFont("medium_bold") renderType: Text.NativeRendering } + Label { - anchors.top: packageName.bottom width: parent.width text: model.description maximumLineCount: 25 @@ -45,6 +45,12 @@ Item font: UM.Theme.getFont("default") renderType: Text.NativeRendering } + + ToolboxCompatibilityChart + { + width: parent.width + packageData: model + } } ToolboxDetailTileActions @@ -57,20 +63,12 @@ Item packageData: model } - ToolboxCompatibilityChart - { - id: compatibilityChart - anchors.top: normalData.bottom - width: normalData.width - packageData: model - } - Rectangle { color: UM.Theme.getColor("lining") width: tile.width height: UM.Theme.getSize("default_lining").height - anchors.top: compatibilityChart.bottom + anchors.top: normalData.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height + UM.Theme.getSize("wide_margin").height //Normal margin for spacing after chart, wide margin between items. } } diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml index 2b86aacefc..dfe91edbf6 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml @@ -35,7 +35,7 @@ Column // Don't allow installing while another download is running enabled: installed || (!(toolbox.isDownloading && toolbox.activePackage != model) && !loginRequired) opacity: enabled ? 1.0 : 0.5 - visible: !updateButton.visible && !installed// Don't show when the update button is visible + visible: !updateButton.visible && !installed // Don't show when the update button is visible } Cura.SecondaryButton diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml index a9fcb39b28..6682281a31 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml @@ -2,9 +2,7 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 -import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.3 import UM 1.1 as UM Column diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml index 3e0dda4f4a..5ea24d17ba 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml @@ -1,25 +1,20 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import UM 1.1 as UM ScrollView { - frameVisible: false + clip: true width: parent.width height: parent.height - style: UM.Theme.styles.scrollview - - flickableItem.flickableDirection: Flickable.VerticalFlick Column { width: base.width spacing: UM.Theme.getSize("default_margin").height - height: childrenRect.height ToolboxDownloadsShowcase { @@ -31,14 +26,14 @@ ScrollView { id: allPlugins width: parent.width - heading: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins") - model: toolbox.viewCategory == "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel + heading: toolbox.viewCategory === "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins") + model: toolbox.viewCategory === "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel } ToolboxDownloadsGrid { id: genericMaterials - visible: toolbox.viewCategory == "material" + visible: toolbox.viewCategory === "material" width: parent.width heading: catalog.i18nc("@label", "Generic Materials") model: toolbox.materialsGenericModel diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml index 0c43c67679..f4a9e634c4 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml @@ -1,50 +1,50 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Dialogs 1.1 -import QtQuick.Window 2.2 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 +import QtQuick.Controls 2.3 import UM 1.1 as UM ScrollView { id: page - frameVisible: false + clip: true width: parent.width height: parent.height - style: UM.Theme.styles.scrollview - flickableItem.flickableDirection: Flickable.VerticalFlick Column { + width: page.width spacing: UM.Theme.getSize("default_margin").height + padding: UM.Theme.getSize("wide_margin").width visible: toolbox.pluginsInstalledModel.items.length > 0 - height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height - - anchors - { - right: parent.right - left: parent.left - margins: UM.Theme.getSize("default_margin").width - top: parent.top - } + height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height Label { - width: page.width + anchors + { + left: parent.left + right: parent.right + margins: parent.padding + } text: catalog.i18nc("@title:tab", "Plugins") color: UM.Theme.getColor("text_medium") font: UM.Theme.getFont("large") renderType: Text.NativeRendering } + Rectangle { + anchors + { + left: parent.left + right: parent.right + margins: parent.padding + } id: installedPlugins color: "transparent" - width: parent.width height: childrenRect.height + UM.Theme.getSize("default_margin").width border.color: UM.Theme.getColor("lining") border.width: UM.Theme.getSize("default_lining").width @@ -65,8 +65,15 @@ ScrollView } } } + Label { + anchors + { + left: parent.left + right: parent.right + margins: parent.padding + } text: catalog.i18nc("@title:tab", "Materials") color: UM.Theme.getColor("text_medium") font: UM.Theme.getFont("medium") @@ -75,9 +82,14 @@ ScrollView Rectangle { + anchors + { + left: parent.left + right: parent.right + margins: parent.padding + } id: installedMaterials color: "transparent" - width: parent.width height: childrenRect.height + UM.Theme.getSize("default_margin").width border.color: UM.Theme.getColor("lining") border.width: UM.Theme.getSize("default_lining").width diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml index e47cde1bf4..f85a1056b7 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml @@ -41,7 +41,7 @@ Item Column { id: pluginInfo - topPadding: Math.floor(UM.Theme.getSize("default_margin").height / 2) + topPadding: UM.Theme.getSize("narrow_margin").height property var color: model.type === "plugin" && !isEnabled ? UM.Theme.getColor("lining") : UM.Theme.getColor("text") width: Math.floor(tileRow.width - (authorInfo.width + pluginActions.width + 2 * tileRow.spacing + ((disableButton.visible) ? disableButton.width + tileRow.spacing : 0))) Label diff --git a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml index 4d4ae92e73..40d6c1af47 100644 --- a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml +++ b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml @@ -1,16 +1,16 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 +import QtQuick 2.10 +import QtQuick.Controls 2.3 + import UM 1.1 as UM import Cura 1.0 as Cura -Item +Cura.PrimaryButton { - id: base + id: button property var active: false property var complete: false @@ -25,43 +25,36 @@ Item width: UM.Theme.getSize("toolbox_action_button").width height: UM.Theme.getSize("toolbox_action_button").height - - Cura.PrimaryButton + fixedWidthMode: true + text: { - id: button - width: UM.Theme.getSize("toolbox_action_button").width - height: UM.Theme.getSize("toolbox_action_button").height - fixedWidthMode: true - text: + if (complete) { - if (complete) - { - return completeLabel - } - else if (active) - { - return activeLabel - } - else - { - return readyLabel - } + return completeLabel } - onClicked: + else if (active) { - if (complete) - { - completeAction() - } - else if (active) - { - activeAction() - } - else - { - readyAction() - } + return activeLabel + } + else + { + return readyLabel } - busy: active } + onClicked: + { + if (complete) + { + completeAction() + } + else if (active) + { + activeAction() + } + else + { + readyAction() + } + } + busy: active } diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 698fdbd795..4dabba87a0 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -655,8 +655,12 @@ class Toolbox(QObject, Extension): # Check if the download was sucessfull if self._download_reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) != 200: - Logger.log("w", "Failed to download package. The following error was returned: %s", json.loads(bytes(self._download_reply.readAll()).decode("utf-8"))) - return + try: + Logger.log("w", "Failed to download package. The following error was returned: %s", json.loads(bytes(self._download_reply.readAll()).decode("utf-8"))) + except json.decoder.JSONDecodeError: + Logger.logException("w", "Failed to download package and failed to parse a response from it") + finally: + return # Must not delete the temporary file on Windows self._temp_plugin_file = tempfile.NamedTemporaryFile(mode = "w+b", suffix = ".curapackage", delete = False) file_path = self._temp_plugin_file.name diff --git a/plugins/UM3NetworkPrinting/__init__.py b/plugins/UM3NetworkPrinting/__init__.py index 3da7795589..ea0f69639d 100644 --- a/plugins/UM3NetworkPrinting/__init__.py +++ b/plugins/UM3NetworkPrinting/__init__.py @@ -1,7 +1,7 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from .src import DiscoverUM3Action from .src import UM3OutputDevicePlugin +from .src import UltimakerNetworkedPrinterAction def getMetaData(): @@ -11,5 +11,5 @@ def getMetaData(): def register(app): return { "output_device": UM3OutputDevicePlugin.UM3OutputDevicePlugin(), - "machine_action": DiscoverUM3Action.DiscoverUM3Action() + "machine_action": UltimakerNetworkedPrinterAction.UltimakerNetworkedPrinterAction() } diff --git a/plugins/UM3NetworkPrinting/plugin.json b/plugins/UM3NetworkPrinting/plugin.json index 088b4dae6a..894fc41815 100644 --- a/plugins/UM3NetworkPrinting/plugin.json +++ b/plugins/UM3NetworkPrinting/plugin.json @@ -1,7 +1,7 @@ { - "name": "UM3 Network Connection", + "name": "Ultimaker Network Connection", "author": "Ultimaker B.V.", - "description": "Manages network connections to Ultimaker 3 printers.", + "description": "Manages network connections to Ultimaker networked printers.", "version": "1.0.1", "api": "6.0", "i18n-catalog": "cura" diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index c0369cac0b..2e3d17ceb0 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -53,4 +53,4 @@ Rectangle } } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml index 733f3fd13a..f600083f36 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml @@ -23,37 +23,13 @@ Cura.MachineAction function connectToPrinter() { - if(base.selectedDevice && base.completeProperties) + if (base.selectedDevice && base.completeProperties) { - var printerKey = base.selectedDevice.key - var printerName = base.selectedDevice.name // TODO To change when the groups have a name - if (manager.getStoredKey() != printerKey) - { - // Check if there is another instance with the same key - if (!manager.existsKey(printerKey)) - { - manager.associateActiveMachineWithPrinterDevice(base.selectedDevice) - manager.setGroupName(printerName) // TODO To change when the groups have a name - completed() - } - else - { - existingConnectionDialog.open() - } - } + manager.associateActiveMachineWithPrinterDevice(base.selectedDevice) + completed() } } - MessageDialog - { - id: existingConnectionDialog - title: catalog.i18nc("@window:title", "Existing Connection") - icon: StandardIcon.Information - text: catalog.i18nc("@message:text", "This printer/group is already added to Cura. Please select another printer/group.") - standardButtons: StandardButton.Ok - modality: Qt.ApplicationModal - } - Column { anchors.fill: parent; @@ -151,21 +127,6 @@ Cura.MachineAction { id: listview model: manager.foundDevices - onModelChanged: - { - var selectedKey = manager.getLastManualEntryKey() - // If there is no last manual entry key, then we select the stored key (if any) - if (selectedKey == "") - selectedKey = manager.getStoredKey() - for(var i = 0; i < model.length; i++) { - if(model[i].key == selectedKey) - { - currentIndex = i; - return - } - } - currentIndex = -1; - } width: parent.width currentIndex: -1 onCurrentIndexChanged: @@ -250,29 +211,13 @@ Cura.MachineAction renderType: Text.NativeRendering text: { - if(base.selectedDevice) - { - if (base.selectedDevice.printerType == "ultimaker3") - { - return "Ultimaker 3"; - } - else if (base.selectedDevice.printerType == "ultimaker3_extended") - { - return "Ultimaker 3 Extended"; - } - else if (base.selectedDevice.printerType == "ultimaker_s5") - { - return "Ultimaker S5"; - } - else - { - return catalog.i18nc("@label", "Unknown") // We have no idea what type it is. Should not happen 'in the field' - } - } - else - { - return "" + if (base.selectedDevice) { + // It would be great to use a more readable machine type here, + // but the new discoveredPrintersModel is not used yet in the UM networking actions. + // TODO: remove actions or replace 'connect via network' button with new flow? + return base.selectedDevice.printerType } + return "" } } Label diff --git a/plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml b/plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml index fae8280488..5257361367 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ExpandableCard.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -87,4 +87,4 @@ Item } } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml b/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml index 74d9377f3e..61981dab2c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 619658a7eb..5d08422877 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -35,7 +35,7 @@ Item { height: parent.height width: 32 * screenScaleFactor // Ensure the icon is centered under the extruder icon (same width) - + Rectangle { anchors.centerIn: parent @@ -56,7 +56,7 @@ Item visible: buildplate } } - + Label { id: buildplateLabel @@ -72,4 +72,4 @@ Item renderType: Text.NativeRendering } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml index 0d7a177dd3..08743ed777 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -23,7 +23,7 @@ Item height: centerSection.height width: maximumWidth - + // Enable keyboard navigation Keys.onLeftPressed: navigateTo(currentIndex - 1) Keys.onRightPressed: navigateTo(currentIndex + 1) @@ -131,7 +131,7 @@ Item } } spacing: 60 * screenScaleFactor // TODO: Theme! - + Repeater { model: printers @@ -255,4 +255,4 @@ Item currentIndex = i } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml index d380915633..1fe766d9f7 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -160,4 +160,4 @@ UM.Dialog } return translationText } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml index fbae66117e..34ca3c6df2 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml index e91e8b04d2..aa5d6de89b 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -29,4 +29,4 @@ Button hoverEnabled: enabled text: "\u22EE" //Unicode Three stacked points. width: 36 * screenScaleFactor // TODO: Theme! -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index deed3ac5e6..63caaab433 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -56,7 +56,7 @@ Item Label { id: materialLabel - + color: UM.Theme.getColor("monitor_text_primary") elide: Text.ElideRight font: UM.Theme.getFont("default") // 12pt, regular @@ -86,7 +86,7 @@ Item Label { id: printCoreLabel - + color: UM.Theme.getColor("monitor_text_primary") elide: Text.ElideRight font: UM.Theme.getFont("default_bold") // 12pt, bold @@ -99,4 +99,4 @@ Item renderType: Text.NativeRendering } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index f6b84d69b2..876215d65d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -50,4 +50,4 @@ Item visible: position >= 0 renderType: Text.NativeRendering } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml index 0d2c7f8beb..32e19c1cdb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml index 41b3a93a7b..1ac72b8f8e 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -42,4 +42,4 @@ Component { z: 1; } } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index b863712481..14e95559ec 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -1,6 +1,5 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. - import QtQuick 2.2 import QtQuick.Controls 2.0 import UM 1.3 as UM @@ -76,6 +75,7 @@ Item anchors.verticalCenter: parent.verticalCenter height: 18 * screenScaleFactor // TODO: Theme! width: UM.Theme.getSize("monitor_column").width + Rectangle { color: UM.Theme.getColor("monitor_skeleton_loading") @@ -84,6 +84,7 @@ Item visible: !printJob radius: 2 * screenScaleFactor // TODO: Theme! } + Label { text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : "" @@ -179,13 +180,10 @@ Item id: printerConfiguration anchors.verticalCenter: parent.verticalCenter buildplate: catalog.i18nc("@label", "Glass") - configurations: - [ - base.printJob.configuration.extruderConfigurations[0], - base.printJob.configuration.extruderConfigurations[1] - ] + configurations: base.printJob.configuration.extruderConfigurations height: 72 * screenScaleFactor // TODO: Theme! } + Label { text: printJob && printJob.owner ? printJob.owner : "" color: UM.Theme.getColor("monitor_text_primary") @@ -243,10 +241,11 @@ Item enabled: !contextMenuButton.enabled } - MonitorInfoBlurb - { - id: contextMenuDisabledInfo - text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") - target: contextMenuButton - } + // TODO: uncomment this tooltip as soon as the required firmware is released + // MonitorInfoBlurb + // { + // id: contextMenuDisabledInfo + // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") + // target: contextMenuButton + // } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml index a392571757..7492b4e8e4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -41,7 +41,7 @@ Item UM.RecolorImage { id: ultiBotImage - + anchors.centerIn: printJobPreview color: UM.Theme.getColor("monitor_placeholder_image") height: printJobPreview.height @@ -98,4 +98,4 @@ Item visible: source != "" width: 0.5 * printJobPreview.width } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index e6d09b68f6..48bab48a9f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -107,4 +107,4 @@ Item verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 1f5a4cfcb2..0175d5a2ad 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -81,7 +81,7 @@ Item mipmap: true } } - + Item { @@ -90,7 +90,7 @@ Item verticalCenter: parent.verticalCenter } width: 180 * screenScaleFactor // TODO: Theme! - height: printerNameLabel.height + printerFamilyPill.height + 6 * screenScaleFactor // TODO: Theme! + height: childrenRect.height Rectangle { @@ -99,7 +99,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! width: parent.width radius: 2 * screenScaleFactor // TODO: Theme! - + Label { text: printer && printer.name ? printer.name : "" @@ -135,6 +135,54 @@ Item } text: printer ? printer.type : "" } + Item + { + id: managePrinterLink + anchors { + top: printerFamilyPill.bottom + topMargin: 6 * screenScaleFactor + } + height: 18 * screenScaleFactor // TODO: Theme! + width: childrenRect.width + + Label + { + id: managePrinterText + anchors.verticalCenter: managePrinterLink.verticalCenter + color: UM.Theme.getColor("monitor_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 + } + UM.RecolorImage + { + id: externalLinkIcon + anchors + { + left: managePrinterText.right + leftMargin: 6 * screenScaleFactor + verticalCenter: managePrinterText.verticalCenter + } + color: UM.Theme.getColor("monitor_text_link") + source: UM.Theme.getIcon("external_link") + width: 12 * screenScaleFactor + height: 12 * screenScaleFactor + } + } + MouseArea + { + anchors.fill: managePrinterLink + onClicked: OutputDevice.openPrintJobControlPanel() + onEntered: + { + manageQueueText.font.underline = true + } + onExited: + { + manageQueueText.font.underline = false + } + } } MonitorPrinterConfiguration @@ -202,12 +250,13 @@ Item enabled: !contextMenuButton.enabled } - MonitorInfoBlurb - { - id: contextMenuDisabledInfo - text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") - target: contextMenuButton - } + // TODO: uncomment this tooltip as soon as the required firmware is released + // MonitorInfoBlurb + // { + // id: contextMenuDisabledInfo + // text: catalog.i18nc("@info", "Please update your printer's firmware to manage the queue remotely.") + // target: contextMenuButton + // } CameraButton { @@ -454,4 +503,4 @@ Item id: overrideConfirmationDialog printer: base.printer } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml index dbe085e18e..21d08a310c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -55,4 +55,4 @@ Item anchors.bottom: parent.bottom buildplate: null } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml index 584e336a80..44aa1a1f8d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -11,20 +11,8 @@ import UM 1.2 as UM */ Item { - // The printer name + id: monitorPrinterPill property var text: "" - property var tagText: { - switch(text) { - case "Ultimaker 3": - return "UM 3" - case "Ultimaker 3 Extended": - return "UM 3 EXT" - case "Ultimaker S5": - return "UM S5" - default: - return text - } - } implicitHeight: 18 * screenScaleFactor // TODO: Theme! implicitWidth: Math.max(printerNameLabel.contentWidth + 12 * screenScaleFactor, 36 * screenScaleFactor) // TODO: Theme! @@ -40,9 +28,9 @@ Item id: printerNameLabel anchors.centerIn: parent color: UM.Theme.getColor("monitor_text_primary") - text: tagText + text: monitorPrinterPill.text font.pointSize: 10 // TODO: Theme! - visible: text !== "" + visible: monitorPrinterPill.text !== "" renderType: Text.NativeRendering } -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 369951fa9c..b70759454a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -95,6 +95,22 @@ Item } spacing: 18 * screenScaleFactor // TODO: Theme! + Label + { + text: catalog.i18nc("@label", "There are no print jobs in the queue. Slice and send a job to add one.") + color: UM.Theme.getColor("monitor_text_primary") + elide: Text.ElideRight + font: UM.Theme.getFont("medium") // 14pt, regular + anchors.verticalCenter: parent.verticalCenter + width: 600 * screenScaleFactor // TODO: Theme! (Should match column size) + + // FIXED-LINE-HEIGHT: + height: 18 * screenScaleFactor // TODO: Theme! + verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering + visible: printJobList.count === 0 + } + Label { text: catalog.i18nc("@label", "Print jobs") @@ -108,6 +124,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + visible: printJobList.count > 0 } Label @@ -123,6 +140,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + visible: printJobList.count > 0 } Label @@ -138,6 +156,7 @@ Item height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering + visible: printJobList.count > 0 } } @@ -167,102 +186,8 @@ Item } printJob: modelData } - model: - { - // When printing over the cloud we don't recieve print jobs until there is one, so - // unless there's at least one print job we'll be stuck with skeleton loading - // indefinitely. - if (Cura.MachineManager.activeMachineIsUsingCloudConnection || OutputDevice.receivedPrintJobs) - { - return OutputDevice.queuedPrintJobs - } - return [null, null] - } + model: OutputDevice.queuedPrintJobs spacing: 6 // TODO: Theme! } } - - Rectangle - { - anchors - { - horizontalCenter: parent.horizontalCenter - top: printJobQueueHeadings.bottom - topMargin: 12 * screenScaleFactor // TODO: Theme! - } - height: 48 * screenScaleFactor // TODO: Theme! - width: parent.width - color: UM.Theme.getColor("monitor_card_background") - border.color: UM.Theme.getColor("monitor_card_border") - radius: 2 * screenScaleFactor // TODO: Theme! - visible: OutputDevice.printJobs.length == 0 - - Row - { - anchors - { - left: parent.left - leftMargin: 18 * screenScaleFactor // TODO: Theme! - verticalCenter: parent.verticalCenter - } - spacing: 18 * screenScaleFactor // TODO: Theme! - height: 18 * screenScaleFactor // TODO: Theme! - - Label - { - text: i18n.i18nc("@info", "All jobs are printed.") - color: UM.Theme.getColor("monitor_text_primary") - font: UM.Theme.getFont("medium") // 14pt, regular - renderType: Text.NativeRendering - } - - Item - { - id: viewPrintHistoryLabel - - height: 18 * screenScaleFactor // TODO: Theme! - width: childrenRect.width - visible: !cloudConnection - - UM.RecolorImage - { - id: printHistoryIcon - anchors.verticalCenter: parent.verticalCenter - color: UM.Theme.getColor("monitor_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?!) - } - Label - { - id: viewPrintHistoryText - anchors - { - left: printHistoryIcon.right - leftMargin: 6 * screenScaleFactor // TODO: Theme! - verticalCenter: printHistoryIcon.verticalCenter - } - color: UM.Theme.getColor("monitor_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 - } - MouseArea - { - anchors.fill: parent - hoverEnabled: true - onClicked: OutputDevice.openPrintJobControlPanel() - onEntered: - { - viewPrintHistoryText.font.underline = true - } - onExited: - { - viewPrintHistoryText.font.underline = false - } - } - } - } - } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index e68418c21a..58e4263d2d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -25,7 +25,7 @@ Component } width: maximumWidth color: UM.Theme.getColor("monitor_stage_background") - + // Enable keyboard navigation. NOTE: This is done here so that we can also potentially // forward to the queue items in the future. (Deleting selected print job, etc.) Keys.forwardTo: carousel @@ -50,17 +50,7 @@ Component MonitorCarousel { id: carousel - printers: - { - // When printing over the cloud we don't recieve print jobs until there is one, so - // unless there's at least one print job we'll be stuck with skeleton loading - // indefinitely. - if (Cura.MachineManager.activeMachineIsUsingCloudConnection || OutputDevice.receivedPrintJobs) - { - return OutputDevice.printers - } - return [null] - } + printers: OutputDevice.printers } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml index ff5635e45d..78b94ce259 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -21,4 +21,4 @@ Button { height: visible ? 39 * screenScaleFactor : 0; // TODO: Theme! hoverEnabled: true; width: parent.width; -} \ No newline at end of file +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index 548e5ce1ea..bcba60352c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index 77b481f6d8..cfbb30fdfb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2019 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 diff --git a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml deleted file mode 100644 index c99ed1688e..0000000000 --- a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.1 -import UM 1.2 as UM -import Cura 1.0 as Cura - -Item { - id: base; - property string activeQualityDefinitionId: Cura.MachineManager.activeQualityDefinitionId; - property bool isUM3: activeQualityDefinitionId == "ultimaker3" || activeQualityDefinitionId.match("ultimaker_") != null; - property bool printerConnected: Cura.MachineManager.printerConnected; - property bool printerAcceptsCommands: - { - if (printerConnected && Cura.MachineManager.printerOutputDevices[0]) - { - return Cura.MachineManager.printerOutputDevices[0].acceptsCommands - } - return false - } - property bool authenticationRequested: - { - if (printerConnected && Cura.MachineManager.printerOutputDevices[0]) - { - var device = Cura.MachineManager.printerOutputDevices[0] - // AuthState.AuthenticationRequested or AuthState.AuthenticationReceived - return device.authenticationState == 2 || device.authenticationState == 5 - } - return false - } - property var materialNames: - { - if (printerConnected && Cura.MachineManager.printerOutputDevices[0]) - { - return Cura.MachineManager.printerOutputDevices[0].materialNames - } - return null - } - property var hotendIds: - { - if (printerConnected && Cura.MachineManager.printerOutputDevices[0]) - { - return Cura.MachineManager.printerOutputDevices[0].hotendIds - } - return null - } - - UM.I18nCatalog { - id: catalog; - name: "cura"; - } - - Row { - objectName: "networkPrinterConnectButton"; - spacing: UM.Theme.getSize("default_margin").width; - visible: isUM3; - - Button { - height: UM.Theme.getSize("save_button_save_to_button").height; - onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication(); - style: UM.Theme.styles.print_setup_action_button; - text: catalog.i18nc("@action:button", "Request Access"); - tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer"); - visible: printerConnected && !printerAcceptsCommands && !authenticationRequested; - } - - Button { - height: UM.Theme.getSize("save_button_save_to_button").height; - onClicked: connectActionDialog.show(); - style: UM.Theme.styles.print_setup_action_button; - text: catalog.i18nc("@action:button", "Connect"); - tooltip: catalog.i18nc("@info:tooltip", "Connect to a printer"); - visible: !printerConnected; - } - } - - UM.Dialog { - id: connectActionDialog; - rightButtons: Button { - iconName: "dialog-close"; - onClicked: connectActionDialog.reject(); - text: catalog.i18nc("@action:button", "Close"); - } - - Loader { - anchors.fill: parent; - source: "DiscoverUM3Action.qml"; - } - } -} diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py index d55fd8ab28..21a7f4aa57 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json from json import JSONDecodeError @@ -11,18 +11,19 @@ from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManage from UM.Logger import Logger from cura import UltimakerCloudAuthentication from cura.API import Account + from .ToolPathUploader import ToolPathUploader -from ..Models import BaseModel -from .Models.CloudClusterResponse import CloudClusterResponse -from .Models.CloudError import CloudError -from .Models.CloudClusterStatus import CloudClusterStatus -from .Models.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest -from .Models.CloudPrintResponse import CloudPrintResponse -from .Models.CloudPrintJobResponse import CloudPrintJobResponse +from ..Models.BaseModel import BaseModel +from ..Models.Http.CloudClusterResponse import CloudClusterResponse +from ..Models.Http.CloudError import CloudError +from ..Models.Http.CloudClusterStatus import CloudClusterStatus +from ..Models.Http.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest +from ..Models.Http.CloudPrintResponse import CloudPrintResponse +from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse ## The generic type variable used to document the methods below. -CloudApiClientModel = TypeVar("CloudApiClientModel", bound = BaseModel) +CloudApiClientModel = TypeVar("CloudApiClientModel", bound=BaseModel) ## The cloud API client is responsible for handling the requests and responses from the cloud. @@ -34,6 +35,9 @@ class CloudApiClient: CLUSTER_API_ROOT = "{}/connect/v1".format(ROOT_PATH) CURA_API_ROOT = "{}/cura/v1".format(ROOT_PATH) + # In order to avoid garbage collection we keep the callbacks in this list. + _anti_gc_callbacks = [] # type: List[Callable[[], None]] + ## Initializes a new cloud API client. # \param account: The user's account object # \param on_error: The callback to be called whenever we receive errors from the server. @@ -43,8 +47,6 @@ class CloudApiClient: self._account = account self._on_error = on_error self._upload = None # type: Optional[ToolPathUploader] - # In order to avoid garbage collection we keep the callbacks in this list. - self._anti_gc_callbacks = [] # type: List[Callable[[], None]] ## Gets the account used for the API. @property @@ -69,8 +71,8 @@ class CloudApiClient: ## Requests the cloud to register the upload of a print job mesh. # \param request: The request object. # \param on_finished: The function to be called after the result is parsed. - def requestUpload(self, request: CloudPrintJobUploadRequest, on_finished: Callable[[CloudPrintJobResponse], Any] - ) -> None: + def requestUpload(self, request: CloudPrintJobUploadRequest, + on_finished: Callable[[CloudPrintJobResponse], Any]) -> None: url = "{}/jobs/upload".format(self.CURA_API_ROOT) body = json.dumps({"data": request.toDict()}) reply = self._manager.put(self._createEmptyRequest(url), body.encode()) @@ -100,14 +102,9 @@ class CloudApiClient: # \param cluster_id: The ID of the cluster. # \param cluster_job_id: The ID of the print job within the cluster. # \param action: The name of the action to execute. - def doPrintJobAction(self, cluster_id: str, cluster_job_id: str, action: str, data: Optional[Dict[str, Any]] = None) -> None: - body = b"" - if data: - try: - body = json.dumps({"data": data}).encode() - except JSONDecodeError as err: - Logger.log("w", "Could not encode body: %s", err) - return + def doPrintJobAction(self, cluster_id: str, cluster_job_id: str, action: str, + data: Optional[Dict[str, Any]] = None) -> None: + body = json.dumps({"data": data}).encode() if data else b"" url = "{}/clusters/{}/print_jobs/{}/action/{}".format(self.CLUSTER_API_ROOT, cluster_id, cluster_job_id, action) self._manager.post(self._createEmptyRequest(url), body) @@ -171,12 +168,16 @@ class CloudApiClient: reply: QNetworkReply, on_finished: Union[Callable[[CloudApiClientModel], Any], Callable[[List[CloudApiClientModel]], Any]], - model: Type[CloudApiClientModel], - ) -> None: + model: Type[CloudApiClientModel]) -> None: def parse() -> None: - status_code, response = self._parseReply(reply) self._anti_gc_callbacks.remove(parse) - return self._parseModels(response, on_finished, model) + + # Don't try to parse the reply if we didn't get one + if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) is None: + return + + status_code, response = self._parseReply(reply) + self._parseModels(response, on_finished, model) self._anti_gc_callbacks.append(parse) reply.finished.connect(parse) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 34f062671f..fc514d1fca 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -1,9 +1,7 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import os - from time import time -from typing import Dict, List, Optional, Set, cast +from typing import List, Optional, cast from PyQt5.QtCore import QObject, QUrl, pyqtProperty, pyqtSignal, pyqtSlot from PyQt5.QtGui import QDesktopServices @@ -12,30 +10,25 @@ from UM import i18nCatalog from UM.Backend.Backend import BackendState from UM.FileHandler.FileHandler import FileHandler from UM.Logger import Logger -from UM.Message import Message -from UM.PluginRegistry import PluginRegistry -from UM.Qt.Duration import Duration, DurationFormat from UM.Scene.SceneNode import SceneNode from UM.Version import Version - from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice -from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel +from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState from cura.PrinterOutput.PrinterOutputDevice import ConnectionType -from .CloudOutputController import CloudOutputController -from ..MeshFormatHandler import MeshFormatHandler -from ..UM3PrintJobOutputModel import UM3PrintJobOutputModel -from .CloudProgressMessage import CloudProgressMessage from .CloudApiClient import CloudApiClient -from .Models.CloudClusterResponse import CloudClusterResponse -from .Models.CloudClusterStatus import CloudClusterStatus -from .Models.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest -from .Models.CloudPrintResponse import CloudPrintResponse -from .Models.CloudPrintJobResponse import CloudPrintJobResponse -from .Models.CloudClusterPrinterStatus import CloudClusterPrinterStatus -from .Models.CloudClusterPrintJobStatus import CloudClusterPrintJobStatus -from .Utils import findChanges, formatDateCompleted, formatTimeCompleted +from ..ExportFileJob import ExportFileJob +from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice +from ..Messages.PrintJobUploadBlockedMessage import PrintJobUploadBlockedMessage +from ..Messages.PrintJobUploadErrorMessage import PrintJobUploadErrorMessage +from ..Messages.PrintJobUploadSuccessMessage import PrintJobUploadSuccessMessage +from ..Models.Http.CloudClusterResponse import CloudClusterResponse +from ..Models.Http.CloudClusterStatus import CloudClusterStatus +from ..Models.Http.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest +from ..Models.Http.CloudPrintResponse import CloudPrintResponse +from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse +from ..Models.Http.ClusterPrinterStatus import ClusterPrinterStatus +from ..Models.Http.ClusterPrintJobStatus import ClusterPrintJobStatus I18N_CATALOG = i18nCatalog("cura") @@ -45,10 +38,11 @@ I18N_CATALOG = i18nCatalog("cura") # Currently it only supports viewing the printer and print job status and adding a new job to the queue. # As such, those methods have been implemented here. # Note that this device represents a single remote cluster, not a list of multiple clusters. -class CloudOutputDevice(NetworkedPrinterOutputDevice): +class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): - # The interval with which the remote clusters are checked - CHECK_CLUSTER_INTERVAL = 10.0 # seconds + # The interval with which the remote cluster is checked. + # We can do this relatively often as this API call is quite fast. + CHECK_CLUSTER_INTERVAL = 8.0 # seconds # The minimum version of firmware that support print job actions over cloud. PRINT_JOB_ACTIONS_MIN_VERSION = Version("5.3.0") @@ -80,44 +74,29 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice): b"cluster_size": b"1" # cloud devices are always clusters of at least one } - super().__init__(device_id = cluster.cluster_id, address = "", - connection_type = ConnectionType.CloudConnection, properties = properties, parent = parent) + super().__init__( + device_id=cluster.cluster_id, + address="", + connection_type=ConnectionType.CloudConnection, + properties=properties, + parent=parent + ) + self._api = api_client - self._cluster = cluster - - self._setInterfaceElements() - self._account = api_client.account - - # We use the Cura Connect monitor tab to get most functionality right away. - if PluginRegistry.getInstance() is not None: - plugin_path = PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting") - if plugin_path is None: - Logger.log("e", "Cloud not find plugin path for plugin UM3NetworkPrnting") - raise RuntimeError("Cloud not find plugin path for plugin UM3NetworkPrnting") - self._monitor_view_qml_path = os.path.join(plugin_path, "resources", "qml", "MonitorStage.qml") + self._cluster = cluster + self.setAuthenticationState(AuthState.NotAuthenticated) + self._setInterfaceElements() # Trigger the printersChanged signal when the private signal is triggered. self.printersChanged.connect(self._clusterPrintersChanged) - # We keep track of which printer is visible in the monitor page. - self._active_printer = None # type: Optional[PrinterOutputModel] - - # Properties to populate later on with received cloud data. - self._print_jobs = [] # type: List[UM3PrintJobOutputModel] - self._number_of_extruders = 2 # All networked printers are dual-extrusion Ultimaker machines. - - # We only allow a single upload at a time. - self._progress = CloudProgressMessage() - # Keep server string of the last generated time to avoid updating models more than once for the same response - self._received_printers = None # type: Optional[List[CloudClusterPrinterStatus]] - self._received_print_jobs = None # type: Optional[List[CloudClusterPrintJobStatus]] - - # A set of the user's job IDs that have finished - self._finished_jobs = set() # type: Set[str] + self._received_printers = None # type: Optional[List[ClusterPrinterStatus]] + self._received_print_jobs = None # type: Optional[List[ClusterPrintJobStatus]] # Reference to the uploaded print job / mesh + # We do this to prevent re-uploading the same file multiple times. self._tool_path = None # type: Optional[bytes] self._uploaded_print_job = None # type: Optional[CloudPrintJobResponse] @@ -128,9 +107,12 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice): super().connect() Logger.log("i", "Connected to cluster %s", self.key) CuraApplication.getInstance().getBackend().backendStateChange.connect(self._onBackendStateChange) + self._update() ## Disconnects the device def disconnect(self) -> None: + if not self.isConnected(): + return super().disconnect() Logger.log("i", "Disconnected from cluster %s", self.key) CuraApplication.getInstance().getBackend().backendStateChange.disconnect(self._onBackendStateChange) @@ -140,6 +122,149 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice): self._tool_path = None self._uploaded_print_job = None + ## Checks whether the given network key is found in the cloud's host name + def matchesNetworkKey(self, network_key: str) -> bool: + # Typically, a network key looks like "ultimakersystem-aabbccdd0011._ultimaker._tcp.local." + # the host name should then be "ultimakersystem-aabbccdd0011" + if network_key.startswith(self.clusterData.host_name): + return True + # However, for manually added printers, the local IP address is used in lieu of a proper + # network key, so check for that as well + if self.clusterData.host_internal_ip is not None and network_key in self.clusterData.host_internal_ip: + return True + return False + + ## Set all the interface elements and texts for this output device. + def _setInterfaceElements(self) -> None: + 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.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via Cloud")) + self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via Cloud")) + + ## Called when the network data should be updated. + def _update(self) -> None: + super()._update() + if self._last_request_time and time() - self._last_request_time < self.CHECK_CLUSTER_INTERVAL: + return # Avoid calling the cloud too often + if self._account.isLoggedIn: + self.setAuthenticationState(AuthState.Authenticated) + self._last_request_time = time() + self._api.getClusterStatus(self.key, self._onStatusCallFinished) + else: + self.setAuthenticationState(AuthState.NotAuthenticated) + + ## Method called when HTTP request to status endpoint is finished. + # Contains both printers and print jobs statuses in a single response. + def _onStatusCallFinished(self, status: CloudClusterStatus) -> None: + # Update all data from the cluster. + self._last_response_time = time() + if self._received_printers != status.printers: + self._received_printers = status.printers + self._updatePrinters(status.printers) + if status.print_jobs != self._received_print_jobs: + self._received_print_jobs = status.print_jobs + self._updatePrintJobs(status.print_jobs) + + ## Called when Cura requests an output device to receive a (G-code) file. + def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, + file_handler: Optional[FileHandler] = None, filter_by_machine: bool = False, **kwargs) -> None: + + # Show an error message if we're already sending a job. + if self._progress.visible: + PrintJobUploadBlockedMessage().show() + return + + # Indicate we have started sending a job. + self.writeStarted.emit(self) + + # The mesh didn't change, let's not upload it to the cloud again. + # Note that self.writeFinished is called in _onPrintUploadCompleted as well. + if self._uploaded_print_job: + self._api.requestPrint(self.key, self._uploaded_print_job.job_id, self._onPrintUploadCompleted) + return + + # Export the scene to the correct file type. + job = ExportFileJob(file_handler=file_handler, nodes=nodes, firmware_version=self.firmwareVersion) + job.finished.connect(self._onPrintJobCreated) + job.start() + + ## Handler for when the print job was created locally. + # It can now be sent over the cloud. + def _onPrintJobCreated(self, job: ExportFileJob) -> None: + output = job.getOutput() + self._tool_path = output # store the tool path to prevent re-uploading when printing the same file again + request = CloudPrintJobUploadRequest( + job_name=job.getFileName(), + file_size=len(output), + content_type=job.getMimeType(), + ) + self._api.requestUpload(request, self._uploadPrintJob) + + ## Uploads the mesh when the print job was registered with the cloud API. + # \param job_response: The response received from the cloud API. + def _uploadPrintJob(self, job_response: CloudPrintJobResponse) -> None: + if not self._tool_path: + return self._onUploadError() + self._progress.show() + self._uploaded_print_job = job_response # store the last uploaded job to prevent re-upload of the same file + self._api.uploadToolPath(job_response, self._tool_path, self._onPrintJobUploaded, self._progress.update, + self._onUploadError) + + ## Requests the print to be sent to the printer when we finished uploading the mesh. + def _onPrintJobUploaded(self) -> None: + self._progress.update(100) + print_job = cast(CloudPrintJobResponse, self._uploaded_print_job) + self._api.requestPrint(self.key, print_job.job_id, self._onPrintUploadCompleted) + + ## Shows a message when the upload has succeeded + # \param response: The response from the cloud API. + def _onPrintUploadCompleted(self, response: CloudPrintResponse) -> None: + self._progress.hide() + PrintJobUploadSuccessMessage().show() + self.writeFinished.emit() + + ## Displays the given message if uploading the mesh has failed + # \param message: The message to display. + def _onUploadError(self, message: str = None) -> None: + self._progress.hide() + self._uploaded_print_job = None + PrintJobUploadErrorMessage(message).show() + self.writeError.emit() + + ## Whether the printer that this output device represents supports print job actions via the cloud. + @pyqtProperty(bool, notify=_clusterPrintersChanged) + def supportsPrintJobActions(self) -> bool: + if not self._printers: + return False + version_number = self.printers[0].firmwareVersion.split(".") + firmware_version = Version([version_number[0], version_number[1], version_number[2]]) + return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION + + ## Set the remote print job state. + def setJobState(self, print_job_uuid: str, state: str) -> None: + self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, state) + + @pyqtSlot(str, name="sendJobToTop") + def sendJobToTop(self, print_job_uuid: str) -> None: + self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "move", + {"list": "queued", "to_position": 0}) + + @pyqtSlot(str, name="deleteJobFromQueue") + def deleteJobFromQueue(self, print_job_uuid: str) -> None: + self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "remove") + + @pyqtSlot(str, name="forceSendJob") + def forceSendJob(self, print_job_uuid: str) -> None: + self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "force") + + @pyqtSlot(name="openPrintJobControlPanel") + def openPrintJobControlPanel(self) -> None: + QDesktopServices.openUrl(QUrl(self.clusterCloudUrl)) + + @pyqtSlot(name="openPrinterControlPanel") + def openPrinterControlPanel(self) -> None: + QDesktopServices.openUrl(QUrl(self.clusterCloudUrl)) + ## Gets the cluster response from which this device was created. @property def clusterData(self) -> CloudClusterResponse: @@ -149,319 +274,9 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice): @clusterData.setter def clusterData(self, value: CloudClusterResponse) -> None: self._cluster = value - - ## Checks whether the given network key is found in the cloud's host name - def matchesNetworkKey(self, network_key: str) -> bool: - # Typically, a network key looks like "ultimakersystem-aabbccdd0011._ultimaker._tcp.local." - # the host name should then be "ultimakersystem-aabbccdd0011" - if network_key.startswith(self.clusterData.host_name): - return True - - # However, for manually added printers, the local IP address is used in lieu of a proper - # network key, so check for that as well - if self.clusterData.host_internal_ip is not None and network_key.find(self.clusterData.host_internal_ip): - return True - - return False - - ## Set all the interface elements and texts for this output device. - def _setInterfaceElements(self) -> None: - self.setPriority(2) # Make sure we end up below the local networking and above 'save to file' - self.setName(self._id) - self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via Cloud")) - self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via Cloud")) - self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via Cloud")) - - ## Called when Cura requests an output device to receive a (G-code) file. - def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, - file_handler: Optional[FileHandler] = None, **kwargs: str) -> None: - - # Show an error message if we're already sending a job. - if self._progress.visible: - message = Message( - text = I18N_CATALOG.i18nc("@info:status", "Sending new jobs (temporarily) blocked, still sending the previous print job."), - title = I18N_CATALOG.i18nc("@info:title", "Cloud error"), - lifetime = 10 - ) - message.show() - return - - if self._uploaded_print_job: - # The mesh didn't change, let's not upload it again - self._api.requestPrint(self.key, self._uploaded_print_job.job_id, self._onPrintUploadCompleted) - return - - # Indicate we have started sending a job. - self.writeStarted.emit(self) - - mesh_format = MeshFormatHandler(file_handler, self.firmwareVersion) - if not mesh_format.is_valid: - Logger.log("e", "Missing file or mesh writer!") - return self._onUploadError(I18N_CATALOG.i18nc("@info:status", "Could not export print job.")) - - mesh = mesh_format.getBytes(nodes) - - self._tool_path = mesh - request = CloudPrintJobUploadRequest( - job_name = file_name or mesh_format.file_extension, - file_size = len(mesh), - content_type = mesh_format.mime_type, - ) - self._api.requestUpload(request, self._onPrintJobCreated) - - ## Called when the network data should be updated. - def _update(self) -> None: - super()._update() - if self._last_request_time and time() - self._last_request_time < self.CHECK_CLUSTER_INTERVAL: - return # Avoid calling the cloud too often - - Logger.log("d", "Updating: %s - %s >= %s", time(), self._last_request_time, self.CHECK_CLUSTER_INTERVAL) - if self._account.isLoggedIn: - self.setAuthenticationState(AuthState.Authenticated) - self._last_request_time = time() - self._api.getClusterStatus(self.key, self._onStatusCallFinished) - else: - self.setAuthenticationState(AuthState.NotAuthenticated) - - ## Method called when HTTP request to status endpoint is finished. - # Contains both printers and print jobs statuses in a single response. - def _onStatusCallFinished(self, status: CloudClusterStatus) -> None: - # Update all data from the cluster. - self._last_response_time = time() - if self._received_printers != status.printers: - self._received_printers = status.printers - self._updatePrinters(status.printers) - - if status.print_jobs != self._received_print_jobs: - self._received_print_jobs = status.print_jobs - self._updatePrintJobs(status.print_jobs) - - ## Updates the local list of printers with the list received from the cloud. - # \param jobs: The printers received from the cloud. - def _updatePrinters(self, printers: List[CloudClusterPrinterStatus]) -> None: - previous = {p.key: p for p in self._printers} # type: Dict[str, PrinterOutputModel] - received = {p.uuid: p for p in printers} # type: Dict[str, CloudClusterPrinterStatus] - removed_printers, added_printers, updated_printers = findChanges(previous, received) - - for removed_printer in removed_printers: - if self._active_printer == removed_printer: - self.setActivePrinter(None) - self._printers.remove(removed_printer) - - for added_printer in added_printers: - self._printers.append(added_printer.createOutputModel(CloudOutputController(self))) - - for model, printer in updated_printers: - printer.updateOutputModel(model) - - # Always have an active printer - if self._printers and not self._active_printer: - self.setActivePrinter(self._printers[0]) - - if added_printers or removed_printers: - self.printersChanged.emit() - - ## Updates the local list of print jobs with the list received from the cloud. - # \param jobs: The print jobs received from the cloud. - def _updatePrintJobs(self, jobs: List[CloudClusterPrintJobStatus]) -> None: - received = {j.uuid: j for j in jobs} # type: Dict[str, CloudClusterPrintJobStatus] - previous = {j.key: j for j in self._print_jobs} # type: Dict[str, UM3PrintJobOutputModel] - - removed_jobs, added_jobs, updated_jobs = findChanges(previous, received) - - for removed_job in removed_jobs: - if removed_job.assignedPrinter: - removed_job.assignedPrinter.updateActivePrintJob(None) - removed_job.stateChanged.disconnect(self._onPrintJobStateChanged) - self._print_jobs.remove(removed_job) - - for added_job in added_jobs: - self._addPrintJob(added_job) - - for model, job in updated_jobs: - job.updateOutputModel(model) - if job.printer_uuid: - self._updateAssignedPrinter(model, job.printer_uuid) - - # We only have to update when jobs are added or removed - # updated jobs push their changes via their output model - if added_jobs or removed_jobs: - self.printJobsChanged.emit() - - ## Registers a new print job received via the cloud API. - # \param job: The print job received. - def _addPrintJob(self, job: CloudClusterPrintJobStatus) -> None: - model = job.createOutputModel(CloudOutputController(self)) - model.stateChanged.connect(self._onPrintJobStateChanged) - if job.printer_uuid: - self._updateAssignedPrinter(model, job.printer_uuid) - self._print_jobs.append(model) - - ## Handles the event of a change in a print job state - def _onPrintJobStateChanged(self) -> None: - user_name = self._getUserName() - # TODO: confirm that notifications in Cura are still required - for job in self._print_jobs: - if job.state == "wait_cleanup" and job.key not in self._finished_jobs and job.owner == user_name: - self._finished_jobs.add(job.key) - Message( - title = I18N_CATALOG.i18nc("@info:status", "Print finished"), - text = (I18N_CATALOG.i18nc("@info:status", "Printer '{printer_name}' has finished printing '{job_name}'.").format( - printer_name = job.assignedPrinter.name, - job_name = job.name - ) if job.assignedPrinter else - I18N_CATALOG.i18nc("@info:status", "The print job '{job_name}' was finished.").format( - job_name = job.name - )), - ).show() - - ## Updates the printer assignment for the given print job model. - def _updateAssignedPrinter(self, model: UM3PrintJobOutputModel, printer_uuid: str) -> None: - printer = next((p for p in self._printers if printer_uuid == p.key), None) - if not printer: - Logger.log("w", "Missing printer %s for job %s in %s", model.assignedPrinter, model.key, - [p.key for p in self._printers]) - return - - printer.updateActivePrintJob(model) - model.updateAssignedPrinter(printer) - - ## Uploads the mesh when the print job was registered with the cloud API. - # \param job_response: The response received from the cloud API. - def _onPrintJobCreated(self, job_response: CloudPrintJobResponse) -> None: - self._progress.show() - self._uploaded_print_job = job_response - tool_path = cast(bytes, self._tool_path) - self._api.uploadToolPath(job_response, tool_path, self._onPrintJobUploaded, self._progress.update, self._onUploadError) - - ## Requests the print to be sent to the printer when we finished uploading the mesh. - def _onPrintJobUploaded(self) -> None: - self._progress.update(100) - print_job = cast(CloudPrintJobResponse, self._uploaded_print_job) - self._api.requestPrint(self.key, print_job.job_id, self._onPrintUploadCompleted) - - ## Displays the given message if uploading the mesh has failed - # \param message: The message to display. - def _onUploadError(self, message: str = None) -> None: - self._progress.hide() - self._uploaded_print_job = None - Message( - text = message or I18N_CATALOG.i18nc("@info:text", "Could not upload the data to the printer."), - title = I18N_CATALOG.i18nc("@info:title", "Cloud error"), - lifetime = 10 - ).show() - self.writeError.emit() - - ## Shows a message when the upload has succeeded - # \param response: The response from the cloud API. - def _onPrintUploadCompleted(self, response: CloudPrintResponse) -> None: - Logger.log("d", "The cluster will be printing this print job with the ID %s", response.cluster_job_id) - self._progress.hide() - Message( - text = I18N_CATALOG.i18nc("@info:status", "Print job was successfully sent to the printer."), - title = I18N_CATALOG.i18nc("@info:title", "Data Sent"), - lifetime = 5 - ).show() - self.writeFinished.emit() - - ## Whether the printer that this output device represents supports print job actions via the cloud. - @pyqtProperty(bool, notify = _clusterPrintersChanged) - def supportsPrintJobActions(self) -> bool: - version_number = self.printers[0].firmwareVersion.split(".") - firmware_version = Version([version_number[0], version_number[1], version_number[2]]) - return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION - - ## Gets the number of printers in the cluster. - # We use a minimum of 1 because cloud devices are always a cluster and printer discovery needs it. - @pyqtProperty(int, notify = _clusterPrintersChanged) - def clusterSize(self) -> int: - return max(1, len(self._printers)) - - ## Gets the remote printers. - @pyqtProperty("QVariantList", notify=_clusterPrintersChanged) - def printers(self) -> List[PrinterOutputModel]: - return self._printers - - ## Get the active printer in the UI (monitor page). - @pyqtProperty(QObject, notify = activePrinterChanged) - def activePrinter(self) -> Optional[PrinterOutputModel]: - return self._active_printer - - ## Set the active printer in the UI (monitor page). - @pyqtSlot(QObject) - def setActivePrinter(self, printer: Optional[PrinterOutputModel] = None) -> None: - if printer != self._active_printer: - self._active_printer = printer - self.activePrinterChanged.emit() - - ## Get remote print jobs. - @pyqtProperty("QVariantList", notify = printJobsChanged) - def printJobs(self) -> List[UM3PrintJobOutputModel]: - return self._print_jobs - - ## Get remote print jobs that are still in the print queue. - @pyqtProperty("QVariantList", notify = printJobsChanged) - def queuedPrintJobs(self) -> List[UM3PrintJobOutputModel]: - return [print_job for print_job in self._print_jobs - if print_job.state == "queued" or print_job.state == "error"] - - ## Get remote print jobs that are assigned to a printer. - @pyqtProperty("QVariantList", notify = printJobsChanged) - def activePrintJobs(self) -> List[UM3PrintJobOutputModel]: - return [print_job for print_job in self._print_jobs if - print_job.assignedPrinter is not None and print_job.state != "queued"] - - def setJobState(self, print_job_uuid: str, state: str) -> None: - self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, state) - - @pyqtSlot(str) - def sendJobToTop(self, print_job_uuid: str) -> None: - self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "move", - {"list": "queued", "to_position": 0}) - - @pyqtSlot(str) - def deleteJobFromQueue(self, print_job_uuid: str) -> None: - self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "remove") - - @pyqtSlot(str) - def forceSendJob(self, print_job_uuid: str) -> None: - self._api.doPrintJobAction(self._cluster.cluster_id, print_job_uuid, "force") - - @pyqtSlot(int, result = str) - def formatDuration(self, seconds: int) -> str: - return Duration(seconds).getDisplayString(DurationFormat.Format.Short) - - @pyqtSlot(int, result = str) - def getTimeCompleted(self, time_remaining: int) -> str: - return formatTimeCompleted(time_remaining) - - @pyqtSlot(int, result = str) - def getDateCompleted(self, time_remaining: int) -> str: - return formatDateCompleted(time_remaining) - - @pyqtProperty(bool, notify=printJobsChanged) - def receivedPrintJobs(self) -> bool: - return bool(self._print_jobs) - - @pyqtSlot() - def openPrintJobControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com")) - - @pyqtSlot() - def openPrinterControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl("https://mycloud.ultimaker.com")) - - ## TODO: The following methods are required by the monitor page QML, but are not actually available using cloud. - # TODO: We fake the methods here to not break the monitor page. - - @pyqtProperty(QUrl, notify = _clusterPrintersChanged) - def activeCameraUrl(self) -> "QUrl": - return QUrl() - - @pyqtSlot(QUrl) - def setActiveCameraUrl(self, camera_url: "QUrl") -> None: - pass - - @pyqtProperty("QVariantList", notify = _clusterPrintersChanged) - def connectedPrintersTypeCount(self) -> List[Dict[str, str]]: - return [] + + ## Gets the URL on which to monitor the cluster via the cloud. + @property + def clusterCloudUrl(self) -> str: + root_url_prefix = "-staging" if self._account.is_staging else "" + return "https://mycloud{}.ultimaker.com/app/jobs/{}".format(root_url_prefix, self.clusterData.cluster_id) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index ced53e347b..e6cd98426f 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -1,30 +1,27 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Dict, List +from typing import Dict, List, Optional from PyQt5.QtCore import QTimer from UM import i18nCatalog -from UM.Logger import Logger -from UM.Message import Message from UM.Signal import Signal from cura.API import Account from cura.CuraApplication import CuraApplication from cura.Settings.GlobalStack import GlobalStack + from .CloudApiClient import CloudApiClient from .CloudOutputDevice import CloudOutputDevice -from .Models.CloudClusterResponse import CloudClusterResponse -from .Models.CloudError import CloudError -from .Utils import findChanges +from ..Models.Http.CloudClusterResponse import CloudClusterResponse -## The cloud output device manager is responsible for using the Ultimaker Cloud APIs to manage remote clusters. -# Keeping all cloud related logic in this class instead of the UM3OutputDevicePlugin results in more readable code. -# -# API spec is available on https://api.ultimaker.com/docs/connect/spec/. -# +## The cloud output device manager is responsible for using the Ultimaker Cloud APIs to manage remote clusters. +# Keeping all cloud related logic in this class instead of the UM3OutputDevicePlugin results in more readable code. +# API spec is available on https://api.ultimaker.com/docs/connect/spec/. class CloudOutputDeviceManager: + META_CLUSTER_ID = "um_cloud_cluster_id" + META_NETWORK_KEY = "um_network_key" # The interval with which the remote clusters are checked CHECK_CLUSTER_INTERVAL = 30.0 # seconds @@ -32,108 +29,120 @@ class CloudOutputDeviceManager: # The translation catalog for this device. I18N_CATALOG = i18nCatalog("cura") - addedCloudCluster = Signal() - removedCloudCluster = Signal() + # Signal emitted when the list of discovered devices changed. + discoveredDevicesChanged = Signal() def __init__(self) -> None: # Persistent dict containing the remote clusters for the authenticated user. self._remote_clusters = {} # type: Dict[str, CloudOutputDevice] - - self._application = CuraApplication.getInstance() - self._output_device_manager = self._application.getOutputDeviceManager() - - self._account = self._application.getCuraAPI().account # type: Account - self._api = CloudApiClient(self._account, self._onApiError) + self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account + self._api = CloudApiClient(self._account, on_error=lambda error: print(error)) + self._account.loginStateChanged.connect(self._onLoginStateChanged) # Create a timer to update the remote cluster list self._update_timer = QTimer() self._update_timer.setInterval(int(self.CHECK_CLUSTER_INTERVAL * 1000)) self._update_timer.setSingleShot(False) + self._update_timer.timeout.connect(self._getRemoteClusters) + # Ensure we don't start twice. self._running = False - # Called when the uses logs in or out + ## Starts running the cloud output device manager, thus periodically requesting cloud data. + def start(self): + if self._running: + return + if not self._account.isLoggedIn: + return + self._running = True + if not self._update_timer.isActive(): + self._update_timer.start() + self._getRemoteClusters() + + ## Stops running the cloud output device manager. + def stop(self): + if not self._running: + return + self._running = False + if self._update_timer.isActive(): + self._update_timer.stop() + self._onGetRemoteClustersFinished([]) # Make sure we remove all cloud output devices. + + ## Force refreshing connections. + def refreshConnections(self) -> None: + self._connectToActiveMachine() + + ## Called when the uses logs in or out def _onLoginStateChanged(self, is_logged_in: bool) -> None: - Logger.log("d", "Log in state changed to %s", is_logged_in) if is_logged_in: - if not self._update_timer.isActive(): - self._update_timer.start() - self._getRemoteClusters() + self.start() else: - if self._update_timer.isActive(): - self._update_timer.stop() + self.stop() - # Notify that all clusters have disappeared - self._onGetRemoteClustersFinished([]) - - ## Gets all remote clusters from the API. + ## Gets all remote clusters from the API. def _getRemoteClusters(self) -> None: - Logger.log("d", "Retrieving remote clusters") self._api.getClusters(self._onGetRemoteClustersFinished) - ## Callback for when the request for getting the clusters. is finished. + ## Callback for when the request for getting the clusters is finished. def _onGetRemoteClustersFinished(self, clusters: List[CloudClusterResponse]) -> None: online_clusters = {c.cluster_id: c for c in clusters if c.is_online} # type: Dict[str, CloudClusterResponse] + for device_id, cluster_data in online_clusters.items(): + if device_id not in self._remote_clusters: + self._onDeviceDiscovered(cluster_data) + else: + self._onDiscoveredDeviceUpdated(cluster_data) - removed_devices, added_clusters, updates = findChanges(self._remote_clusters, online_clusters) - - Logger.log("d", "Parsed remote clusters to %s", [cluster.toDict() for cluster in online_clusters.values()]) - Logger.log("d", "Removed: %s, added: %s, updates: %s", len(removed_devices), len(added_clusters), len(updates)) - - # Remove output devices that are gone - for device in removed_devices: - if device.isConnected(): - device.disconnect() - device.close() - self._output_device_manager.removeOutputDevice(device.key) - self._application.getDiscoveredPrintersModel().removeDiscoveredPrinter(device.key) - self.removedCloudCluster.emit(device) - del self._remote_clusters[device.key] - - # Add an output device for each new remote cluster. - # We only add when is_online as we don't want the option in the drop down if the cluster is not online. - for cluster in added_clusters: - device = CloudOutputDevice(self._api, cluster) - self._remote_clusters[cluster.cluster_id] = device - self._application.getDiscoveredPrintersModel().addDiscoveredPrinter( - device.key, - device.key, - cluster.friendly_name, - self._createMachineFromDiscoveredPrinter, - device.printerType, - device - ) - self.addedCloudCluster.emit(cluster) - - # Update the output devices - for device, cluster in updates: - device.clusterData = cluster - self._application.getDiscoveredPrintersModel().updateDiscoveredPrinter( - device.key, - cluster.friendly_name, - device.printerType, - ) + removed_device_keys = set(self._remote_clusters.keys()) - set(online_clusters.keys()) + for device_id in removed_device_keys: + self._onDiscoveredDeviceRemoved(device_id) + def _onDeviceDiscovered(self, cluster_data: CloudClusterResponse) -> None: + device = CloudOutputDevice(self._api, cluster_data) + CuraApplication.getInstance().getDiscoveredPrintersModel().addDiscoveredPrinter( + ip_address=device.key, + key=device.getId(), + name=device.getName(), + create_callback=self._createMachineFromDiscoveredDevice, + machine_type=device.printerType, + device=device + ) + self._remote_clusters[device.getId()] = device + self.discoveredDevicesChanged.emit() self._connectToActiveMachine() - - def _createMachineFromDiscoveredPrinter(self, key: str) -> None: - device = self._remote_clusters[key] # type: CloudOutputDevice + + def _onDiscoveredDeviceUpdated(self, cluster_data: CloudClusterResponse) -> None: + device = self._remote_clusters.get(cluster_data.cluster_id) if not device: - Logger.log("e", "Could not find discovered device with key [%s]", key) return - - group_name = device.clusterData.friendly_name - machine_type_id = device.printerType - - Logger.log("i", "Creating machine from cloud device with key = [%s], group name = [%s], printer type = [%s]", - key, group_name, machine_type_id) - + CuraApplication.getInstance().getDiscoveredPrintersModel().updateDiscoveredPrinter( + ip_address=device.key, + name=cluster_data.friendly_name, + machine_type=device.printerType + ) + self.discoveredDevicesChanged.emit() + + def _onDiscoveredDeviceRemoved(self, device_id: str) -> None: + device = self._remote_clusters.pop(device_id, None) # type: Optional[CloudOutputDevice] + if not device: + return + device.close() + CuraApplication.getInstance().getDiscoveredPrintersModel().removeDiscoveredPrinter(device.key) + output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() + if device.key in output_device_manager.getOutputDeviceIds(): + output_device_manager.removeOutputDevice(device.key) + self.discoveredDevicesChanged.emit() + + def _createMachineFromDiscoveredDevice(self, key: str) -> None: + device = self._remote_clusters[key] + if not device: + return + # The newly added machine is automatically activated. - self._application.getMachineManager().addMachine(machine_type_id, group_name) + machine_manager = CuraApplication.getInstance().getMachineManager() + machine_manager.addMachine(device.printerType, device.clusterData.friendly_name) active_machine = CuraApplication.getInstance().getGlobalContainerStack() if not active_machine: return - active_machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) self._connectToOutputDevice(device, active_machine) @@ -143,69 +152,24 @@ class CloudOutputDeviceManager: if not active_machine: return - # Remove all output devices that we have registered. - # This is needed because when we switch machines we can only leave - # output devices that are meant for that machine. - for stored_cluster_id in self._remote_clusters: - self._output_device_manager.removeOutputDevice(stored_cluster_id) - - # Check if the stored cluster_id for the active machine is in our list of remote clusters. + output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID) - if stored_cluster_id in self._remote_clusters: - device = self._remote_clusters[stored_cluster_id] - self._connectToOutputDevice(device, active_machine) - Logger.log("d", "Device connected by metadata cluster ID %s", stored_cluster_id) - else: - self._connectByNetworkKey(active_machine) - - ## Tries to match the local network key to the cloud cluster host name. - def _connectByNetworkKey(self, active_machine: GlobalStack) -> None: - # Check if the active printer has a local network connection and match this key to the remote cluster. - local_network_key = active_machine.getMetaDataEntry("um_network_key") - if not local_network_key: - return - - device = next((c for c in self._remote_clusters.values() if c.matchesNetworkKey(local_network_key)), None) - if not device: - return - - Logger.log("i", "Found cluster %s with network key %s", device, local_network_key) - active_machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) - self._connectToOutputDevice(device, active_machine) + local_network_key = active_machine.getMetaDataEntry(self.META_NETWORK_KEY) + for device in self._remote_clusters.values(): + if device.key == stored_cluster_id: + # Connect to it if the stored ID matches. + self._connectToOutputDevice(device, active_machine) + elif local_network_key and device.matchesNetworkKey(local_network_key): + # Connect to it if we can match the local network key that was already present. + active_machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) + self._connectToOutputDevice(device, active_machine) + elif device.key in output_device_manager.getOutputDeviceIds(): + # Remove device if it is not meant for the active machine. + output_device_manager.removeOutputDevice(device.key) ## Connects to an output device and makes sure it is registered in the output device manager. - def _connectToOutputDevice(self, device: CloudOutputDevice, active_machine: GlobalStack) -> None: + @staticmethod + def _connectToOutputDevice(device: CloudOutputDevice, active_machine: GlobalStack) -> None: device.connect() - self._output_device_manager.addOutputDevice(device) active_machine.addConfiguredConnectionType(device.connectionType.value) - - ## Handles an API error received from the cloud. - # \param errors: The errors received - def _onApiError(self, errors: List[CloudError] = None) -> None: - Logger.log("w", str(errors)) - message = Message( - text = self.I18N_CATALOG.i18nc("@info:description", "There was an error connecting to the cloud."), - title = self.I18N_CATALOG.i18nc("@info:title", "Error"), - lifetime = 10 - ) - message.show() - - ## Starts running the cloud output device manager, thus periodically requesting cloud data. - def start(self): - if self._running: - return - self._account.loginStateChanged.connect(self._onLoginStateChanged) - # When switching machines we check if we have to activate a remote cluster. - self._application.globalContainerStackChanged.connect(self._connectToActiveMachine) - self._update_timer.timeout.connect(self._getRemoteClusters) - self._onLoginStateChanged(is_logged_in = self._account.isLoggedIn) - - ## Stops running the cloud output device manager. - def stop(self): - if not self._running: - return - self._account.loginStateChanged.disconnect(self._onLoginStateChanged) - # When switching machines we check if we have to activate a remote cluster. - self._application.globalContainerStackChanged.disconnect(self._connectToActiveMachine) - self._update_timer.timeout.disconnect(self._getRemoteClusters) - self._onLoginStateChanged(is_logged_in = False) + CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(device) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterBuildPlate.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterBuildPlate.py deleted file mode 100644 index 4386bbb435..0000000000 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterBuildPlate.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -from .BaseCloudModel import BaseCloudModel - - -## Class representing a cluster printer -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterBuildPlate(BaseCloudModel): - ## Create a new build plate - # \param type: The type of buildplate glass or aluminium - def __init__(self, type: str = "glass", **kwargs) -> None: - self.type = type - super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/__init__.py b/plugins/UM3NetworkPrinting/src/Cloud/Models/__init__.py deleted file mode 100644 index f3f6970c54..0000000000 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. diff --git a/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py b/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py index 176b7e6ab7..d5de7fe10a 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # !/usr/bin/env python # -*- coding: utf-8 -*- from PyQt5.QtCore import QUrl @@ -6,7 +6,8 @@ from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManage from typing import Optional, Callable, Any, Tuple, cast from UM.Logger import Logger -from .Models.CloudPrintJobResponse import CloudPrintJobResponse + +from ..Models.Http.CloudPrintJobResponse import CloudPrintJobResponse ## Class responsible for uploading meshes to the cloud in separate requests. @@ -53,7 +54,7 @@ class ToolPathUploader: def _createRequest(self) -> QNetworkRequest: request = QNetworkRequest(QUrl(self._print_job.upload_url)) request.setHeader(QNetworkRequest.ContentTypeHeader, self._print_job.content_type) - + first_byte, last_byte = self._chunkRange() content_range = "bytes {}-{}/{}".format(first_byte, last_byte - 1, len(self._data)) request.setRawHeader(b"Content-Range", content_range.encode()) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Utils.py b/plugins/UM3NetworkPrinting/src/Cloud/Utils.py deleted file mode 100644 index 5136e0e7db..0000000000 --- a/plugins/UM3NetworkPrinting/src/Cloud/Utils.py +++ /dev/null @@ -1,54 +0,0 @@ -from datetime import datetime, timedelta -from typing import TypeVar, Dict, Tuple, List - -from UM import i18nCatalog - -T = TypeVar("T") -U = TypeVar("U") - - -## Splits the given dictionaries into three lists (in a tuple): -# - `removed`: Items that were in the first argument but removed in the second one. -# - `added`: Items that were not in the first argument but were included in the second one. -# - `updated`: Items that were in both dictionaries. Both values are given in a tuple. -# \param previous: The previous items -# \param received: The received items -# \return: The tuple (removed, added, updated) as explained above. -def findChanges(previous: Dict[str, T], received: Dict[str, U]) -> Tuple[List[T], List[U], List[Tuple[T, U]]]: - previous_ids = set(previous) - received_ids = set(received) - - removed_ids = previous_ids.difference(received_ids) - new_ids = received_ids.difference(previous_ids) - updated_ids = received_ids.intersection(previous_ids) - - removed = [previous[removed_id] for removed_id in removed_ids] - added = [received[new_id] for new_id in new_ids] - updated = [(previous[updated_id], received[updated_id]) for updated_id in updated_ids] - - return removed, added, updated - - -def formatTimeCompleted(seconds_remaining: int) -> str: - completed = datetime.now() + timedelta(seconds=seconds_remaining) - return "{hour:02d}:{minute:02d}".format(hour = completed.hour, minute = completed.minute) - - -def formatDateCompleted(seconds_remaining: int) -> str: - now = datetime.now() - completed = now + timedelta(seconds=seconds_remaining) - days = (completed.date() - now.date()).days - i18n = i18nCatalog("cura") - - # If finishing date is more than 7 days out, using "Mon Dec 3 at HH:MM" format - if days >= 7: - return completed.strftime("%a %b ") + "{day}".format(day = completed.day) - # If finishing date is within the next week, use "Monday at HH:MM" format - elif days >= 2: - return completed.strftime("%a") - # If finishing tomorrow, use "tomorrow at HH:MM" format - elif days >= 1: - return i18n.i18nc("@info:status", "tomorrow") - # If finishing today, use "today at HH:MM" format - else: - return i18n.i18nc("@info:status", "today") diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputController.py b/plugins/UM3NetworkPrinting/src/ClusterOutputController.py similarity index 52% rename from plugins/UM3NetworkPrinting/src/Cloud/CloudOutputController.py rename to plugins/UM3NetworkPrinting/src/ClusterOutputController.py index 8c09483990..02d8d174d1 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputController.py +++ b/plugins/UM3NetworkPrinting/src/ClusterOutputController.py @@ -1,19 +1,14 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.PrinterOutputController import PrinterOutputController - -from typing import TYPE_CHECKING -if TYPE_CHECKING: - from .CloudOutputDevice import CloudOutputDevice +from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice -class CloudOutputController(PrinterOutputController): - def __init__(self, output_device: "CloudOutputDevice") -> None: +class ClusterOutputController(PrinterOutputController): + + def __init__(self, output_device: PrinterOutputDevice) -> None: super().__init__(output_device) - - # The cloud connection only supports fetching the printer and queue status and adding a job to the queue. - # To let the UI know this we mark all features below as False. self.can_pause = True self.can_abort = True self.can_pre_heat_bed = False @@ -22,5 +17,5 @@ class CloudOutputController(PrinterOutputController): self.can_control_manually = False self.can_update_firmware = False - def setJobState(self, job: "PrintJobOutputModel", state: str): + def setJobState(self, job: PrintJobOutputModel, state: str): self._output_device.setJobState(job.key, state) diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py deleted file mode 100644 index 6fbb115601..0000000000 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ /dev/null @@ -1,717 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from typing import Any, cast, Tuple, Union, Optional, Dict, List -from time import time - -import io # To create the correct buffers for sending data to the printer. -import json -import os - -from UM.FileHandler.FileHandler import FileHandler -from UM.FileHandler.WriteFileJob import WriteFileJob # To call the file writer asynchronously. -from UM.i18n import i18nCatalog -from UM.Logger import Logger -from UM.Message import Message -from UM.PluginRegistry import PluginRegistry -from UM.Qt.Duration import Duration, DurationFormat -from UM.Scene.SceneNode import SceneNode # For typing. -from UM.Settings.ContainerRegistry import ContainerRegistry - -from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel -from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel -from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice -from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel -from cura.PrinterOutput.Models.MaterialOutputModel import MaterialOutputModel -from cura.PrinterOutput.PrinterOutputDevice import ConnectionType - -from .Cloud.Utils import formatTimeCompleted, formatDateCompleted -from .ClusterUM3PrinterOutputController import ClusterUM3PrinterOutputController -from .ConfigurationChangeModel import ConfigurationChangeModel -from .MeshFormatHandler import MeshFormatHandler -from .SendMaterialJob import SendMaterialJob -from .UM3PrintJobOutputModel import UM3PrintJobOutputModel - -from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply -from PyQt5.QtGui import QDesktopServices, QImage -from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject - -i18n_catalog = i18nCatalog("cura") - - -class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): - printJobsChanged = pyqtSignal() - activePrinterChanged = pyqtSignal() - activeCameraUrlChanged = pyqtSignal() - receivedPrintJobsChanged = pyqtSignal() - - # Notify can only use signals that are defined by the class that they are in, not inherited ones. - # Therefore we create a private signal used to trigger the printersChanged signal. - _clusterPrintersChanged = pyqtSignal() - - def __init__(self, device_id, address, properties, parent = None) -> None: - super().__init__(device_id = device_id, address = address, properties=properties, connection_type = ConnectionType.NetworkConnection, parent = parent) - self._api_prefix = "/cluster-api/v1/" - - self._application = CuraApplication.getInstance() - - self._number_of_extruders = 2 - - self._dummy_lambdas = ( - "", {}, io.BytesIO() - ) # type: Tuple[Optional[str], Dict[str, Union[str, int, bool]], Union[io.StringIO, io.BytesIO]] - - self._print_jobs = [] # type: List[UM3PrintJobOutputModel] - self._received_print_jobs = False # type: bool - - if PluginRegistry.getInstance() is not None: - plugin_path = PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting") - if plugin_path is None: - Logger.log("e", "Cloud not find plugin path for plugin UM3NetworkPrnting") - raise RuntimeError("Cloud not find plugin path for plugin UM3NetworkPrnting") - self._monitor_view_qml_path = os.path.join(plugin_path, "resources", "qml", "MonitorStage.qml") - - # Trigger the printersChanged signal when the private signal is triggered - self.printersChanged.connect(self._clusterPrintersChanged) - - self._accepts_commands = True # type: bool - - # Cluster does not have authentication, so default to authenticated - self._authentication_state = AuthState.Authenticated - - self._error_message = None # type: Optional[Message] - self._write_job_progress_message = None # type: Optional[Message] - self._progress_message = None # type: Optional[Message] - - self._active_printer = None # type: Optional[PrinterOutputModel] - - self._printer_selection_dialog = None # type: QObject - - self.setPriority(3) # Make sure the output device gets selected above local file output - self.setName(self._id) - self.setShortDescription(i18n_catalog.i18nc("@action:button Preceded by 'Ready to'.", "Print over network")) - self.setDescription(i18n_catalog.i18nc("@properties:tooltip", "Print over network")) - - self.setConnectionText(i18n_catalog.i18nc("@info:status", "Connected over the network")) - - self._printer_uuid_to_unique_name_mapping = {} # type: Dict[str, str] - - self._finished_jobs = [] # type: List[UM3PrintJobOutputModel] - - self._cluster_size = int(properties.get(b"cluster_size", 0)) # type: int - - self._latest_reply_handler = None # type: Optional[QNetworkReply] - self._sending_job = None - - self._active_camera_url = QUrl() # type: QUrl - - def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, - file_handler: Optional[FileHandler] = None, **kwargs: str) -> None: - self.writeStarted.emit(self) - - self.sendMaterialProfiles() - - mesh_format = MeshFormatHandler(file_handler, self.firmwareVersion) - - # This function pauses with the yield, waiting on instructions on which printer it needs to print with. - if not mesh_format.is_valid: - Logger.log("e", "Missing file or mesh writer!") - return - self._sending_job = self._sendPrintJob(mesh_format, nodes) - if self._sending_job is not None: - self._sending_job.send(None) # Start the generator. - - if len(self._printers) > 1: # We need to ask the user. - self._spawnPrinterSelectionDialog() - is_job_sent = True - else: # Just immediately continue. - self._sending_job.send("") # No specifically selected printer. - is_job_sent = self._sending_job.send(None) - - def _spawnPrinterSelectionDialog(self): - if self._printer_selection_dialog is None: - if PluginRegistry.getInstance() is not None: - path = os.path.join( - PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"), - "resources", "qml", "PrintWindow.qml" - ) - self._printer_selection_dialog = self._application.createQmlComponent(path, {"OutputDevice": self}) - if self._printer_selection_dialog is not None: - self._printer_selection_dialog.show() - - ## Whether the printer that this output device represents supports print job actions via the local network. - @pyqtProperty(bool, constant=True) - def supportsPrintJobActions(self) -> bool: - return True - - @pyqtProperty(int, constant=True) - def clusterSize(self) -> int: - return self._cluster_size - - ## Allows the user to choose a printer to print with from the printer - # selection dialogue. - # \param target_printer The name of the printer to target. - @pyqtSlot(str) - def selectPrinter(self, target_printer: str = "") -> None: - if self._sending_job is not None: - self._sending_job.send(target_printer) - - @pyqtSlot() - def cancelPrintSelection(self) -> None: - self._sending_gcode = False - - ## Greenlet to send a job to the printer over the network. - # - # This greenlet gets called asynchronously in requestWrite. It is a - # greenlet in order to optionally wait for selectPrinter() to select a - # printer. - # The greenlet yields exactly three times: First time None, - # \param mesh_format Object responsible for choosing the right kind of format to write with. - def _sendPrintJob(self, mesh_format: MeshFormatHandler, nodes: List[SceneNode]): - Logger.log("i", "Sending print job to printer.") - if self._sending_gcode: - self._error_message = Message( - i18n_catalog.i18nc("@info:status", - "Sending new jobs (temporarily) blocked, still sending the previous print job.")) - self._error_message.show() - yield #Wait on the user to select a target printer. - yield #Wait for the write job to be finished. - yield False #Return whether this was a success or not. - yield #Prevent StopIteration. - - self._sending_gcode = True - - # Potentially wait on the user to select a target printer. - target_printer = yield # type: Optional[str] - - # Using buffering greatly reduces the write time for many lines of gcode - - stream = mesh_format.createStream() - - job = WriteFileJob(mesh_format.writer, stream, nodes, mesh_format.file_mode) - - self._write_job_progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), - lifetime = 0, dismissable = False, progress = -1, - title = i18n_catalog.i18nc("@info:title", "Sending Data"), - use_inactivity_timer = False) - self._write_job_progress_message.show() - - if mesh_format.preferred_format is not None: - self._dummy_lambdas = (target_printer, mesh_format.preferred_format, stream) - job.finished.connect(self._sendPrintJobWaitOnWriteJobFinished) - job.start() - yield True # Return that we had success! - yield # To prevent having to catch the StopIteration exception. - - def _sendPrintJobWaitOnWriteJobFinished(self, job: WriteFileJob) -> None: - if self._write_job_progress_message: - self._write_job_progress_message.hide() - - self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), lifetime = 0, - dismissable = False, progress = -1, - title = i18n_catalog.i18nc("@info:title", "Sending Data")) - self._progress_message.addAction("Abort", i18n_catalog.i18nc("@action:button", "Cancel"), icon = "", - description = "") - self._progress_message.actionTriggered.connect(self._progressMessageActionTriggered) - self._progress_message.show() - parts = [] - - target_printer, preferred_format, stream = self._dummy_lambdas - - # If a specific printer was selected, it should be printed with that machine. - if target_printer: - target_printer = self._printer_uuid_to_unique_name_mapping[target_printer] - parts.append(self._createFormPart("name=require_printer_name", bytes(target_printer, "utf-8"), "text/plain")) - - # Add user name to the print_job - parts.append(self._createFormPart("name=owner", bytes(self._getUserName(), "utf-8"), "text/plain")) - - file_name = self._application.getPrintInformation().jobName + "." + preferred_format["extension"] - - output = stream.getvalue() # Either str or bytes depending on the output mode. - if isinstance(stream, io.StringIO): - output = cast(str, output).encode("utf-8") - output = cast(bytes, output) - - parts.append(self._createFormPart("name=\"file\"; filename=\"%s\"" % file_name, output)) - - self._latest_reply_handler = self.postFormWithParts("print_jobs/", parts, - on_finished = self._onPostPrintJobFinished, - on_progress = self._onUploadPrintJobProgress) - - @pyqtProperty(QObject, notify = activePrinterChanged) - def activePrinter(self) -> Optional[PrinterOutputModel]: - return self._active_printer - - @pyqtSlot(QObject) - def setActivePrinter(self, printer: Optional[PrinterOutputModel]) -> None: - if self._active_printer != printer: - self._active_printer = printer - self.activePrinterChanged.emit() - - @pyqtProperty(QUrl, notify = activeCameraUrlChanged) - def activeCameraUrl(self) -> "QUrl": - return self._active_camera_url - - @pyqtSlot(QUrl) - def setActiveCameraUrl(self, camera_url: "QUrl") -> None: - if self._active_camera_url != camera_url: - self._active_camera_url = camera_url - self.activeCameraUrlChanged.emit() - - def _onPostPrintJobFinished(self, reply: QNetworkReply) -> None: - if self._progress_message: - self._progress_message.hide() - self._compressing_gcode = False - self._sending_gcode = False - - ## The IP address of the printer. - @pyqtProperty(str, constant = True) - def address(self) -> str: - return self._address - - def _onUploadPrintJobProgress(self, bytes_sent: int, bytes_total: int) -> None: - if bytes_total > 0: - new_progress = bytes_sent / bytes_total * 100 - # Treat upload progress as response. Uploading can take more than 10 seconds, so if we don't, we can get - # timeout responses if this happens. - self._last_response_time = time() - if self._progress_message is not None and new_progress != self._progress_message.getProgress(): - self._progress_message.show() # Ensure that the message is visible. - self._progress_message.setProgress(bytes_sent / bytes_total * 100) - - # If successfully sent: - if bytes_sent == bytes_total: - # Show a confirmation to the user so they know the job was sucessful and provide the option to switch to - # the monitor tab. - self._success_message = Message( - i18n_catalog.i18nc("@info:status", "Print job was successfully sent to the printer."), - lifetime=5, dismissable=True, - title=i18n_catalog.i18nc("@info:title", "Data Sent")) - self._success_message.addAction("View", i18n_catalog.i18nc("@action:button", "View in Monitor"), icon = "", - description="") - self._success_message.actionTriggered.connect(self._successMessageActionTriggered) - self._success_message.show() - else: - if self._progress_message is not None: - self._progress_message.setProgress(0) - self._progress_message.hide() - - def _progressMessageActionTriggered(self, message_id: Optional[str] = None, action_id: Optional[str] = None) -> None: - if action_id == "Abort": - Logger.log("d", "User aborted sending print to remote.") - if self._progress_message is not None: - self._progress_message.hide() - self._compressing_gcode = False - self._sending_gcode = False - self._application.getController().setActiveStage("PrepareStage") - - # After compressing the sliced model Cura sends data to printer, to stop receiving updates from the request - # the "reply" should be disconnected - if self._latest_reply_handler: - self._latest_reply_handler.disconnect() - self._latest_reply_handler = None - - def _successMessageActionTriggered(self, message_id: Optional[str] = None, action_id: Optional[str] = None) -> None: - if action_id == "View": - self._application.getController().setActiveStage("MonitorStage") - - @pyqtSlot() - def openPrintJobControlPanel(self) -> None: - Logger.log("d", "Opening print job control panel...") - QDesktopServices.openUrl(QUrl("http://" + self._address + "/print_jobs")) - - @pyqtSlot() - def openPrinterControlPanel(self) -> None: - Logger.log("d", "Opening printer control panel...") - QDesktopServices.openUrl(QUrl("http://" + self._address + "/printers")) - - @pyqtProperty("QVariantList", notify = printJobsChanged) - def printJobs(self)-> List[UM3PrintJobOutputModel]: - return self._print_jobs - - @pyqtProperty(bool, notify = receivedPrintJobsChanged) - def receivedPrintJobs(self) -> bool: - return self._received_print_jobs - - @pyqtProperty("QVariantList", notify = printJobsChanged) - def queuedPrintJobs(self) -> List[UM3PrintJobOutputModel]: - return [print_job for print_job in self._print_jobs if print_job.state == "queued" or print_job.state == "error"] - - @pyqtProperty("QVariantList", notify = printJobsChanged) - def activePrintJobs(self) -> List[UM3PrintJobOutputModel]: - return [print_job for print_job in self._print_jobs if print_job.assignedPrinter is not None and print_job.state != "queued"] - - @pyqtProperty("QVariantList", notify = _clusterPrintersChanged) - def connectedPrintersTypeCount(self) -> List[Dict[str, str]]: - printer_count = {} # type: Dict[str, int] - for printer in self._printers: - if printer.type in printer_count: - printer_count[printer.type] += 1 - else: - printer_count[printer.type] = 1 - result = [] - for machine_type in printer_count: - result.append({"machine_type": machine_type, "count": str(printer_count[machine_type])}) - return result - - @pyqtProperty("QVariantList", notify=_clusterPrintersChanged) - def printers(self): - return self._printers - - @pyqtSlot(int, result = str) - def getTimeCompleted(self, time_remaining: int) -> str: - return formatTimeCompleted(time_remaining) - - @pyqtSlot(int, result = str) - def getDateCompleted(self, time_remaining: int) -> str: - return formatDateCompleted(time_remaining) - - @pyqtSlot(int, result = str) - def formatDuration(self, seconds: int) -> str: - return Duration(seconds).getDisplayString(DurationFormat.Format.Short) - - @pyqtSlot(str) - def sendJobToTop(self, print_job_uuid: str) -> None: - # This function is part of the output device (and not of the printjob output model) as this type of operation - # is a modification of the cluster queue and not of the actual job. - data = "{\"to_position\": 0}" - self.put("print_jobs/{uuid}/move_to_position".format(uuid = print_job_uuid), data, on_finished=None) - - @pyqtSlot(str) - def deleteJobFromQueue(self, print_job_uuid: str) -> None: - # This function is part of the output device (and not of the printjob output model) as this type of operation - # is a modification of the cluster queue and not of the actual job. - self.delete("print_jobs/{uuid}".format(uuid = print_job_uuid), on_finished=None) - - @pyqtSlot(str) - def forceSendJob(self, print_job_uuid: str) -> None: - data = "{\"force\": true}" - self.put("print_jobs/{uuid}".format(uuid=print_job_uuid), data, on_finished=None) - - def _printJobStateChanged(self) -> None: - username = self._getUserName() - - if username is None: - return # We only want to show notifications if username is set. - - finished_jobs = [job for job in self._print_jobs if job.state == "wait_cleanup"] - - newly_finished_jobs = [job for job in finished_jobs if job not in self._finished_jobs and job.owner == username] - for job in newly_finished_jobs: - if job.assignedPrinter: - job_completed_text = i18n_catalog.i18nc("@info:status", "Printer '{printer_name}' has finished printing '{job_name}'.").format(printer_name=job.assignedPrinter.name, job_name = job.name) - else: - job_completed_text = i18n_catalog.i18nc("@info:status", "The print job '{job_name}' was finished.").format(job_name = job.name) - job_completed_message = Message(text=job_completed_text, title = i18n_catalog.i18nc("@info:status", "Print finished")) - job_completed_message.show() - - # Ensure UI gets updated - self.printJobsChanged.emit() - - # Keep a list of all completed jobs so we know if something changed next time. - self._finished_jobs = finished_jobs - - ## Called when the connection to the cluster changes. - def connect(self) -> None: - super().connect() - self.sendMaterialProfiles() - - def _onGetPreviewImageFinished(self, reply: QNetworkReply) -> None: - reply_url = reply.url().toString() - - uuid = reply_url[reply_url.find("print_jobs/")+len("print_jobs/"):reply_url.rfind("/preview_image")] - - print_job = findByKey(self._print_jobs, uuid) - if print_job: - image = QImage() - image.loadFromData(reply.readAll()) - print_job.updatePreviewImage(image) - - def _update(self) -> None: - super()._update() - self.get("printers/", on_finished = self._onGetPrintersDataFinished) - self.get("print_jobs/", on_finished = self._onGetPrintJobsFinished) - - for print_job in self._print_jobs: - if print_job.getPreviewImage() is None: - self.get("print_jobs/{uuid}/preview_image".format(uuid=print_job.key), on_finished=self._onGetPreviewImageFinished) - - def _onGetPrintJobsFinished(self, reply: QNetworkReply) -> None: - self._received_print_jobs = True - self.receivedPrintJobsChanged.emit() - - if not checkValidGetReply(reply): - return - - result = loadJsonFromReply(reply) - if result is None: - return - - print_jobs_seen = [] - job_list_changed = False - for idx, print_job_data in enumerate(result): - print_job = findByKey(self._print_jobs, print_job_data["uuid"]) - if print_job is None: - print_job = self._createPrintJobModel(print_job_data) - job_list_changed = True - elif not job_list_changed: - # Check if the order of the jobs has changed since the last check - if self._print_jobs.index(print_job) != idx: - job_list_changed = True - - self._updatePrintJob(print_job, print_job_data) - - if print_job.state != "queued" and print_job.state != "error": # Print job should be assigned to a printer. - if print_job.state in ["failed", "finished", "aborted", "none"]: - # Print job was already completed, so don't attach it to a printer. - printer = None - else: - printer = self._getPrinterByKey(print_job_data["printer_uuid"]) - else: # The job can "reserve" a printer if some changes are required. - printer = self._getPrinterByKey(print_job_data["assigned_to"]) - - if printer: - printer.updateActivePrintJob(print_job) - - print_jobs_seen.append(print_job) - - # Check what jobs need to be removed. - removed_jobs = [print_job for print_job in self._print_jobs if print_job not in print_jobs_seen] - - for removed_job in removed_jobs: - job_list_changed = job_list_changed or self._removeJob(removed_job) - - if job_list_changed: - # Override the old list with the new list (either because jobs were removed / added or order changed) - self._print_jobs = print_jobs_seen - self.printJobsChanged.emit() # Do a single emit for all print job changes. - - def _onGetPrintersDataFinished(self, reply: QNetworkReply) -> None: - if not checkValidGetReply(reply): - return - - result = loadJsonFromReply(reply) - if result is None: - return - - printer_list_changed = False - printers_seen = [] - - for printer_data in result: - printer = findByKey(self._printers, printer_data["uuid"]) - - if printer is None: - printer = self._createPrinterModel(printer_data) - printer_list_changed = True - - printers_seen.append(printer) - - self._updatePrinter(printer, printer_data) - - removed_printers = [printer for printer in self._printers if printer not in printers_seen] - for printer in removed_printers: - self._removePrinter(printer) - - if removed_printers or printer_list_changed: - self.printersChanged.emit() - - def _createPrinterModel(self, data: Dict[str, Any]) -> PrinterOutputModel: - printer = PrinterOutputModel(output_controller = ClusterUM3PrinterOutputController(self), - number_of_extruders = self._number_of_extruders) - printer.setCameraUrl(QUrl("http://" + data["ip_address"] + ":8080/?action=stream")) - self._printers.append(printer) - return printer - - def _createPrintJobModel(self, data: Dict[str, Any]) -> UM3PrintJobOutputModel: - print_job = UM3PrintJobOutputModel(output_controller=ClusterUM3PrinterOutputController(self), - key=data["uuid"], name= data["name"]) - - configuration = PrinterConfigurationModel() - extruders = [ExtruderConfigurationModel(position = idx) for idx in range(0, self._number_of_extruders)] - for index in range(0, self._number_of_extruders): - try: - extruder_data = data["configuration"][index] - except IndexError: - continue - extruder = extruders[int(data["configuration"][index]["extruder_index"])] - extruder.setHotendID(extruder_data.get("print_core_id", "")) - extruder.setMaterial(self._createMaterialOutputModel(extruder_data.get("material", {}))) - - configuration.setExtruderConfigurations(extruders) - configuration.setPrinterType(data.get("machine_variant", "")) - print_job.updateConfiguration(configuration) - print_job.setCompatibleMachineFamilies(data.get("compatible_machine_families", [])) - print_job.stateChanged.connect(self._printJobStateChanged) - return print_job - - def _updatePrintJob(self, print_job: UM3PrintJobOutputModel, data: Dict[str, Any]) -> None: - print_job.updateTimeTotal(data["time_total"]) - print_job.updateTimeElapsed(data["time_elapsed"]) - impediments_to_printing = data.get("impediments_to_printing", []) - print_job.updateOwner(data["owner"]) - - status_set_by_impediment = False - for impediment in impediments_to_printing: - if impediment["severity"] == "UNFIXABLE": - status_set_by_impediment = True - print_job.updateState("error") - break - - if not status_set_by_impediment: - print_job.updateState(data["status"]) - - print_job.updateConfigurationChanges(self._createConfigurationChanges(data["configuration_changes_required"])) - - def _createConfigurationChanges(self, data: List[Dict[str, Any]]) -> List[ConfigurationChangeModel]: - result = [] - for change in data: - result.append(ConfigurationChangeModel(type_of_change=change["type_of_change"], - index=change["index"], - target_name=change["target_name"], - origin_name=change["origin_name"])) - return result - - def _createMaterialOutputModel(self, material_data: Dict[str, Any]) -> "MaterialOutputModel": - material_manager = self._application.getMaterialManager() - material_group_list = None - - # Avoid crashing if there is no "guid" field in the metadata - material_guid = material_data.get("guid") - if material_guid: - material_group_list = material_manager.getMaterialGroupListByGUID(material_guid) - - # This can happen if the connected machine has no material in one or more extruders (if GUID is empty), or the - # material is unknown to Cura, so we should return an "empty" or "unknown" material model. - if material_group_list is None: - material_name = i18n_catalog.i18nc("@label:material", "Empty") if len(material_data.get("guid", "")) == 0 \ - else i18n_catalog.i18nc("@label:material", "Unknown") - - return MaterialOutputModel(guid = material_data.get("guid", ""), - type = material_data.get("material", ""), - color = material_data.get("color", ""), - brand = material_data.get("brand", ""), - name = material_data.get("name", material_name) - ) - - # Sort the material groups by "is_read_only = True" first, and then the name alphabetically. - read_only_material_group_list = list(filter(lambda x: x.is_read_only, material_group_list)) - non_read_only_material_group_list = list(filter(lambda x: not x.is_read_only, material_group_list)) - material_group = None - if read_only_material_group_list: - read_only_material_group_list = sorted(read_only_material_group_list, key = lambda x: x.name) - material_group = read_only_material_group_list[0] - elif non_read_only_material_group_list: - non_read_only_material_group_list = sorted(non_read_only_material_group_list, key = lambda x: x.name) - material_group = non_read_only_material_group_list[0] - - if material_group: - container = material_group.root_material_node.getContainer() - color = container.getMetaDataEntry("color_code") - brand = container.getMetaDataEntry("brand") - material_type = container.getMetaDataEntry("material") - name = container.getName() - else: - Logger.log("w", - "Unable to find material with guid {guid}. Using data as provided by cluster".format( - guid=material_data["guid"])) - color = material_data["color"] - brand = material_data["brand"] - material_type = material_data["material"] - name = i18n_catalog.i18nc("@label:material", "Empty") if material_data["material"] == "empty" \ - else i18n_catalog.i18nc("@label:material", "Unknown") - return MaterialOutputModel(guid = material_data["guid"], type = material_type, - brand = brand, color = color, name = name) - - def _updatePrinter(self, printer: PrinterOutputModel, data: Dict[str, Any]) -> None: - # For some unknown reason the cluster wants UUID for everything, except for sending a job directly to a printer. - # Then we suddenly need the unique name. So in order to not have to mess up all the other code, we save a mapping. - self._printer_uuid_to_unique_name_mapping[data["uuid"]] = data["unique_name"] - - definitions = ContainerRegistry.getInstance().findDefinitionContainers(name = data["machine_variant"]) - if not definitions: - Logger.log("w", "Unable to find definition for machine variant %s", data["machine_variant"]) - return - - machine_definition = definitions[0] - - printer.updateName(data["friendly_name"]) - printer.updateKey(data["uuid"]) - printer.updateType(data["machine_variant"]) - - if data["status"] != "unreachable": - self._application.getDiscoveredPrintersModel().updateDiscoveredPrinter(data["ip_address"], - name = data["friendly_name"], - machine_type = data["machine_variant"]) - - # Do not store the build plate information that comes from connect if the current printer has not build plate information - if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False): - printer.updateBuildplate(data["build_plate"]["type"]) - if not data["enabled"]: - printer.updateState("disabled") - else: - printer.updateState(data["status"]) - - for index in range(0, self._number_of_extruders): - extruder = printer.extruders[index] - try: - extruder_data = data["configuration"][index] - except IndexError: - break - - extruder.updateHotendID(extruder_data.get("print_core_id", "")) - - material_data = extruder_data["material"] - if extruder.activeMaterial is None or extruder.activeMaterial.guid != material_data["guid"]: - material = self._createMaterialOutputModel(material_data) - extruder.updateActiveMaterial(material) - - def _removeJob(self, job: UM3PrintJobOutputModel) -> bool: - if job not in self._print_jobs: - return False - - if job.assignedPrinter: - job.assignedPrinter.updateActivePrintJob(None) - job.stateChanged.disconnect(self._printJobStateChanged) - self._print_jobs.remove(job) - - return True - - def _removePrinter(self, printer: PrinterOutputModel) -> None: - self._printers.remove(printer) - if self._active_printer == printer: - self._active_printer = None - self.activePrinterChanged.emit() - - ## Sync the material profiles in Cura with the printer. - # - # This gets called when connecting to a printer as well as when sending a - # print. - def sendMaterialProfiles(self) -> None: - job = SendMaterialJob(device = self) - job.run() - -def loadJsonFromReply(reply: QNetworkReply) -> Optional[List[Dict[str, Any]]]: - try: - result = json.loads(bytes(reply.readAll()).decode("utf-8")) - except json.decoder.JSONDecodeError: - Logger.logException("w", "Unable to decode JSON from reply.") - return None - return result - - -def checkValidGetReply(reply: QNetworkReply) -> bool: - status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) - - if status_code != 200: - Logger.log("w", "Got status code {status_code} while trying to get data".format(status_code=status_code)) - return False - return True - - -def findByKey(lst: List[Union[UM3PrintJobOutputModel, PrinterOutputModel]], key: str) -> Optional[UM3PrintJobOutputModel]: - for item in lst: - if item.key == key: - return item - return None diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3PrinterOutputController.py b/plugins/UM3NetworkPrinting/src/ClusterUM3PrinterOutputController.py deleted file mode 100644 index 370cfc9008..0000000000 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3PrinterOutputController.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2017 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from cura.PrinterOutput.PrinterOutputController import PrinterOutputController - -MYPY = False -if MYPY: - from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel - -class ClusterUM3PrinterOutputController(PrinterOutputController): - def __init__(self, output_device): - super().__init__(output_device) - self.can_pre_heat_bed = False - self.can_pre_heat_hotends = False - self.can_control_manually = False - self.can_send_raw_gcode = False - - def setJobState(self, job: "PrintJobOutputModel", state: str): - data = "{\"action\": \"%s\"}" % state - self._output_device.put("print_jobs/%s/action" % job.key, data, on_finished=None) diff --git a/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py b/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py deleted file mode 100644 index b67f4d7185..0000000000 --- a/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -import os.path -import time -from typing import Optional, TYPE_CHECKING - -from PyQt5.QtCore import pyqtSignal, pyqtProperty, pyqtSlot, QObject - -from UM.PluginRegistry import PluginRegistry -from UM.Logger import Logger -from UM.i18n import i18nCatalog - -from cura.CuraApplication import CuraApplication -from cura.MachineAction import MachineAction -from cura.Settings.CuraContainerRegistry import CuraContainerRegistry - -from .UM3OutputDevicePlugin import UM3OutputDevicePlugin - -if TYPE_CHECKING: - from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice - -catalog = i18nCatalog("cura") - - -class DiscoverUM3Action(MachineAction): - discoveredDevicesChanged = pyqtSignal() - - def __init__(self) -> None: - super().__init__("DiscoverUM3Action", catalog.i18nc("@action","Connect via Network")) - self._qml_url = "resources/qml/DiscoverUM3Action.qml" - - self._network_plugin = None #type: Optional[UM3OutputDevicePlugin] - - self.__additional_components_view = None #type: Optional[QObject] - - CuraApplication.getInstance().engineCreatedSignal.connect(self._createAdditionalComponentsView) - - self._last_zero_conf_event_time = time.time() #type: float - - # Time to wait after a zero-conf service change before allowing a zeroconf reset - self._zero_conf_change_grace_period = 0.25 #type: float - - # Overrides the one in MachineAction. - # This requires not attention from the user (any more), so we don't need to show any 'upgrade screens'. - def needsUserInteraction(self) -> bool: - return False - - @pyqtSlot() - def startDiscovery(self): - if not self._network_plugin: - Logger.log("d", "Starting device discovery.") - self._network_plugin = CuraApplication.getInstance().getOutputDeviceManager().getOutputDevicePlugin("UM3NetworkPrinting") - self._network_plugin.discoveredDevicesChanged.connect(self._onDeviceDiscoveryChanged) - self.discoveredDevicesChanged.emit() - - ## Re-filters the list of devices. - @pyqtSlot() - def reset(self): - Logger.log("d", "Reset the list of found devices.") - if self._network_plugin: - self._network_plugin.resetLastManualDevice() - self.discoveredDevicesChanged.emit() - - @pyqtSlot() - def restartDiscovery(self): - # Ensure that there is a bit of time after a printer has been discovered. - # This is a work around for an issue with Qt 5.5.1 up to Qt 5.7 which can segfault if we do this too often. - # It's most likely that the QML engine is still creating delegates, where the python side already deleted or - # garbage collected the data. - # Whatever the case, waiting a bit ensures that it doesn't crash. - if time.time() - self._last_zero_conf_event_time > self._zero_conf_change_grace_period: - if not self._network_plugin: - self.startDiscovery() - else: - self._network_plugin.startDiscovery() - - @pyqtSlot(str, str) - def removeManualDevice(self, key, address): - if not self._network_plugin: - return - - self._network_plugin.removeManualDevice(key, address) - - @pyqtSlot(str, str) - def setManualDevice(self, key, address): - if key != "": - # This manual printer replaces a current manual printer - self._network_plugin.removeManualDevice(key) - - if address != "": - self._network_plugin.addManualDevice(address) - - def _onDeviceDiscoveryChanged(self, *args): - self._last_zero_conf_event_time = time.time() - self.discoveredDevicesChanged.emit() - - @pyqtProperty("QVariantList", notify = discoveredDevicesChanged) - def foundDevices(self): - if self._network_plugin: - - printers = list(self._network_plugin.getDiscoveredDevices().values()) - printers.sort(key = lambda k: k.name) - return printers - else: - return [] - - @pyqtSlot(str) - def setGroupName(self, group_name: str) -> None: - Logger.log("d", "Attempting to set the group name of the active machine to %s", group_name) - global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() - if global_container_stack: - # Update a GlobalStacks in the same group with the new group name. - group_id = global_container_stack.getMetaDataEntry("group_id") - machine_manager = CuraApplication.getInstance().getMachineManager() - for machine in machine_manager.getMachinesInGroup(group_id): - machine.setMetaDataEntry("group_name", group_name) - - # Set the default value for "hidden", which is used when you have a group with multiple types of printers - global_container_stack.setMetaDataEntry("hidden", False) - - if self._network_plugin: - # Ensure that the connection states are refreshed. - self._network_plugin.refreshConnections() - - # Associates the currently active machine with the given printer device. The network connection information will be - # stored into the metadata of the currently active machine. - @pyqtSlot(QObject) - def associateActiveMachineWithPrinterDevice(self, printer_device: Optional["PrinterOutputDevice"]) -> None: - if self._network_plugin: - self._network_plugin.associateActiveMachineWithPrinterDevice(printer_device) - - @pyqtSlot(result = str) - def getStoredKey(self) -> str: - global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() - if global_container_stack: - meta_data = global_container_stack.getMetaData() - if "um_network_key" in meta_data: - return global_container_stack.getMetaDataEntry("um_network_key") - - return "" - - @pyqtSlot(result = str) - def getLastManualEntryKey(self) -> str: - if self._network_plugin: - return self._network_plugin.getLastManualDevice() - return "" - - @pyqtSlot(str, result = bool) - def existsKey(self, key: str) -> bool: - metadata_filter = {"um_network_key": key} - containers = CuraContainerRegistry.getInstance().findContainerStacks(type="machine", **metadata_filter) - return bool(containers) - - @pyqtSlot() - def loadConfigurationFromPrinter(self) -> None: - machine_manager = CuraApplication.getInstance().getMachineManager() - hotend_ids = machine_manager.printerOutputDevices[0].hotendIds - for index in range(len(hotend_ids)): - machine_manager.printerOutputDevices[0].hotendIdChanged.emit(index, hotend_ids[index]) - material_ids = machine_manager.printerOutputDevices[0].materialIds - for index in range(len(material_ids)): - machine_manager.printerOutputDevices[0].materialIdChanged.emit(index, material_ids[index]) - - def _createAdditionalComponentsView(self) -> None: - Logger.log("d", "Creating additional ui components for UM3.") - - # Create networking dialog - plugin_path = PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting") - if not plugin_path: - return - path = os.path.join(plugin_path, "resources/qml/UM3InfoComponents.qml") - self.__additional_components_view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self}) - if not self.__additional_components_view: - Logger.log("w", "Could not create ui components for UM3.") - return - - # Create extra components - CuraApplication.getInstance().addAdditionalComponent("monitorButtons", self.__additional_components_view.findChild(QObject, "networkPrinterConnectButton")) diff --git a/plugins/UM3NetworkPrinting/src/ExportFileJob.py b/plugins/UM3NetworkPrinting/src/ExportFileJob.py new file mode 100644 index 0000000000..56d15bc835 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/ExportFileJob.py @@ -0,0 +1,39 @@ +from typing import List, Optional + +from UM.FileHandler.FileHandler import FileHandler +from UM.FileHandler.WriteFileJob import WriteFileJob +from UM.Logger import Logger +from UM.Scene.SceneNode import SceneNode +from cura.CuraApplication import CuraApplication + +from .MeshFormatHandler import MeshFormatHandler + + +## Job that exports the build plate to the correct file format for the target cluster. +class ExportFileJob(WriteFileJob): + + def __init__(self, file_handler: Optional[FileHandler], nodes: List[SceneNode], firmware_version: str) -> None: + + self._mesh_format_handler = MeshFormatHandler(file_handler, firmware_version) + if not self._mesh_format_handler.is_valid: + Logger.log("e", "Missing file or mesh writer!") + return + + super().__init__(self._mesh_format_handler.writer, self._mesh_format_handler.createStream(), nodes, + self._mesh_format_handler.file_mode) + + # Determine the filename. + job_name = CuraApplication.getInstance().getPrintInformation().jobName + extension = self._mesh_format_handler.preferred_format.get("extension", "") + self.setFileName("{}.{}".format(job_name, extension)) + + ## Get the mime type of the selected export file type. + def getMimeType(self) -> str: + return self._mesh_format_handler.mime_type + + ## Get the job result as bytes as that is what we need to upload to the cluster. + def getOutput(self) -> bytes: + output = self.getStream().getvalue() + if isinstance(output, str): + output = output.encode("utf-8") + return output diff --git a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py deleted file mode 100644 index 5c1948b977..0000000000 --- a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py +++ /dev/null @@ -1,646 +0,0 @@ -from typing import List, Optional - -from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState -from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel -from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel -from cura.PrinterOutput.Models.MaterialOutputModel import MaterialOutputModel -from cura.PrinterOutput.PrinterOutputDevice import ConnectionType - -from cura.Settings.ContainerManager import ContainerManager -from cura.Settings.ExtruderManager import ExtruderManager - -from UM.FileHandler.FileHandler import FileHandler -from UM.i18n import i18nCatalog -from UM.Logger import Logger -from UM.Message import Message -from UM.PluginRegistry import PluginRegistry -from UM.Scene.SceneNode import SceneNode -from UM.Settings.ContainerRegistry import ContainerRegistry - -from PyQt5.QtNetwork import QNetworkRequest -from PyQt5.QtCore import QTimer, QUrl -from PyQt5.QtWidgets import QMessageBox - -from .LegacyUM3PrinterOutputController import LegacyUM3PrinterOutputController - -from time import time - -import json -import os - - -i18n_catalog = i18nCatalog("cura") - - -## This is the output device for the "Legacy" API of the UM3. All firmware before 4.0.1 uses this API. -# Everything after that firmware uses the ClusterUM3Output. -# The Legacy output device can only have one printer (whereas the cluster can have 0 to n). -# -# Authentication is done in a number of steps; -# 1. Request an id / key pair by sending the application & user name. (state = authRequested) -# 2. Machine sends this back and will display an approve / deny message on screen. (state = AuthReceived) -# 3. OutputDevice will poll if the button was pressed. -# 4. At this point the machine either has the state Authenticated or AuthenticationDenied. -# 5. As a final step, we verify the authentication, as this forces the QT manager to setup the authenticator. -class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): - def __init__(self, device_id, address: str, properties, parent = None) -> None: - super().__init__(device_id = device_id, address = address, properties = properties, connection_type = ConnectionType.NetworkConnection, parent = parent) - self._api_prefix = "/api/v1/" - self._number_of_extruders = 2 - - self._authentication_id = None - self._authentication_key = None - - self._authentication_counter = 0 - self._max_authentication_counter = 5 * 60 # Number of attempts before authentication timed out (5 min) - - self._authentication_timer = QTimer() - self._authentication_timer.setInterval(1000) # TODO; Add preference for update interval - self._authentication_timer.setSingleShot(False) - - self._authentication_timer.timeout.connect(self._onAuthenticationTimer) - - # The messages are created when connect is called the first time. - # This ensures that the messages are only created for devices that actually want to connect. - self._authentication_requested_message = None - self._authentication_failed_message = None - self._authentication_succeeded_message = None - self._not_authenticated_message = None - - self.authenticationStateChanged.connect(self._onAuthenticationStateChanged) - - self.setPriority(3) # Make sure the output device gets selected above local file output - self.setName(self._id) - self.setShortDescription(i18n_catalog.i18nc("@action:button Preceded by 'Ready to'.", "Print over network")) - self.setDescription(i18n_catalog.i18nc("@properties:tooltip", "Print over network")) - - self.setIconName("print") - - self._output_controller = LegacyUM3PrinterOutputController(self) - - def _createMonitorViewFromQML(self) -> None: - if self._monitor_view_qml_path is None and PluginRegistry.getInstance() is not None: - self._monitor_view_qml_path = os.path.join( - PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"), - "resources", "qml", "MonitorStage.qml" - ) - super()._createMonitorViewFromQML() - - def _onAuthenticationStateChanged(self): - # We only accept commands if we are authenticated. - self._setAcceptsCommands(self._authentication_state == AuthState.Authenticated) - - if self._authentication_state == AuthState.Authenticated: - self.setConnectionText(i18n_catalog.i18nc("@info:status", "Connected over the network.")) - elif self._authentication_state == AuthState.AuthenticationRequested: - self.setConnectionText(i18n_catalog.i18nc("@info:status", - "Connected over the network. Please approve the access request on the printer.")) - elif self._authentication_state == AuthState.AuthenticationDenied: - self.setConnectionText(i18n_catalog.i18nc("@info:status", "Connected over the network. No access to control the printer.")) - - - def _setupMessages(self): - self._authentication_requested_message = Message(i18n_catalog.i18nc("@info:status", - "Access to the printer requested. Please approve the request on the printer"), - lifetime=0, dismissable=False, progress=0, - title=i18n_catalog.i18nc("@info:title", - "Authentication status")) - - self._authentication_failed_message = Message("", title=i18n_catalog.i18nc("@info:title", "Authentication Status")) - self._authentication_failed_message.addAction("Retry", i18n_catalog.i18nc("@action:button", "Retry"), None, - i18n_catalog.i18nc("@info:tooltip", "Re-send the access request")) - self._authentication_failed_message.actionTriggered.connect(self._messageCallback) - self._authentication_succeeded_message = Message( - i18n_catalog.i18nc("@info:status", "Access to the printer accepted"), - title=i18n_catalog.i18nc("@info:title", "Authentication Status")) - - self._not_authenticated_message = Message( - i18n_catalog.i18nc("@info:status", "No access to print with this printer. Unable to send print job."), - title=i18n_catalog.i18nc("@info:title", "Authentication Status")) - self._not_authenticated_message.addAction("Request", i18n_catalog.i18nc("@action:button", "Request Access"), - None, i18n_catalog.i18nc("@info:tooltip", - "Send access request to the printer")) - self._not_authenticated_message.actionTriggered.connect(self._messageCallback) - - def _messageCallback(self, message_id=None, action_id="Retry"): - if action_id == "Request" or action_id == "Retry": - if self._authentication_failed_message: - self._authentication_failed_message.hide() - if self._not_authenticated_message: - self._not_authenticated_message.hide() - - self._requestAuthentication() - - def connect(self): - super().connect() - self._setupMessages() - global_container = CuraApplication.getInstance().getGlobalContainerStack() - if global_container: - self._authentication_id = global_container.getMetaDataEntry("network_authentication_id", None) - self._authentication_key = global_container.getMetaDataEntry("network_authentication_key", None) - - def close(self): - super().close() - if self._authentication_requested_message: - self._authentication_requested_message.hide() - if self._authentication_failed_message: - self._authentication_failed_message.hide() - if self._authentication_succeeded_message: - self._authentication_succeeded_message.hide() - self._sending_gcode = False - self._compressing_gcode = False - self._authentication_timer.stop() - - ## Send all material profiles to the printer. - def _sendMaterialProfiles(self): - Logger.log("i", "Sending material profiles to printer") - - # TODO: Might want to move this to a job... - for container in ContainerRegistry.getInstance().findInstanceContainers(type="material"): - try: - xml_data = container.serialize() - if xml_data == "" or xml_data is None: - continue - - names = ContainerManager.getInstance().getLinkedMaterials(container.getId()) - if names: - # There are other materials that share this GUID. - if not container.isReadOnly(): - continue # If it's not readonly, it's created by user, so skip it. - - file_name = "none.xml" - - self.postForm("materials", "form-data; name=\"file\";filename=\"%s\"" % file_name, xml_data.encode(), on_finished=None) - - except NotImplementedError: - # If the material container is not the most "generic" one it can't be serialized an will raise a - # NotImplementedError. We can simply ignore these. - pass - - def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, file_handler: Optional[FileHandler] = None, **kwargs: str) -> None: - if not self.activePrinter: - # No active printer. Unable to write - return - - if self.activePrinter.state not in ["idle", ""]: - # Printer is not able to accept commands. - return - - if self._authentication_state != AuthState.Authenticated: - # Not authenticated, so unable to send job. - return - - self.writeStarted.emit(self) - - gcode_dict = getattr(CuraApplication.getInstance().getController().getScene(), "gcode_dict", []) - active_build_plate_id = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate - gcode_list = gcode_dict[active_build_plate_id] - - if not gcode_list: - # Unable to find g-code. Nothing to send - return - - self._gcode = gcode_list - - errors = self._checkForErrors() - if errors: - text = i18n_catalog.i18nc("@label", "Unable to start a new print job.") - informative_text = i18n_catalog.i18nc("@label", - "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. " - "Please resolve this issues before continuing.") - detailed_text = "" - for error in errors: - detailed_text += error + "\n" - - CuraApplication.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Mismatched configuration"), - text, - informative_text, - detailed_text, - buttons=QMessageBox.Ok, - icon=QMessageBox.Critical, - callback = self._messageBoxCallback - ) - return # Don't continue; Errors must block sending the job to the printer. - - # There might be multiple things wrong with the configuration. Check these before starting. - warnings = self._checkForWarnings() - - if warnings: - text = i18n_catalog.i18nc("@label", "Are you sure you wish to print with the selected configuration?") - informative_text = i18n_catalog.i18nc("@label", - "There is a mismatch between the configuration or calibration of the printer and Cura. " - "For the best result, always slice for the PrintCores and materials that are inserted in your printer.") - detailed_text = "" - for warning in warnings: - detailed_text += warning + "\n" - - CuraApplication.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Mismatched configuration"), - text, - informative_text, - detailed_text, - buttons=QMessageBox.Yes + QMessageBox.No, - icon=QMessageBox.Question, - callback=self._messageBoxCallback - ) - return - - # No warnings or errors, so we're good to go. - self._startPrint() - - # Notify the UI that a switch to the print monitor should happen - CuraApplication.getInstance().getController().setActiveStage("MonitorStage") - - def _startPrint(self): - Logger.log("i", "Sending print job to printer.") - if self._sending_gcode: - self._error_message = Message( - i18n_catalog.i18nc("@info:status", - "Sending new jobs (temporarily) blocked, still sending the previous print job.")) - self._error_message.show() - return - - self._sending_gcode = True - - self._send_gcode_start = time() - self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1, - i18n_catalog.i18nc("@info:title", "Sending Data")) - self._progress_message.addAction("Abort", i18n_catalog.i18nc("@action:button", "Cancel"), None, "") - self._progress_message.actionTriggered.connect(self._progressMessageActionTriggered) - self._progress_message.show() - - compressed_gcode = self._compressGCode() - if compressed_gcode is None: - # Abort was called. - return - - file_name = "%s.gcode.gz" % CuraApplication.getInstance().getPrintInformation().jobName - self.postForm("print_job", "form-data; name=\"file\";filename=\"%s\"" % file_name, compressed_gcode, - on_finished=self._onPostPrintJobFinished) - - return - - def _progressMessageActionTriggered(self, message_id=None, action_id=None): - if action_id == "Abort": - Logger.log("d", "User aborted sending print to remote.") - self._progress_message.hide() - self._compressing_gcode = False - self._sending_gcode = False - CuraApplication.getInstance().getController().setActiveStage("PrepareStage") - - def _onPostPrintJobFinished(self, reply): - self._progress_message.hide() - self._sending_gcode = False - - def _onUploadPrintJobProgress(self, bytes_sent, bytes_total): - if bytes_total > 0: - new_progress = bytes_sent / bytes_total * 100 - # Treat upload progress as response. Uploading can take more than 10 seconds, so if we don't, we can get - # timeout responses if this happens. - self._last_response_time = time() - if new_progress > self._progress_message.getProgress(): - self._progress_message.show() # Ensure that the message is visible. - self._progress_message.setProgress(bytes_sent / bytes_total * 100) - else: - self._progress_message.setProgress(0) - - self._progress_message.hide() - - def _messageBoxCallback(self, button): - def delayedCallback(): - if button == QMessageBox.Yes: - self._startPrint() - else: - CuraApplication.getInstance().getController().setActiveStage("PrepareStage") - # For some unknown reason Cura on OSX will hang if we do the call back code - # immediately without first returning and leaving QML's event system. - - QTimer.singleShot(100, delayedCallback) - - def _checkForErrors(self): - errors = [] - print_information = CuraApplication.getInstance().getPrintInformation() - if not print_information.materialLengths: - Logger.log("w", "There is no material length information. Unable to check for errors.") - return errors - - for index, extruder in enumerate(self.activePrinter.extruders): - # Due to airflow issues, both slots must be loaded, regardless if they are actually used or not. - if extruder.hotendID == "": - # No Printcore loaded. - errors.append(i18n_catalog.i18nc("@info:status", "No Printcore loaded in slot {slot_number}".format(slot_number=index + 1))) - - if index < len(print_information.materialLengths) and print_information.materialLengths[index] != 0: - # The extruder is by this print. - if extruder.activeMaterial is None: - # No active material - errors.append(i18n_catalog.i18nc("@info:status", "No material loaded in slot {slot_number}".format(slot_number=index + 1))) - return errors - - def _checkForWarnings(self): - warnings = [] - print_information = CuraApplication.getInstance().getPrintInformation() - - if not print_information.materialLengths: - Logger.log("w", "There is no material length information. Unable to check for warnings.") - return warnings - - extruder_manager = ExtruderManager.getInstance() - - for index, extruder in enumerate(self.activePrinter.extruders): - if index < len(print_information.materialLengths) and print_information.materialLengths[index] != 0: - # The extruder is by this print. - - # TODO: material length check - - # Check if the right Printcore is active. - variant = extruder_manager.getExtruderStack(index).findContainer({"type": "variant"}) - if variant: - if variant.getName() != extruder.hotendID: - warnings.append(i18n_catalog.i18nc("@label", "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}".format(cura_printcore_name = variant.getName(), remote_printcore_name = extruder.hotendID, extruder_id = index + 1))) - else: - Logger.log("w", "Unable to find variant.") - - # Check if the right material is loaded. - local_material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"}) - if local_material: - if extruder.activeMaterial.guid != local_material.getMetaDataEntry("GUID"): - Logger.log("w", "Extruder %s has a different material (%s) as Cura (%s)", index + 1, extruder.activeMaterial.guid, local_material.getMetaDataEntry("GUID")) - warnings.append(i18n_catalog.i18nc("@label", "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}").format(local_material.getName(), extruder.activeMaterial.name, index + 1)) - else: - Logger.log("w", "Unable to find material.") - - return warnings - - def _update(self): - if not super()._update(): - return - if self._authentication_state == AuthState.NotAuthenticated: - if self._authentication_id is None and self._authentication_key is None: - # This machine doesn't have any authentication, so request it. - self._requestAuthentication() - elif self._authentication_id is not None and self._authentication_key is not None: - # We have authentication info, but we haven't checked it out yet. Do so now. - self._verifyAuthentication() - elif self._authentication_state == AuthState.AuthenticationReceived: - # We have an authentication, but it's not confirmed yet. - self._checkAuthentication() - - # We don't need authentication for requesting info, so we can go right ahead with requesting this. - self.get("printer", on_finished=self._onGetPrinterDataFinished) - self.get("print_job", on_finished=self._onGetPrintJobFinished) - - def _resetAuthenticationRequestedMessage(self): - if self._authentication_requested_message: - self._authentication_requested_message.hide() - self._authentication_timer.stop() - self._authentication_counter = 0 - - def _onAuthenticationTimer(self): - self._authentication_counter += 1 - self._authentication_requested_message.setProgress( - self._authentication_counter / self._max_authentication_counter * 100) - if self._authentication_counter > self._max_authentication_counter: - self._authentication_timer.stop() - Logger.log("i", "Authentication timer ended. Setting authentication to denied for printer: %s" % self._id) - self.setAuthenticationState(AuthState.AuthenticationDenied) - self._resetAuthenticationRequestedMessage() - self._authentication_failed_message.show() - - def _verifyAuthentication(self): - Logger.log("d", "Attempting to verify authentication") - # This will ensure that the "_onAuthenticationRequired" is triggered, which will setup the authenticator. - self.get("auth/verify", on_finished=self._onVerifyAuthenticationCompleted) - - def _onVerifyAuthenticationCompleted(self, reply): - status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) - if status_code == 401: - # Something went wrong; We somehow tried to verify authentication without having one. - Logger.log("d", "Attempted to verify auth without having one.") - self._authentication_id = None - self._authentication_key = None - self.setAuthenticationState(AuthState.NotAuthenticated) - elif status_code == 403 and self._authentication_state != AuthState.Authenticated: - # If we were already authenticated, we probably got an older message back all of the sudden. Drop that. - Logger.log("d", - "While trying to verify the authentication state, we got a forbidden response. Our own auth state was %s. ", - self._authentication_state) - self.setAuthenticationState(AuthState.AuthenticationDenied) - self._authentication_failed_message.show() - elif status_code == 200: - self.setAuthenticationState(AuthState.Authenticated) - - def _checkAuthentication(self): - Logger.log("d", "Checking if authentication is correct for id %s and key %s", self._authentication_id, self._getSafeAuthKey()) - self.get("auth/check/" + str(self._authentication_id), on_finished=self._onCheckAuthenticationFinished) - - def _onCheckAuthenticationFinished(self, reply): - if str(self._authentication_id) not in reply.url().toString(): - Logger.log("w", "Got an old id response.") - # Got response for old authentication ID. - return - try: - data = json.loads(bytes(reply.readAll()).decode("utf-8")) - except json.decoder.JSONDecodeError: - Logger.log("w", "Received an invalid authentication check from printer: Not valid JSON.") - return - - if data.get("message", "") == "authorized": - Logger.log("i", "Authentication was approved") - self.setAuthenticationState(AuthState.Authenticated) - self._saveAuthentication() - - # Double check that everything went well. - self._verifyAuthentication() - - # Notify the user. - self._resetAuthenticationRequestedMessage() - self._authentication_succeeded_message.show() - elif data.get("message", "") == "unauthorized": - Logger.log("i", "Authentication was denied.") - self.setAuthenticationState(AuthState.AuthenticationDenied) - self._authentication_failed_message.show() - - def _saveAuthentication(self) -> None: - global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() - if self._authentication_key is None: - Logger.log("e", "Authentication key is None, nothing to save.") - return - if self._authentication_id is None: - Logger.log("e", "Authentication id is None, nothing to save.") - return - if global_container_stack: - global_container_stack.setMetaDataEntry("network_authentication_key", self._authentication_key) - - global_container_stack.setMetaDataEntry("network_authentication_id", self._authentication_id) - - # Force save so we are sure the data is not lost. - CuraApplication.getInstance().saveStack(global_container_stack) - Logger.log("i", "Authentication succeeded for id %s and key %s", self._authentication_id, - self._getSafeAuthKey()) - else: - Logger.log("e", "Unable to save authentication for id %s and key %s", self._authentication_id, - self._getSafeAuthKey()) - - def _onRequestAuthenticationFinished(self, reply): - try: - data = json.loads(bytes(reply.readAll()).decode("utf-8")) - except json.decoder.JSONDecodeError: - Logger.log("w", "Received an invalid authentication request reply from printer: Not valid JSON.") - self.setAuthenticationState(AuthState.NotAuthenticated) - return - - self.setAuthenticationState(AuthState.AuthenticationReceived) - self._authentication_id = data["id"] - self._authentication_key = data["key"] - Logger.log("i", "Got a new authentication ID (%s) and KEY (%s). Waiting for authorization.", - self._authentication_id, self._getSafeAuthKey()) - - def _requestAuthentication(self): - self._authentication_requested_message.show() - self._authentication_timer.start() - - # Reset any previous authentication info. If this isn't done, the "Retry" action on the failed message might - # give issues. - self._authentication_key = None - self._authentication_id = None - - self.post("auth/request", - json.dumps({"application": "Cura-" + CuraApplication.getInstance().getVersion(), - "user": self._getUserName()}), - on_finished=self._onRequestAuthenticationFinished) - - self.setAuthenticationState(AuthState.AuthenticationRequested) - - def _onAuthenticationRequired(self, reply, authenticator): - if self._authentication_id is not None and self._authentication_key is not None: - Logger.log("d", - "Authentication was required for printer: %s. Setting up authenticator with ID %s and key %s", - self._id, self._authentication_id, self._getSafeAuthKey()) - authenticator.setUser(self._authentication_id) - authenticator.setPassword(self._authentication_key) - else: - Logger.log("d", "No authentication is available to use for %s, but we did got a request for it.", self._id) - - def _onGetPrintJobFinished(self, reply): - status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) - - if not self._printers: - return # Ignore the data for now, we don't have info about a printer yet. - printer = self._printers[0] - - if status_code == 200: - try: - result = json.loads(bytes(reply.readAll()).decode("utf-8")) - except json.decoder.JSONDecodeError: - Logger.log("w", "Received an invalid print job state message: Not valid JSON.") - return - if printer.activePrintJob is None: - print_job = PrintJobOutputModel(output_controller=self._output_controller) - printer.updateActivePrintJob(print_job) - else: - print_job = printer.activePrintJob - print_job.updateState(result["state"]) - print_job.updateTimeElapsed(result["time_elapsed"]) - print_job.updateTimeTotal(result["time_total"]) - print_job.updateName(result["name"]) - elif status_code == 404: - # No job found, so delete the active print job (if any!) - printer.updateActivePrintJob(None) - else: - Logger.log("w", - "Got status code {status_code} while trying to get printer data".format(status_code=status_code)) - - def materialHotendChangedMessage(self, callback): - CuraApplication.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Sync with your printer"), - i18n_catalog.i18nc("@label", - "Would you like to use your current printer configuration in Cura?"), - i18n_catalog.i18nc("@label", - "The PrintCores and/or materials on your printer differ from those within your current project. For the best result, always slice for the PrintCores and materials that are inserted in your printer."), - buttons=QMessageBox.Yes + QMessageBox.No, - icon=QMessageBox.Question, - callback=callback - ) - - def _onGetPrinterDataFinished(self, reply): - status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) - if status_code == 200: - try: - result = json.loads(bytes(reply.readAll()).decode("utf-8")) - except json.decoder.JSONDecodeError: - Logger.log("w", "Received an invalid printer state message: Not valid JSON.") - return - - if not self._printers: - # Quickest way to get the firmware version is to grab it from the zeroconf. - firmware_version = self._properties.get(b"firmware_version", b"").decode("utf-8") - self._printers = [PrinterOutputModel(output_controller=self._output_controller, number_of_extruders=self._number_of_extruders, firmware_version=firmware_version)] - self._printers[0].setCameraUrl(QUrl("http://" + self._address + ":8080/?action=stream")) - for extruder in self._printers[0].extruders: - extruder.activeMaterialChanged.connect(self.materialIdChanged) - extruder.hotendIDChanged.connect(self.hotendIdChanged) - self.printersChanged.emit() - - # LegacyUM3 always has a single printer. - printer = self._printers[0] - printer.updateBedTemperature(result["bed"]["temperature"]["current"]) - printer.updateTargetBedTemperature(result["bed"]["temperature"]["target"]) - printer.updateState(result["status"]) - - try: - # If we're still handling the request, we should ignore remote for a bit. - if not printer.getController().isPreheatRequestInProgress(): - printer.updateIsPreheating(result["bed"]["pre_heat"]["active"]) - except KeyError: - # Older firmwares don't support preheating, so we need to fake it. - pass - - head_position = result["heads"][0]["position"] - printer.updateHeadPosition(head_position["x"], head_position["y"], head_position["z"]) - - for index in range(0, self._number_of_extruders): - temperatures = result["heads"][0]["extruders"][index]["hotend"]["temperature"] - extruder = printer.extruders[index] - extruder.updateTargetHotendTemperature(temperatures["target"]) - extruder.updateHotendTemperature(temperatures["current"]) - - material_guid = result["heads"][0]["extruders"][index]["active_material"]["guid"] - - if extruder.activeMaterial is None or extruder.activeMaterial.guid != material_guid: - # Find matching material (as we need to set brand, type & color) - containers = ContainerRegistry.getInstance().findInstanceContainers(type="material", - GUID=material_guid) - if containers: - color = containers[0].getMetaDataEntry("color_code") - brand = containers[0].getMetaDataEntry("brand") - material_type = containers[0].getMetaDataEntry("material") - name = containers[0].getName() - else: - # Unknown material. - color = "#00000000" - brand = "Unknown" - material_type = "Unknown" - name = "Unknown" - material = MaterialOutputModel(guid=material_guid, type=material_type, - brand=brand, color=color, name = name) - extruder.updateActiveMaterial(material) - - try: - hotend_id = result["heads"][0]["extruders"][index]["hotend"]["id"] - except KeyError: - hotend_id = "" - printer.extruders[index].updateHotendID(hotend_id) - - else: - Logger.log("w", - "Got status code {status_code} while trying to get printer data".format(status_code = status_code)) - - ## Convenience function to "blur" out all but the last 5 characters of the auth key. - # This can be used to debug print the key, without it compromising the security. - def _getSafeAuthKey(self): - if self._authentication_key is not None: - result = self._authentication_key[-5:] - result = "********" + result - return result - - return self._authentication_key diff --git a/plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py b/plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py deleted file mode 100644 index 9e372d4113..0000000000 --- a/plugins/UM3NetworkPrinting/src/LegacyUM3PrinterOutputController.py +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright (c) 2019 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from cura.PrinterOutput.PrinterOutputController import PrinterOutputController -from PyQt5.QtCore import QTimer -from UM.Version import Version - -MYPY = False -if MYPY: - from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel - from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel - - -class LegacyUM3PrinterOutputController(PrinterOutputController): - def __init__(self, output_device): - super().__init__(output_device) - self._preheat_bed_timer = QTimer() - self._preheat_bed_timer.setSingleShot(True) - self._preheat_bed_timer.timeout.connect(self._onPreheatBedTimerFinished) - self._preheat_printer = None - - self.can_control_manually = False - self.can_send_raw_gcode = False - - # Are we still waiting for a response about preheat? - # We need this so we can already update buttons, so it feels more snappy. - self._preheat_request_in_progress = False - - def isPreheatRequestInProgress(self): - return self._preheat_request_in_progress - - def setJobState(self, job: "PrintJobOutputModel", state: str): - data = "{\"target\": \"%s\"}" % state - self._output_device.put("print_job/state", data, on_finished=None) - - def setTargetBedTemperature(self, printer: "PrinterOutputModel", temperature: float): - data = str(temperature) - self._output_device.put("printer/bed/temperature/target", data, on_finished = self._onPutBedTemperatureCompleted) - - def _onPutBedTemperatureCompleted(self, reply): - if Version(self._preheat_printer.firmwareVersion) < Version("3.5.92"): - # If it was handling a preheat, it isn't anymore. - self._preheat_request_in_progress = False - - def _onPutPreheatBedCompleted(self, reply): - self._preheat_request_in_progress = False - - def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed): - head_pos = printer._head_position - new_x = head_pos.x + x - new_y = head_pos.y + y - new_z = head_pos.z + z - data = "{\n\"x\":%s,\n\"y\":%s,\n\"z\":%s\n}" %(new_x, new_y, new_z) - self._output_device.put("printer/heads/0/position", data, on_finished=None) - - def homeBed(self, printer): - self._output_device.put("printer/heads/0/position/z", "0", on_finished=None) - - def _onPreheatBedTimerFinished(self): - self.setTargetBedTemperature(self._preheat_printer, 0) - self._preheat_printer.updateIsPreheating(False) - self._preheat_request_in_progress = True - - def cancelPreheatBed(self, printer: "PrinterOutputModel"): - self.preheatBed(printer, temperature=0, duration=0) - self._preheat_bed_timer.stop() - printer.updateIsPreheating(False) - - def preheatBed(self, printer: "PrinterOutputModel", temperature, duration): - try: - temperature = round(temperature) # The API doesn't allow floating point. - duration = round(duration) - except ValueError: - return # Got invalid values, can't pre-heat. - - if duration > 0: - data = """{"temperature": "%i", "timeout": "%i"}""" % (temperature, duration) - else: - data = """{"temperature": "%i"}""" % temperature - - # Real bed pre-heating support is implemented from 3.5.92 and up. - - if Version(printer.firmwareVersion) < Version("3.5.92"): - # No firmware-side duration support then, so just set target bed temp and set a timer. - self.setTargetBedTemperature(printer, temperature=temperature) - self._preheat_bed_timer.setInterval(duration * 1000) - self._preheat_bed_timer.start() - self._preheat_printer = printer - printer.updateIsPreheating(True) - return - - self._output_device.put("printer/bed/pre_heat", data, on_finished = self._onPutPreheatBedCompleted) - printer.updateIsPreheating(True) - self._preheat_request_in_progress = True - - diff --git a/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py b/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py index c3cd82a86d..9927bf744e 100644 --- a/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py +++ b/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import io from typing import Optional, Dict, Union, List, cast @@ -32,7 +32,7 @@ class MeshFormatHandler: # \return A dict with the file format details, with the following keys: # {id: str, extension: str, description: str, mime_type: str, mode: int, hide_in_file_dialog: bool} @property - def preferred_format(self) -> Optional[Dict[str, Union[str, int, bool]]]: + def preferred_format(self) -> Dict[str, Union[str, int, bool]]: return self._preferred_format ## Gets the file writer for the given file handler and mime type. @@ -90,6 +90,7 @@ class MeshFormatHandler: machine_file_formats = global_stack.getMetaDataEntry("file_formats").split(";") machine_file_formats = [file_type.strip() for file_type in machine_file_formats] + # Exception for UM3 firmware version >=4.4: UFP is now supported and should be the preferred file format. if "application/x-ufp" not in machine_file_formats and Version(firmware_version) >= Version("4.4"): machine_file_formats = ["application/x-ufp"] + machine_file_formats diff --git a/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py new file mode 100644 index 0000000000..4f2f7a71a2 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py @@ -0,0 +1,41 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import os + +from PyQt5.QtCore import QUrl +from PyQt5.QtGui import QDesktopServices + +from UM import i18nCatalog +from UM.Message import Message +from cura.CuraApplication import CuraApplication + + +I18N_CATALOG = i18nCatalog("cura") + + +class CloudFlowMessage(Message): + + def __init__(self, address: str) -> None: + + image_path = os.path.join( + CuraApplication.getInstance().getPluginRegistry().getPluginPath("UM3NetworkPrinting") or "", + "resources", "svg", "cloud-flow-start.svg" + ) + + super().__init__( + text=I18N_CATALOG.i18nc("@info:status", + "Send and monitor print jobs from anywhere using your Ultimaker account."), + lifetime=0, + dismissable=True, + option_state=False, + image_source=image_path, + image_caption=I18N_CATALOG.i18nc("@info:status Ultimaker Cloud should not be translated.", + "Connect to Ultimaker Cloud"), + ) + self._address = address + self.addAction("", I18N_CATALOG.i18nc("@action", "Get started"), "", "") + self.actionTriggered.connect(self._onCloudFlowStarted) + + def _onCloudFlowStarted(self, messageId: str, actionId: str) -> None: + QDesktopServices.openUrl(QUrl("http://{}/cloud_connect".format(self._address))) + self.hide() diff --git a/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py b/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py new file mode 100644 index 0000000000..f4132dbcbc --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py @@ -0,0 +1,33 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message + + +I18N_CATALOG = i18nCatalog("cura") + + +## Message shown when trying to connect to a legacy printer device. +class LegacyDeviceNoLongerSupportedMessage(Message): + + # Singleton used to prevent duplicate messages of this type at the same time. + __is_visible = False + + def __init__(self) -> None: + super().__init__( + text = I18N_CATALOG.i18nc("@info:status", "You are attempting to connect to a printer that is not " + "running Ultimaker Connect. Please update the printer to the " + "latest firmware."), + title = I18N_CATALOG.i18nc("@info:title", "Update your printer"), + lifetime = 10 + ) + + def show(self) -> None: + if LegacyDeviceNoLongerSupportedMessage.__is_visible: + return + super().show() + LegacyDeviceNoLongerSupportedMessage.__is_visible = True + + def hide(self, send_signal = True) -> None: + super().hide(send_signal) + LegacyDeviceNoLongerSupportedMessage.__is_visible = False diff --git a/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py b/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py new file mode 100644 index 0000000000..77d7995fc7 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py @@ -0,0 +1,50 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import TYPE_CHECKING + +from PyQt5.QtCore import QUrl +from PyQt5.QtGui import QDesktopServices + +from UM import i18nCatalog +from UM.Message import Message + + +if TYPE_CHECKING: + from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice + + +I18N_CATALOG = i18nCatalog("cura") + + +## Message shown when trying to connect to a printer that is not a host. +class NotClusterHostMessage(Message): + + # Singleton used to prevent duplicate messages of this type at the same time. + __is_visible = False + + def __init__(self, device: "UltimakerNetworkedPrinterOutputDevice") -> None: + super().__init__( + text = I18N_CATALOG.i18nc("@info:status", "You are attempting to connect to {0} but it is not " + "the host of a group. You can visit the web page to configure " + "it as a group host.", device.name), + title = I18N_CATALOG.i18nc("@info:title", "Not a group host"), + lifetime = 0, + dismissable = True + ) + self._address = device.address + self.addAction("", I18N_CATALOG.i18nc("@action", "Configure group"), "", "") + self.actionTriggered.connect(self._onConfigureClicked) + + def show(self) -> None: + if NotClusterHostMessage.__is_visible: + return + super().show() + NotClusterHostMessage.__is_visible = True + + def hide(self, send_signal = True) -> None: + super().hide(send_signal) + NotClusterHostMessage.__is_visible = False + + def _onConfigureClicked(self, messageId: str, actionId: str) -> None: + QDesktopServices.openUrl(QUrl("http://{}/print_jobs".format(self._address))) + self.hide() diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py new file mode 100644 index 0000000000..be00292559 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadBlockedMessage.py @@ -0,0 +1,18 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message + + +I18N_CATALOG = i18nCatalog("cura") + + +## Message shown when uploading a print job to a cluster is blocked because another upload is already in progress. +class PrintJobUploadBlockedMessage(Message): + + def __init__(self) -> None: + super().__init__( + text = I18N_CATALOG.i18nc("@info:status", "Please wait until the current job has been sent."), + title = I18N_CATALOG.i18nc("@info:title", "Print error"), + lifetime = 10 + ) diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py new file mode 100644 index 0000000000..bb26a84953 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py @@ -0,0 +1,18 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message + + +I18N_CATALOG = i18nCatalog("cura") + + +## Message shown when uploading a print job to a cluster failed. +class PrintJobUploadErrorMessage(Message): + + def __init__(self, message: str = None) -> None: + super().__init__( + text = message or I18N_CATALOG.i18nc("@info:text", "Could not upload the data to the printer."), + title = I18N_CATALOG.i18nc("@info:title", "Network error"), + lifetime = 10 + ) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudProgressMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadProgressMessage.py similarity index 89% rename from plugins/UM3NetworkPrinting/src/Cloud/CloudProgressMessage.py rename to plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadProgressMessage.py index 943bef2bc1..bdbab008e3 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudProgressMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadProgressMessage.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM import i18nCatalog from UM.Message import Message @@ -8,11 +8,11 @@ I18N_CATALOG = i18nCatalog("cura") ## Class responsible for showing a progress message while a mesh is being uploaded to the cloud. -class CloudProgressMessage(Message): +class PrintJobUploadProgressMessage(Message): def __init__(self): super().__init__( title = I18N_CATALOG.i18nc("@info:status", "Sending Print Job"), - text = I18N_CATALOG.i18nc("@info:status", "Uploading via Ultimaker Cloud"), + text = I18N_CATALOG.i18nc("@info:status", "Uploading print job to printer."), progress = -1, lifetime = 0, dismissable = False, diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py new file mode 100644 index 0000000000..c9be28d57f --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py @@ -0,0 +1,18 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message + + +I18N_CATALOG = i18nCatalog("cura") + + +## Message shown when uploading a print job to a cluster succeeded. +class PrintJobUploadSuccessMessage(Message): + + def __init__(self) -> None: + super().__init__( + text = I18N_CATALOG.i18nc("@info:status", "Print job was successfully sent to the printer."), + title = I18N_CATALOG.i18nc("@info:title", "Data Sent"), + lifetime = 5 + ) diff --git a/plugins/UM3NetworkPrinting/src/Messages/__init__.py b/plugins/UM3NetworkPrinting/src/Messages/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/UM3NetworkPrinting/src/Models.py b/plugins/UM3NetworkPrinting/src/Models.py deleted file mode 100644 index c5b9b16665..0000000000 --- a/plugins/UM3NetworkPrinting/src/Models.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - - -## Base model that maps kwargs to instance attributes. -class BaseModel: - def __init__(self, **kwargs) -> None: - self.__dict__.update(kwargs) - self.validate() - - # Validates the model, raising an exception if the model is invalid. - def validate(self) -> None: - pass - - -## Class representing a material that was fetched from the cluster API. -class ClusterMaterial(BaseModel): - def __init__(self, guid: str, version: int, **kwargs) -> None: - self.guid = guid # type: str - self.version = version # type: int - super().__init__(**kwargs) - - def validate(self) -> None: - if not self.guid: - raise ValueError("guid is required on ClusterMaterial") - if not self.version: - raise ValueError("version is required on ClusterMaterial") - - -## Class representing a local material that was fetched from the container registry. -class LocalMaterial(BaseModel): - def __init__(self, GUID: str, id: str, version: int, **kwargs) -> None: - self.GUID = GUID # type: str - self.id = id # type: str - self.version = version # type: int - super().__init__(**kwargs) - - # - def validate(self) -> None: - super().validate() - if not self.GUID: - raise ValueError("guid is required on LocalMaterial") - if not self.version: - raise ValueError("version is required on LocalMaterial") - if not self.id: - raise ValueError("id is required on LocalMaterial") diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/BaseCloudModel.py b/plugins/UM3NetworkPrinting/src/Models/BaseModel.py similarity index 81% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/BaseCloudModel.py rename to plugins/UM3NetworkPrinting/src/Models/BaseModel.py index 18a8cb5cba..3d38a4b116 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/BaseCloudModel.py +++ b/plugins/UM3NetworkPrinting/src/Models/BaseModel.py @@ -1,13 +1,23 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from datetime import datetime, timezone -from typing import Dict, Union, TypeVar, Type, List, Any - -from ...Models import BaseModel +from typing import TypeVar, Dict, List, Any, Type, Union -## Base class for the models used in the interface with the Ultimaker cloud APIs. -class BaseCloudModel(BaseModel): +# Type variable used in the parse methods below, which should be a subclass of BaseModel. +T = TypeVar("T", bound="BaseModel") + + +class BaseModel: + + def __init__(self, **kwargs) -> None: + self.__dict__.update(kwargs) + self.validate() + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + pass + ## Checks whether the two models are equal. # \param other: The other model. # \return True if they are equal, False if they are different. @@ -24,9 +34,6 @@ class BaseCloudModel(BaseModel): def toDict(self) -> Dict[str, Any]: return self.__dict__ - # Type variable used in the parse methods below, which should be a subclass of BaseModel. - T = TypeVar("T", bound=BaseModel) - ## Parses a single model. # \param model_class: The model class. # \param values: The value of the model, which is usually a dictionary, but may also be already parsed. diff --git a/plugins/UM3NetworkPrinting/src/Models/ClusterMaterial.py b/plugins/UM3NetworkPrinting/src/Models/ClusterMaterial.py new file mode 100644 index 0000000000..a441f28292 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Models/ClusterMaterial.py @@ -0,0 +1,16 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from .BaseModel import BaseModel + + +class ClusterMaterial(BaseModel): + def __init__(self, guid: str, version: int, **kwargs) -> None: + self.guid = guid # type: str + self.version = version # type: int + super().__init__(**kwargs) + + def validate(self) -> None: + if not self.guid: + raise ValueError("guid is required on ClusterMaterial") + if not self.version: + raise ValueError("version is required on ClusterMaterial") diff --git a/plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py b/plugins/UM3NetworkPrinting/src/Models/ConfigurationChangeModel.py similarity index 78% rename from plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py rename to plugins/UM3NetworkPrinting/src/Models/ConfigurationChangeModel.py index 7136d8b93f..58fae03679 100644 --- a/plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py +++ b/plugins/UM3NetworkPrinting/src/Models/ConfigurationChangeModel.py @@ -1,17 +1,17 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from PyQt5.QtCore import pyqtProperty, QObject -from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot BLOCKING_CHANGE_TYPES = [ "material_insert", "buildplate_change" ] + class ConfigurationChangeModel(QObject): def __init__(self, type_of_change: str, index: int, target_name: str, origin_name: str) -> None: super().__init__() - self._type_of_change = type_of_change - # enum = ["material", "print_core_change"] + self._type_of_change = type_of_change # enum = ["material", "print_core_change"] self._can_override = self._type_of_change not in BLOCKING_CHANGE_TYPES self._index = index self._target_name = target_name @@ -35,4 +35,4 @@ class ConfigurationChangeModel(QObject): @pyqtProperty(bool, constant = True) def canOverride(self) -> bool: - return self._can_override \ No newline at end of file + return self._can_override diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py similarity index 91% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterResponse.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py index a872a6ba68..7ecfe8b0a3 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterResponse.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py @@ -1,13 +1,13 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel ## Class representing a cloud connected cluster. -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterResponse(BaseCloudModel): +class CloudClusterResponse(BaseModel): + ## Creates a new cluster response object. # \param cluster_id: The secret unique ID, e.g. 'kBEeZWEifXbrXviO8mRYLx45P8k5lHVGs43XKvRniPg='. # \param host_guid: The unique identifier of the print cluster host, e.g. 'e90ae0ac-1257-4403-91ee-a44c9b7e8050'. diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterStatus.py similarity index 52% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterStatus.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterStatus.py index b0250c2ebb..330e61d343 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterStatus.py @@ -1,26 +1,26 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from datetime import datetime from typing import List, Dict, Union, Any -from .CloudClusterPrinterStatus import CloudClusterPrinterStatus -from .CloudClusterPrintJobStatus import CloudClusterPrintJobStatus -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel +from .ClusterPrinterStatus import ClusterPrinterStatus +from .ClusterPrintJobStatus import ClusterPrintJobStatus # Model that represents the status of the cluster for the cloud -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterStatus(BaseCloudModel): +class CloudClusterStatus(BaseModel): + ## Creates a new cluster status model object. # \param printers: The latest status of each printer in the cluster. # \param print_jobs: The latest status of each print job in the cluster. # \param generated_time: The datetime when the object was generated on the server-side. def __init__(self, - printers: List[Union[CloudClusterPrinterStatus, Dict[str, Any]]], - print_jobs: List[Union[CloudClusterPrintJobStatus, Dict[str, Any]]], + printers: List[Union[ClusterPrinterStatus, Dict[str, Any]]], + print_jobs: List[Union[ClusterPrintJobStatus, Dict[str, Any]]], generated_time: Union[str, datetime], **kwargs) -> None: self.generated_time = self.parseDate(generated_time) - self.printers = self.parseModels(CloudClusterPrinterStatus, printers) - self.print_jobs = self.parseModels(CloudClusterPrintJobStatus, print_jobs) + self.printers = self.parseModels(ClusterPrinterStatus, printers) + self.print_jobs = self.parseModels(ClusterPrintJobStatus, print_jobs) super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudError.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudError.py similarity index 88% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudError.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudError.py index b53361022e..9381e4b8cf 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudError.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudError.py @@ -1,13 +1,13 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Dict, Optional, Any -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel ## Class representing errors generated by the cloud servers, according to the JSON-API standard. -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudError(BaseCloudModel): +class CloudError(BaseModel): + ## Creates a new error object. # \param id: Unique identifier for this particular occurrence of the problem. # \param title: A short, human-readable summary of the problem that SHOULD NOT change from occurrence to occurrence diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py similarity index 88% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobResponse.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py index 79196ee38c..a1880e8751 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobResponse.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobResponse.py @@ -1,13 +1,13 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel # Model that represents the response received from the cloud after requesting to upload a print job -# Spec: https://api-staging.ultimaker.com/cura/v1/spec -class CloudPrintJobResponse(BaseCloudModel): +class CloudPrintJobResponse(BaseModel): + ## Creates a new print job response model. # \param job_id: The job unique ID, e.g. 'kBEeZWEifXbrXviO8mRYLx45P8k5lHVGs43XKvRniPg='. # \param status: The status of the print job. @@ -28,6 +28,5 @@ class CloudPrintJobResponse(BaseCloudModel): self.upload_url = upload_url self.content_type = content_type self.status_description = status_description - # TODO: Implement slicing details self.slicing_details = slicing_details super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobUploadRequest.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobUploadRequest.py similarity index 77% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobUploadRequest.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobUploadRequest.py index e59c571558..ff705ae495 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintJobUploadRequest.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintJobUploadRequest.py @@ -1,11 +1,11 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel # Model that represents the request to upload a print job to the cloud -# Spec: https://api-staging.ultimaker.com/cura/v1/spec -class CloudPrintJobUploadRequest(BaseCloudModel): +class CloudPrintJobUploadRequest(BaseModel): + ## Creates a new print job upload request. # \param job_name: The name of the print job. # \param file_size: The size of the file in bytes. diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintResponse.py similarity index 85% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintResponse.py rename to plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintResponse.py index 919d1b3c3a..b108f40e27 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudPrintResponse.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudPrintResponse.py @@ -1,14 +1,14 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from datetime import datetime from typing import Optional, Union -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel # Model that represents the responses received from the cloud after requesting a job to be printed. -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudPrintResponse(BaseCloudModel): +class CloudPrintResponse(BaseModel): + ## Creates a new print response object. # \param job_id: The unique ID of a print job inside of the cluster. This ID is generated by Cura Connect. # \param status: The status of the print request (queued or failed). diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterBuildPlate.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterBuildPlate.py new file mode 100644 index 0000000000..a5a392488d --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterBuildPlate.py @@ -0,0 +1,13 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from ..BaseModel import BaseModel + + +## Class representing a cluster printer +class ClusterBuildPlate(BaseModel): + + ## Create a new build plate + # \param type: The type of build plate glass or aluminium + def __init__(self, type: str = "glass", **kwargs) -> None: + self.type = type + super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintCoreConfiguration.py similarity index 81% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintCoreConfiguration.py index aba1cdb755..24c9a577f9 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintCoreConfiguration.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintCoreConfiguration.py @@ -1,26 +1,27 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Union, Dict, Optional, Any from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel from cura.PrinterOutput.Models.ExtruderOutputModel import ExtruderOutputModel -from .CloudClusterPrinterConfigurationMaterial import CloudClusterPrinterConfigurationMaterial -from .BaseCloudModel import BaseCloudModel + +from .ClusterPrinterConfigurationMaterial import ClusterPrinterConfigurationMaterial +from ..BaseModel import BaseModel ## Class representing a cloud cluster printer configuration -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrintCoreConfiguration(BaseCloudModel): +class ClusterPrintCoreConfiguration(BaseModel): + ## Creates a new cloud cluster printer configuration object # \param extruder_index: The position of the extruder on the machine as list index. Numbered from left to right. # \param material: The material of a configuration object in a cluster printer. May be in a dict or an object. # \param nozzle_diameter: The diameter of the print core at this position in millimeters, e.g. '0.4'. # \param print_core_id: The type of print core inserted at this position, e.g. 'AA 0.4'. def __init__(self, extruder_index: int, - material: Union[None, Dict[str, Any], CloudClusterPrinterConfigurationMaterial], + material: Union[None, Dict[str, Any], ClusterPrinterConfigurationMaterial], print_core_id: Optional[str] = None, **kwargs) -> None: self.extruder_index = extruder_index - self.material = self.parseModel(CloudClusterPrinterConfigurationMaterial, material) if material else None + self.material = self.parseModel(ClusterPrinterConfigurationMaterial, material) if material else None self.print_core_id = print_core_id super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConfigurationChange.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConfigurationChange.py similarity index 84% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConfigurationChange.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConfigurationChange.py index 9ff4154666..88251bbf53 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConfigurationChange.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConfigurationChange.py @@ -1,13 +1,13 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel ## Model for the types of changes that are needed before a print job can start -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrintJobConfigurationChange(BaseCloudModel): +class ClusterPrintJobConfigurationChange(BaseModel): + ## Creates a new print job constraint. # \param type_of_change: The type of configuration change, one of: "material", "print_core_change" # \param index: The hotend slot or extruder index to change diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConstraint.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py similarity index 75% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConstraint.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py index 8236ec06b9..9239004b18 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobConstraint.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py @@ -1,13 +1,13 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel ## Class representing a cloud cluster print job constraint -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrintJobConstraints(BaseCloudModel): +class ClusterPrintJobConstraints(BaseModel): + ## Creates a new print job constraint. # \param require_printer_name: Unique name of the printer that this job should be printed on. # Should be one of the unique_name field values in the cluster, e.g. 'ultimakersystem-ccbdd30044ec' diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobImpediment.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobImpediment.py similarity index 68% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobImpediment.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobImpediment.py index 12b67996c1..5a8f0aa46d 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobImpediment.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobImpediment.py @@ -1,13 +1,14 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from .BaseCloudModel import BaseCloudModel +from ..BaseModel import BaseModel ## Class representing the reasons that prevent this job from being printed on the associated printer -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrintJobImpediment(BaseCloudModel): +class ClusterPrintJobImpediment(BaseModel): + ## Creates a new print job constraint. - # \param translation_key: A string indicating a reason the print cannot be printed, such as 'does_not_fit_in_build_volume' + # \param translation_key: A string indicating a reason the print cannot be printed, + # such as 'does_not_fit_in_build_volume' # \param severity: A number indicating the severity of the problem, with higher being more severe def __init__(self, translation_key: str, severity: int, **kwargs) -> None: self.translation_key = translation_key diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py similarity index 78% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index 4a3823ccca..8b35fb7b5a 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -1,22 +1,25 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import List, Optional, Union, Dict, Any +from PyQt5.QtCore import QUrl + from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel -from ...UM3PrintJobOutputModel import UM3PrintJobOutputModel -from ...ConfigurationChangeModel import ConfigurationChangeModel -from ..CloudOutputController import CloudOutputController -from .BaseCloudModel import BaseCloudModel -from .CloudClusterBuildPlate import CloudClusterBuildPlate -from .CloudClusterPrintJobConfigurationChange import CloudClusterPrintJobConfigurationChange -from .CloudClusterPrintJobImpediment import CloudClusterPrintJobImpediment -from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration -from .CloudClusterPrintJobConstraint import CloudClusterPrintJobConstraints + +from .ClusterBuildPlate import ClusterBuildPlate +from .ClusterPrintJobConfigurationChange import ClusterPrintJobConfigurationChange +from .ClusterPrintJobImpediment import ClusterPrintJobImpediment +from .ClusterPrintCoreConfiguration import ClusterPrintCoreConfiguration +from .ClusterPrintJobConstraint import ClusterPrintJobConstraints +from ..UM3PrintJobOutputModel import UM3PrintJobOutputModel +from ..ConfigurationChangeModel import ConfigurationChangeModel +from ..BaseModel import BaseModel +from ...ClusterOutputController import ClusterOutputController ## Model for the status of a single print job in a cluster. -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrintJobStatus(BaseCloudModel): +class ClusterPrintJobStatus(BaseModel): + ## Creates a new cloud print job status model. # \param assigned_to: The name of the printer this job is assigned to while being queued. # \param configuration: The required print core configurations of this print job. @@ -45,21 +48,21 @@ class CloudClusterPrintJobStatus(BaseCloudModel): # printer def __init__(self, created_at: str, force: bool, machine_variant: str, name: str, started: bool, status: str, time_total: int, uuid: str, - configuration: List[Union[Dict[str, Any], CloudClusterPrintCoreConfiguration]], - constraints: List[Union[Dict[str, Any], CloudClusterPrintJobConstraints]], + configuration: List[Union[Dict[str, Any], ClusterPrintCoreConfiguration]], + constraints: List[Union[Dict[str, Any], ClusterPrintJobConstraints]], last_seen: Optional[float] = None, network_error_count: Optional[int] = None, owner: Optional[str] = None, printer_uuid: Optional[str] = None, time_elapsed: Optional[int] = None, assigned_to: Optional[str] = None, deleted_at: Optional[str] = None, printed_on_uuid: Optional[str] = None, configuration_changes_required: List[ - Union[Dict[str, Any], CloudClusterPrintJobConfigurationChange]] = None, - build_plate: Union[Dict[str, Any], CloudClusterBuildPlate] = None, + Union[Dict[str, Any], ClusterPrintJobConfigurationChange]] = None, + build_plate: Union[Dict[str, Any], ClusterBuildPlate] = None, compatible_machine_families: List[str] = None, - impediments_to_printing: List[Union[Dict[str, Any], CloudClusterPrintJobImpediment]] = None, + impediments_to_printing: List[Union[Dict[str, Any], ClusterPrintJobImpediment]] = None, **kwargs) -> None: self.assigned_to = assigned_to - self.configuration = self.parseModels(CloudClusterPrintCoreConfiguration, configuration) - self.constraints = self.parseModels(CloudClusterPrintJobConstraints, constraints) + self.configuration = self.parseModels(ClusterPrintCoreConfiguration, configuration) + self.constraints = self.parseModels(ClusterPrintJobConstraints, constraints) self.created_at = created_at self.force = force self.last_seen = last_seen @@ -76,19 +79,19 @@ class CloudClusterPrintJobStatus(BaseCloudModel): self.deleted_at = deleted_at self.printed_on_uuid = printed_on_uuid - self.configuration_changes_required = self.parseModels(CloudClusterPrintJobConfigurationChange, + self.configuration_changes_required = self.parseModels(ClusterPrintJobConfigurationChange, configuration_changes_required) \ if configuration_changes_required else [] - self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) if build_plate else None + self.build_plate = self.parseModel(ClusterBuildPlate, build_plate) if build_plate else None self.compatible_machine_families = compatible_machine_families if compatible_machine_families else [] - self.impediments_to_printing = self.parseModels(CloudClusterPrintJobImpediment, impediments_to_printing) \ + self.impediments_to_printing = self.parseModels(ClusterPrintJobImpediment, impediments_to_printing) \ if impediments_to_printing else [] super().__init__(**kwargs) ## Creates an UM3 print job output model based on this cloud cluster print job. # \param printer: The output model of the printer - def createOutputModel(self, controller: CloudOutputController) -> UM3PrintJobOutputModel: + def createOutputModel(self, controller: ClusterOutputController) -> UM3PrintJobOutputModel: model = UM3PrintJobOutputModel(controller, self.uuid, self.name) self.updateOutputModel(model) return model diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py similarity index 82% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterConfigurationMaterial.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index db09133a14..378a885a3b 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -1,14 +1,16 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. from typing import Optional -from UM.Logger import Logger from cura.CuraApplication import CuraApplication from cura.PrinterOutput.Models.MaterialOutputModel import MaterialOutputModel -from .BaseCloudModel import BaseCloudModel + +from ..BaseModel import BaseModel -## Class representing a cloud cluster printer configuration -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrinterConfigurationMaterial(BaseCloudModel): +## Class representing a cloud cluster printer configuration +class ClusterPrinterConfigurationMaterial(BaseModel): + ## Creates a new material configuration model. # \param brand: The brand of material in this print core, e.g. 'Ultimaker'. # \param color: The color of material in this print core, e.g. 'Blue'. @@ -45,11 +47,9 @@ class CloudClusterPrinterConfigurationMaterial(BaseCloudModel): material_type = container.getMetaDataEntry("material") name = container.getName() else: - Logger.log("w", "Unable to find material with guid {guid}. Using data as provided by cluster" - .format(guid = self.guid)) color = self.color brand = self.brand material_type = self.material name = "Empty" if self.material == "empty" else "Unknown" - return MaterialOutputModel(guid = self.guid, type = material_type, brand = brand, color = color, name = name) + return MaterialOutputModel(guid=self.guid, type=material_type, brand=brand, color=color, name=name) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py similarity index 75% rename from plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py index 0b76ba1bce..7ab2082451 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py @@ -1,17 +1,20 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import List, Union, Dict, Optional, Any +from PyQt5.QtCore import QUrl + from cura.PrinterOutput.PrinterOutputController import PrinterOutputController from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel -from .CloudClusterBuildPlate import CloudClusterBuildPlate -from .CloudClusterPrintCoreConfiguration import CloudClusterPrintCoreConfiguration -from .BaseCloudModel import BaseCloudModel + +from .ClusterBuildPlate import ClusterBuildPlate +from .ClusterPrintCoreConfiguration import ClusterPrintCoreConfiguration +from ..BaseModel import BaseModel ## Class representing a cluster printer -# Spec: https://api-staging.ultimaker.com/connect/v1/spec -class CloudClusterPrinterStatus(BaseCloudModel): +class ClusterPrinterStatus(BaseModel): + ## Creates a new cluster printer status # \param enabled: A printer can be disabled if it should not receive new jobs. By default every printer is enabled. # \param firmware_version: Firmware version installed on the printer. Can differ for each printer in a cluster. @@ -30,12 +33,12 @@ class CloudClusterPrinterStatus(BaseCloudModel): # \param build_plate: The build plate that is on the printer def __init__(self, enabled: bool, firmware_version: str, friendly_name: str, ip_address: str, machine_variant: str, status: str, unique_name: str, uuid: str, - configuration: List[Union[Dict[str, Any], CloudClusterPrintCoreConfiguration]], + configuration: List[Union[Dict[str, Any], ClusterPrintCoreConfiguration]], reserved_by: Optional[str] = None, maintenance_required: Optional[bool] = None, firmware_update_status: Optional[str] = None, latest_available_firmware: Optional[str] = None, - build_plate: Union[Dict[str, Any], CloudClusterBuildPlate] = None, **kwargs) -> None: + build_plate: Union[Dict[str, Any], ClusterBuildPlate] = None, **kwargs) -> None: - self.configuration = self.parseModels(CloudClusterPrintCoreConfiguration, configuration) + self.configuration = self.parseModels(ClusterPrintCoreConfiguration, configuration) self.enabled = enabled self.firmware_version = firmware_version self.friendly_name = friendly_name @@ -48,7 +51,7 @@ class CloudClusterPrinterStatus(BaseCloudModel): self.maintenance_required = maintenance_required self.firmware_update_status = firmware_update_status self.latest_available_firmware = latest_available_firmware - self.build_plate = self.parseModel(CloudClusterBuildPlate, build_plate) if build_plate else None + self.build_plate = self.parseModel(ClusterBuildPlate, build_plate) if build_plate else None super().__init__(**kwargs) ## Creates a new output model. @@ -66,8 +69,10 @@ class CloudClusterPrinterStatus(BaseCloudModel): model.updateType(self.machine_variant) model.updateState(self.status if self.enabled else "disabled") model.updateBuildplate(self.build_plate.type if self.build_plate else "glass") + model.setCameraUrl(QUrl("http://{}:8080/?action=stream".format(self.ip_address))) - for configuration, extruder_output, extruder_config in \ - zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): - configuration.updateOutputModel(extruder_output) - configuration.updateConfigurationModel(extruder_config) + if model.printerConfiguration is not None: + for configuration, extruder_output, extruder_config in \ + zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): + configuration.updateOutputModel(extruder_output) + configuration.updateConfigurationModel(extruder_config) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py new file mode 100644 index 0000000000..ad7b9c8698 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Dict, Any + +from ..BaseModel import BaseModel + + +## Class representing the system status of a printer. +class PrinterSystemStatus(BaseModel): + + def __init__(self, guid: str, firmware: str, hostname: str, name: str, platform: str, variant: str, + hardware: Dict[str, Any], **kwargs + ) -> None: + self.guid = guid + self.firmware = firmware + self.hostname = hostname + self.name = name + self.platform = platform + self.variant = variant + self.hardware = hardware + super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Models/LocalMaterial.py b/plugins/UM3NetworkPrinting/src/Models/LocalMaterial.py new file mode 100644 index 0000000000..b45289e1c4 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Models/LocalMaterial.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from .BaseModel import BaseModel + + +class LocalMaterial(BaseModel): + + def __init__(self, GUID: str, id: str, version: int, **kwargs) -> None: + self.GUID = GUID # type: str + self.id = id # type: str + self.version = version # type: int + super().__init__(**kwargs) + + def validate(self) -> None: + super().validate() + if not self.GUID: + raise ValueError("guid is required on LocalMaterial") + if not self.version: + raise ValueError("version is required on LocalMaterial") + if not self.id: + raise ValueError("id is required on LocalMaterial") diff --git a/plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py b/plugins/UM3NetworkPrinting/src/Models/UM3PrintJobOutputModel.py similarity index 69% rename from plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py rename to plugins/UM3NetworkPrinting/src/Models/UM3PrintJobOutputModel.py index b627b6e9c8..bfde233a35 100644 --- a/plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py +++ b/plugins/UM3NetworkPrinting/src/Models/UM3PrintJobOutputModel.py @@ -1,21 +1,22 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - from typing import List from PyQt5.QtCore import pyqtProperty, pyqtSignal +from PyQt5.QtGui import QImage from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.PrinterOutputController import PrinterOutputController + from .ConfigurationChangeModel import ConfigurationChangeModel class UM3PrintJobOutputModel(PrintJobOutputModel): configurationChangesChanged = pyqtSignal() - def __init__(self, output_controller: "PrinterOutputController", key: str = "", name: str = "", parent=None) -> None: + def __init__(self, output_controller: PrinterOutputController, key: str = "", name: str = "", parent=None) -> None: super().__init__(output_controller, key, name, parent) - self._configuration_changes = [] # type: List[ConfigurationChangeModel] + self._configuration_changes = [] # type: List[ConfigurationChangeModel] @pyqtProperty("QVariantList", notify=configurationChangesChanged) def configurationChanges(self) -> List[ConfigurationChangeModel]: @@ -26,3 +27,8 @@ class UM3PrintJobOutputModel(PrintJobOutputModel): return self._configuration_changes = changes self.configurationChangesChanged.emit() + + def updatePreviewImageData(self, data: bytes) -> None: + image = QImage() + image.loadFromData(data) + self.updatePreviewImage(image) diff --git a/plugins/UM3NetworkPrinting/src/Models/__init__.py b/plugins/UM3NetworkPrinting/src/Models/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py new file mode 100644 index 0000000000..3925ac364e --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py @@ -0,0 +1,160 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import json +from json import JSONDecodeError +from typing import Callable, List, Optional, Dict, Union, Any, Type, cast, TypeVar, Tuple + +from PyQt5.QtCore import QUrl +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply + +from UM.Logger import Logger + +from ..Models.BaseModel import BaseModel +from ..Models.Http.ClusterPrintJobStatus import ClusterPrintJobStatus +from ..Models.Http.ClusterPrinterStatus import ClusterPrinterStatus +from ..Models.Http.PrinterSystemStatus import PrinterSystemStatus + + +## The generic type variable used to document the methods below. +ClusterApiClientModel = TypeVar("ClusterApiClientModel", bound=BaseModel) + + +## The ClusterApiClient is responsible for all network calls to local network clusters. +class ClusterApiClient: + + PRINTER_API_PREFIX = "/api/v1" + CLUSTER_API_PREFIX = "/cluster-api/v1" + + # In order to avoid garbage collection we keep the callbacks in this list. + _anti_gc_callbacks = [] # type: List[Callable[[], None]] + + ## Initializes a new cluster API client. + # \param address: The network address of the cluster to call. + # \param on_error: The callback to be called whenever we receive errors from the server. + def __init__(self, address: str, on_error: Callable) -> None: + super().__init__() + self._manager = QNetworkAccessManager() + self._address = address + self._on_error = on_error + + ## Get printer system information. + # \param on_finished: The callback in case the response is successful. + def getSystem(self, on_finished: Callable) -> None: + url = "{}/system".format(self.PRINTER_API_PREFIX) + reply = self._manager.get(self._createEmptyRequest(url)) + self._addCallback(reply, on_finished, PrinterSystemStatus) + + ## Get the printers in the cluster. + # \param on_finished: The callback in case the response is successful. + def getPrinters(self, on_finished: Callable[[List[ClusterPrinterStatus]], Any]) -> None: + url = "{}/printers".format(self.CLUSTER_API_PREFIX) + reply = self._manager.get(self._createEmptyRequest(url)) + self._addCallback(reply, on_finished, ClusterPrinterStatus) + + ## Get the print jobs in the cluster. + # \param on_finished: The callback in case the response is successful. + def getPrintJobs(self, on_finished: Callable[[List[ClusterPrintJobStatus]], Any]) -> None: + url = "{}/print_jobs".format(self.CLUSTER_API_PREFIX) + reply = self._manager.get(self._createEmptyRequest(url)) + self._addCallback(reply, on_finished, ClusterPrintJobStatus) + + ## Move a print job to the top of the queue. + def movePrintJobToTop(self, print_job_uuid: str) -> None: + url = "{}/print_jobs/{}/action/move".format(self.CLUSTER_API_PREFIX, print_job_uuid) + self._manager.post(self._createEmptyRequest(url), json.dumps({"to_position": 0, "list": "queued"}).encode()) + + ## Delete a print job from the queue. + def deletePrintJob(self, print_job_uuid: str) -> None: + url = "{}/print_jobs/{}".format(self.CLUSTER_API_PREFIX, print_job_uuid) + self._manager.deleteResource(self._createEmptyRequest(url)) + + ## Set the state of a print job. + def setPrintJobState(self, print_job_uuid: str, state: str) -> None: + url = "{}/print_jobs/{}/action".format(self.CLUSTER_API_PREFIX, print_job_uuid) + # We rewrite 'resume' to 'print' here because we are using the old print job action endpoints. + action = "print" if state == "resume" else state + self._manager.put(self._createEmptyRequest(url), json.dumps({"action": action}).encode()) + + ## Get the preview image data of a print job. + def getPrintJobPreviewImage(self, print_job_uuid: str, on_finished: Callable) -> None: + url = "{}/print_jobs/{}/preview_image".format(self.CLUSTER_API_PREFIX, print_job_uuid) + reply = self._manager.get(self._createEmptyRequest(url)) + self._addCallback(reply, on_finished) + + ## We override _createEmptyRequest in order to add the user credentials. + # \param url: The URL to request + # \param content_type: The type of the body contents. + def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest: + url = QUrl("http://" + self._address + path) + request = QNetworkRequest(url) + request.setAttribute(QNetworkRequest.FollowRedirectsAttribute, True) + if content_type: + request.setHeader(QNetworkRequest.ContentTypeHeader, content_type) + return request + + ## Parses the given JSON network reply into a status code and a dictionary, handling unexpected errors as well. + # \param reply: The reply from the server. + # \return A tuple with a status code and a dictionary. + @staticmethod + def _parseReply(reply: QNetworkReply) -> Tuple[int, Dict[str, Any]]: + status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) + try: + response = bytes(reply.readAll()).decode() + return status_code, json.loads(response) + except (UnicodeDecodeError, JSONDecodeError, ValueError) as err: + Logger.logException("e", "Could not parse the cluster response: %s", err) + return status_code, {"errors": [err]} + + ## Parses the given models and calls the correct callback depending on the result. + # \param response: The response from the server, after being converted to a dict. + # \param on_finished: The callback in case the response is successful. + # \param model_class: The type of the model to convert the response to. It may either be a single record or a list. + def _parseModels(self, response: Dict[str, Any], + on_finished: Union[Callable[[ClusterApiClientModel], Any], + Callable[[List[ClusterApiClientModel]], Any]], + model_class: Type[ClusterApiClientModel]) -> None: + try: + if isinstance(response, list): + results = [model_class(**c) for c in response] # type: List[ClusterApiClientModel] + on_finished_list = cast(Callable[[List[ClusterApiClientModel]], Any], on_finished) + on_finished_list(results) + else: + result = model_class(**response) # type: ClusterApiClientModel + on_finished_item = cast(Callable[[ClusterApiClientModel], Any], on_finished) + on_finished_item(result) + except JSONDecodeError: + Logger.log("e", "Could not parse response from network: %s", str(response)) + + ## Creates a callback function so that it includes the parsing of the response into the correct model. + # The callback is added to the 'finished' signal of the reply. + # \param reply: The reply that should be listened to. + # \param on_finished: The callback in case the response is successful. + def _addCallback(self, + reply: QNetworkReply, + on_finished: Union[Callable[[ClusterApiClientModel], Any], + Callable[[List[ClusterApiClientModel]], Any]], + model: Type[ClusterApiClientModel] = None, + ) -> None: + + def parse() -> None: + self._anti_gc_callbacks.remove(parse) + + # Don't try to parse the reply if we didn't get one + if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) is None: + return + + if reply.error() > 0: + self._on_error(reply.errorString()) + return + + # If no parse model is given, simply return the raw data in the callback. + if not model: + on_finished(reply.readAll()) + return + + # Otherwise parse the result and return the formatted data in the callback. + status_code, response = self._parseReply(reply) + self._parseModels(response, on_finished, model) + + self._anti_gc_callbacks.append(parse) + reply.finished.connect(parse) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py new file mode 100644 index 0000000000..2c1ac2279d --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -0,0 +1,165 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, Dict, List + +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty +from PyQt5.QtNetwork import QNetworkReply + +from UM.FileHandler.FileHandler import FileHandler +from UM.i18n import i18nCatalog +from UM.Scene.SceneNode import SceneNode +from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState +from cura.PrinterOutput.PrinterOutputDevice import ConnectionType + +from .ClusterApiClient import ClusterApiClient +from ..ExportFileJob import ExportFileJob +from ..SendMaterialJob import SendMaterialJob +from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice +from ..Messages.PrintJobUploadBlockedMessage import PrintJobUploadBlockedMessage +from ..Messages.PrintJobUploadErrorMessage import PrintJobUploadErrorMessage +from ..Messages.PrintJobUploadSuccessMessage import PrintJobUploadSuccessMessage + + +I18N_CATALOG = i18nCatalog("cura") + + +class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): + + activeCameraUrlChanged = pyqtSignal() + + def __init__(self, device_id: str, address: str, properties: Dict[bytes, bytes], parent=None) -> None: + + super().__init__( + device_id=device_id, + address=address, + properties=properties, + connection_type=ConnectionType.NetworkConnection, + parent=parent + ) + + # API client for making requests to the print cluster. + self._cluster_api = ClusterApiClient(address, on_error=lambda error: print(error)) + # We don't have authentication over local networking, so we're always authenticated. + self.setAuthenticationState(AuthState.Authenticated) + self._setInterfaceElements() + self._active_camera_url = QUrl() # type: QUrl + + # Get the printers of this cluster to check if this device is a group host or not. + self._cluster_api.getPrinters(self._updatePrinters) + + ## Set all the interface elements and texts for this output device. + def _setInterfaceElements(self) -> None: + self.setPriority(3) # Make sure the output device gets selected above local file output + self.setShortDescription(I18N_CATALOG.i18nc("@action:button Preceded by 'Ready to'.", "Print over network")) + self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print over network")) + self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected over the network")) + + ## Called when the connection to the cluster changes. + def connect(self) -> None: + super().connect() + self._update() + self.sendMaterialProfiles() + + @pyqtProperty(QUrl, notify=activeCameraUrlChanged) + def activeCameraUrl(self) -> QUrl: + return self._active_camera_url + + @pyqtSlot(QUrl, name="setActiveCameraUrl") + def setActiveCameraUrl(self, camera_url: QUrl) -> None: + if self._active_camera_url != camera_url: + self._active_camera_url = camera_url + self.activeCameraUrlChanged.emit() + + @pyqtSlot(name="openPrintJobControlPanel") + def openPrintJobControlPanel(self) -> None: + QDesktopServices.openUrl(QUrl("http://" + self._address + "/print_jobs")) + + @pyqtSlot(name="openPrinterControlPanel") + def openPrinterControlPanel(self) -> None: + QDesktopServices.openUrl(QUrl("http://" + self._address + "/printers")) + + @pyqtSlot(str, name="sendJobToTop") + def sendJobToTop(self, print_job_uuid: str) -> None: + self._cluster_api.movePrintJobToTop(print_job_uuid) + + @pyqtSlot(str, name="deleteJobFromQueue") + def deleteJobFromQueue(self, print_job_uuid: str) -> None: + self._cluster_api.deletePrintJob(print_job_uuid) + + @pyqtSlot(str, name="forceSendJob") + def forceSendJob(self, print_job_uuid: str) -> None: + pass # TODO + + ## Set the remote print job state. + # \param print_job_uuid: The UUID of the print job to set the state for. + # \param action: The action to undertake ('pause', 'resume', 'abort'). + def setJobState(self, print_job_uuid: str, action: str) -> None: + self._cluster_api.setPrintJobState(print_job_uuid, action) + + def _update(self) -> None: + super()._update() + self._cluster_api.getPrinters(self._updatePrinters) + self._cluster_api.getPrintJobs(self._updatePrintJobs) + self._updatePrintJobPreviewImages() + + ## Sync the material profiles in Cura with the printer. + # This gets called when connecting to a printer as well as when sending a print. + def sendMaterialProfiles(self) -> None: + job = SendMaterialJob(device=self) + job.run() + + ## Send a print job to the cluster. + def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, + file_handler: Optional[FileHandler] = None, filter_by_machine: bool = False, **kwargs) -> None: + + # Show an error message if we're already sending a job. + if self._progress.visible: + PrintJobUploadBlockedMessage().show() + return + + self.writeStarted.emit(self) + + # Make sure the printer is aware of all new materials as the new print job might contain one. + self.sendMaterialProfiles() + + # Export the scene to the correct file type. + job = ExportFileJob(file_handler=file_handler, nodes=nodes, firmware_version=self.firmwareVersion) + job.finished.connect(self._onPrintJobCreated) + job.start() + + ## Handler for when the print job was created locally. + # It can now be sent over the network. + def _onPrintJobCreated(self, job: ExportFileJob) -> None: + self._progress.show() + parts = [ + self._createFormPart("name=owner", bytes(self._getUserName(), "utf-8"), "text/plain"), + self._createFormPart("name=\"file\"; filename=\"%s\"" % job.getFileName(), job.getOutput()) + ] + self.postFormWithParts("/cluster-api/v1/print_jobs/", parts, on_finished=self._onPrintUploadCompleted, + on_progress=self._onPrintJobUploadProgress) + + ## Handler for print job upload progress. + def _onPrintJobUploadProgress(self, bytes_sent: int, bytes_total: int) -> None: + percentage = (bytes_sent / bytes_total) if bytes_total else 0 + self._progress.setProgress(percentage * 100) + self.writeProgress.emit() + + ## Handler for when the print job was fully uploaded to the cluster. + def _onPrintUploadCompleted(self, _: QNetworkReply) -> None: + self._progress.hide() + PrintJobUploadSuccessMessage().show() + self.writeFinished.emit() + + ## Displays the given message if uploading the mesh has failed + # \param message: The message to display. + def _onUploadError(self, message: str = None) -> None: + self._progress.hide() + PrintJobUploadErrorMessage(message).show() + self.writeError.emit() + + ## Download all the images from the cluster and load their data in the print job models. + def _updatePrintJobPreviewImages(self): + for print_job in self._print_jobs: + if print_job.getPreviewImage() is None: + self._cluster_api.getPrintJobPreviewImage(print_job.key, print_job.updatePreviewImageData) diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py new file mode 100644 index 0000000000..6c45fd9fc0 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -0,0 +1,242 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Dict, Optional, Callable, List + +from UM import i18nCatalog +from UM.Logger import Logger +from UM.Signal import Signal +from UM.Version import Version + +from cura.CuraApplication import CuraApplication +from cura.Settings.GlobalStack import GlobalStack + +from .ZeroConfClient import ZeroConfClient +from .ClusterApiClient import ClusterApiClient +from .LocalClusterOutputDevice import LocalClusterOutputDevice +from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice +from ..Messages.CloudFlowMessage import CloudFlowMessage +from ..Messages.LegacyDeviceNoLongerSupportedMessage import LegacyDeviceNoLongerSupportedMessage +from ..Models.Http.PrinterSystemStatus import PrinterSystemStatus + + +I18N_CATALOG = i18nCatalog("cura") + + +## The LocalClusterOutputDeviceManager is responsible for discovering and managing local networked clusters. +class LocalClusterOutputDeviceManager: + + META_NETWORK_KEY = "um_network_key" + + MANUAL_DEVICES_PREFERENCE_KEY = "um3networkprinting/manual_instances" + MIN_SUPPORTED_CLUSTER_VERSION = Version("4.0.0") + + # The translation catalog for this device. + I18N_CATALOG = i18nCatalog("cura") + + # Signal emitted when the list of discovered devices changed. + discoveredDevicesChanged = Signal() + + def __init__(self) -> None: + + # Persistent dict containing the networked clusters. + self._discovered_devices = {} # type: Dict[str, LocalClusterOutputDevice] + self._output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() + + # Hook up ZeroConf client. + self._zero_conf_client = ZeroConfClient() + self._zero_conf_client.addedNetworkCluster.connect(self._onDeviceDiscovered) + self._zero_conf_client.removedNetworkCluster.connect(self._onDiscoveredDeviceRemoved) + + ## Start the network discovery. + def start(self) -> None: + self._zero_conf_client.start() + for address in self._getStoredManualAddresses(): + self.addManualDevice(address) + + ## Stop network discovery and clean up discovered devices. + def stop(self) -> None: + self._zero_conf_client.stop() + for instance_name in list(self._discovered_devices): + self._onDiscoveredDeviceRemoved(instance_name) + + ## Restart discovery on the local network. + def startDiscovery(self): + self.stop() + self.start() + + ## Add a networked printer manually by address. + def addManualDevice(self, address: str, callback: Optional[Callable[[bool, str], None]] = None) -> None: + api_client = ClusterApiClient(address, lambda error: print(error)) + api_client.getSystem(lambda status: self._onCheckManualDeviceResponse(address, status, callback)) + + ## Remove a manually added networked printer. + def removeManualDevice(self, device_id: str, address: Optional[str] = None) -> None: + if device_id not in self._discovered_devices and address is not None: + device_id = "manual:{}".format(address) + + if device_id in self._discovered_devices: + address = address or self._discovered_devices[device_id].ipAddress + self._onDiscoveredDeviceRemoved(device_id) + + if address in self._getStoredManualAddresses(): + self._removeStoredManualAddress(address) + + ## Force reset all network device connections. + def refreshConnections(self) -> None: + self._connectToActiveMachine() + + ## Get the discovered devices. + def getDiscoveredDevices(self) -> Dict[str, LocalClusterOutputDevice]: + return self._discovered_devices + + ## Connect the active machine to a given device. + def associateActiveMachineWithPrinterDevice(self, device: LocalClusterOutputDevice) -> None: + active_machine = CuraApplication.getInstance().getGlobalContainerStack() + if not active_machine: + return + self._connectToOutputDevice(device, active_machine) + + ## Callback for when the active machine was changed by the user or a new remote cluster was found. + def _connectToActiveMachine(self) -> None: + active_machine = CuraApplication.getInstance().getGlobalContainerStack() + if not active_machine: + return + + output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() + stored_device_id = active_machine.getMetaDataEntry(self.META_NETWORK_KEY) + for device in self._discovered_devices.values(): + if device.key == stored_device_id: + # Connect to it if the stored key matches. + self._connectToOutputDevice(device, active_machine) + elif device.key in output_device_manager.getOutputDeviceIds(): + # Remove device if it is not meant for the active machine. + CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(device.key) + + ## Callback for when a manual device check request was responded to. + def _onCheckManualDeviceResponse(self, address: str, status: PrinterSystemStatus, + callback: Optional[Callable[[bool, str], None]] = None) -> None: + self._onDeviceDiscovered("manual:{}".format(address), address, { + b"name": status.name.encode("utf-8"), + b"address": address.encode("utf-8"), + b"machine": str(status.hardware.get("typeid", "")).encode("utf-8"), + b"manual": b"true", + b"firmware_version": status.firmware.encode("utf-8"), + b"cluster_size": b"1" + }) + self._storeManualAddress(address) + if callback is not None: + CuraApplication.getInstance().callLater(callback, True, address) + + ## Returns a dict of printer BOM numbers to machine types. + # These numbers are available in the machine definition already so we just search for them here. + @staticmethod + def _getPrinterTypeIdentifiers() -> Dict[str, str]: + container_registry = CuraApplication.getInstance().getContainerRegistry() + ultimaker_machines = container_registry.findContainersMetadata(type="machine", manufacturer="Ultimaker B.V.") + found_machine_type_identifiers = {} # type: Dict[str, str] + for machine in ultimaker_machines: + machine_bom_number = machine.get("firmware_update_info", {}).get("id", None) + machine_type = machine.get("id", None) + if machine_bom_number and machine_type: + found_machine_type_identifiers[str(machine_bom_number)] = machine_type + return found_machine_type_identifiers + + ## Add a new device. + def _onDeviceDiscovered(self, key: str, address: str, properties: Dict[bytes, bytes]) -> None: + machine_identifier = properties.get(b"machine", b"").decode("utf-8") + printer_type_identifiers = self._getPrinterTypeIdentifiers() + + # Detect the machine type based on the BOM number that is sent over the network. + properties[b"printer_type"] = b"Unknown" + for bom, p_type in printer_type_identifiers.items(): + if machine_identifier.startswith(bom): + properties[b"printer_type"] = bytes(p_type, encoding="utf8") + break + + device = LocalClusterOutputDevice(key, address, properties) + discovered_printers_model = CuraApplication.getInstance().getDiscoveredPrintersModel() + if address in list(discovered_printers_model.discoveredPrintersByAddress.keys()): + # The printer was already added, we just update the available data. + discovered_printers_model.updateDiscoveredPrinter( + ip_address=address, + name=device.getName(), + machine_type=device.printerType + ) + else: + # The printer was not added yet so let's do that. + discovered_printers_model.addDiscoveredPrinter( + ip_address=address, + key=device.getId(), + name=device.getName(), + create_callback=self._createMachineFromDiscoveredDevice, + machine_type=device.printerType, + device=device + ) + self._discovered_devices[device.getId()] = device + self.discoveredDevicesChanged.emit() + self._connectToActiveMachine() + + ## Remove a device. + def _onDiscoveredDeviceRemoved(self, device_id: str) -> None: + device = self._discovered_devices.pop(device_id, None) # type: Optional[LocalClusterOutputDevice] + if not device: + return + device.close() + CuraApplication.getInstance().getDiscoveredPrintersModel().removeDiscoveredPrinter(device.address) + self.discoveredDevicesChanged.emit() + + ## Create a machine instance based on the discovered network printer. + def _createMachineFromDiscoveredDevice(self, device_id: str) -> None: + device = self._discovered_devices.get(device_id) + if device is None: + return + + # The newly added machine is automatically activated. + CuraApplication.getInstance().getMachineManager().addMachine(device.printerType, device.name) + active_machine = CuraApplication.getInstance().getGlobalContainerStack() + if not active_machine: + return + self._connectToOutputDevice(device, active_machine) + CloudFlowMessage(device.ipAddress).show() # Nudge the user to start using Ultimaker Cloud. + + ## Add an address to the stored preferences. + def _storeManualAddress(self, address: str) -> None: + stored_addresses = self._getStoredManualAddresses() + if address in stored_addresses: + return # Prevent duplicates. + stored_addresses.append(address) + new_value = ",".join(stored_addresses) + CuraApplication.getInstance().getPreferences().setValue(self.MANUAL_DEVICES_PREFERENCE_KEY, new_value) + + ## Remove an address from the stored preferences. + def _removeStoredManualAddress(self, address: str) -> None: + stored_addresses = self._getStoredManualAddresses() + try: + stored_addresses.remove(address) # Can throw a ValueError + new_value = ",".join(stored_addresses) + CuraApplication.getInstance().getPreferences().setValue(self.MANUAL_DEVICES_PREFERENCE_KEY, new_value) + except ValueError: + Logger.log("w", "Could not remove address from stored_addresses, it was not there") + + ## Load the user-configured manual devices from Cura preferences. + def _getStoredManualAddresses(self) -> List[str]: + preferences = CuraApplication.getInstance().getPreferences() + preferences.addPreference(self.MANUAL_DEVICES_PREFERENCE_KEY, "") + manual_instances = preferences.getValue(self.MANUAL_DEVICES_PREFERENCE_KEY).split(",") + return manual_instances + + ## Add a device to the current active machine. + def _connectToOutputDevice(self, device: UltimakerNetworkedPrinterOutputDevice, machine: GlobalStack) -> None: + + # Make sure users know that we no longer support legacy devices. + if Version(device.firmwareVersion) < self.MIN_SUPPORTED_CLUSTER_VERSION: + LegacyDeviceNoLongerSupportedMessage().show() + return + + machine.setName(device.name) + machine.setMetaDataEntry(self.META_NETWORK_KEY, device.key) + machine.setMetaDataEntry("group_name", device.name) + + device.connect() + machine.addConfiguredConnectionType(device.connectionType.value) + CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(device) diff --git a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py new file mode 100644 index 0000000000..b6416b2bd0 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py @@ -0,0 +1,140 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from queue import Queue +from threading import Thread, Event +from time import time +from typing import Optional + +from zeroconf import Zeroconf, ServiceBrowser, ServiceStateChange, ServiceInfo + +from UM.Logger import Logger +from UM.Signal import Signal +from cura.CuraApplication import CuraApplication + + +## The ZeroConfClient handles all network discovery logic. +# It emits signals when new network services were found or disappeared. +class ZeroConfClient: + + # The discovery protocol name for Ultimaker printers. + ZERO_CONF_NAME = u"_ultimaker._tcp.local." + + # Signals emitted when new services were discovered or removed on the network. + addedNetworkCluster = Signal() + removedNetworkCluster = Signal() + + def __init__(self) -> None: + self._zero_conf = None # type: Optional[Zeroconf] + self._zero_conf_browser = None # type: Optional[ServiceBrowser] + self._service_changed_request_queue = None # type: Optional[Queue] + self._service_changed_request_event = None # type: Optional[Event] + self._service_changed_request_thread = None # type: Optional[Thread] + + ## The ZeroConf service changed requests are handled in a separate thread so we don't block the UI. + # We can also re-schedule the requests when they fail to get detailed service info. + # Any new or re-reschedule requests will be appended to the request queue and the thread will process them. + def start(self) -> None: + self._service_changed_request_queue = Queue() + self._service_changed_request_event = Event() + self._service_changed_request_thread = Thread(target=self._handleOnServiceChangedRequests, daemon=True) + self._service_changed_request_thread.start() + self._zero_conf = Zeroconf() + self._zero_conf_browser = ServiceBrowser(self._zero_conf, self.ZERO_CONF_NAME, [self._queueService]) + + # Cleanup ZeroConf resources. + def stop(self) -> None: + if self._zero_conf is not None: + self._zero_conf.close() + self._zero_conf = None + if self._zero_conf_browser is not None: + self._zero_conf_browser.cancel() + self._zero_conf_browser = None + + ## Handles a change is discovered network services. + def _queueService(self, zeroconf: Zeroconf, service_type, name: str, state_change: ServiceStateChange) -> None: + item = (zeroconf, service_type, name, state_change) + if not self._service_changed_request_queue or not self._service_changed_request_event: + return + self._service_changed_request_queue.put(item) + self._service_changed_request_event.set() + + ## Callback for when a ZeroConf service has changes. + def _handleOnServiceChangedRequests(self) -> None: + if not self._service_changed_request_queue or not self._service_changed_request_event: + return + + while True: + # Wait for the event to be set + self._service_changed_request_event.wait(timeout=5.0) + + # Stop if the application is shutting down + if CuraApplication.getInstance().isShuttingDown(): + return + + self._service_changed_request_event.clear() + + # Handle all pending requests + reschedule_requests = [] # A list of requests that have failed so later they will get re-scheduled + while not self._service_changed_request_queue.empty(): + request = self._service_changed_request_queue.get() + zeroconf, service_type, name, state_change = request + try: + result = self._onServiceChanged(zeroconf, service_type, name, state_change) + if not result: + reschedule_requests.append(request) + except Exception: + Logger.logException("e", "Failed to get service info for [%s] [%s], the request will be rescheduled", + service_type, name) + reschedule_requests.append(request) + + # Re-schedule the failed requests if any + if reschedule_requests: + for request in reschedule_requests: + self._service_changed_request_queue.put(request) + + ## Handler for zeroConf detection. + # Return True or False indicating if the process succeeded. + # Note that this function can take over 3 seconds to complete. Be careful calling it from the main thread. + def _onServiceChanged(self, zero_conf: Zeroconf, service_type: str, name: str, state_change: ServiceStateChange + ) -> bool: + if state_change == ServiceStateChange.Added: + return self._onServiceAdded(zero_conf, service_type, name) + elif state_change == ServiceStateChange.Removed: + return self._onServiceRemoved(name) + return True + + ## Handler for when a ZeroConf service was added. + def _onServiceAdded(self, zero_conf: Zeroconf, service_type: str, name: str) -> bool: + # First try getting info from zero-conf cache + info = ServiceInfo(service_type, name, properties={}) + for record in zero_conf.cache.entries_with_name(name.lower()): + info.update_record(zero_conf, time(), record) + + for record in zero_conf.cache.entries_with_name(info.server): + info.update_record(zero_conf, time(), record) + if info.address: + break + + # Request more data if info is not complete + if not info.address: + info = zero_conf.get_service_info(service_type, name) + + if info: + type_of_device = info.properties.get(b"type", None) + if type_of_device: + if type_of_device == b"printer": + address = '.'.join(map(lambda n: str(n), info.address)) + self.addedNetworkCluster.emit(str(name), address, info.properties) + else: + Logger.log("w", "The type of the found device is '%s', not 'printer'." % type_of_device) + else: + Logger.log("w", "Could not get information about %s" % name) + return False + + return True + + ## Handler for when a ZeroConf service was removed. + def _onServiceRemoved(self, name: str) -> bool: + Logger.log("d", "ZeroConf service removed: %s" % name) + self.removedNetworkCluster.emit(str(name)) + return True diff --git a/plugins/UM3NetworkPrinting/src/Network/__init__.py b/plugins/UM3NetworkPrinting/src/Network/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py index f0fde818c4..697ba33a6b 100644 --- a/plugins/UM3NetworkPrinting/src/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/SendMaterialJob.py @@ -1,6 +1,5 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - import json import os from typing import Dict, TYPE_CHECKING, Set, Optional @@ -10,11 +9,11 @@ from UM.Job import Job from UM.Logger import Logger from cura.CuraApplication import CuraApplication -# Absolute imports don't work in plugins -from .Models import ClusterMaterial, LocalMaterial +from .Models.ClusterMaterial import ClusterMaterial +from .Models.LocalMaterial import LocalMaterial if TYPE_CHECKING: - from .ClusterUM3OutputDevice import ClusterUM3OutputDevice + from .Network.LocalClusterOutputDevice import LocalClusterOutputDevice ## Asynchronous job to send material profiles to the printer. @@ -22,9 +21,9 @@ if TYPE_CHECKING: # This way it won't freeze up the interface while sending those materials. class SendMaterialJob(Job): - def __init__(self, device: "ClusterUM3OutputDevice") -> None: + def __init__(self, device: "LocalClusterOutputDevice") -> None: super().__init__() - self.device = device # type: ClusterUM3OutputDevice + self.device = device # type: LocalClusterOutputDevice ## Send the request to the printer and register a callback def run(self) -> None: diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index e49077d66d..3ab37297b5 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -1,646 +1,73 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import json -import os -from queue import Queue -from threading import Event, Thread -from time import time -from typing import Optional, TYPE_CHECKING, Dict, Callable - -from zeroconf import Zeroconf, ServiceBrowser, ServiceStateChange, ServiceInfo - -from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QDesktopServices +from typing import Optional, Callable, Dict +from UM.Signal import Signal from cura.CuraApplication import CuraApplication -from cura.PrinterOutput.PrinterOutputDevice import ConnectionType -from UM.i18n import i18nCatalog -from UM.Logger import Logger -from UM.Message import Message from UM.OutputDevice.OutputDeviceManager import ManualDeviceAdditionAttempt from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin -from UM.PluginRegistry import PluginRegistry -from UM.Signal import Signal, signalemitter -from UM.Version import Version -from . import ClusterUM3OutputDevice, LegacyUM3OutputDevice +from .Network.LocalClusterOutputDevice import LocalClusterOutputDevice +from .Network.LocalClusterOutputDeviceManager import LocalClusterOutputDeviceManager from .Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager -from .Cloud.CloudOutputDevice import CloudOutputDevice # typing - -if TYPE_CHECKING: - from PyQt5.QtNetwork import QNetworkReply - from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin - from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice - from cura.Settings.GlobalStack import GlobalStack -i18n_catalog = i18nCatalog("cura") - - -# -# Represents a request for adding a manual printer. It has the following fields: -# - address: The string of the (IP) address of the manual printer -# - callback: (Optional) Once the HTTP request to the printer to get printer information is done, whether successful -# or not, this callback will be invoked to notify about the result. The callback must have a signature of -# func(success: bool, address: str) -> None -# - network_reply: This is the QNetworkReply instance for this request if the request has been issued and still in -# progress. It is kept here so we can cancel a request when needed. -# -class ManualPrinterRequest: - def __init__(self, address: str, callback: Optional[Callable[[bool, str], None]] = None) -> None: - self.address = address - self.callback = callback - self.network_reply = None # type: Optional["QNetworkReply"] - - -## This plugin handles the connection detection & creation of output device objects for the UM3 printer. -# Zero-Conf is used to detect printers, which are saved in a dict. -# If we discover a printer that has the same key as the active machine instance a connection is made. -@signalemitter +## This plugin handles the discovery and networking for Ultimaker 3D printers that support network and cloud printing. class UM3OutputDevicePlugin(OutputDevicePlugin): - addDeviceSignal = Signal() # Called '...Signal' to avoid confusion with function-names. - removeDeviceSignal = Signal() # Ditto ^^^. + + # Signal emitted when the list of discovered devices changed. Used by printer action in this plugin. discoveredDevicesChanged = Signal() - cloudFlowIsPossible = Signal() - def __init__(self): + def __init__(self) -> None: super().__init__() - - self._zero_conf = None - self._zero_conf_browser = None - self._application = CuraApplication.getInstance() + # Create a network output device manager that abstracts all network connection logic away. + self._network_output_device_manager = LocalClusterOutputDeviceManager() + self._network_output_device_manager.discoveredDevicesChanged.connect(self.discoveredDevicesChanged) # Create a cloud output device manager that abstracts all cloud connection logic away. self._cloud_output_device_manager = CloudOutputDeviceManager() - # Because the model needs to be created in the same thread as the QMLEngine, we use a signal. - self.addDeviceSignal.connect(self._onAddDevice) - self.removeDeviceSignal.connect(self._onRemoveDevice) + # Refresh network connections when another machine was selected in Cura. + # This ensures no output devices are still connected that do not belong to the new active machine. + CuraApplication.getInstance().globalContainerStackChanged.connect(self.refreshConnections) - self._application.globalContainerStackChanged.connect(self.refreshConnections) - - self._discovered_devices = {} - - self._network_manager = QNetworkAccessManager() - self._network_manager.finished.connect(self._onNetworkRequestFinished) - - self._min_cluster_version = Version("4.0.0") - self._min_cloud_version = Version("5.2.0") - - self._api_version = "1" - self._api_prefix = "/api/v" + self._api_version + "/" - self._cluster_api_version = "1" - self._cluster_api_prefix = "/cluster-api/v" + self._cluster_api_version + "/" - - # Get list of manual instances from preferences - self._preferences = CuraApplication.getInstance().getPreferences() - self._preferences.addPreference("um3networkprinting/manual_instances", - "") # A comma-separated list of ip adresses or hostnames - - manual_instances = self._preferences.getValue("um3networkprinting/manual_instances").split(",") - self._manual_instances = {address: ManualPrinterRequest(address) - for address in manual_instances} # type: Dict[str, ManualPrinterRequest] - - # Store the last manual entry key - self._last_manual_entry_key = "" # type: str - - # The zero-conf service changed requests are handled in a separate thread, so we can re-schedule the requests - # which fail to get detailed service info. - # Any new or re-scheduled requests will be appended to the request queue, and the handling thread will pick - # them up and process them. - self._service_changed_request_queue = Queue() - self._service_changed_request_event = Event() - self._service_changed_request_thread = Thread(target=self._handleOnServiceChangedRequests, daemon=True) - self._service_changed_request_thread.start() - - self._account = self._application.getCuraAPI().account - - # Check if cloud flow is possible when user logs in - self._account.loginStateChanged.connect(self.checkCloudFlowIsPossible) - - # Check if cloud flow is possible when user switches machines - self._application.globalContainerStackChanged.connect(self._onMachineSwitched) - - # Listen for when cloud flow is possible - self.cloudFlowIsPossible.connect(self._onCloudFlowPossible) - - # Listen if cloud cluster was added - self._cloud_output_device_manager.addedCloudCluster.connect(self._onCloudPrintingConfigured) - - # Listen if cloud cluster was removed - self._cloud_output_device_manager.removedCloudCluster.connect(self.checkCloudFlowIsPossible) - - self._start_cloud_flow_message = None # type: Optional[Message] - self._cloud_flow_complete_message = None # type: Optional[Message] - - def getDiscoveredDevices(self): - return self._discovered_devices - - def getLastManualDevice(self) -> str: - return self._last_manual_entry_key - - def resetLastManualDevice(self) -> None: - self._last_manual_entry_key = "" - - ## Start looking for devices on network. + ## Start looking for devices in the network and cloud. def start(self): - self.startDiscovery() + self._network_output_device_manager.start() self._cloud_output_device_manager.start() - def startDiscovery(self): - self.stop() - if self._zero_conf_browser: - self._zero_conf_browser.cancel() - self._zero_conf_browser = None # Force the old ServiceBrowser to be destroyed. - - for instance_name in list(self._discovered_devices): - self._onRemoveDevice(instance_name) - - self._zero_conf = Zeroconf() - self._zero_conf_browser = ServiceBrowser(self._zero_conf, u'_ultimaker._tcp.local.', - [self._appendServiceChangedRequest]) - - # Look for manual instances from preference - for address in self._manual_instances: - if address: - self.addManualDevice(address) - self.resetLastManualDevice() - - # TODO: CHANGE TO HOSTNAME - def refreshConnections(self): - active_machine = CuraApplication.getInstance().getGlobalContainerStack() - if not active_machine: - return - - um_network_key = active_machine.getMetaDataEntry("um_network_key") - - for key in self._discovered_devices: - if key == um_network_key: - if not self._discovered_devices[key].isConnected(): - Logger.log("d", "Attempting to connect with [%s]" % key) - # It should already be set, but if it actually connects we know for sure it's supported! - active_machine.addConfiguredConnectionType(self._discovered_devices[key].connectionType.value) - self._discovered_devices[key].connect() - self._discovered_devices[key].connectionStateChanged.connect(self._onDeviceConnectionStateChanged) - else: - self._onDeviceConnectionStateChanged(key) - else: - if self._discovered_devices[key].isConnected(): - Logger.log("d", "Attempting to close connection with [%s]" % key) - self._discovered_devices[key].close() - self._discovered_devices[key].connectionStateChanged.disconnect(self._onDeviceConnectionStateChanged) - - def _onDeviceConnectionStateChanged(self, key): - if key not in self._discovered_devices: - return - if self._discovered_devices[key].isConnected(): - # Sometimes the status changes after changing the global container and maybe the device doesn't belong to this machine - um_network_key = CuraApplication.getInstance().getGlobalContainerStack().getMetaDataEntry("um_network_key") - if key == um_network_key: - self.getOutputDeviceManager().addOutputDevice(self._discovered_devices[key]) - self.checkCloudFlowIsPossible(None) - else: - self.getOutputDeviceManager().removeOutputDevice(key) - - def stop(self): - if self._zero_conf is not None: - Logger.log("d", "zeroconf close...") - self._zero_conf.close() + # Stop network and cloud discovery. + def stop(self) -> None: + self._network_output_device_manager.stop() self._cloud_output_device_manager.stop() + ## Restart network discovery. + def startDiscovery(self) -> None: + self._network_output_device_manager.startDiscovery() + + ## Force refreshing the network connections. + def refreshConnections(self) -> None: + self._network_output_device_manager.refreshConnections() + self._cloud_output_device_manager.refreshConnections() + + ## Indicate that this plugin supports adding networked printers manually. def canAddManualDevice(self, address: str = "") -> ManualDeviceAdditionAttempt: - # This plugin should always be the fallback option (at least try it): - return ManualDeviceAdditionAttempt.POSSIBLE - - def removeManualDevice(self, key: str, address: Optional[str] = None) -> None: - if key not in self._discovered_devices and address is not None: - key = "manual:%s" % address - - if key in self._discovered_devices: - if not address: - address = self._discovered_devices[key].ipAddress - self._onRemoveDevice(key) - self.resetLastManualDevice() - - if address in self._manual_instances: - manual_printer_request = self._manual_instances.pop(address) - self._preferences.setValue("um3networkprinting/manual_instances", ",".join(self._manual_instances.keys())) - - if manual_printer_request.network_reply is not None: - manual_printer_request.network_reply.abort() - - if manual_printer_request.callback is not None: - self._application.callLater(manual_printer_request.callback, False, address) + return ManualDeviceAdditionAttempt.PRIORITY + ## Add a networked printer manually based on its network address. def addManualDevice(self, address: str, callback: Optional[Callable[[bool, str], None]] = None) -> None: - self._manual_instances[address] = ManualPrinterRequest(address, callback = callback) - self._preferences.setValue("um3networkprinting/manual_instances", ",".join(self._manual_instances.keys())) + self._network_output_device_manager.addManualDevice(address, callback) - instance_name = "manual:%s" % address - properties = { - b"name": address.encode("utf-8"), - b"address": address.encode("utf-8"), - b"manual": b"true", - b"incomplete": b"true", - b"temporary": b"true" # Still a temporary device until all the info is retrieved in _onNetworkRequestFinished - } - - if instance_name not in self._discovered_devices: - # Add a preliminary printer instance - self._onAddDevice(instance_name, address, properties) - self._last_manual_entry_key = instance_name - - reply = self._checkManualDevice(address) - self._manual_instances[address].network_reply = reply - - def _createMachineFromDiscoveredPrinter(self, key: str) -> None: - discovered_device = self._discovered_devices.get(key) - if discovered_device is None: - Logger.log("e", "Could not find discovered device with key [%s]", key) - return - - group_name = discovered_device.getProperty("name") - machine_type_id = discovered_device.getProperty("printer_type") - - Logger.log("i", "Creating machine from network device with key = [%s], group name = [%s], printer type = [%s]", - key, group_name, machine_type_id) - - self._application.getMachineManager().addMachine(machine_type_id, group_name) - # connect the new machine to that network printer - self.associateActiveMachineWithPrinterDevice(discovered_device) - # ensure that the connection states are refreshed. - self.refreshConnections() - - def associateActiveMachineWithPrinterDevice(self, printer_device: Optional["PrinterOutputDevice"]) -> None: - if not printer_device: - return - - Logger.log("d", "Attempting to set the network key of the active machine to %s", printer_device.key) - - machine_manager = CuraApplication.getInstance().getMachineManager() - global_container_stack = machine_manager.activeMachine - if not global_container_stack: - return - - for machine in machine_manager.getMachinesInGroup(global_container_stack.getMetaDataEntry("group_id")): - machine.setMetaDataEntry("um_network_key", printer_device.key) - machine.setMetaDataEntry("group_name", printer_device.name) - - # Delete old authentication data. - Logger.log("d", "Removing old authentication id %s for device %s", - global_container_stack.getMetaDataEntry("network_authentication_id", None), printer_device.key) - - machine.removeMetaDataEntry("network_authentication_id") - machine.removeMetaDataEntry("network_authentication_key") - - # Ensure that these containers do know that they are configured for network connection - machine.addConfiguredConnectionType(printer_device.connectionType.value) - - self.refreshConnections() - - def _checkManualDevice(self, address: str) -> "QNetworkReply": - # Check if a UM3 family device exists at this address. - # If a printer responds, it will replace the preliminary printer created above - # origin=manual is for tracking back the origin of the call - url = QUrl("http://" + address + self._api_prefix + "system") - name_request = QNetworkRequest(url) - return self._network_manager.get(name_request) - - def _onNetworkRequestFinished(self, reply: "QNetworkReply") -> None: - reply_url = reply.url().toString() - - address = reply.url().host() - device = None - properties = {} # type: Dict[bytes, bytes] - - if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) != 200: - # Either: - # - Something went wrong with checking the firmware version! - # - Something went wrong with checking the amount of printers the cluster has! - # - Couldn't find printer at the address when trying to add it manually. - if address in self._manual_instances: - key = "manual:" + address - self.removeManualDevice(key, address) - return - - if "system" in reply_url: - try: - system_info = json.loads(bytes(reply.readAll()).decode("utf-8")) - except: - Logger.log("e", "Something went wrong converting the JSON.") - return - - if address in self._manual_instances: - manual_printer_request = self._manual_instances[address] - manual_printer_request.network_reply = None - if manual_printer_request.callback is not None: - self._application.callLater(manual_printer_request.callback, True, address) - - has_cluster_capable_firmware = Version(system_info["firmware"]) > self._min_cluster_version - instance_name = "manual:%s" % address - properties = { - b"name": (system_info["name"] + " (manual)").encode("utf-8"), - b"address": address.encode("utf-8"), - b"firmware_version": system_info["firmware"].encode("utf-8"), - b"manual": b"true", - b"machine": str(system_info['hardware']["typeid"]).encode("utf-8") - } - - if has_cluster_capable_firmware: - # Cluster needs an additional request, before it's completed. - properties[b"incomplete"] = b"true" - - # Check if the device is still in the list & re-add it with the updated - # information. - if instance_name in self._discovered_devices: - self._onRemoveDevice(instance_name) - self._onAddDevice(instance_name, address, properties) - - if has_cluster_capable_firmware: - # We need to request more info in order to figure out the size of the cluster. - cluster_url = QUrl("http://" + address + self._cluster_api_prefix + "printers/") - cluster_request = QNetworkRequest(cluster_url) - self._network_manager.get(cluster_request) - - elif "printers" in reply_url: - # So we confirmed that the device is in fact a cluster printer, and we should now know how big it is. - try: - cluster_printers_list = json.loads(bytes(reply.readAll()).decode("utf-8")) - except: - Logger.log("e", "Something went wrong converting the JSON.") - return - instance_name = "manual:%s" % address - if instance_name in self._discovered_devices: - device = self._discovered_devices[instance_name] - properties = device.getProperties().copy() - if b"incomplete" in properties: - del properties[b"incomplete"] - properties[b"cluster_size"] = str(len(cluster_printers_list)).encode("utf-8") - self._onRemoveDevice(instance_name) - self._onAddDevice(instance_name, address, properties) - - def _onRemoveDevice(self, device_id: str) -> None: - device = self._discovered_devices.pop(device_id, None) - if device: - if device.isConnected(): - device.disconnect() - try: - device.connectionStateChanged.disconnect(self._onDeviceConnectionStateChanged) - except TypeError: - # Disconnect already happened. - pass - self._application.getDiscoveredPrintersModel().removeDiscoveredPrinter(device.address) - self.discoveredDevicesChanged.emit() - - def _onAddDevice(self, name, address, properties): - # Check what kind of device we need to add; Depending on the firmware we either add a "Connect"/"Cluster" - # or "Legacy" UM3 device. - cluster_size = int(properties.get(b"cluster_size", -1)) - - printer_type = properties.get(b"machine", b"").decode("utf-8") - printer_type_identifiers = { - "9066": "ultimaker3", - "9511": "ultimaker3_extended", - "9051": "ultimaker_s5" - } - - for key, value in printer_type_identifiers.items(): - if printer_type.startswith(key): - properties[b"printer_type"] = bytes(value, encoding="utf8") - break - else: - properties[b"printer_type"] = b"Unknown" - if cluster_size >= 0: - device = ClusterUM3OutputDevice.ClusterUM3OutputDevice(name, address, properties) - else: - device = LegacyUM3OutputDevice.LegacyUM3OutputDevice(name, address, properties) - self._application.getDiscoveredPrintersModel().addDiscoveredPrinter( - address, device.getId(), properties[b"name"].decode("utf-8"), self._createMachineFromDiscoveredPrinter, - properties[b"printer_type"].decode("utf-8"), device) - self._discovered_devices[device.getId()] = device - self.discoveredDevicesChanged.emit() - - global_container_stack = CuraApplication.getInstance().getGlobalContainerStack() - if global_container_stack and device.getId() == global_container_stack.getMetaDataEntry("um_network_key"): - # Ensure that the configured connection type is set. - global_container_stack.addConfiguredConnectionType(device.connectionType.value) - device.connect() - device.connectionStateChanged.connect(self._onDeviceConnectionStateChanged) - - ## Appends a service changed request so later the handling thread will pick it up and processes it. - def _appendServiceChangedRequest(self, zeroconf, service_type, name, state_change): - # append the request and set the event so the event handling thread can pick it up - item = (zeroconf, service_type, name, state_change) - self._service_changed_request_queue.put(item) - self._service_changed_request_event.set() - - def _handleOnServiceChangedRequests(self): - while True: - # Wait for the event to be set - self._service_changed_request_event.wait(timeout = 5.0) - - # Stop if the application is shutting down - if CuraApplication.getInstance().isShuttingDown(): - return - - self._service_changed_request_event.clear() - - # Handle all pending requests - reschedule_requests = [] # A list of requests that have failed so later they will get re-scheduled - while not self._service_changed_request_queue.empty(): - request = self._service_changed_request_queue.get() - zeroconf, service_type, name, state_change = request - try: - result = self._onServiceChanged(zeroconf, service_type, name, state_change) - if not result: - reschedule_requests.append(request) - except Exception: - Logger.logException("e", "Failed to get service info for [%s] [%s], the request will be rescheduled", - service_type, name) - reschedule_requests.append(request) - - # Re-schedule the failed requests if any - if reschedule_requests: - for request in reschedule_requests: - self._service_changed_request_queue.put(request) - - ## Handler for zeroConf detection. - # Return True or False indicating if the process succeeded. - # Note that this function can take over 3 seconds to complete. Be careful - # calling it from the main thread. - def _onServiceChanged(self, zero_conf, service_type, name, state_change): - if state_change == ServiceStateChange.Added: - # First try getting info from zero-conf cache - info = ServiceInfo(service_type, name, properties = {}) - for record in zero_conf.cache.entries_with_name(name.lower()): - info.update_record(zero_conf, time(), record) - - for record in zero_conf.cache.entries_with_name(info.server): - info.update_record(zero_conf, time(), record) - if info.address: - break - - # Request more data if info is not complete - if not info.address: - info = zero_conf.get_service_info(service_type, name) - - if info: - type_of_device = info.properties.get(b"type", None) - if type_of_device: - if type_of_device == b"printer": - address = '.'.join(map(lambda n: str(n), info.address)) - self.addDeviceSignal.emit(str(name), address, info.properties) - else: - Logger.log("w", - "The type of the found device is '%s', not 'printer'! Ignoring.." % type_of_device) - else: - Logger.log("w", "Could not get information about %s" % name) - return False - - elif state_change == ServiceStateChange.Removed: - Logger.log("d", "Bonjour service removed: %s" % name) - self.removeDeviceSignal.emit(str(name)) - - return True - - ## Check if the prerequsites are in place to start the cloud flow - def checkCloudFlowIsPossible(self, cluster: Optional[CloudOutputDevice]) -> None: - Logger.log("d", "Checking if cloud connection is possible...") - - # Pre-Check: Skip if active machine already has been cloud connected or you said don't ask again - active_machine = self._application.getMachineManager().activeMachine # type: Optional[GlobalStack] - if active_machine: - # Check 1A: Printer isn't already configured for cloud - if ConnectionType.CloudConnection.value in active_machine.configuredConnectionTypes: - Logger.log("d", "Active machine was already configured for cloud.") - return - - # Check 1B: Printer isn't already configured for cloud - if active_machine.getMetaDataEntry("cloud_flow_complete", False): - Logger.log("d", "Active machine was already configured for cloud.") - return - - # Check 2: User did not already say "Don't ask me again" - if active_machine.getMetaDataEntry("do_not_show_cloud_message", False): - Logger.log("d", "Active machine shouldn't ask about cloud anymore.") - return + ## Remove a manually connected networked printer. + def removeManualDevice(self, key: str, address: Optional[str] = None) -> None: + self._network_output_device_manager.removeManualDevice(key, address) - # Check 3: User is logged in with an Ultimaker account - if not self._account.isLoggedIn: - Logger.log("d", "Cloud Flow not possible: User not logged in!") - return + ## Get the discovered devices from the local network. + def getDiscoveredDevices(self) -> Dict[str, LocalClusterOutputDevice]: + return self._network_output_device_manager.getDiscoveredDevices() - # Check 4: Machine is configured for network connectivity - if not self._application.getMachineManager().activeMachineHasNetworkConnection: - Logger.log("d", "Cloud Flow not possible: Machine is not connected!") - return - - # Check 5: Machine has correct firmware version - firmware_version = self._application.getMachineManager().activeMachineFirmwareVersion # type: str - if not Version(firmware_version) > self._min_cloud_version: - Logger.log("d", "Cloud Flow not possible: Machine firmware (%s) is too low! (Requires version %s)", - firmware_version, - self._min_cloud_version) - return - - Logger.log("d", "Cloud flow is possible!") - self.cloudFlowIsPossible.emit() - - def _onCloudFlowPossible(self) -> None: - # Cloud flow is possible, so show the message - if not self._start_cloud_flow_message: - self._createCloudFlowStartMessage() - if self._start_cloud_flow_message and not self._start_cloud_flow_message.visible: - self._start_cloud_flow_message.show() - - def _onCloudPrintingConfigured(self, device) -> None: - # Hide the cloud flow start message if it was hanging around already - # For example: if the user already had the browser openen and made the association themselves - if self._start_cloud_flow_message and self._start_cloud_flow_message.visible: - self._start_cloud_flow_message.hide() - - # Cloud flow is complete, so show the message - if not self._cloud_flow_complete_message: - self._createCloudFlowCompleteMessage() - if self._cloud_flow_complete_message and not self._cloud_flow_complete_message.visible: - self._cloud_flow_complete_message.show() - - # Set the machine's cloud flow as complete so we don't ask the user again and again for cloud connected printers - active_machine = self._application.getMachineManager().activeMachine - if active_machine: - - # The active machine _might_ not be the machine that was in the added cloud cluster and - # then this will hide the cloud message for the wrong machine. So we only set it if the - # host names match between the active machine and the newly added cluster - saved_host_name = active_machine.getMetaDataEntry("um_network_key", "").split('.')[0] - added_host_name = device.toDict()["host_name"] - - if added_host_name == saved_host_name: - active_machine.setMetaDataEntry("do_not_show_cloud_message", True) - - return - - def _onDontAskMeAgain(self, checked: bool) -> None: - active_machine = self._application.getMachineManager().activeMachine # type: Optional[GlobalStack] - if active_machine: - active_machine.setMetaDataEntry("do_not_show_cloud_message", checked) - if checked: - Logger.log("d", "Will not ask the user again to cloud connect for current printer.") - return - - def _onCloudFlowStarted(self, messageId: str, actionId: str) -> None: - address = self._application.getMachineManager().activeMachineAddress # type: str - if address: - QDesktopServices.openUrl(QUrl("http://" + address + "/cloud_connect")) - if self._start_cloud_flow_message: - self._start_cloud_flow_message.hide() - self._start_cloud_flow_message = None - return - - def _onReviewCloudConnection(self, messageId: str, actionId: str) -> None: - address = self._application.getMachineManager().activeMachineAddress # type: str - if address: - QDesktopServices.openUrl(QUrl("http://" + address + "/settings")) - return - - def _onMachineSwitched(self) -> None: - # Hide any left over messages - if self._start_cloud_flow_message is not None and self._start_cloud_flow_message.visible: - self._start_cloud_flow_message.hide() - if self._cloud_flow_complete_message is not None and self._cloud_flow_complete_message.visible: - self._cloud_flow_complete_message.hide() - - # Check for cloud flow again with newly selected machine - self.checkCloudFlowIsPossible(None) - - def _createCloudFlowStartMessage(self): - self._start_cloud_flow_message = Message( - text = i18n_catalog.i18nc("@info:status", "Send and monitor print jobs from anywhere using your Ultimaker account."), - lifetime = 0, - image_source = QUrl.fromLocalFile(os.path.join( - PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"), - "resources", "svg", "cloud-flow-start.svg" - )), - image_caption = i18n_catalog.i18nc("@info:status Ultimaker Cloud is a brand name and shouldn't be translated.", "Connect to Ultimaker Cloud"), - option_text = i18n_catalog.i18nc("@action", "Don't ask me again for this printer."), - option_state = False - ) - self._start_cloud_flow_message.addAction("", i18n_catalog.i18nc("@action", "Get started"), "", "") - self._start_cloud_flow_message.optionToggled.connect(self._onDontAskMeAgain) - self._start_cloud_flow_message.actionTriggered.connect(self._onCloudFlowStarted) - - def _createCloudFlowCompleteMessage(self): - self._cloud_flow_complete_message = Message( - text = i18n_catalog.i18nc("@info:status", "You can now send and monitor print jobs from anywhere using your Ultimaker account."), - lifetime = 30, - image_source = QUrl.fromLocalFile(os.path.join( - PluginRegistry.getInstance().getPluginPath("UM3NetworkPrinting"), - "resources", "svg", "cloud-flow-completed.svg" - )), - image_caption = i18n_catalog.i18nc("@info:status", "Connected!") - ) - self._cloud_flow_complete_message.addAction("", i18n_catalog.i18nc("@action", "Review your connection"), "", "", 1) # TODO: Icon - self._cloud_flow_complete_message.actionTriggered.connect(self._onReviewCloudConnection) \ No newline at end of file + ## Connect the active machine to a device. + def associateActiveMachineWithPrinterDevice(self, device: LocalClusterOutputDevice) -> None: + self._network_output_device_manager.associateActiveMachineWithPrinterDevice(device) diff --git a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterAction.py b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterAction.py new file mode 100644 index 0000000000..5a37e1aeba --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterAction.py @@ -0,0 +1,91 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, cast + +from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty, QObject + +from UM import i18nCatalog +from cura.CuraApplication import CuraApplication +from cura.MachineAction import MachineAction + +from .UM3OutputDevicePlugin import UM3OutputDevicePlugin +from .Network.LocalClusterOutputDevice import LocalClusterOutputDevice + + +I18N_CATALOG = i18nCatalog("cura") + + +## Machine action that allows to connect the active machine to a networked devices. +# TODO: in the future this should be part of the new discovery workflow baked into Cura. +class UltimakerNetworkedPrinterAction(MachineAction): + + # Signal emitted when discovered devices have changed. + discoveredDevicesChanged = pyqtSignal() + + def __init__(self) -> None: + super().__init__("DiscoverUM3Action", I18N_CATALOG.i18nc("@action", "Connect via Network")) + self._qml_url = "resources/qml/DiscoverUM3Action.qml" + self._network_plugin = None # type: Optional[UM3OutputDevicePlugin] + + ## Override the default value. + def needsUserInteraction(self) -> bool: + return False + + ## Start listening to network discovery events via the plugin. + @pyqtSlot(name = "startDiscovery") + def startDiscovery(self) -> None: + network_plugin = self._getNetworkPlugin() + network_plugin.discoveredDevicesChanged.connect(self._onDeviceDiscoveryChanged) + self.discoveredDevicesChanged.emit() # trigger at least once to populate the list + + ## Reset the discovered devices. + @pyqtSlot(name = "reset") + def reset(self) -> None: + self.restartDiscovery() + + ## Reset the discovered devices. + @pyqtSlot(name = "restartDiscovery") + def restartDiscovery(self) -> None: + network_plugin = self._getNetworkPlugin() + network_plugin.startDiscovery() + self.discoveredDevicesChanged.emit() # trigger to reset the list + + ## Remove a manually added device. + @pyqtSlot(str, str, name = "removeManualDevice") + def removeManualDevice(self, key: str, address: str) -> None: + network_plugin = self._getNetworkPlugin() + network_plugin.removeManualDevice(key, address) + + ## Add a new manual device. Can replace an existing one by key. + @pyqtSlot(str, str, name = "setManualDevice") + def setManualDevice(self, key: str, address: str) -> None: + network_plugin = self._getNetworkPlugin() + if key != "": + network_plugin.removeManualDevice(key) + if address != "": + network_plugin.addManualDevice(address) + + ## Get the devices discovered in the local network sorted by name. + @pyqtProperty("QVariantList", notify = discoveredDevicesChanged) + def foundDevices(self): + network_plugin = self._getNetworkPlugin() + discovered_devices = list(network_plugin.getDiscoveredDevices().values()) + discovered_devices.sort(key = lambda d: d.name) + return discovered_devices + + ## Connect a device selected in the list with the active machine. + @pyqtSlot(QObject, name = "associateActiveMachineWithPrinterDevice") + def associateActiveMachineWithPrinterDevice(self, device: LocalClusterOutputDevice) -> None: + network_plugin = self._getNetworkPlugin() + network_plugin.associateActiveMachineWithPrinterDevice(device) + + ## Callback for when the list of discovered devices in the plugin was changed. + def _onDeviceDiscoveryChanged(self) -> None: + self.discoveredDevicesChanged.emit() + + ## Get the network manager from the plugin. + def _getNetworkPlugin(self) -> UM3OutputDevicePlugin: + if not self._network_plugin: + plugin = CuraApplication.getInstance().getOutputDeviceManager().getOutputDevicePlugin("UM3NetworkPrinting") + self._network_plugin = cast(UM3OutputDevicePlugin, plugin) + return self._network_plugin diff --git a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py new file mode 100644 index 0000000000..f2c24e4802 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py @@ -0,0 +1,335 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import os +from time import time +from typing import List, Optional, Dict + +from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject, pyqtSlot, QUrl + +from UM.Logger import Logger +from UM.Qt.Duration import Duration, DurationFormat +from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel +from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState +from cura.PrinterOutput.PrinterOutputDevice import ConnectionType, ConnectionState + +from .Utils import formatTimeCompleted, formatDateCompleted +from .ClusterOutputController import ClusterOutputController +from .Messages.PrintJobUploadProgressMessage import PrintJobUploadProgressMessage +from .Messages.NotClusterHostMessage import NotClusterHostMessage +from .Models.UM3PrintJobOutputModel import UM3PrintJobOutputModel +from .Models.Http.ClusterPrinterStatus import ClusterPrinterStatus +from .Models.Http.ClusterPrintJobStatus import ClusterPrintJobStatus + + +## Output device class that forms the basis of Ultimaker networked printer output devices. +# Currently used for local networking and cloud printing using Ultimaker Connect. +# This base class primarily contains all the Qt properties and slots needed for the monitor page to work. +class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): + + META_NETWORK_KEY = "um_network_key" + META_CLUSTER_ID = "um_cloud_cluster_id" + + # Signal emitted when the status of the print jobs for this cluster were changed over the network. + printJobsChanged = pyqtSignal() + + # Signal emitted when the currently visible printer card in the UI was changed by the user. + activePrinterChanged = pyqtSignal() + + # Notify can only use signals that are defined by the class that they are in, not inherited ones. + # Therefore we create a private signal used to trigger the printersChanged signal. + _clusterPrintersChanged = pyqtSignal() + + # States indicating if a print job is queued. + QUEUED_PRINT_JOBS_STATES = {"queued", "error"} + + # Time in seconds since last network response after which we consider this device offline. + # We set this a bit higher than some of the other intervals to make sure they don't overlap. + NETWORK_RESPONSE_CONSIDER_OFFLINE = 12.0 + + def __init__(self, device_id: str, address: str, properties: Dict[bytes, bytes], connection_type: ConnectionType, + parent=None) -> None: + super().__init__(device_id=device_id, address=address, properties=properties, connection_type=connection_type, + parent=parent) + + # Trigger the printersChanged signal when the private signal is triggered. + self.printersChanged.connect(self._clusterPrintersChanged) + + # Keeps track the last network response to determine if we are still connected. + self._time_of_last_response = time() + + # Set the display name from the properties + self.setName(self.getProperty("name")) + + # Keeps track of all printers in the cluster. + self._printers = [] # type: List[PrinterOutputModel] + self._has_received_printers = False + + # Keeps track of all print jobs in the cluster. + self._print_jobs = [] # type: List[UM3PrintJobOutputModel] + + # Keep track of the printer currently selected in the UI. + self._active_printer = None # type: Optional[PrinterOutputModel] + + # By default we are not authenticated. This state will be changed later. + self._authentication_state = AuthState.NotAuthenticated + + # Load the Monitor UI elements. + self._loadMonitorTab() + + # The job upload progress message modal. + self._progress = PrintJobUploadProgressMessage() + + ## The IP address of the printer. + @pyqtProperty(str, constant=True) + def address(self) -> str: + return self._address + + # Get all print jobs for this cluster. + @pyqtProperty("QVariantList", notify=printJobsChanged) + def printJobs(self) -> List[UM3PrintJobOutputModel]: + return self._print_jobs + + # Get all print jobs for this cluster that are queued. + @pyqtProperty("QVariantList", notify=printJobsChanged) + def queuedPrintJobs(self) -> List[UM3PrintJobOutputModel]: + return [print_job for print_job in self._print_jobs if print_job.state in self.QUEUED_PRINT_JOBS_STATES] + + # Get all print jobs for this cluster that are currently printing. + @pyqtProperty("QVariantList", notify=printJobsChanged) + def activePrintJobs(self) -> List[UM3PrintJobOutputModel]: + return [print_job for print_job in self._print_jobs if + print_job.assignedPrinter is not None and print_job.state not in self.QUEUED_PRINT_JOBS_STATES] + + @pyqtProperty(bool, notify=printJobsChanged) + def receivedPrintJobs(self) -> bool: + return bool(self._print_jobs) + + # Get the amount of printers in the cluster. + @pyqtProperty(int, notify=_clusterPrintersChanged) + def clusterSize(self) -> int: + if not self._has_received_printers: + return 1 # prevent false positives when discovering new devices + return len(self._printers) + + # Get the amount of printer in the cluster per type. + @pyqtProperty("QVariantList", notify=_clusterPrintersChanged) + def connectedPrintersTypeCount(self) -> List[Dict[str, str]]: + printer_count = {} # type: Dict[str, int] + for printer in self._printers: + if printer.type in printer_count: + printer_count[printer.type] += 1 + else: + printer_count[printer.type] = 1 + result = [] + for machine_type in printer_count: + result.append({"machine_type": machine_type, "count": str(printer_count[machine_type])}) + return result + + # Get a list of all printers. + @pyqtProperty("QVariantList", notify=_clusterPrintersChanged) + def printers(self) -> List[PrinterOutputModel]: + return self._printers + + # Get the currently active printer in the UI. + @pyqtProperty(QObject, notify=activePrinterChanged) + def activePrinter(self) -> Optional[PrinterOutputModel]: + return self._active_printer + + # Set the currently active printer from the UI. + @pyqtSlot(QObject, name="setActivePrinter") + def setActivePrinter(self, printer: Optional[PrinterOutputModel]) -> None: + if self.activePrinter == printer: + return + self._active_printer = printer + self.activePrinterChanged.emit() + + ## Whether the printer that this output device represents supports print job actions via the local network. + @pyqtProperty(bool, constant=True) + def supportsPrintJobActions(self) -> bool: + return True + + ## Set the remote print job state. + def setJobState(self, print_job_uuid: str, state: str) -> None: + raise NotImplementedError("setJobState must be implemented") + + @pyqtSlot(str, name="sendJobToTop") + def sendJobToTop(self, print_job_uuid: str) -> None: + raise NotImplementedError("sendJobToTop must be implemented") + + @pyqtSlot(str, name="deleteJobFromQueue") + def deleteJobFromQueue(self, print_job_uuid: str) -> None: + raise NotImplementedError("deleteJobFromQueue must be implemented") + + @pyqtSlot(str, name="forceSendJob") + def forceSendJob(self, print_job_uuid: str) -> None: + raise NotImplementedError("forceSendJob must be implemented") + + @pyqtSlot(name="openPrintJobControlPanel") + def openPrintJobControlPanel(self) -> None: + raise NotImplementedError("openPrintJobControlPanel must be implemented") + + @pyqtSlot(name="openPrinterControlPanel") + def openPrinterControlPanel(self) -> None: + raise NotImplementedError("openPrinterControlPanel must be implemented") + + @pyqtProperty(QUrl, notify=_clusterPrintersChanged) + def activeCameraUrl(self) -> QUrl: + return QUrl() + + @pyqtSlot(QUrl, name="setActiveCameraUrl") + def setActiveCameraUrl(self, camera_url: QUrl) -> None: + pass + + @pyqtSlot(int, result=str, name="getTimeCompleted") + def getTimeCompleted(self, time_remaining: int) -> str: + return formatTimeCompleted(time_remaining) + + @pyqtSlot(int, result=str, name="getDateCompleted") + def getDateCompleted(self, time_remaining: int) -> str: + return formatDateCompleted(time_remaining) + + @pyqtSlot(int, result=str, name="formatDuration") + def formatDuration(self, seconds: int) -> str: + return Duration(seconds).getDisplayString(DurationFormat.Format.Short) + + def _update(self) -> None: + self._checkStillConnected() + super()._update() + + ## Check if we're still connected by comparing the last timestamps for network response and the current time. + # This implementation is similar to the base NetworkedPrinterOutputDevice, but is tweaked slightly. + # Re-connecting is handled automatically by the output device managers in this plugin. + # TODO: it would be nice to have this logic in the managers, but connecting those with signals causes crashes. + def _checkStillConnected(self) -> None: + time_since_last_response = time() - self._time_of_last_response + if time_since_last_response > self.NETWORK_RESPONSE_CONSIDER_OFFLINE: + self.setConnectionState(ConnectionState.Closed) + if self.key in CuraApplication.getInstance().getOutputDeviceManager().getOutputDeviceIds(): + CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(self.key) + elif self.connectionState == ConnectionState.Closed: + self._reconnectForActiveMachine() + + ## Reconnect for the active output device. + # Does nothing if the device is not meant for the active machine. + def _reconnectForActiveMachine(self) -> None: + active_machine = CuraApplication.getInstance().getGlobalContainerStack() + if not active_machine: + return + + # Indicate this device is now connected again. + self.setConnectionState(ConnectionState.Connected) + + # If the device was already registered we don't need to register it again. + if self.key in CuraApplication.getInstance().getOutputDeviceManager().getOutputDeviceIds(): + return + + # Try for local network device. + stored_device_id = active_machine.getMetaDataEntry(self.META_NETWORK_KEY) + if self.key == stored_device_id: + CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(self) + + # Try for cloud device. + stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID) + if self.key == stored_cluster_id: + CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(self) + + def _responseReceived(self) -> None: + self._time_of_last_response = time() + + def _updatePrinters(self, remote_printers: List[ClusterPrinterStatus]) -> None: + self._responseReceived() + + # Keep track of the new printers to show. + # We create a new list instead of changing the existing one to get the correct order. + new_printers = [] # type: List[PrinterOutputModel] + + # Check which printers need to be created or updated. + for index, printer_data in enumerate(remote_printers): + printer = next(iter(printer for printer in self._printers if printer.key == printer_data.uuid), None) + if printer is None: + printer = printer_data.createOutputModel(ClusterOutputController(self)) + else: + printer_data.updateOutputModel(printer) + new_printers.append(printer) + + # Check which printers need to be removed (de-referenced). + remote_printers_keys = [printer_data.uuid for printer_data in remote_printers] + removed_printers = [printer for printer in self._printers if printer.key not in remote_printers_keys] + for removed_printer in removed_printers: + if self._active_printer and self._active_printer.key == removed_printer.key: + self.setActivePrinter(None) + + self._printers = new_printers + self._has_received_printers = True + if self._printers and not self.activePrinter: + self.setActivePrinter(self._printers[0]) + + self.printersChanged.emit() + self._checkIfClusterHost() + + ## Check is this device is a cluster host and takes the needed actions when it is not. + def _checkIfClusterHost(self): + if len(self._printers) < 1 and self.isConnected(): + NotClusterHostMessage(self).show() + self.close() + CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(self.key) + + ## Updates the local list of print jobs with the list received from the cluster. + # \param remote_jobs: The print jobs received from the cluster. + def _updatePrintJobs(self, remote_jobs: List[ClusterPrintJobStatus]) -> None: + self._responseReceived() + + # Keep track of the new print jobs to show. + # We create a new list instead of changing the existing one to get the correct order. + new_print_jobs = [] + + # Check which print jobs need to be created or updated. + for index, print_job_data in enumerate(remote_jobs): + print_job = next( + iter(print_job for print_job in self._print_jobs if print_job.key == print_job_data.uuid), None) + if not print_job: + new_print_jobs.append(self._createPrintJobModel(print_job_data)) + else: + print_job_data.updateOutputModel(print_job) + if print_job_data.printer_uuid: + self._updateAssignedPrinter(print_job, print_job_data.printer_uuid) + new_print_jobs.append(print_job) + + # Check which print job need to be removed (de-referenced). + remote_job_keys = [print_job_data.uuid for print_job_data in remote_jobs] + removed_jobs = [print_job for print_job in self._print_jobs if print_job.key not in remote_job_keys] + for removed_job in removed_jobs: + if removed_job.assignedPrinter: + removed_job.assignedPrinter.updateActivePrintJob(None) + + self._print_jobs = new_print_jobs + self.printJobsChanged.emit() + + ## Create a new print job model based on the remote status of the job. + # \param remote_job: The remote print job data. + def _createPrintJobModel(self, remote_job: ClusterPrintJobStatus) -> UM3PrintJobOutputModel: + model = remote_job.createOutputModel(ClusterOutputController(self)) + if remote_job.printer_uuid: + self._updateAssignedPrinter(model, remote_job.printer_uuid) + return model + + ## Updates the printer assignment for the given print job model. + def _updateAssignedPrinter(self, model: UM3PrintJobOutputModel, printer_uuid: str) -> None: + printer = next((p for p in self._printers if printer_uuid == p.key), None) + if not printer: + return + printer.updateActivePrintJob(model) + model.updateAssignedPrinter(printer) + + ## Load Monitor tab QML. + def _loadMonitorTab(self) -> None: + plugin_registry = CuraApplication.getInstance().getPluginRegistry() + if not plugin_registry: + Logger.log("e", "Could not get plugin registry") + return + plugin_path = plugin_registry.getPluginPath("UM3NetworkPrinting") + if not plugin_path: + Logger.log("e", "Could not get plugin path") + return + self._monitor_view_qml_path = os.path.join(plugin_path, "resources", "qml", "MonitorStage.qml") diff --git a/plugins/UM3NetworkPrinting/src/Utils.py b/plugins/UM3NetworkPrinting/src/Utils.py new file mode 100644 index 0000000000..a628130416 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Utils.py @@ -0,0 +1,30 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from datetime import datetime, timedelta + +from UM import i18nCatalog + + +def formatTimeCompleted(seconds_remaining: int) -> str: + completed = datetime.now() + timedelta(seconds=seconds_remaining) + return "{hour:02d}:{minute:02d}".format(hour = completed.hour, minute = completed.minute) + + +def formatDateCompleted(seconds_remaining: int) -> str: + now = datetime.now() + completed = now + timedelta(seconds=seconds_remaining) + days = (completed.date() - now.date()).days + i18n = i18nCatalog("cura") + + # If finishing date is more than 7 days out, using "Mon Dec 3 at HH:MM" format + if days >= 7: + return completed.strftime("%a %b ") + "{day}".format(day = completed.day) + # If finishing date is within the next week, use "Monday at HH:MM" format + elif days >= 2: + return completed.strftime("%a") + # If finishing tomorrow, use "tomorrow at HH:MM" format + elif days >= 1: + return i18n.i18nc("@info:status", "tomorrow") + # If finishing today, use "today at HH:MM" format + else: + return i18n.i18nc("@info:status", "today") diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/__init__.py b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/__init__.py deleted file mode 100644 index 777afc92c2..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -import json -import os - - -def readFixture(fixture_name: str) -> bytes: - with open("{}/{}.json".format(os.path.dirname(__file__), fixture_name), "rb") as f: - return f.read() - -def parseFixture(fixture_name: str) -> dict: - return json.loads(readFixture(fixture_name).decode()) diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusterStatusResponse.json b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusterStatusResponse.json deleted file mode 100644 index 4f9f47fc75..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusterStatusResponse.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "data": { - "generated_time": "2018-12-10T08:23:55.110Z", - "printers": [ - { - "configuration": [ - { - "extruder_index": 0, - "material": { - "material": "empty" - }, - "print_core_id": "AA 0.4" - }, - { - "extruder_index": 1, - "material": { - "material": "empty" - }, - "print_core_id": "AA 0.4" - } - ], - "enabled": true, - "firmware_version": "5.1.2.20180807", - "friendly_name": "Master-Luke", - "ip_address": "10.183.1.140", - "machine_variant": "Ultimaker 3", - "status": "maintenance", - "unique_name": "ultimakersystem-ccbdd30044ec", - "uuid": "b3a47ea3-1eeb-4323-9626-6f9c3c888f9e" - }, - { - "configuration": [ - { - "extruder_index": 0, - "material": { - "brand": "Generic", - "color": "Generic", - "guid": "506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9", - "material": "PLA" - }, - "print_core_id": "AA 0.4" - }, - { - "extruder_index": 1, - "material": { - "brand": "Ultimaker", - "color": "Red", - "guid": "9cfe5bf1-bdc5-4beb-871a-52c70777842d", - "material": "PLA" - }, - "print_core_id": "AA 0.4" - } - ], - "enabled": true, - "firmware_version": "4.3.3.20180529", - "friendly_name": "UM-Marijn", - "ip_address": "10.183.1.166", - "machine_variant": "Ultimaker 3", - "status": "idle", - "unique_name": "ultimakersystem-ccbdd30058ab", - "uuid": "6e62c40a-4601-4b0e-9fec-c7c02c59c30a" - } - ], - "print_jobs": [ - { - "assigned_to": "6e62c40a-4601-4b0e-9fec-c7c02c59c30a", - "configuration": [ - { - "extruder_index": 0, - "material": { - "brand": "Ultimaker", - "color": "Black", - "guid": "3ee70a86-77d8-4b87-8005-e4a1bc57d2ce", - "material": "PLA" - }, - "print_core_id": "AA 0.4" - } - ], - "constraints": {}, - "created_at": "2018-12-10T08:28:04.108Z", - "force": false, - "last_seen": 500165.109491861, - "machine_variant": "Ultimaker 3", - "name": "UM3_dragon", - "network_error_count": 0, - "owner": "Daniel Testing", - "started": false, - "status": "queued", - "time_elapsed": 0, - "time_total": 14145, - "uuid": "d1c8bd52-5e9f-486a-8c25-a123cc8c7702" - } - ] - } -} diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json deleted file mode 100644 index 5200e3b971..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "data": [{ - "cluster_id": "RIZ6cZbWA_Ua7RZVJhrdVfVpf0z-MqaSHQE4v8aRTtYq", - "host_guid": "e90ae0ac-1257-4403-91ee-a44c9b7e8050", - "host_name": "ultimakersystem-ccbdd30044ec", - "host_version": "5.0.0.20170101", - "is_online": true, - "status": "active" - }, { - "cluster_id": "NWKV6vJP_LdYsXgXqAcaNCR0YcLJwar1ugh0ikEZsZs8", - "host_guid": "e0ace90a-91ee-1257-4403-e8050a44c9b7", - "host_name": "ultimakersystem-30044ecccbdd", - "host_version": "5.1.2.20180807", - "is_online": true, - "status": "active" - }] -} diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/postJobPrintResponse.json b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/postJobPrintResponse.json deleted file mode 100644 index caedcd8732..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/postJobPrintResponse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "data": { - "cluster_job_id": "9a59d8e9-91d3-4ff6-b4cb-9db91c4094dd", - "job_id": "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=", - "status": "queued", - "generated_time": "2018-12-10T08:23:55.110Z" - } -} diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/putJobUploadResponse.json b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/putJobUploadResponse.json deleted file mode 100644 index 1304f3a9f6..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/putJobUploadResponse.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "data": { - "content_type": "text/plain", - "job_id": "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=", - "job_name": "Ultimaker Robot v3.0", - "status": "uploading", - "upload_url": "https://api.ultimaker.com/print-job-upload" - } -} diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Models/__init__.py b/plugins/UM3NetworkPrinting/tests/Cloud/Models/__init__.py deleted file mode 100644 index f3f6970c54..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Models/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/NetworkManagerMock.py b/plugins/UM3NetworkPrinting/tests/Cloud/NetworkManagerMock.py deleted file mode 100644 index e504509d67..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/NetworkManagerMock.py +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -import json -from typing import Dict, Tuple, Union, Optional, Any -from unittest.mock import MagicMock - -from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest - -from UM.Logger import Logger -from UM.Signal import Signal - - -class FakeSignal: - def __init__(self): - self._callbacks = [] - - def connect(self, callback): - self._callbacks.append(callback) - - def disconnect(self, callback): - self._callbacks.remove(callback) - - def emit(self, *args, **kwargs): - for callback in self._callbacks: - callback(*args, **kwargs) - - -## This class can be used to mock the QNetworkManager class and test the code using it. -# After patching the QNetworkManager class, requests are prepared before they can be executed. -# Any requests not prepared beforehand will cause KeyErrors. -class NetworkManagerMock: - - # An enumeration of the supported operations and their code for the network access manager. - _OPERATIONS = { - "GET": QNetworkAccessManager.GetOperation, - "POST": QNetworkAccessManager.PostOperation, - "PUT": QNetworkAccessManager.PutOperation, - "DELETE": QNetworkAccessManager.DeleteOperation, - "HEAD": QNetworkAccessManager.HeadOperation, - } # type: Dict[str, int] - - ## Initializes the network manager mock. - def __init__(self) -> None: - # A dict with the prepared replies, using the format {(http_method, url): reply} - self.replies = {} # type: Dict[Tuple[str, str], MagicMock] - self.request_bodies = {} # type: Dict[Tuple[str, str], bytes] - - # Signals used in the network manager. - self.finished = Signal() - self.authenticationRequired = Signal() - - ## Mock implementation of the get, post, put, delete and head methods from the network manager. - # Since the methods are very simple and the same it didn't make sense to repeat the code. - # \param method: The method being called. - # \return The mocked function, if the method name is known. Defaults to the standard getattr function. - def __getattr__(self, method: str) -> Any: - ## This mock implementation will simply return the reply from the prepared ones. - # it raises a KeyError if requests are done without being prepared. - def doRequest(request: QNetworkRequest, body: Optional[bytes] = None, *_): - key = method.upper(), request.url().toString() - if body: - self.request_bodies[key] = body - return self.replies[key] - - operation = self._OPERATIONS.get(method.upper()) - if operation: - return doRequest - - # the attribute is not one of the implemented methods, default to the standard implementation. - return getattr(super(), method) - - ## Prepares a server reply for the given parameters. - # \param method: The HTTP method. - # \param url: The URL being requested. - # \param status_code: The HTTP status code for the response. - # \param response: The response body from the server (generally json-encoded). - def prepareReply(self, method: str, url: str, status_code: int, response: Union[bytes, dict]) -> None: - reply_mock = MagicMock() - reply_mock.url().toString.return_value = url - reply_mock.operation.return_value = self._OPERATIONS[method] - reply_mock.attribute.return_value = status_code - reply_mock.finished = FakeSignal() - reply_mock.isFinished.return_value = False - reply_mock.readAll.return_value = response if isinstance(response, bytes) else json.dumps(response).encode() - self.replies[method, url] = reply_mock - Logger.log("i", "Prepared mock {}-response to {} {}", status_code, method, url) - - ## Gets the request that was sent to the network manager for the given method and URL. - # \param method: The HTTP method. - # \param url: The URL. - def getRequestBody(self, method: str, url: str) -> Optional[bytes]: - return self.request_bodies.get((method.upper(), url)) - - ## Emits the signal that the reply is ready to all prepared replies. - def flushReplies(self) -> None: - for key, reply in self.replies.items(): - Logger.log("i", "Flushing reply to {} {}", *key) - reply.isFinished.return_value = True - reply.finished.emit() - self.finished.emit(reply) - self.reset() - - ## Deletes all prepared replies - def reset(self) -> None: - self.replies.clear() diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py deleted file mode 100644 index b79d009c31..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -from typing import List -from unittest import TestCase -from unittest.mock import patch, MagicMock - -from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot -from ...src.Cloud import CloudApiClient -from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse -from ...src.Cloud.Models.CloudClusterStatus import CloudClusterStatus -from ...src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse -from ...src.Cloud.Models.CloudPrintJobUploadRequest import CloudPrintJobUploadRequest -from ...src.Cloud.Models.CloudError import CloudError -from .Fixtures import readFixture, parseFixture -from .NetworkManagerMock import NetworkManagerMock - - -class TestCloudApiClient(TestCase): - maxDiff = None - - def _errorHandler(self, errors: List[CloudError]): - raise Exception("Received unexpected error: {}".format(errors)) - - def setUp(self): - super().setUp() - self.account = MagicMock() - self.account.isLoggedIn.return_value = True - - self.network = NetworkManagerMock() - with patch.object(CloudApiClient, 'QNetworkAccessManager', return_value = self.network): - self.api = CloudApiClient.CloudApiClient(self.account, self._errorHandler) - - def test_getClusters(self): - result = [] - - response = readFixture("getClusters") - data = parseFixture("getClusters")["data"] - - self.network.prepareReply("GET", CuraCloudAPIRoot + "/connect/v1/clusters", 200, response) - # The callback is a function that adds the result of the call to getClusters to the result list - self.api.getClusters(lambda clusters: result.extend(clusters)) - - self.network.flushReplies() - - self.assertEqual([CloudClusterResponse(**data[0]), CloudClusterResponse(**data[1])], result) - - def test_getClusterStatus(self): - result = [] - - response = readFixture("getClusterStatusResponse") - data = parseFixture("getClusterStatusResponse")["data"] - - url = CuraCloudAPIRoot + "/connect/v1/clusters/R0YcLJwar1ugh0ikEZsZs8NWKV6vJP_LdYsXgXqAcaNC/status" - self.network.prepareReply("GET", url, 200, response) - self.api.getClusterStatus("R0YcLJwar1ugh0ikEZsZs8NWKV6vJP_LdYsXgXqAcaNC", lambda s: result.append(s)) - - self.network.flushReplies() - - self.assertEqual([CloudClusterStatus(**data)], result) - - def test_requestUpload(self): - - results = [] - - response = readFixture("putJobUploadResponse") - - self.network.prepareReply("PUT", CuraCloudAPIRoot + "/cura/v1/jobs/upload", 200, response) - request = CloudPrintJobUploadRequest(job_name = "job name", file_size = 143234, content_type = "text/plain") - self.api.requestUpload(request, lambda r: results.append(r)) - self.network.flushReplies() - - self.assertEqual(["text/plain"], [r.content_type for r in results]) - self.assertEqual(["uploading"], [r.status for r in results]) - - def test_uploadToolPath(self): - - results = [] - progress = MagicMock() - - data = parseFixture("putJobUploadResponse")["data"] - upload_response = CloudPrintJobResponse(**data) - - # Network client doesn't look into the reply - self.network.prepareReply("PUT", upload_response.upload_url, 200, b'{}') - - mesh = ("1234" * 100000).encode() - self.api.uploadToolPath(upload_response, mesh, lambda: results.append("sent"), progress.advance, progress.error) - - for _ in range(10): - self.network.flushReplies() - self.network.prepareReply("PUT", upload_response.upload_url, 200, b'{}') - - self.assertEqual(["sent"], results) - - def test_requestPrint(self): - - results = [] - - response = readFixture("postJobPrintResponse") - - cluster_id = "NWKV6vJP_LdYsXgXqAcaNCR0YcLJwar1ugh0ikEZsZs8" - cluster_job_id = "9a59d8e9-91d3-4ff6-b4cb-9db91c4094dd" - job_id = "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=" - - self.network.prepareReply("POST", - CuraCloudAPIRoot + "/connect/v1/clusters/{}/print/{}" - .format(cluster_id, job_id), - 200, response) - - self.api.requestPrint(cluster_id, job_id, lambda r: results.append(r)) - - self.network.flushReplies() - - self.assertEqual([job_id], [r.job_id for r in results]) - self.assertEqual([cluster_job_id], [r.cluster_job_id for r in results]) - self.assertEqual(["queued"], [r.status for r in results]) diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py deleted file mode 100644 index 352efb292e..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -import json -from unittest import TestCase -from unittest.mock import patch, MagicMock - -from UM.Scene.SceneNode import SceneNode -from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot -from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel -from ...src.Cloud import CloudApiClient -from ...src.Cloud.CloudOutputDevice import CloudOutputDevice -from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse -from .Fixtures import readFixture, parseFixture -from .NetworkManagerMock import NetworkManagerMock - - -class TestCloudOutputDevice(TestCase): - maxDiff = None - - CLUSTER_ID = "RIZ6cZbWA_Ua7RZVJhrdVfVpf0z-MqaSHQE4v8aRTtYq" - JOB_ID = "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=" - HOST_NAME = "ultimakersystem-ccbdd30044ec" - HOST_GUID = "e90ae0ac-1257-4403-91ee-a44c9b7e8050" - HOST_VERSION = "5.2.0" - FRIENDLY_NAME = "My Friendly Printer" - - STATUS_URL = "{}/connect/v1/clusters/{}/status".format(CuraCloudAPIRoot, CLUSTER_ID) - PRINT_URL = "{}/connect/v1/clusters/{}/print/{}".format(CuraCloudAPIRoot, CLUSTER_ID, JOB_ID) - REQUEST_UPLOAD_URL = "{}/cura/v1/jobs/upload".format(CuraCloudAPIRoot) - - def setUp(self): - super().setUp() - self.app = MagicMock() - - self.patches = [patch("UM.Qt.QtApplication.QtApplication.getInstance", return_value=self.app), - patch("UM.Application.Application.getInstance", return_value=self.app)] - for patched_method in self.patches: - patched_method.start() - - self.cluster = CloudClusterResponse(self.CLUSTER_ID, self.HOST_GUID, self.HOST_NAME, is_online=True, - status="active", host_version=self.HOST_VERSION, - friendly_name=self.FRIENDLY_NAME) - - self.network = NetworkManagerMock() - self.account = MagicMock(isLoggedIn=True, accessToken="TestAccessToken") - self.onError = MagicMock() - with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network): - self._api = CloudApiClient.CloudApiClient(self.account, self.onError) - - self.device = CloudOutputDevice(self._api, self.cluster) - self.cluster_status = parseFixture("getClusterStatusResponse") - self.network.prepareReply("GET", self.STATUS_URL, 200, readFixture("getClusterStatusResponse")) - - def tearDown(self): - try: - super().tearDown() - self.network.flushReplies() - finally: - for patched_method in self.patches: - patched_method.stop() - - # We test for these in order to make sure the correct file type is selected depending on the firmware version. - def test_properties(self): - self.assertEqual(self.device.firmwareVersion, self.HOST_VERSION) - self.assertEqual(self.device.name, self.FRIENDLY_NAME) - - def test_status(self): - self.device._update() - self.network.flushReplies() - - self.assertEqual([PrinterOutputModel, PrinterOutputModel], [type(printer) for printer in self.device.printers]) - - controller_fields = { - "_output_device": self.device, - "can_abort": True, - "can_control_manually": False, - "can_pause": True, - "can_pre_heat_bed": False, - "can_pre_heat_hotends": False, - "can_send_raw_gcode": False, - "can_update_firmware": False, - } - - self.assertEqual({printer["uuid"] for printer in self.cluster_status["data"]["printers"]}, - {printer.key for printer in self.device.printers}) - self.assertEqual([controller_fields, controller_fields], - [printer.getController().__dict__ for printer in self.device.printers]) - - self.assertEqual(["UM3PrintJobOutputModel"], [type(printer).__name__ for printer in self.device.printJobs]) - self.assertEqual({job["uuid"] for job in self.cluster_status["data"]["print_jobs"]}, - {job.key for job in self.device.printJobs}) - self.assertEqual({job["owner"] for job in self.cluster_status["data"]["print_jobs"]}, - {job.owner for job in self.device.printJobs}) - self.assertEqual({job["name"] for job in self.cluster_status["data"]["print_jobs"]}, - {job.name for job in self.device.printJobs}) - - def test_remove_print_job(self): - self.device._update() - self.network.flushReplies() - self.assertEqual(1, len(self.device.printJobs)) - - self.cluster_status["data"]["print_jobs"].clear() - self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status) - - self.device._last_request_time = None - self.device._update() - self.network.flushReplies() - self.assertEqual([], self.device.printJobs) - - def test_remove_printers(self): - self.device._update() - self.network.flushReplies() - self.assertEqual(2, len(self.device.printers)) - - self.cluster_status["data"]["printers"].clear() - self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status) - - self.device._last_request_time = None - self.device._update() - self.network.flushReplies() - self.assertEqual([], self.device.printers) - - def test_print_to_cloud(self): - active_machine_mock = self.app.getGlobalContainerStack.return_value - active_machine_mock.getMetaDataEntry.side_effect = {"file_formats": "application/x-ufp"}.get - - request_upload_response = parseFixture("putJobUploadResponse") - request_print_response = parseFixture("postJobPrintResponse") - self.network.prepareReply("PUT", self.REQUEST_UPLOAD_URL, 201, request_upload_response) - self.network.prepareReply("PUT", request_upload_response["data"]["upload_url"], 201, b"{}") - self.network.prepareReply("POST", self.PRINT_URL, 200, request_print_response) - - file_handler = MagicMock() - file_handler.getSupportedFileTypesWrite.return_value = [{ - "extension": "ufp", - "mime_type": "application/x-ufp", - "mode": 2 - }, { - "extension": "gcode.gz", - "mime_type": "application/gzip", - "mode": 2, - }] - file_handler.getWriterByMimeType.return_value.write.side_effect = \ - lambda stream, nodes: stream.write(str(nodes).encode()) - - scene_nodes = [SceneNode()] - expected_mesh = str(scene_nodes).encode() - self.device.requestWrite(scene_nodes, file_handler=file_handler, file_name="FileName") - - self.network.flushReplies() - self.assertEqual( - {"data": {"content_type": "application/x-ufp", "file_size": len(expected_mesh), "job_name": "FileName"}}, - json.loads(self.network.getRequestBody("PUT", self.REQUEST_UPLOAD_URL).decode()) - ) - self.assertEqual(expected_mesh, - self.network.getRequestBody("PUT", request_upload_response["data"]["upload_url"])) - self.assertIsNone(self.network.getRequestBody("POST", self.PRINT_URL)) diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py deleted file mode 100644 index 869b39440c..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. -from unittest import TestCase -from unittest.mock import patch, MagicMock - -from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager -from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot -from ...src.Cloud import CloudApiClient -from ...src.Cloud import CloudOutputDeviceManager -from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse -from .Fixtures import parseFixture, readFixture -from .NetworkManagerMock import NetworkManagerMock, FakeSignal - - -class TestCloudOutputDeviceManager(TestCase): - maxDiff = None - - URL = CuraCloudAPIRoot + "/connect/v1/clusters" - - def setUp(self): - super().setUp() - self.app = MagicMock() - self.device_manager = OutputDeviceManager() - self.app.getOutputDeviceManager.return_value = self.device_manager - - self.patches = [patch("UM.Qt.QtApplication.QtApplication.getInstance", return_value=self.app), - patch("UM.Application.Application.getInstance", return_value=self.app)] - for patched_method in self.patches: - patched_method.start() - - self.network = NetworkManagerMock() - self.timer = MagicMock(timeout = FakeSignal()) - with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network), \ - patch.object(CloudOutputDeviceManager, "QTimer", return_value = self.timer): - self.manager = CloudOutputDeviceManager.CloudOutputDeviceManager() - self.clusters_response = parseFixture("getClusters") - self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters")) - - def tearDown(self): - try: - self._beforeTearDown() - - self.network.flushReplies() - self.manager.stop() - for patched_method in self.patches: - patched_method.stop() - finally: - super().tearDown() - - ## Before tear down method we check whether the state of the output device manager is what we expect based on the - # mocked API response. - def _beforeTearDown(self): - # let the network send replies - self.network.flushReplies() - # get the created devices - devices = self.device_manager.getOutputDevices() - # TODO: Check active device - - response_clusters = [] - for cluster in self.clusters_response.get("data", []): - response_clusters.append(CloudClusterResponse(**cluster).toDict()) - manager_clusters = sorted([device.clusterData.toDict() for device in self.manager._remote_clusters.values()], - key=lambda cluster: cluster['cluster_id'], reverse=True) - self.assertEqual(response_clusters, manager_clusters) - - ## Runs the initial request to retrieve the clusters. - def _loadData(self): - self.manager.start() - self.network.flushReplies() - - def test_device_is_created(self): - # just create the cluster, it is checked at tearDown - self._loadData() - - def test_device_is_updated(self): - self._loadData() - - # update the cluster from member variable, which is checked at tearDown - self.clusters_response["data"][0]["host_name"] = "New host name" - self.network.prepareReply("GET", self.URL, 200, self.clusters_response) - - self.manager._update_timer.timeout.emit() - - def test_device_is_removed(self): - self._loadData() - - # delete the cluster from member variable, which is checked at tearDown - del self.clusters_response["data"][1] - self.network.prepareReply("GET", self.URL, 200, self.clusters_response) - - self.manager._update_timer.timeout.emit() - - def test_device_connects_by_cluster_id(self): - active_machine_mock = self.app.getGlobalContainerStack.return_value - cluster1, cluster2 = self.clusters_response["data"] - cluster_id = cluster1["cluster_id"] - active_machine_mock.getMetaDataEntry.side_effect = {"um_cloud_cluster_id": cluster_id}.get - - self._loadData() - - self.assertTrue(self.device_manager.getOutputDevice(cluster1["cluster_id"]).isConnected()) - self.assertIsNone(self.device_manager.getOutputDevice(cluster2["cluster_id"])) - self.assertEqual([], active_machine_mock.setMetaDataEntry.mock_calls) - - def test_device_connects_by_network_key(self): - active_machine_mock = self.app.getGlobalContainerStack.return_value - - cluster1, cluster2 = self.clusters_response["data"] - network_key = cluster2["host_name"] + ".ultimaker.local" - active_machine_mock.getMetaDataEntry.side_effect = {"um_network_key": network_key}.get - - self._loadData() - - self.assertIsNone(self.device_manager.getOutputDevice(cluster1["cluster_id"])) - self.assertTrue(self.device_manager.getOutputDevice(cluster2["cluster_id"]).isConnected()) - - active_machine_mock.setMetaDataEntry.assert_called_with("um_cloud_cluster_id", cluster2["cluster_id"]) - - @patch.object(CloudOutputDeviceManager, "Message") - def test_api_error(self, message_mock): - self.clusters_response = { - "errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}] - } - self.network.prepareReply("GET", self.URL, 200, self.clusters_response) - self._loadData() - message_mock.return_value.show.assert_called_once_with() diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/__init__.py b/plugins/UM3NetworkPrinting/tests/Cloud/__init__.py deleted file mode 100644 index f3f6970c54..0000000000 --- a/plugins/UM3NetworkPrinting/tests/Cloud/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. diff --git a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py index 2cab110861..75be120ac5 100644 --- a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py @@ -1,5 +1,5 @@ -# Copyright (c) 2018 Ultimaker B.V. -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import io import json diff --git a/plugins/UM3NetworkPrinting/tests/__init__.py b/plugins/UM3NetworkPrinting/tests/__init__.py index f3f6970c54..d5641e902f 100644 --- a/plugins/UM3NetworkPrinting/tests/__init__.py +++ b/plugins/UM3NetworkPrinting/tests/__init__.py @@ -1,2 +1,2 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 6ce042f32d..e32e4c8745 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -6,6 +6,7 @@ import os from UM.i18n import i18nCatalog from UM.Logger import Logger from UM.Mesh.MeshWriter import MeshWriter #To get the g-code output. +from UM.Message import Message #Show an error when already printing. from UM.PluginRegistry import PluginRegistry #To get the g-code output. from UM.Qt.Duration import DurationFormat @@ -23,11 +24,15 @@ from queue import Queue from serial import Serial, SerialException, SerialTimeoutException from threading import Thread, Event from time import time -from typing import Union, Optional, List, cast +from typing import Union, Optional, List, cast, TYPE_CHECKING import re import functools # Used for reduce +if TYPE_CHECKING: + from UM.FileHandler.FileHandler import FileHandler + from UM.Scene.SceneNode import SceneNode + catalog = i18nCatalog("cura") @@ -112,16 +117,20 @@ class USBPrinterOutputDevice(PrinterOutputDevice): ## Request the current scene to be sent to a USB-connected printer. # # \param nodes A collection of scene nodes to send. This is ignored. - # \param file_name \type{string} A suggestion for a file name to write. + # \param file_name A suggestion for a file name to write. # \param filter_by_machine Whether to filter MIME types by machine. This # is ignored. # \param kwargs Keyword arguments. - def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None, **kwargs): + def requestWrite(self, nodes: List["SceneNode"], file_name: Optional[str] = None, limit_mimetypes: bool = False, + file_handler: Optional["FileHandler"] = None, filter_by_machine: bool = False, **kwargs) -> None: if self._is_printing: + message = Message(text = catalog.i18nc("@message", "A print is still in progress. Cura cannot start another print via USB until the previous print has completed."), title = catalog.i18nc("@message", "Print in Progress")) + message.show() return # Already printing self.writeStarted.emit(self) # cancel any ongoing preheat timer before starting a print - self._printers[0].getController().stopPreheatTimers() + controller = cast(GenericOutputController, self._printers[0].getController()) + controller.stopPreheatTimers() CuraApplication.getInstance().getController().setActiveStage("MonitorStage") @@ -181,7 +190,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): try: self._serial = Serial(str(self._serial_port), self._baud_rate, timeout=self._timeout, writeTimeout=self._timeout) except SerialException: - Logger.log("w", "An exception occured while trying to create serial connection") + Logger.log("w", "An exception occurred while trying to create serial connection") return CuraApplication.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged) self._onGlobalContainerStackChanged() diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py index 0b0f9b7aa3..a5d7436fde 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py @@ -3,15 +3,215 @@ import configparser import io +import os.path # To get the file ID. from typing import Dict, List, Tuple from UM.VersionUpgrade import VersionUpgrade _renamed_settings = { "support_minimal_diameter": "support_tower_maximum_supported_diameter" -} #type: Dict[str, str] -_removed_settings = ["prime_tower_circular"] # type: List[str] +} # type: Dict[str, str] +_removed_settings = ["prime_tower_circular", "max_feedrate_z_override"] # type: List[str] +_renamed_profiles = { + # Include CreawsomeMod profiles here as well for the people who installed that. + # Definitions. + "creawsome_base": "creality_base", + "creawsome_cr10": "creality_cr10", + "creawsome_cr10mini": "creality_cr10mini", + "creawsome_cr10s": "creality_cr10s", + "creawsome_cr10s4": "creality_cr10s4", + "creawsome_cr10s5": "creality_cr10s5", + "creawsome_cr10spro": "creality_cr10spro", + "creawsome_cr20": "creality_cr20", + "creawsome_cr20pro": "creality_cr20pro", + "creawsome_ender2": "creality_ender2", + "creawsome_ender3": "creality_ender3", + "creawsome_ender4": "creality_ender4", + "creawsome_ender5": "creality_ender5", + # Extruder definitions. + "creawsome_base_extruder_0": "creality_base_extruder_0", + + # Variants. + "creawsome_base_0.2": "creality_base_0.2", + "creawsome_base_0.3": "creality_base_0.3", + "creawsome_base_0.4": "creality_base_0.4", + "creawsome_base_0.5": "creality_base_0.5", + "creawsome_base_0.6": "creality_base_0.6", + "creawsome_base_0.8": "creality_base_0.8", + "creawsome_base_1.0": "creality_base_1.0", + "creawsome_cr10_0.2": "creality_cr10_0.2", + "creawsome_cr10_0.3": "creality_cr10_0.3", + "creawsome_cr10_0.4": "creality_cr10_0.4", + "creawsome_cr10_0.5": "creality_cr10_0.5", + "creawsome_cr10_0.6": "creality_cr10_0.6", + "creawsome_cr10_0.8": "creality_cr10_0.8", + "creawsome_cr10_1.0": "creality_cr10_1.0", + "creawsome_cr10mini_0.2": "creality_cr10mini_0.2", + "creawsome_cr10mini_0.3": "creality_cr10mini_0.3", + "creawsome_cr10mini_0.4": "creality_cr10mini_0.4", + "creawsome_cr10mini_0.5": "creality_cr10mini_0.5", + "creawsome_cr10mini_0.6": "creality_cr10mini_0.6", + "creawsome_cr10mini_0.8": "creality_cr10mini_0.8", + "creawsome_cr10mini_1.0": "creality_cr10mini_1.0", + "creawsome_cr10s4_0.2": "creality_cr10s4_0.2", + "creawsome_cr10s4_0.3": "creality_cr10s4_0.3", + "creawsome_cr10s4_0.4": "creality_cr10s4_0.4", + "creawsome_cr10s4_0.5": "creality_cr10s4_0.5", + "creawsome_cr10s4_0.6": "creality_cr10s4_0.6", + "creawsome_cr10s4_0.8": "creality_cr10s4_0.8", + "creawsome_cr10s4_1.0": "creality_cr10s4_1.0", + "creawsome_cr10s5_0.2": "creality_cr10s5_0.2", + "creawsome_cr10s5_0.3": "creality_cr10s5_0.3", + "creawsome_cr10s5_0.4": "creality_cr10s5_0.4", + "creawsome_cr10s5_0.5": "creality_cr10s5_0.5", + "creawsome_cr10s5_0.6": "creality_cr10s5_0.6", + "creawsome_cr10s5_0.8": "creality_cr10s5_0.8", + "creawsome_cr10s5_1.0": "creality_cr10s5_1.0", + "creawsome_cr10s_0.2": "creality_cr10s_0.2", + "creawsome_cr10s_0.3": "creality_cr10s_0.3", + "creawsome_cr10s_0.4": "creality_cr10s_0.4", + "creawsome_cr10s_0.5": "creality_cr10s_0.5", + "creawsome_cr10s_0.6": "creality_cr10s_0.6", + "creawsome_cr10s_0.8": "creality_cr10s_0.8", + "creawsome_cr10s_1.0": "creality_cr10s_1.0", + "creawsome_cr10spro_0.2": "creality_cr10spro_0.2", + "creawsome_cr10spro_0.3": "creality_cr10spro_0.3", + "creawsome_cr10spro_0.4": "creality_cr10spro_0.4", + "creawsome_cr10spro_0.5": "creality_cr10spro_0.5", + "creawsome_cr10spro_0.6": "creality_cr10spro_0.6", + "creawsome_cr10spro_0.8": "creality_cr10spro_0.8", + "creawsome_cr10spro_1.0": "creality_cr10spro_1.0", + "creawsome_cr20_0.2": "creality_cr20_0.2", + "creawsome_cr20_0.3": "creality_cr20_0.3", + "creawsome_cr20_0.4": "creality_cr20_0.4", + "creawsome_cr20_0.5": "creality_cr20_0.5", + "creawsome_cr20_0.6": "creality_cr20_0.6", + "creawsome_cr20_0.8": "creality_cr20_0.8", + "creawsome_cr20_1.0": "creality_cr20_1.0", + "creawsome_cr20pro_0.2": "creality_cr20pro_0.2", + "creawsome_cr20pro_0.3": "creality_cr20pro_0.3", + "creawsome_cr20pro_0.4": "creality_cr20pro_0.4", + "creawsome_cr20pro_0.5": "creality_cr20pro_0.5", + "creawsome_cr20pro_0.6": "creality_cr20pro_0.6", + "creawsome_cr20pro_0.8": "creality_cr20pro_0.8", + "creawsome_cr20pro_1.0": "creality_cr20pro_1.0", + "creawsome_ender2_0.2": "creality_ender2_0.2", + "creawsome_ender2_0.3": "creality_ender2_0.3", + "creawsome_ender2_0.4": "creality_ender2_0.4", + "creawsome_ender2_0.5": "creality_ender2_0.5", + "creawsome_ender2_0.6": "creality_ender2_0.6", + "creawsome_ender2_0.8": "creality_ender2_0.8", + "creawsome_ender2_1.0": "creality_ender2_1.0", + "creawsome_ender3_0.2": "creality_ender3_0.2", + "creawsome_ender3_0.3": "creality_ender3_0.3", + "creawsome_ender3_0.4": "creality_ender3_0.4", + "creawsome_ender3_0.5": "creality_ender3_0.5", + "creawsome_ender3_0.6": "creality_ender3_0.6", + "creawsome_ender3_0.8": "creality_ender3_0.8", + "creawsome_ender3_1.0": "creality_ender3_1.0", + "creawsome_ender4_0.2": "creality_ender4_0.2", + "creawsome_ender4_0.3": "creality_ender4_0.3", + "creawsome_ender4_0.4": "creality_ender4_0.4", + "creawsome_ender4_0.5": "creality_ender4_0.5", + "creawsome_ender4_0.6": "creality_ender4_0.6", + "creawsome_ender4_0.8": "creality_ender4_0.8", + "creawsome_ender4_1.0": "creality_ender4_1.0", + "creawsome_ender5_0.2": "creality_ender5_0.2", + "creawsome_ender5_0.3": "creality_ender5_0.3", + "creawsome_ender5_0.4": "creality_ender5_0.4", + "creawsome_ender5_0.5": "creality_ender5_0.5", + "creawsome_ender5_0.6": "creality_ender5_0.6", + "creawsome_ender5_0.8": "creality_ender5_0.8", + "creawsome_ender5_1.0": "creality_ender5_1.0", + + # Upgrade for people who had the original Creality profiles from 4.1 and earlier. + "creality_cr10_extruder_0": "creality_base_extruder_0", + "creality_cr10s4_extruder_0": "creality_base_extruder_0", + "creality_cr10s5_extruder_0": "creality_base_extruder_0", + "creality_ender3_extruder_0": "creality_base_extruder_0" +} + +# For legacy Creality printers, select the correct quality profile depending on the material. +_creality_quality_per_material = { + # Since legacy Creality printers didn't have different variants, we always pick the 0.4mm variant. + "generic_abs_175": { + "high": "base_0.4_ABS_super", + "normal": "base_0.4_ABS_super", + "fast": "base_0.4_ABS_super", + "draft": "base_0.4_ABS_standard", + "extra_fast": "base_0.4_ABS_low", + "coarse": "base_0.4_ABS_low", + "extra_coarse": "base_0.4_ABS_low" + }, + "generic_petg_175": { + "high": "base_0.4_PETG_super", + "normal": "base_0.4_PETG_super", + "fast": "base_0.4_PETG_super", + "draft": "base_0.4_PETG_standard", + "extra_fast": "base_0.4_PETG_low", + "coarse": "base_0.4_PETG_low", + "extra_coarse": "base_0.4_PETG_low" + }, + "generic_pla_175": { + "high": "base_0.4_PLA_super", + "normal": "base_0.4_PLA_super", + "fast": "base_0.4_PLA_super", + "draft": "base_0.4_PLA_standard", + "extra_fast": "base_0.4_PLA_low", + "coarse": "base_0.4_PLA_low", + "extra_coarse": "base_0.4_PLA_low" + }, + "generic_tpu_175": { + "high": "base_0.4_TPU_super", + "normal": "base_0.4_TPU_super", + "fast": "base_0.4_TPU_super", + "draft": "base_0.4_TPU_standard", + "extra_fast": "base_0.4_TPU_standard", + "coarse": "base_0.4_TPU_standard", + "extra_coarse": "base_0.4_TPU_standard" + }, + "empty_material": { # For the global stack. + "high": "base_global_super", + "normal": "base_global_super", + "fast": "base_global_super", + "draft": "base_global_standard", + "extra_fast": "base_global_low", + "coarse": "base_global_low", + "extra_coarse": "base_global_low" + } +} + +# Default variant to select for legacy Creality printers, now that we have variants. +_default_variants = { + "creality_cr10_extruder_0": "creality_cr10_0.4", + "creality_cr10s4_extruder_0": "creality_cr10s4_0.4", + "creality_cr10s5_extruder_0": "creality_cr10s5_0.4", + "creality_ender3_extruder_0": "creality_ender3_0.4" +} + +# Whether the quality changes profile belongs to one of the upgraded printers can only be recognised by how they start. +# If they are, they must use the creality base definition so that they still belong to those printers. +_quality_changes_to_creality_base = { + "creality_cr10_extruder_0", + "creality_cr10s4_extruder_0", + "creality_cr10s5_extruder_0", + "creality_ender3_extruder_0", + "creality_cr10", + "creality_cr10s", + "creality_cr10s4", + "creality_cr10s5", + "creality_ender3", +} +_creality_limited_quality_type = { + "high": "super", + "normal": "super", + "fast": "super", + "draft": "draft", + "extra_fast": "draft", + "coarse": "draft", + "extra_coarse": "draft" +} ## Upgrades configurations from the state they were in at version 4.1 to the # state they should be in at version 4.2. @@ -30,7 +230,7 @@ class VersionUpgrade41to42(VersionUpgrade): def getCfgVersion(self, serialised: str) -> int: parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) - format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised. + format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) return format_version * 1000000 + setting_version @@ -42,20 +242,34 @@ class VersionUpgrade41to42(VersionUpgrade): parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialized) - #Update version number. + # Update version number. parser["metadata"]["setting_version"] = "8" - #Rename settings. + # Certain instance containers (such as definition changes) reference to a certain definition container + # Since a number of those changed name, we also need to update those. + old_definition = parser["general"]["definition"] + if old_definition in _renamed_profiles: + parser["general"]["definition"] = _renamed_profiles[old_definition] + + # Rename settings. if "values" in parser: for old_name, new_name in _renamed_settings.items(): if old_name in parser["values"]: parser["values"][new_name] = parser["values"][old_name] del parser["values"][old_name] - #Remove settings. + # Remove settings. for key in _removed_settings: if key in parser["values"]: del parser["values"][key] + # For quality-changes profiles made for Creality printers, change the definition to the creality_base and make sure that the quality is something we have a profile for. + if parser["metadata"].get("type", "") == "quality_changes": + for possible_printer in _quality_changes_to_creality_base: + if os.path.basename(filename).startswith(possible_printer + "_"): + parser["general"]["definition"] = "creality_base" + parser["metadata"]["quality_type"] = _creality_limited_quality_type.get(parser["metadata"]["quality_type"], "draft") + break + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] @@ -67,10 +281,10 @@ class VersionUpgrade41to42(VersionUpgrade): parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialized) - #Update version number. + # Update version number. parser["metadata"]["setting_version"] = "8" - #Renamed settings. + # Renamed settings. if "visible_settings" in parser["general"]: visible_settings = parser["general"]["visible_settings"] visible_setting_set = set(visible_settings.split(";")) @@ -92,7 +306,7 @@ class VersionUpgrade41to42(VersionUpgrade): parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialized) - #Update version number. + # Update version number. parser["metadata"]["setting_version"] = "8" parser["general"]["version"] = "5" @@ -107,6 +321,30 @@ class VersionUpgrade41to42(VersionUpgrade): parser["containers"]["3"] = parser["containers"]["2"] parser["containers"]["2"] = "empty_intent" + # Change renamed profiles. + if "containers" in parser: + # For legacy Creality printers, change the variant to 0.4. + definition_id = parser["containers"]["6"] + if parser["metadata"].get("type", "machine") == "extruder_train": + if parser["containers"]["4"] == "empty_variant": # Necessary for people entering from CreawsomeMod who already had a variant. + if definition_id in _default_variants: + parser["containers"]["4"] = _default_variants[definition_id] + if definition_id == "creality_cr10_extruder_0": # We can't disambiguate between Creality CR-10 and Creality-CR10S since they share the same extruder definition. Have to go by the name. + if "cr-10s" in parser["metadata"].get("machine", "Creality CR-10").lower(): # Not perfect, since the user can change this name :( + parser["containers"]["4"] = "creality_cr10s_0.4" + + # Also change the quality to go along with it. + material_id = parser["containers"]["3"] + old_quality_id = parser["containers"]["2"] + if material_id in _creality_quality_per_material and old_quality_id in _creality_quality_per_material[material_id]: + parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id] + + stack_copy = {} # type: Dict[str, str] # Make a copy so that we don't modify the dict we're iterating over. + stack_copy.update(parser["containers"]) + for position, profile_id in stack_copy.items(): + if profile_id in _renamed_profiles: + parser["containers"][position] = _renamed_profiles[profile_id] + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] \ No newline at end of file diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py new file mode 100644 index 0000000000..71b665ad7c --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py @@ -0,0 +1,126 @@ +import configparser +import io +from typing import Dict, Tuple, List + +from UM.VersionUpgrade import VersionUpgrade + +_renamed_profiles = {"generic_pla_0.4_coarse": "jbo_generic_pla_0.4_coarse", + "generic_pla_0.4_fine": "jbo_generic_pla_fine", + "generic_pla_0.4_medium": "jbo_generic_pla_medium", + "generic_pla_0.4_ultrafine": "jbo_generic_pla_ultrafine", + + "generic_petg_0.4_coarse": "jbo_generic_petg_0.4_coarse", + "generic_petg_0.4_fine": "jbo_generic_petg_fine", + "generic_petg_0.4_medium": "jbo_generic_petg_medium", + } + +_removed_settings = { + "start_layers_at_same_position" +} + +_renamed_settings = { + "support_infill_angle": "support_infill_angles" +} # type: Dict[str, str] + +## Upgrades configurations from the state they were in at version 4.2 to the +# state they should be in at version 4.3. +class VersionUpgrade42to43(VersionUpgrade): + ## Gets the version number from a CFG file in Uranium's 4.2 format. + # + # Since the format may change, this is implemented for the 4.2 format only + # and needs to be included in the version upgrade system rather than + # globally in Uranium. + # + # \param serialised The serialised form of a CFG file. + # \return The version number stored in the CFG file. + # \raises ValueError The format of the version number in the file is + # incorrect. + # \raises KeyError The format of the file is incorrect. + def getCfgVersion(self, serialised: str) -> int: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialised) + format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. + setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) + return format_version * 1000000 + setting_version + + def upgradePreferences(self, serialized: str, filename: str): + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + if "camera_perspective_mode" in parser["general"] and parser["general"]["camera_perspective_mode"] == "orthogonal": + parser["general"]["camera_perspective_mode"] = "orthographic" + + # Fix renamed settings for visibility + if "visible_settings" in parser["general"]: + all_setting_keys = parser["general"]["visible_settings"].strip().split(";") + if all_setting_keys: + for idx, key in enumerate(all_setting_keys): + if key in _renamed_settings: + all_setting_keys[idx] = _renamed_settings[key] + parser["general"]["visible_settings"] = ";".join(all_setting_keys) + + parser["metadata"]["setting_version"] = "9" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades instance containers to have the new version + # number. + # + # This renames the renamed settings in the containers. + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "9" + + if "values" in parser: + for old_name, new_name in _renamed_settings.items(): + if old_name in parser["values"]: + parser["values"][new_name] = parser["values"][old_name] + del parser["values"][old_name] + for key in _removed_settings: + if key in parser["values"]: + del parser["values"][key] + + if "support_infill_angles" in parser["values"]: + old_value = float(parser["values"]["support_infill_angles"]) + new_value = [int(round(old_value))] + parser["values"]["support_infill_angles"] = str(new_value) + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades stacks to have the new version number. + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "9" + # Handle changes for the imade3d jellybox. The machine was split up into parts (eg; a 2 fan version and a single + # fan version. Perviously it used variants for this. The only upgrade we can do here is strip that variant. + # This is because we only upgrade per stack (and to fully do these changes, we'd need to switch out something + # in the global container based on changes made to the extruder stack) + if parser["containers"]["6"] == "imade3d_jellybox_extruder_0": + quality_id = parser["containers"]["2"] + if quality_id.endswith("_2-fans"): + parser["containers"]["2"] = quality_id.replace("_2-fans", "") + + if parser["containers"]["2"] in _renamed_profiles: + parser["containers"]["2"] = _renamed_profiles[parser["containers"]["2"]] + + material_id = parser["containers"]["3"] + if material_id.endswith("_2-fans"): + parser["containers"]["3"] = material_id.replace("_2-fans", "") + variant_id = parser["containers"]["4"] + + if variant_id.endswith("_2-fans"): + parser["containers"]["4"] = variant_id.replace("_2-fans", "") + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py b/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py new file mode 100644 index 0000000000..7400bbb989 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/__init__.py @@ -0,0 +1,59 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade42to43 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade42to43.VersionUpgrade42to43() + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("preferences", 6000008): ("preferences", 6000009, upgrade.upgradePreferences), + ("machine_stack", 4000008): ("machine_stack", 4000009, upgrade.upgradeStack), + ("extruder_train", 4000008): ("extruder_train", 4000009, upgrade.upgradeStack), + ("definition_changes", 4000008): ("definition_changes", 4000009, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000008): ("quality_changes", 4000009, upgrade.upgradeInstanceContainer), + ("quality", 4000008): ("quality", 4000009, upgrade.upgradeInstanceContainer), + ("user", 4000008): ("user", 4000009, upgrade.upgradeInstanceContainer), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return { "version_upgrade": upgrade } \ No newline at end of file diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json new file mode 100644 index 0000000000..339ec67ee7 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.2 to 4.3", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", + "api": "6.0", + "i18n-catalog": "cura" +} diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index ae59ec181a..a26fc2eeaa 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -191,13 +191,16 @@ class XmlMaterialProfile(InstanceContainer): ## End Name Block for key, value in metadata.items(): - builder.start(key) # type: ignore + key_to_use = key + if key in self._metadata_tags_that_have_cura_namespace: + key_to_use = "cura:" + key_to_use + builder.start(key_to_use) # type: ignore if value is not None: #Nones get handled well by the builder. #Otherwise the builder always expects a string. #Deserialize expects the stringified version. value = str(value) builder.data(value) - builder.end(key) + builder.end(key_to_use) builder.end("metadata") ## End Metadata Block @@ -878,7 +881,7 @@ class XmlMaterialProfile(InstanceContainer): machine_compatibility = cls._parseCompatibleValue(entry.text) for identifier in machine.iterfind("./um:machine_identifier", cls.__namespaces): - machine_id_list = product_id_map.get(identifier.get("product"), []) + machine_id_list = product_id_map.get(identifier.get("product", ""), []) if not machine_id_list: machine_id_list = cls.getPossibleDefinitionIDsFromName(identifier.get("product")) @@ -910,7 +913,7 @@ class XmlMaterialProfile(InstanceContainer): result_metadata.append(new_material_metadata) buildplates = machine.iterfind("./um:buildplate", cls.__namespaces) - buildplate_map = {} # type: Dict[str, Dict[str, bool]] + buildplate_map = {} # type: Dict[str, Dict[str, bool]] buildplate_map["buildplate_compatible"] = {} buildplate_map["buildplate_recommended"] = {} for buildplate in buildplates: @@ -1095,6 +1098,8 @@ class XmlMaterialProfile(InstanceContainer): def __str__(self): return "".format(my_id = self.getId(), name = self.getName(), base_file = self.getMetaDataEntry("base_file")) + _metadata_tags_that_have_cura_namespace = {"pva_compatible", "breakaway_compatible"} + # Map XML file setting names to internal names __material_settings_setting_map = { "print temperature": "default_material_print_temperature", @@ -1108,11 +1113,11 @@ class XmlMaterialProfile(InstanceContainer): "surface energy": "material_surface_energy", "shrinkage percentage": "material_shrinkage_percentage", "build volume temperature": "build_volume_temperature", - "anti ooze retracted position": "material_anti_ooze_retracted_position", + "anti ooze retract position": "material_anti_ooze_retracted_position", "anti ooze retract speed": "material_anti_ooze_retraction_speed", - "break preparation retracted position": "material_break_preparation_retracted_position", + "break preparation position": "material_break_preparation_retracted_position", "break preparation speed": "material_break_preparation_speed", - "break retracted position": "material_break_retracted_position", + "break position": "material_break_retracted_position", "break speed": "material_break_speed", "break temperature": "material_break_temperature" } diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index c45894e537..4d23d56e5c 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -781,6 +781,23 @@ } } }, + "VersionUpgrade42to43": { + "package_info": { + "package_id": "VersionUpgrade42to43", + "package_type": "plugin", + "display_name": "Version Upgrade 4.2 to 4.3", + "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", + "package_version": "1.0.0", + "sdk_version": "6.0.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, "X3DReader": { "package_info": { "package_id": "X3DReader", diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index effca0926e..6a385c4b8b 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -11,9 +11,7 @@ "weight": 0, "has_variants": true, "has_materials": true, - "has_machine_materials": false, "has_machine_quality": false, - "has_variant_materials": false, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", @@ -201,12 +199,6 @@ "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false }, "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false }, "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false }, - "start_layers_at_same_position": - { - "default_value": false, - "enabled": false, - "value": false - }, "layer_start_x": { "default_value": 105.0, diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index d897a76133..e86c979260 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -5,7 +5,7 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "na", + "author": "unknown", "manufacturer": "BIBO", "category": "Other", "file_formats": "text/x-gcode", diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 1d83363684..4ed1a9f2d9 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -10,7 +10,6 @@ "has_machine_quality": true, "has_materials": true, - "has_machine_materials": true, "has_variants": true, "variants_name": "Tool", diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json new file mode 100644 index 0000000000..440e93a948 --- /dev/null +++ b/resources/definitions/creality_base.def.json @@ -0,0 +1,265 @@ +{ + "name": "Creawsome Base Printer", + "version": 2, + "inherits": "fdmprinter", + "overrides": { + "machine_name": { "default_value": "Creawsome Base Printer" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": {"value": 5}, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size * 1.1"}, + + "material_initial_print_temperature": { "value": "material_print_temperature"}, + "material_final_print_temperature": { "value": "material_print_temperature"}, + "material_flow": { "value": 100}, + + "z_seam_type": { "value": "'back'"}, + "z_seam_corner": { "value": "'z_seam_corner_none'"}, + + "infill_sparse_density": { "value": "20"}, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'"}, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'"}, + "retraction_combing_max_distance": { "value": 30}, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false}, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 4 }, + + "adaptive_layer_height_variation": { "value": 0.04}, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_type": { "value": "'buildplate'"}, + "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_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1}, + "support_brim_enable": { "value": true}, + "support_brim_width": { "value": 4}, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2}, + "minimum_support_area": { "value": 10}, + "minimum_interface_area": { "value": 10}, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3"}, + "wall_thickness": {"value": "line_width * 2"} + + }, + "metadata": { + "visible": false, + "author": "trouch.com", + "manufacturer": "Creality3D", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "creality_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "exclude_materials": [ + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + } +} \ No newline at end of file diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index cc0410fe22..0a08c56cc6 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -1,95 +1,32 @@ { "name": "Creality CR-10", "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Michael Wildermuth", - "manufacturer": "Creality3D", - "file_formats": "text/x-gcode", - "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "creality_cr10_extruder_0" - } - }, + "inherits": "creality_base", "overrides": { - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_head_polygon": { - "default_value": [ - [-30, 34], - [-30, -32], - [30, -32], - [30, 34] + "machine_name": { "default_value": "Creality CR-10" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] ] }, - "layer_height_0": { - "default_value": 0.2 + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] }, - "top_bottom_thickness": { - "default_value": 0.6 - }, - "top_bottom_pattern_0": { - "default_value": "concentric" - }, - "infill_pattern": { - "value": "'triangles'" - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_speed": { - "default_value": 40 - }, - "cool_min_layer_time": { - "default_value": 10 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 4 - }, - "skirt_gap": { - "default_value": 5 - }, - "machine_end_gcode": { - "default_value": "G91\nG1 F1800 E-3\nG1 F3000 Z10\nG90\nG28 X0 Y0 ; home x and y axis\nM106 S0 ; turn off cooling fan\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors" - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "30" - }, - "acceleration_enabled": { - "default_value": true - }, - "acceleration_print": { - "default_value": 500 - }, - "acceleration_travel": { - "default_value": 500 - }, - "jerk_enabled": { - "default_value": true - }, - "jerk_print": { - "default_value": 8 - }, - "jerk_travel": { - "default_value": 8 - } + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10mini.def.json b/resources/definitions/creality_cr10mini.def.json new file mode 100644 index 0000000000..bdc0d4406e --- /dev/null +++ b/resources/definitions/creality_cr10mini.def.json @@ -0,0 +1,32 @@ +{ + "name": "Creality CR-10 Mini", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality CR-10 Mini" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 300 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/creality_cr10s.def.json b/resources/definitions/creality_cr10s.def.json index c368269a46..9884b95cb4 100644 --- a/resources/definitions/creality_cr10s.def.json +++ b/resources/definitions/creality_cr10s.def.json @@ -1,5 +1,11 @@ { "name": "Creality CR-10S", "version": 2, - "inherits": "creality_cr10" + "inherits": "creality_cr10", + "overrides": { + "machine_name": { "default_value": "Creality CR-10S" } + }, + "metadata": { + "quality_definition": "creality_base" + } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10s4.def.json b/resources/definitions/creality_cr10s4.def.json index 7145083674..593a526fc3 100644 --- a/resources/definitions/creality_cr10s4.def.json +++ b/resources/definitions/creality_cr10s4.def.json @@ -1,26 +1,32 @@ { - "name": "Creality CR-10 S4", + "name": "Creality CR-10S4", "version": 2, - "inherits": "creality_cr10", - "metadata": { - "visible": true, - "author": "Michael Wildermuth", - "manufacturer": "Creality3D", - "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "creality_cr10s4_extruder_0" - } - }, + "inherits": "creality_base", "overrides": { - "machine_width": { - "default_value": 400 + "machine_name": { "default_value": "Creality CR-10S4" }, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 400 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] }, - "machine_height": { - "default_value": 400 + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] }, - "machine_depth": { - "default_value": 400 - } + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10s5.def.json b/resources/definitions/creality_cr10s5.def.json index b082894a16..91469deb7f 100644 --- a/resources/definitions/creality_cr10s5.def.json +++ b/resources/definitions/creality_cr10s5.def.json @@ -1,26 +1,32 @@ { - "name": "Creality CR-10 S5", + "name": "Creality CR-10S5", "version": 2, - "inherits": "creality_cr10", - "metadata": { - "visible": true, - "author": "Michael Wildermuth", - "manufacturer": "Creality3D", - "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "creality_cr10s5_extruder_0" - } - }, + "inherits": "creality_base", "overrides": { - "machine_width": { - "default_value": 500 + "machine_name": { "default_value": "Creality CR-10S5" }, + "machine_width": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 500 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] }, - "machine_height": { - "default_value": 500 + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] }, - "machine_depth": { - "default_value": 500 - } + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10spro.def.json b/resources/definitions/creality_cr10spro.def.json new file mode 100644 index 0000000000..86897e711a --- /dev/null +++ b/resources/definitions/creality_cr10spro.def.json @@ -0,0 +1,31 @@ +{ + "name": "Creality CR-10S Pro", + "version": 2, + "inherits": "creality_cr10", + "overrides": { + "machine_name": { "default_value": "Creality CR-10S Pro" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, + "machine_head_polygon": { "default_value": [ + [-44, 34], + [-44, -34], + [18, -34], + [18, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-44, 34], + [-44, -34], + [38, -34], + [38, 34] + ] + }, + + "gantry_height": { "value": 30 } + + }, + "metadata": { + "quality_definition": "creality_base", + "platform": "creality_cr10spro.stl", + "platform_offset": [ -150, 0, 150] + } +} \ No newline at end of file diff --git a/resources/definitions/creality_cr20.def.json b/resources/definitions/creality_cr20.def.json new file mode 100644 index 0000000000..af027f2452 --- /dev/null +++ b/resources/definitions/creality_cr20.def.json @@ -0,0 +1,32 @@ +{ + "name": "Creality CR-20", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality CR-20" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/creality_cr20pro.def.json b/resources/definitions/creality_cr20pro.def.json new file mode 100644 index 0000000000..4e676bcb74 --- /dev/null +++ b/resources/definitions/creality_cr20pro.def.json @@ -0,0 +1,13 @@ +{ + "name": "Creality CR-20 Pro", + "version": 2, + "inherits": "creality_cr20", + "overrides": { + "machine_name": { "default_value": "Creality CR-20 Pro" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"} + + }, + "metadata": { + "quality_definition": "creality_base" + } +} \ No newline at end of file diff --git a/resources/definitions/creality_ender2.def.json b/resources/definitions/creality_ender2.def.json new file mode 100644 index 0000000000..55b2e88478 --- /dev/null +++ b/resources/definitions/creality_ender2.def.json @@ -0,0 +1,33 @@ +{ + "name": "Creality Ender-2", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-2" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y100.0 Z0.28 F1500.0 E8 ;Draw the first line\nG1 X10.4 Y100.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, + "machine_width": { "default_value": 150 }, + "machine_depth": { "default_value": 150 }, + "machine_height": { "default_value": 200 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json old mode 100755 new mode 100644 index 689628d037..e00e6eab63 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -1,99 +1,32 @@ { "name": "Creality Ender-3", "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Sacha Telgenhof", - "manufacturer": "Creality3D", - "file_formats": "text/x-gcode", - "platform": "creality_ender3_platform.stl", - "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "creality_ender3_extruder_0" - } - }, + "inherits": "creality_base", "overrides": { - "machine_name": { - "default_value": "Creality Ender-3" - }, - "machine_width": { - "default_value": 235 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 235 - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "30" - }, - "machine_head_polygon": { - "default_value": [ - [-30, 34], - [-30, -32], - [30, -32], - [30, 34] + "machine_name": { "default_value": "Creality Ender-3" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] ] }, - "material_diameter": { - "default_value": 1.75 + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] }, - "acceleration_enabled": { - "default_value": true - }, - "acceleration_print": { - "default_value": 500 - }, - "acceleration_travel": { - "value": "acceleration_print" - }, - "jerk_enabled": { - "default_value": true - }, - "jerk_print": { - "value": "10" - }, - "jerk_travel": { - "value": "jerk_print" - }, - "machine_max_jerk_z": { - "default_value": 0.3 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "top_bottom_thickness": { - "default_value": 0.6 - }, - "retraction_amount": { - "default_value": 6 - }, - "retraction_speed": { - "default_value": 25 - }, - "cool_min_layer_time": { - "default_value": 10 - }, - "skirt_line_count": { - "default_value": 4 - }, - "skirt_gap": { - "default_value": 5 - }, - "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End of custom start GCode" - }, - "machine_end_gcode": { - "default_value": "; Ender 3 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" - } + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender4.def.json b/resources/definitions/creality_ender4.def.json new file mode 100644 index 0000000000..6962be558e --- /dev/null +++ b/resources/definitions/creality_ender4.def.json @@ -0,0 +1,34 @@ +{ + "name": "Creality Ender-4", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-4" }, + "machine_width": { "default_value": 452 }, + "machine_depth": { "default_value": 468 }, + "machine_height": { "default_value": 482 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + + "speed_print": { "value": 80.0 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json new file mode 100644 index 0000000000..d95f4a1467 --- /dev/null +++ b/resources/definitions/creality_ender5.def.json @@ -0,0 +1,35 @@ +{ + "name": "Creality Ender-5", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-5" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 300 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + + "speed_print": { "value": 80.0 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 95435f659d..613b61d32c 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Danny Lu", + "manufacturer": "Custom", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], "machine_extruder_trains": diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index 026dfca9ed..c46beeec2d 100755 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -13,7 +13,6 @@ "platform": "deltacomb.stl", "has_machine_quality": true, "has_materials": true, - "has_machine_materials": false, "has_variants": true, "variants_name": "Head", "preferred_variant_name": "E3D 0.40mm", diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 5655d0a795..0e2742f484 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "nliaudat", - "manufacturer": "EasyArts (discontinued)", + "manufacturer": "EasyArts", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index b053e1f4ad..6554b2aa0f 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -6,7 +6,7 @@ "type": "extruder", "author": "Ultimaker", "manufacturer": "Unknown", - "setting_version": 8, + "setting_version": 9, "visible": false, "position": "0" }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6944a09115..8327834b7a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7,7 +7,7 @@ "author": "Ultimaker", "category": "Other", "manufacturer": "Unknown", - "setting_version": 8, + "setting_version": 9, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, @@ -1399,34 +1399,58 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "z_seam_x": + "z_seam_position": { - "label": "Z Seam X", - "description": "The X coordinate of the position near where to start printing each part in a layer.", - "unit": "mm", - "type": "float", - "default_value": 100.0, - "value": "machine_width / 2", + "label": "Z Seam Position", + "description": "The position near where to start printing each part in a layer.", + "type": "enum", + "options": + { + "backleft": "Back Left", + "back": "Back", + "backright": "Back Right", + "right": "Right", + "frontright": "Front Right", + "front": "Front", + "frontleft": "Front Left", + "left": "Left" + }, "enabled": "z_seam_type == 'back'", + "default_value": "back", "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_mesh": true - }, - "z_seam_y": - { - "label": "Z Seam Y", - "description": "The Y coordinate of the position near where to start printing each part in a layer.", - "unit": "mm", - "type": "float", - "default_value": 100.0, - "value": "machine_depth * 3", - "enabled": "z_seam_type == 'back'", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": true, + "children": + { + "z_seam_x": + { + "label": "Z Seam X", + "description": "The X coordinate of the position near where to start printing each part in a layer.", + "unit": "mm", + "type": "float", + "default_value": 100.0, + "value": "0 if (z_seam_position == 'frontleft' or z_seam_position == 'left' or z_seam_position == 'backleft') else machine_width/2 if (z_seam_position == 'front' or z_seam_position == 'back') else machine_width", + "enabled": "z_seam_type == 'back'", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "z_seam_y": + { + "label": "Z Seam Y", + "description": "The Y coordinate of the position near where to start printing each part in a layer.", + "unit": "mm", + "type": "float", + "default_value": 100.0, + "value": "0 if (z_seam_position == 'frontleft' or z_seam_position == 'front' or z_seam_position == 'frontright') else machine_depth/2 if (z_seam_position == 'left' or z_seam_position == 'right') else machine_depth", + "enabled": "z_seam_type == 'back'", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + } + } }, "z_seam_corner": { "label": "Seam Corner Preference", - "description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner.", + "description": "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate.", "type": "enum", "options": { @@ -1454,8 +1478,8 @@ }, "skin_no_small_gaps_heuristic": { - "label": "Ignore Small Z Gaps", - "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.", + "label": "No Skin in Z Gaps", + "description": "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air.", "type": "bool", "default_value": false, "enabled": "top_layers > 0 or bottom_layers > 0", @@ -1477,7 +1501,7 @@ "ironing_enabled": { "label": "Enable Ironing", - "description": "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface.", + "description": "Go over the top surface one additional time, but this time extruding very little material. This is meant to melt the plastic on top further, creating a smoother surface. The pressure in the nozzle chamber is kept high so that the creases in the surface are filled with material.", "type": "bool", "default_value": false, "limit_to_extruder": "top_bottom_extruder_nr", @@ -1591,6 +1615,36 @@ "enabled": "resolveOrValue('jerk_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true + }, + "skin_overlap": + { + "label": "Skin Overlap Percentage", + "description": "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines, as a percentage of the line widths of the skin lines and the innermost wall. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any percentage over 50% may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall.", + "unit": "%", + "type": "float", + "default_value": 5, + "minimum_value_warning": "-50", + "maximum_value_warning": "100", + "value": "5 if top_bottom_pattern != 'concentric' else 0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "skin_overlap_mm": + { + "label": "Skin Overlap", + "description": "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall.", + "unit": "mm", + "type": "float", + "default_value": 0.02, + "minimum_value_warning": "-0.5 * machine_nozzle_size", + "maximum_value_warning": "machine_nozzle_size", + "value": "0.5 * (skin_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", + "settable_per_mesh": true + } + } } } }, @@ -1723,6 +1777,17 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, + "infill_randomize_start_location": + { + "label": "Randomize Infill Start", + "description": "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move.", + "type": "bool", + "default_value": false, + "warning_value": "True if infill_pattern not in ('grid', 'triangles', 'trihexagon', 'cubic', 'cubicsubdiv', 'tetrahedral', 'quarter_cubic') else None", + "enabled": "not ((infill_pattern == 'cross' and connect_infill_polygons) or infill_pattern == 'concentric')", + "limit_to_extruder": "infill_extruder_nr", + "settable_per_mesh": true + }, "infill_multiplier": { "label": "Infill Line Multiplier", @@ -1790,36 +1855,6 @@ } } }, - "skin_overlap": - { - "label": "Skin Overlap Percentage", - "description": "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines, as a percentage of the line widths of the skin lines and the innermost wall. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any percentage over 50% may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall.", - "unit": "%", - "type": "float", - "default_value": 5, - "minimum_value_warning": "-50", - "maximum_value_warning": "100", - "value": "5 if top_bottom_pattern != 'concentric' else 0", - "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "skin_overlap_mm": - { - "label": "Skin Overlap", - "description": "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall.", - "unit": "mm", - "type": "float", - "default_value": 0.02, - "minimum_value_warning": "-0.5 * machine_nozzle_size", - "maximum_value_warning": "machine_nozzle_size", - "value": "0.5 * (skin_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0", - "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", - "settable_per_mesh": true - } - } - }, "infill_wipe_dist": { "label": "Infill Wipe Distance", @@ -2063,7 +2098,7 @@ "description": "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted.", "unit": "°C", "type": "float", - "default_value": 35, + "default_value": 0, "resolve": "min(extruderValues('build_volume_temperature'))", "minimum_value": "-273.15", "minimum_value_warning": "0", @@ -2250,10 +2285,10 @@ "description": "How far the material needs to be retracted before it stops oozing.", "type": "float", "unit": "mm", - "default_value": 4, + "default_value": -4, "enabled": false, - "minimum_value_warning": "0", - "maximum_value_warning": "retraction_amount", + "minimum_value_warning": "-retraction_amount", + "maximum_value_warning": "0", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2276,10 +2311,10 @@ "description": "How far the filament can be stretched before it breaks, while heated.", "type": "float", "unit": "mm", - "default_value": 16, + "default_value": -16, "enabled": false, - "minimum_value_warning": "0", - "maximum_value_warning": "retraction_amount * 4", + "minimum_value_warning": "-retraction_amount * 4", + "maximum_value_warning": "0", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2302,10 +2337,10 @@ "description": "How far to retract the filament in order to break it cleanly.", "type": "float", "unit": "mm", - "default_value": 50, + "default_value": -50, "enabled": false, - "minimum_value_warning": "0", - "maximum_value_warning": "100", + "minimum_value_warning": "-100", + "maximum_value_warning": "0", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2686,7 +2721,7 @@ "limit_support_retractions": { "label": "Limit Support Retractions", - "description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure.", + "description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure.", "type": "bool", "default_value": true, "enabled": "retraction_enable and (support_enable or support_tree_enable)", @@ -3085,19 +3120,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "max_feedrate_z_override": - { - "label": "Maximum Z Speed", - "description": "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed.", - "unit": "mm/s", - "type": "float", - "default_value": 0, - "minimum_value": "0", - "maximum_value": "299792458000", - "maximum_value_warning": "machine_max_feedrate_z", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "speed_slowdown_layers": { "label": "Number of Slower Layers", @@ -3785,17 +3807,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "start_layers_at_same_position": - { - "label": "Start Layers with the Same Part", - "description": "In each layer start with printing the object near the same point, so that we don't start a new layer with printing the piece which the previous layer ended with. This makes for better overhangs and small parts, but increases printing time.", - "type": "bool", - "default_value": false, - "enabled": false, - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": true - }, "layer_start_x": { "label": "Layer Start X", @@ -4249,15 +4260,12 @@ } } }, - "support_infill_angle": + "support_infill_angles": { - "label": "Support Infill Line Direction", - "description": "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane.", - "unit": "°", - "type": "float", - "minimum_value": "-180", - "maximum_value": "180", - "default_value": 0, + "label": "Support Infill Line Directions", + "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees.", + "type": "[int]", + "default_value": "[ ]", "enabled": "(support_enable or support_tree_enable) and support_pattern != 'concentric' and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, @@ -4823,6 +4831,42 @@ } } }, + "support_interface_angles": + { + "label": "Support Interface Line Directions", + "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).", + "type": "[int]", + "default_value": "[ ]", + "limit_to_extruder": "support_interface_extruder_nr", + "enabled": "support_interface_enable and support_interface_pattern != 'concentric'", + "settable_per_mesh": false, + "settable_per_extruder": true, + "children": + { + "support_roof_angles": + { + "label": "Support Roof Line Directions", + "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).", + "type": "[int]", + "default_value": "[ ]", + "limit_to_extruder": "support_roof_extruder_nr", + "enabled": "support_roof_enable and support_roof_pattern != 'concentric'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "support_bottom_angles": + { + "label": "Support Floor Line Directions", + "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angles (alternates between 45 and 135 degrees if interfaces are quite thick or 90 degrees).", + "type": "[int]", + "default_value": "[ ]", + "limit_to_extruder": "support_bottom_extruder_nr", + "enabled": "support_bottom_enable and support_bottom_pattern != 'concentric'", + "settable_per_mesh": false, + "settable_per_extruder": true + } + } + }, "support_fan_enable": { "label": "Fan Speed Override", @@ -5929,7 +5973,7 @@ "smooth_spiralized_contours": { "label": "Smooth Spiralized Contours", - "description": "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details.", + "description": "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details.", "type": "bool", "default_value": true, "enabled": "magic_spiralize", @@ -6197,7 +6241,7 @@ "meshfix_maximum_deviation": { "label": "Maximum Deviation", - "description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller.", + "description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true.", "type": "float", "unit": "mm", "default_value": 0.05, @@ -6672,7 +6716,7 @@ "type": "float", "default_value": 5, "minimum_value": "0.1", - "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", "settable_per_mesh": false, @@ -6704,7 +6748,7 @@ "type": "float", "default_value": 5, "minimum_value": "0.1", - "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", "value": "wireframe_printspeed", @@ -6720,7 +6764,7 @@ "type": "float", "default_value": 5, "minimum_value": "0.1", - "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + max(max_feedrate_z_override, machine_max_feedrate_z) ** 2)", + "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value_warning": "50", "enabled": "wireframe_enabled", "value": "wireframe_printspeed", @@ -7483,6 +7527,52 @@ "settable_per_mesh": false, "settable_per_extruder": true, "settable_per_meshgroup": false + }, + "small_hole_max_size": + { + "label": "Small Hole Max Size", + "description": "Holes and part outlines with a diameter smaller than this will be printed using Small Feature Speed.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "default_value": 0, + "settable_per_mesh": true + }, + "small_feature_max_length": + { + "label": "Small Feature Max Length", + "description": "Feature outlines that are shorter than this length will be printed using Small Feature Speed.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "default_value": 0, + "value": "small_hole_max_size * math.pi", + "settable_per_mesh": true + }, + "small_feature_speed_factor": + { + "label": "Small Feature Speed", + "description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.", + "unit": "%", + "type": "float", + "default_value": 50, + "minimum_value": "1", + "minimum_value_warning": "25", + "maximum_value": "100", + "settable_per_mesh": true + }, + "small_feature_speed_factor_0": + { + "label": "First Layer Speed", + "description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.", + "unit": "%", + "type": "float", + "default_value": 50, + "value": "small_feature_speed_factor", + "minimum_value": "1", + "minimum_value_warning": "25", + "maximum_value": "100", + "settable_per_mesh": true } } }, diff --git a/resources/definitions/felixpro2dual.def.json b/resources/definitions/felixpro2dual.def.json new file mode 100644 index 0000000000..0c978cdb71 --- /dev/null +++ b/resources/definitions/felixpro2dual.def.json @@ -0,0 +1,73 @@ +{ + "version": 2, + "name": "Felix Pro 2 Dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "pnks", + "manufacturer": "Felix", + "platform": "FelixPro2_platform.obj", + "platform_offset": [-135, -0.5, 130], + "machine_extruder_trains": + { + "0": "felixpro2_dual_extruder_0", + "1": "felixpro2_dual_extruder_1" + }, + "file_formats": "text/x-gcode", + "has_variants": true, + "has_materials": true, + "preferred_variant_name": "0.35 mm", + "variants_name": "Nozzle diameter" + }, + "overrides": { + "machine_name": { "default_value": "FelixPro2Dual" }, + + "layer_height": { "default_value": 0.15 }, + "layer_height_0": { "default_value": 0.2 }, + "speed_layer_0": { "default_value": 20}, + + "infill_sparse_density": { "default_value": 20 }, + "wall_thickness": { "default_value": 1 }, + "top_bottom_thickness": { "default_value": 1 }, + + "machine_width": { "default_value": 240 }, + "machine_depth": { "default_value": 225 }, + "machine_height": { "default_value": 245 }, + + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -60, 50 ], + [ -60, -50 ], + [ 70, 50 ], + [ 70, -50 ] + ] + }, + "gantry_height": { "value": "0" }, + "machine_extruder_count": { "default_value": 2 }, + "prime_tower_position_x": { "value": "250" }, + "prime_tower_position_y": { "value": "200" }, + + "machine_heated_bed": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_center_is_zero": { "default_value": false }, + + "speed_print": { "default_value": 80 }, + "speed_travel": { "default_value": 200 }, + + "retraction_amount": { "default_value": 1 }, + "retraction_speed": { "default_value": 50}, + "material_flow": { "default_value": 100 }, + "material_flow_layer_0": { "default_value" : 110, "value": "material_flow * 1.1" }, + "adhesion_type": { "default_value": "skirt" }, + "skirt_brim_minimal_length": { "default_value": 130 }, + "skirt_line_count": { "default_value": 3 }, + + "machine_start_gcode": { + "default_value": "G90 ;absolute positioning\r\nM82 ;set extruder to absolute mode\r\nM107 ;start with the fan off\r\nG28 X0 Y0 ;move X\/Y to min endstops\r\nG28 Z0 ;move Z to min endstops\r\nG1 Z15.0 F9000 ;move the platform down 15mm\r\n\r\nT0 ;Switch to the 1st extruder\r\nG92 E0 ;zero the extruded length\r\nG1 F200 E6 ;extrude 6 mm of feed stock\r\nG92 E0 ;zero the extruded length again\r\n;G1 F9000\r\nM117 FPro2 printing...\r\n" + }, + "machine_end_gcode": { + "default_value": "; Endcode FELIXprinters Pro series\r\n; =================================\t; Move extruder to park position\r\nG91 \t\t\t\t\t; Make coordinates relative\r\nG1 Z2 F5000 \t\t\t\t; Move z 2mm up\r\nG90 \t\t\t\t\t; Use absolute coordinates again\t\t\r\nG1 X220 Y243 F7800 \t\t\t; Move bed and printhead to ergonomic position\r\n\r\n; =================================\t; Turn off heaters\r\nT0\t\t\t\t\t; Select left extruder\r\nM104 T0 S0\t\t\t\t; Turn off heater and continue\t\t\t\t\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\n\r\nT1\t\t\t\t\t; Select right extruder\r\nM104 T1 S0\t\t\t\t; Turn off heater and continu\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nT0\t\t\t\t\t; Select left extruder\r\nM140 S0\t\t\t\t\t; Turn off bed heater\r\n\r\n; =================================\t; Turn the rest off\r\nM107 \t\t\t\t; Turn off fan\r\nM84\t\t\t\t\t; Disable steppers\r\nM117 Print Complete" + } + } +} diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index 9b9ceb3f40..3d8823f438 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -6,7 +6,6 @@ "metadata": { "author": "William & Cataldo URSO", "manufacturer": "Shenzhen Geeetech Technology", - "setting_version": 8, "file_formats": "text/x-gcode", "visible": true, "has_materials": true, diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index ad3f3a43ac..9956462071 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -9,7 +9,6 @@ "file_formats": "text/x-gcode", "has_materials": true, - "has_machine_materials": false, "preferred_material": "generic_pla", "exclude_materials": [ "chromatik_pla", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "imade3d_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla", "generic_cpe_175", "generic_nylon_175", "dsm_arnitel2045_175", "dsm_novamid1070_175", "generic_tpu_175", "generic_pc_175" ], @@ -50,11 +49,6 @@ "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, "material_print_temp_wait": {"default_value": true}, "material_bed_temp_wait": {"default_value": true }, - "prime_tower_enable": {"default_value": false }, - "prime_tower_size": {"value": 20.6 }, - "prime_tower_position_x": {"value": 125 }, - "prime_tower_position_y": {"value": 70 }, - "prime_blob_enable": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 1200 }, "machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, @@ -112,7 +106,6 @@ "speed_travel": {"value": "100"}, "speed_travel_layer_0": {"value": "speed_travel"}, "speed_support_interface": {"value": "speed_topbottom"}, - "max_feedrate_z_override": {"value": 10}, "speed_slowdown_layers": {"value": 1}, "acceleration_print": {"value": 200}, "acceleration_travel": {"value": 200}, diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index ae9ca176f5..635cb1fdd0 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -1,19 +1,16 @@ { "version": 2, - "name": "IMADE3D JellyBOX", - "inherits": "fdmprinter", + "name": "IMADE3D JellyBOX Original", + "inherits": "imade3d_jellybox_root", "metadata": { "visible": true, "author": "IMADE3D", - "manufacturer": "IMADE3D", "platform": "imade3d_jellybox_platform.stl", "platform_offset": [ 0, -0.3, 0], - "file_formats": "text/x-gcode", "preferred_variant_name": "0.4 mm", "preferred_quality_type": "fast", "has_materials": true, "has_variants": true, - "has_machine_materials": true, "has_machine_quality": true, "machine_extruder_trains": { "0": "imade3d_jellybox_extruder_0" @@ -22,18 +19,15 @@ "overrides": { "machine_head_with_fans_polygon": { "default_value": [[ 0, 0 ],[ 0, 0 ],[ 0, 0 ],[ 0, 0 ]]}, - "machine_name": { "default_value": "IMADE3D JellyBOX" }, + "machine_name": { "default_value": "IMADE3D JellyBOX Original" }, "machine_width": { "default_value": 170 }, "machine_height": { "default_value": 145 }, "machine_depth": { "default_value": 160 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; M92 E140 ;optionally adjust steps per mm for your filament\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width}\n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nM117 Preparing ;write Preparing\nM140 S{material_bed_temperature_layer_0} ;set bed temperature and move on\nM109 S{material_print_temperature} ; wait for the extruder to reach desired temperature\nM206 X10.0 Y0.0 ;set x homing offset for default bed leveling\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nM82 ;set extruder to absolute mode\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 ;auto bed leveling procedure\nM203 Z7 ;pick up z speed again for printing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nG92 E0 ;reset the extruder position\nG1 F1500 E15 ;extrude 15mm of feed stock\nG92 E0 ;reset the extruder position again\nM117 Print starting ;write Print starting\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" + "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" }, "machine_end_gcode": { - "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\nM117 Finishing Up ;write Finishing Up\n\nM104 S0 ;extruder heater off\nM140 S0 ;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\nG90 ;absolute positioning\nG28 X ;home x, so the head is out of the way\nG1 Y100 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" } } } diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json new file mode 100644 index 0000000000..7d7b82e194 --- /dev/null +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -0,0 +1,36 @@ +{ + "version": 2, + "name": "IMADE3D JellyBOX 2", + "inherits": "imade3d_jellybox_root", + "metadata": { + "visible": true, + "author": "IMADE3D", + "platform": "imade3d_jellybox_2_platform.stl", + "platform_offset": [ 0, -10, 0], + "preferred_variant_name": "0.4 mm", + "preferred_quality_type": "fast", + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "imade3d_jellybox_2_extruder_0" + } + }, + + "overrides": { + "gradual_infill_steps":{"default_value": 0}, + "gradual_infill_step_height": {"default_value": 3}, + "machine_head_with_fans_polygon": { "default_value": [[ 0, 0 ],[ 0, 0 ],[ 0, 0 ],[ 0, 0 ]]}, + "machine_name": { "default_value": "IMADE3D JellyBOX 2" }, + "machine_width": { "default_value": 180 }, + "machine_height": { "default_value": 145 }, + "machine_depth": { "default_value": 165 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { + "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" + }, + "machine_end_gcode": { + "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + } + } +} diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json new file mode 100644 index 0000000000..52f541f1d4 --- /dev/null +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -0,0 +1,143 @@ +{ + "version": 2, + "name": "imade3d_jellybox_root", + "inherits": "fdmprinter", + "metadata": { + "author": "IMADE3D", + "manufacturer": "IMADE3D", + "category": "Ultimaker", + "visible": false, + "file_formats": "text/x-gcode", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "filo3d_pla", + "generic_abs_175", + "generic_abs", + "generic_bam", + "generic_cpe_175", + "generic_cpe_plus", + "generic_cpe", + "generic_hips_175", + "generic_hips", + "generic_nylon_175", + "generic_nylon", + "generic_pc_175", + "generic_pc", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pla_175", + "generic_pp", + "generic_pva_175", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "tizyx_abs", + "tizyx_pla_bois", + "tizyx_pla", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_print_temperature": { + "minimum_value": "0" + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_heated_bed": { + "default_value": true + }, + "material_bed_temperature": { + "minimum_value": "0" + }, + "material_standby_temperature": { + "minimum_value": "0" + }, + "relative_extrusion": + { + "value": true, + "enabled": true + } + } +} diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index 91f374fb6d..d9c3b3d37f 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Claudio Sampaio (Patola)", - "manufacturer": "Other", + "manufacturer": "Johann", "file_formats": "text/x-gcode", "platform": "kossel_platform.stl", "platform_offset": [0, -0.25, 0], diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index e104538b2c..f26c6ed068 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Chris Petersen", - "manufacturer": "OpenBeam", + "manufacturer": "Johann", "file_formats": "text/x-gcode", "platform": "kossel_pro_build_platform.stl", "platform_offset": [0, -0.25, 0], diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 92f98241da..5d09189de8 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "NA", - "manufacturer": "NA", + "author": "unknown", + "manufacturer": "MAKEiT 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 1b3ae8098c..57e2a7dbd4 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "NA", - "manufacturer": "NA", + "author": "unknown", + "manufacturer": "MAKEiT 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index f2c01b3831..71c94184b2 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -80,7 +80,6 @@ "raft_surface_layers": { "default_value": 1 }, "skirt_line_count": { "default_value": 2}, "brim_width" : { "default_value": 5}, - "start_layers_at_same_position": { "default_value": true}, "retraction_combing": { "default_value": "noskin" }, "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, diff --git a/resources/definitions/monoprice_ultimate.def.json b/resources/definitions/monoprice_ultimate.def.json index 48290f0941..445347b54e 100644 --- a/resources/definitions/monoprice_ultimate.def.json +++ b/resources/definitions/monoprice_ultimate.def.json @@ -1,52 +1,48 @@ { - "version": 2, - "name": "Monoprice Ultimate", - "inherits": "wanhao_d6", - "metadata": { - "visible": true, - "author": "Danny Tuppeny", - "manufacturer": "monoprice", - "file_formats": "text/x-gcode", - "icon": "wanhao-icon.png", - "has_materials": true, - "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d6_extruder_0" + "version": 2, + "name": "Monoprice Ultimate", + "inherits": "wanhao_d6", + "metadata": { + "visible": true, + "author": "Danny Tuppeny", + "manufacturer": "Monoprice", + "file_formats": "text/x-gcode", + "icon": "wanhao-icon.png", + "has_materials": true, + "platform": "wanhao_200_200_platform.obj", + "platform_texture": "Wanhaobackplate.png", + "machine_extruder_trains": { + "0": "wanhao_d6_extruder_0" + }, + "platform_offset": [0, -28, 0] }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Monoprice Ultimate" - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 500 - }, - "machine_acceleration": { - "default_value": 800 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 0.4 - }, - "machine_max_jerk_e": { - "default_value": 1.0 + "overrides": { + "machine_name": { + "default_value": "Monoprice Ultimate" + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 500 + }, + "machine_acceleration": { + "default_value": 800 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 0.4 + }, + "machine_max_jerk_e": { + "default_value": 1.0 + } } - } } diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json new file mode 100644 index 0000000000..6463ac2ca4 --- /dev/null +++ b/resources/definitions/nwa3d_a31.def.json @@ -0,0 +1,64 @@ +{ + "name": "NWA3D A31", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "DragonJe", + "manufacturer": "NWA 3D LLC", + "file_formats": "text/x-gcode", + "platform_offset": [0, 0, 0], + "has_materials": true, + "has_variants": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "Standard 0.4mm", + "preferred_quality_type": "normal", + "has_machine_quality": true, + "preferred_material": "generic_pla", + "machine_extruder_trains": + { + "0": "nwa3d_a31_extruder_0" + } + }, + + "overrides": { + "machine_name": { + "default_value": "NWA3D A31" + }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_head_polygon": { + "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + "gantry_height": { + "value": "30" + }, + "machine_heated_bed": { + "default_value": true + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 2829b06927..4309e07184 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -10,8 +10,6 @@ "platform_offset": [0, 0, 0], "has_materials": true, "has_variants": false, - "has_machine_materials": true, - "has_variant_materials": false, "preferred_quality_type": "normal", "has_machine_quality": true, "preferred_material": "generic_pla", diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 177a6a801e..8d7754a9ef 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -126,9 +126,6 @@ "adhesion_type": { "value": "'none'" }, - "acceleration_enabled": { - "value": "False" - }, "print_sequence": { "enabled": false }, @@ -251,10 +248,6 @@ "expand_skins_expand_distance": { "value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2" }, - "max_feedrate_z_override": { - "value": 0, - "enabled": false - }, "flow_rate_max_extrusion_offset": { "enabled": false }, diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index dd6c87c046..581de6fd98 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Quillford", - "manufacturer": "Prusajr", + "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_platform.stl", "machine_extruder_trains": diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index 29407b0afd..ff6f4469e7 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Apsu, Nounours2099", - "manufacturer": "Prusa Research", + "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_platform.stl", "has_materials": true, diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index aa5fcf6df9..b9628b9430 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "guigashm", - "manufacturer": "Prusajr", + "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_xl_platform.stl", "machine_extruder_trains": diff --git a/resources/definitions/stereotech_start.def.json b/resources/definitions/stereotech_start.def.json index 26c4b6a3a2..e85893d811 100644 --- a/resources/definitions/stereotech_start.def.json +++ b/resources/definitions/stereotech_start.def.json @@ -5,12 +5,12 @@ "metadata": { "visible": true, "author": "Stereotech", - "manufacturer": "Other", + "manufacturer": "Stereotech LLC.", "file_formats": "text/x-gcode", "platform": "stereotech_start.stl", "icon": "icon_ultimaker2", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": + "platform_offset": [0, 0, 0], + "machine_extruder_trains": { "0": "stereotech_start_extruder_0" } diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json new file mode 100644 index 0000000000..a3710fb9af --- /dev/null +++ b/resources/definitions/strateo3d.def.json @@ -0,0 +1,137 @@ +{ + "version": 2, + "name": "Strateo3D", + "inherits": "fdmprinter", + "metadata": + { + "author": "M.K", + "manufacturer": "eMotionTech", + "category": "Other", + "visible": true, + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "preferred_variant_name": "Standard 0.6", + "preferred_material": "emotiontech_pla", + "preferred_quality_type": "e", + "variants_name": "Print Head", + "machine_extruder_trains": + { + "0": "strateo3d_right_extruder", + "1": "strateo3d_left_extruder" + } + }, + + "overrides": + { + "machine_name": { "default_value": "Strateo3D" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 420 }, + "machine_height": { "default_value": 495 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, + "gantry_height": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, + "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 E-1 F1500 \nG0 z1 \nG90 \nG28 \nM801.2 \nM801.0 \nM84" }, + "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, + "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, + "machine_heat_zone_length": { "default_value": 7 }, + "default_material_print_temperature": { "maximum_value_warning": "350" }, + "material_print_temperature": { "maximum_value_warning": "350" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "350" }, + "material_bed_temperature": { "maximum_value": "130" }, + "material_bed_temperature_layer_0": { "maximum_value": "130" }, + "extruder_prime_pos_abs": { "default_value": true }, + "machine_acceleration": { "default_value": 2000 }, + + "acceleration_enabled": { "value": false }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, + "acceleration_print": { "value": "2000" }, + "acceleration_support": { "value": "acceleration_print" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 2000)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 2000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1500)" }, + "adaptive_layer_height_variation": { "default_value": 0.1 }, + "adaptive_layer_height_variation_step": { "default_value": 0.05 }, + "adhesion_type": { "default_value": "skirt" }, + "expand_skins_expand_distance": { "value": "wall_line_width_0 + wall_line_count * wall_line_width_x" }, + "gradual_infill_step_height": { "value": "layer_height*10" }, + "gradual_support_infill_step_height": { "value": "layer_height*7" }, + "infill_before_walls": { "default_value": false }, + "infill_overlap": { "value": "0" }, + "infill_wipe_dist": { "value": "0" }, + "jerk_enabled": { "value": "False" }, + "jerk_layer_0": { "value": "jerk_topbottom" }, + "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_print": { "value": "25" }, + "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_support_interface": { "value": "jerk_topbottom" }, + "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, + "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, + "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, + "material_final_print_temperature": { "value": "material_print_temperature - 10" }, + "material_flow": { "default_value": 93 }, + "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "meshfix_maximum_resolution": { "value": "0.03" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": { "enabled": false, "default_value": false }, + "prime_tower_min_volume": { "default_value": 35 }, + "prime_tower_position_x": { "value": "machine_width/2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_combing": { "default_value": "all" }, + "retraction_combing_max_distance": { "default_value": 5 }, + "retraction_count_max": { "default_value": 15 }, + "retraction_hop": { "value": "2" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_only_when_collides": { "value": "True" }, + "retraction_min_travel": { "value": "3*line_width" }, + "retraction_prime_speed": { "value": "retraction_speed-10" }, + "retraction_speed": { "default_value": 25 }, + "skin_overlap": { "value": "10" }, + "skirt_brim_minimal_length": { "default_value": 333 }, + "speed_layer_0": { "value": "20" }, + "speed_travel_layer_0": { "value": "100" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "50" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20/35)" }, + "speed_travel": { "value": "150" }, + "speed_wall": { "value": "math.ceil(speed_print * 3/4)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 2/3)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": "50" }, + "support_bottom_distance": {"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance/2') if support_type == 'everywhere' else 0", "maximum_value_warning": "machine_nozzle_size*1.5" }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "value": "layer_height*3" }, + "support_interface_offset": { "value": "support_offset" }, + "support_top_distance": {"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "maximum_value_warning": "machine_nozzle_size*1.5" }, + "support_use_towers": { "default_value": true }, + "support_xy_distance": { "value": "line_width * 1.7" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height*2", "maximum_value_warning": "machine_nozzle_size*1.5" }, + "switch_extruder_prime_speed": { "value": "retraction_prime_speed" }, + "switch_extruder_retraction_amount": { "value": "7" }, + "switch_extruder_retraction_speeds": {"value": "retraction_retract_speed"}, + "top_bottom_thickness": { "value": "3*layer_height", "minimum_value_warning": "layer_height*2" }, + "top_thickness": { "value": "top_bottom_thickness" }, + "top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))"}, + "bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" }, + "bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))"}, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } + } +} \ No newline at end of file diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index b4f91d68d1..a7f4b7e549 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Discov3ry Complete (Ultimaker 2+)", + "name": "Discov3ry Complete", "inherits": "fdmprinter", "metadata": { "author": "Andrew Finkle, CTO", @@ -14,9 +14,7 @@ "has_variants": true, "variants_name": "Print core", "preferred_variant_name": "0.84mm (Green)", - "has_machine_materials": true, "preferred_material": "structur3d_dap100silicone", - "has_variant_materials": false, "has_machine_quality": false, "preferred_quality_type": "extra_fast", "first_start_actions": [], diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 2a23688eb8..67a4bb8eab 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Type A Machines Series 1 2014", + "name": "Series 1 2014", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index c90433d85a..f92f679677 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -10,7 +10,6 @@ "has_machine_quality": true, "has_materials": true, - "has_machine_materials": true, "has_variants": true, "preferred_variant_name": "0.4mm", @@ -69,6 +68,13 @@ "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - } + }, + + "acceleration_enabled": {"value": "False"}, + "acceleration_print": {"value": "1500"}, + "z_seam_type": {"default_value": "back"}, + "z_seam_x": {"value": "127.5"}, + "z_seam_y": {"value": "250"}, + "retraction_combing": {"default_value": "off"} } } diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index aaa2756181..e06894139e 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -10,7 +10,6 @@ "has_machine_quality": true, "has_materials": true, - "has_machine_materials": true, "has_variants": true, "preferred_variant_name": "Classic Extruder", @@ -52,6 +51,13 @@ "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - } + }, + + "acceleration_enabled": {"value": "False"}, + "acceleration_print": {"value": "1500"}, + "z_seam_type": {"default_value": "back"}, + "z_seam_x": {"value": "127.5"}, + "z_seam_y": {"value": "250"}, + "retraction_combing": {"default_value": "off"} } } diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 28b4857d89..32fa9b331d 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -1,52 +1,60 @@ -{ - "version": 2, - "name": "TiZYX K25", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", - "file_formats": "text/x-gcode", - "platform": "tizyx_k25_platform.stl", - "platform_offset": [0, -4, 0], - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], - "preferred_material": "tizyx_pla", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "preferred_variant_name": "0.4 mm", - "machine_extruder_trains": - { - "0": "tizyx_k25_extruder_0" - } - }, - - "overrides": - { - "machine_name": { "default_value": "TiZYX K25" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 255 }, - "machine_height": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "500" }, - "machine_head_with_fans_polygon": { - "default_value": [ - [25, 49], - [25, -49], - [-25, -49], - [25, 49] - ] - }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": - { - "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" - }, - "machine_end_gcode": - { - "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - } - } -} +{ + "version": 2, + "name": "TiZYX K25", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "TiZYX", + "manufacturer": "TiZYX", + "file_formats": "text/x-gcode", + "platform": "tizyx_k25_platform.stl", + "platform_offset": [0, -4, 0], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], + "preferred_material": "tizyx_pla", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm", + "machine_extruder_trains": + { + "0": "tizyx_k25_extruder_0" + } + }, + + "overrides": + { + "machine_name": { "default_value": "TiZYX K25" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 255 }, + "machine_height": { "default_value": 255 }, + "machine_depth": { "default_value": 255 }, + "machine_center_is_zero": { "default_value": false }, + "gantry_height": { "value": "500" }, + "machine_head_with_fans_polygon": { + "default_value": [ + [25, 49], + [25, -49], + [-25, -49], + [25, 49] + ] + }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": + { + "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" + }, + "machine_end_gcode": + { + "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" + }, + + + "acceleration_enabled": {"value": "False"}, + "acceleration_print": {"value": "1500"}, + "z_seam_type": {"default_value": "back"}, + "z_seam_x": {"value": "127.5"}, + "z_seam_y": {"value": "250"}, + "retraction_combing": {"default_value": "off"} + } +} diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index f95d29c684..65ee8f063b 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -12,7 +12,6 @@ "preferred_variant_name": "0.4 mm", "has_variants": true, "has_materials": true, - "has_machine_materials": true, "has_machine_quality": true, "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], "first_start_actions": [], diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index a297d33c82..ae36d6a3ae 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -12,7 +12,6 @@ "platform_offset": [0, 0, 0], "has_machine_quality": true, "has_materials": true, - "has_machine_materials": true, "has_variants": true, "exclude_materials": [ "generic_hips", "generic_petg", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], "preferred_variant_name": "AA 0.4", diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 43f7b94e61..b3fe48ca11 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -12,7 +12,6 @@ "platform_texture": "Ultimaker3Extendedbackplate.png", "platform_offset": [0, 0, 0], "has_machine_quality": true, - "has_machine_materials": true, "has_materials": true, "has_variants": true, "preferred_variant_name": "AA 0.4", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 0ebd956aa1..38d761f875 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -14,7 +14,6 @@ "platform_offset": [0, -30, -10], "has_machine_quality": true, "has_materials": true, - "has_machine_materials": true, "has_variant_buildplates": true, "has_variants": true, "preferred_variant_name": "AA 0.4", @@ -162,6 +161,7 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_combing": { "default_value": "all" }, "initial_layer_line_width_factor": { "value": "120" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, + "build_volume_temperature": { "maximum_value": 50 } } } diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index 51c745a841..c92476da49 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -3,10 +3,10 @@ "version": 2, "inherits": "fdmprinter", "metadata": { - "manufacturer": "Velleman nv", + "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", "visible": true, - "author": "Velleman", + "author": "Velleman N.V.", "has_machine_quality": true, "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index b43751cadc..6bba095978 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "manufacturer": "Velleman", + "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", "platform": "Vertex_build_panel.stl", "platform_offset": [0, -3, 0], diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index 145cb7abec..9d014b9cf8 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "manufacturer": "Velleman", + "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", "platform": "Vertex_build_panel.stl", "platform_offset": [0, -3, 0], diff --git a/resources/definitions/vertex_nano_k8600.def.json b/resources/definitions/vertex_nano_k8600.def.json new file mode 100644 index 0000000000..02697a1152 --- /dev/null +++ b/resources/definitions/vertex_nano_k8600.def.json @@ -0,0 +1,83 @@ +{ + "version": 2, + "name": "Vertex K8600", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Velleman N.V.", + "file_formats": "text/x-gcode", + "supports_usb_connection": true, + "supported_actions": ["MachineSettingsAction"], + "machine_extruder_trains": { + "0": "vertex_nano_k8600_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "Vertex K8600" + }, + "machine_heated_bed": { + "default_value": false + }, + "material_bed_temperature": { + "default_value": 0 + }, + "material_bed_temperature_layer_0": { + "default_value": 0 + }, + "machine_width": { + "default_value": 80 + }, + "machine_height": { + "default_value": 75 + }, + "machine_depth": { + "default_value": 80 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "; Vertex Nano Start G-code M0 is my nozzle clean M400 G28 ; Home extruder G90 ; Absolute positioning M82 ; Extruder in absolute mode M104 T0 S{material_print_temperature} G92 E0 ; Reset extruder position G1 Z1 F800 M109 T0 S{material_print_temperature} M117 Priming nozzle... M83 G1 E20 F100 ; purge/prime nozzle M82 G92 E0 ; Reset extruder position G4 S3 ; Wait 3 seconds G1 Z5 F2000 M117 Vertex Nano is printing" + }, + "machine_end_gcode": { + "default_value": "; Vertex Nano end G-Code G91 ; Relative positioning T0 G1 E-1 F1500; Reduce filament pressure M104 T0 S0 G90 ; Absolute positioning G92 E0 ; Reset extruder position G28 M84 ; Turn steppers off" + }, + "line_width": { + "value": 0.35 + }, + "infill_line_width": { + "value": 0.35 + }, + "wall_thickness": { + "value": 0.7 + }, + "top_bottom_thickness": { + "value": 0.6 + }, + "infill_sparse_density": { + "value": 40 + }, + "infill_overlap": { + "value": 5 + }, + "min_infill_area": { + "value": 0.1 + }, + "retract_at_layer_change": { + "value": true + }, + "retraction_min_travel": { + "value": 1 + }, + "retraction_count_max": { + "value": 15 + }, + "retraction_extrusion_window": { + "value": 1 + } + } +} diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index 328505e18a..5aa015cace 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Zone3D", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], "machine_extruder_trains": diff --git a/resources/extruders/creality_cr10_extruder_0.def.json b/resources/extruders/creality_base_extruder_0.def.json similarity index 80% rename from resources/extruders/creality_cr10_extruder_0.def.json rename to resources/extruders/creality_base_extruder_0.def.json index 3a259b672b..a173d1c2fa 100644 --- a/resources/extruders/creality_cr10_extruder_0.def.json +++ b/resources/extruders/creality_base_extruder_0.def.json @@ -1,10 +1,9 @@ { - "id": "creality_cr10_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "creality_cr10", + "machine": "creality_base", "position": "0" }, @@ -12,5 +11,6 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } + } } diff --git a/resources/extruders/felixpro2_dual_extruder_0.def.json b/resources/extruders/felixpro2_dual_extruder_0.def.json new file mode 100644 index 0000000000..90c41a83b5 --- /dev/null +++ b/resources/extruders/felixpro2_dual_extruder_0.def.json @@ -0,0 +1,28 @@ +{ + "id": "felixpro2_dual_extruder_0", + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "felixpro2dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/felixpro2_dual_extruder_1.def.json b/resources/extruders/felixpro2_dual_extruder_1.def.json new file mode 100644 index 0000000000..3ff0d401fd --- /dev/null +++ b/resources/extruders/felixpro2_dual_extruder_1.def.json @@ -0,0 +1,28 @@ +{ + "id": "felixpro2_dual_extruder_1", + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "felixpro2dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "2" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/creality_cr10s5_extruder_0.def.json b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json similarity index 78% rename from resources/extruders/creality_cr10s5_extruder_0.def.json rename to resources/extruders/imade3d_jellybox_2_extruder_0.def.json index 98b701ae2e..1d50297343 100644 --- a/resources/extruders/creality_cr10s5_extruder_0.def.json +++ b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json @@ -1,10 +1,10 @@ { - "id": "creality_cr10s5_extruder_0", + "id": "imade3d_jellybox_2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "creality_cr10s5", + "machine": "imade3d_jellybox_2", "position": "0" }, diff --git a/resources/extruders/creality_cr10s4_extruder_0.def.json b/resources/extruders/nwa3d_a31_extruder_0.def.json similarity index 73% rename from resources/extruders/creality_cr10s4_extruder_0.def.json rename to resources/extruders/nwa3d_a31_extruder_0.def.json index 8a40c6431f..999fe37d28 100644 --- a/resources/extruders/creality_cr10s4_extruder_0.def.json +++ b/resources/extruders/nwa3d_a31_extruder_0.def.json @@ -1,10 +1,10 @@ { - "id": "creality_cr10s4_extruder_0", + "id": "nwa3d_a31_extruder_0", "version": 2, - "name": "Extruder 1", + "name": "Standard 0.4mm", "inherits": "fdmextruder", "metadata": { - "machine": "creality_cr10s4", + "machine": "nwa3d_a31", "position": "0" }, diff --git a/resources/extruders/strateo3d_left_extruder.def.json b/resources/extruders/strateo3d_left_extruder.def.json new file mode 100644 index 0000000000..1df8eb0ebb --- /dev/null +++ b/resources/extruders/strateo3d_left_extruder.def.json @@ -0,0 +1,17 @@ +{ + "id": "strateo3d_left_extruder", + "version": 2, + "name": "Left Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "strateo3d", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} \ No newline at end of file diff --git a/resources/extruders/strateo3d_right_extruder.def.json b/resources/extruders/strateo3d_right_extruder.def.json new file mode 100644 index 0000000000..ea59870329 --- /dev/null +++ b/resources/extruders/strateo3d_right_extruder.def.json @@ -0,0 +1,17 @@ +{ + "id": "strateo3d_right_extruder", + "version": 2, + "name": "Right Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "strateo3d", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} \ No newline at end of file diff --git a/resources/extruders/creality_ender3_extruder_0.def.json b/resources/extruders/vertex_nano_k8600_extruder_0.def.json similarity index 65% rename from resources/extruders/creality_ender3_extruder_0.def.json rename to resources/extruders/vertex_nano_k8600_extruder_0.def.json index 431366c777..cfb2d11217 100644 --- a/resources/extruders/creality_ender3_extruder_0.def.json +++ b/resources/extruders/vertex_nano_k8600_extruder_0.def.json @@ -1,16 +1,15 @@ { - "id": "creality_ender3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "creality_ender3", + "machine": "vertex_nano_k8600", "position": "0" }, "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 669f248a0d..8acdb06149 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" @@ -84,6 +84,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "" +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgid "" "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "" @@ -230,8 +234,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "" @@ -369,40 +373,40 @@ msgid "" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "" "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "" @@ -456,82 +460,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "" @@ -561,40 +565,40 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "" "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "" "You can now send and monitor print jobs from anywhere using your Ultimaker " "account." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "" @@ -604,11 +608,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -798,12 +797,12 @@ msgid "3MF File" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" @@ -812,7 +811,7 @@ msgid "" "instead." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "" @@ -946,13 +945,13 @@ msgid "Not supported" msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "" @@ -966,32 +965,30 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." msgid "" -"Settings have been changed to match the current availability of extruders: " -"[%s]" +"Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" "Failed to export profile to {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "" @@ -999,44 +996,44 @@ msgid "" "failure." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "" "Can't import profile from {0} before a printer is added." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "" @@ -1044,7 +1041,7 @@ msgid "" "import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "" @@ -1052,41 +1049,41 @@ msgid "" "with your current machine ({2}), could not import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1164,7 +1161,7 @@ msgctxt "@action:button" msgid "Next" msgstr "" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1175,7 +1172,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1183,7 +1180,7 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "" @@ -1204,21 +1201,21 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "" "The printer(s) below cannot be connected because they are part of a group" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "" @@ -1234,14 +1231,14 @@ msgctxt "@label" msgid "Custom" msgstr "" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "" "The build volume height has been reduced due to the value of the \"Print " "Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "" @@ -1446,30 +1443,32 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" +msgid "" +"User description (Note: Developers may not speak your language, please use " +"English if possible)" msgstr "" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "" "@info 'width', 'depth' and 'height' are variable names that must NOT be " @@ -1477,19 +1476,19 @@ msgctxt "" msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" @@ -1499,98 +1498,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -1620,22 +1619,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "" @@ -1646,7 +1645,7 @@ msgid "Install" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "" @@ -1670,8 +1669,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "" @@ -1681,49 +1680,49 @@ msgctxt "@label" msgid "Your rating" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1985,70 +1984,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "" -"These options are not available because you are monitoring a cloud printer." +msgid "Please update your printer's firmware to manage the queue remotely." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "" @@ -2058,36 +2056,31 @@ msgctxt "@label" msgid "Queued" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" +msgid "Manage in browser" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2112,9 +2105,12 @@ msgid "" "printer is connected to the network using a network cable or by connecting " "your printer to your WIFI network. If you don't connect Cura with your " "printer, you can still use a USB drive to transfer g-code files to your " -"printer.\n" -"\n" -"Select your printer from the list below:" +"printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 @@ -2123,9 +2119,9 @@ msgid "Edit" msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "" @@ -2210,50 +2206,50 @@ msgctxt "@action:button" msgid "OK" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "" @@ -2357,7 +2353,7 @@ msgctxt "@action:button" msgid "Override" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "" @@ -2365,41 +2361,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "" "The printer %1 is assigned, but the job contains an unknown material " "configuration." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "" "Override will use the specified settings with the existing printer " "configuration. This may result in a failed print." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "" @@ -2409,7 +2405,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "" @@ -2419,7 +2415,8 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 @@ -2738,7 +2735,7 @@ msgid "Printer Group" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "" @@ -2751,19 +2748,19 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2941,18 +2938,24 @@ msgid "Previous" msgstr "" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "" @@ -3063,174 +3066,174 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "" "The new filament diameter is set to %1 mm, which is not compatible with the " "current extruder. Do you wish to continue?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "" "Could not import material %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "" "Failed to export material to %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "" @@ -3271,222 +3274,246 @@ msgid "Unit" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "" "You will need to restart the application for these changes to have effect." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "" "Highlight unsupported areas of the model in red. Without support these areas " "will not print properly." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "" "Moves the camera so the model is in the center of the view when a model is " "selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "" +"Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "" "Should models on the platform be moved so that they no longer intersect?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "" "An model may appear extremely small if its unit is for example in meters " "rather than millimeters. Should these models be scaled up?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "" "Should a prefix based on the printer name be added to the print job name " "automatically?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "" "When you have made changes to a profile and switched to a different one, a " @@ -3494,50 +3521,50 @@ msgid "" "not, or you can choose a default behaviour and never show that dialog again." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "" "Default behavior for changed setting values when switching to a different " "profile: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -3545,129 +3572,129 @@ msgid "" "stored." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "" "This profile uses the defaults specified by the printer, so it has no " "settings/overrides in the list below." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "" @@ -3737,33 +3764,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "" @@ -3777,36 +3804,36 @@ msgid "" "Click to make these settings visible." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "" "This setting is not used because all the settings that it influences are " "overridden." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "" "This setting is always shared between all extruders. Changing it here will " "change the value for all extruders." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3814,7 +3841,7 @@ msgid "" "Click to restore the value of the profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value " @@ -3828,7 +3855,7 @@ msgctxt "@button" msgid "Recommended" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "" @@ -3856,12 +3883,12 @@ msgid "" "Without these structures, such parts would collapse during printing." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "" "Enable printing a brim or raft. This will add a flat area around or under " @@ -3953,7 +3980,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "" "Send a custom G-code command to the connected printer. Press 'enter' to send " @@ -4062,11 +4089,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4117,7 +4139,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -4239,22 +4276,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "" @@ -4264,6 +4301,11 @@ msgctxt "@label" msgid "View type" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4312,32 +4354,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "" @@ -4372,233 +4419,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "" @@ -4613,39 +4665,39 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "" "We have found one or more G-Code files within the files you have selected. " @@ -4653,12 +4705,12 @@ msgid "" "file, please just select only one." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -4882,32 +4934,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "" @@ -5090,12 +5142,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "" @@ -5152,23 +5204,11 @@ msgctxt "@button" msgid "Get started" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "" #: MachineSettingsAction/plugin.json msgctxt "description" -msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." +msgid "" +"Provides a way to change machine settings (such as build volume, nozzle " +"size, etc.)." msgstr "" #: MachineSettingsAction/plugin.json @@ -5218,7 +5258,9 @@ msgstr "" #: ModelChecker/plugin.json msgctxt "description" -msgid "Checks models and print configuration for possible printing issues and give suggestions." +msgid "" +"Checks models and print configuration for possible printing issues and give " +"suggestions." msgstr "" #: ModelChecker/plugin.json @@ -5256,9 +5298,20 @@ msgctxt "name" msgid "Profile Flattener" msgstr "" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "" + #: USBPrinting/plugin.json msgctxt "description" -msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." +msgid "" +"Accepts G-Code and sends them to a printer. Plugin can also update firmware." msgstr "" #: USBPrinting/plugin.json @@ -5266,16 +5319,6 @@ msgctxt "name" msgid "USB printing" msgstr "" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "" - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5328,7 +5371,9 @@ msgstr "" #: SettingsGuide/plugin.json msgctxt "description" -msgid "Provides extra information and explanations about settings in Cura, with images and animations." +msgid "" +"Provides extra information and explanations about settings in Cura, with " +"images and animations." msgstr "" #: SettingsGuide/plugin.json @@ -5388,7 +5433,8 @@ msgstr "" #: SupportEraser/plugin.json msgctxt "description" -msgid "Creates an eraser mesh to block the printing of support in certain places" +msgid "" +"Creates an eraser mesh to block the printing of support in certain places" msgstr "" #: SupportEraser/plugin.json @@ -5526,6 +5572,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5596,16 +5652,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "" - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5648,7 +5694,9 @@ msgstr "" #: CuraPrintProfileCreator/plugin.json msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +msgid "" +"Allows material manufacturers to create new material and quality profiles " +"using a drop-in UI." msgstr "" #: CuraPrintProfileCreator/plugin.json @@ -5678,7 +5726,9 @@ msgstr "" #: UltimakerMachineActions/plugin.json msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgid "" +"Provides machine actions for Ultimaker machines (such as bed leveling " +"wizard, selecting upgrades, etc.)." msgstr "" #: UltimakerMachineActions/plugin.json @@ -5695,4 +5745,3 @@ msgstr "" msgctxt "name" msgid "Cura Profile Reader" msgstr "" - diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 3e80e8accc..48c0d976b5 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:32+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: German\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: German , German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Das Profil wurde geglättet und aktiviert." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF-Datei" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Ein USB-Druck wird ausgeführt. Das Schließen von Cura beendet diesen Druck. Sind Sie sicher?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-Datei" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g-Datei" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G-Datei" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "Konnte nicht auf dem Wechseldatenträger gespeichert werden {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Fehler" @@ -230,8 +234,8 @@ msgstr "Wechseldatenträger auswerfen {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Warnhinweis" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Anforderungen zwischen der Druckerkonfiguration oder -kalibrierung und Cura stimmen nicht überein. Für optimale Ergebnisse schneiden Sie stets für die PrintCores und Materialien, die in Ihren Drucker eingelegt wurden." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Das Senden neuer Aufträge ist (vorübergehend) blockiert; der vorherige Druckauftrag wird noch gesendet." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Daten werden zum Drucker gesendet" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Daten werden gesendet" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Abbrechen" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Über Netzwerk verbunden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Der Druckauftrag wurde erfolgreich an den Drucker gesendet." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Daten gesendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "In Monitor überwachen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "Drucker '{printer_name}' hat '{job_name}' vollständig gedrückt." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "Der Druckauftrag '{job_name}' wurde ausgeführt." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Druck vollendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Leer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Unbekannt" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Über Cloud drucken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Über Cloud drucken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Über Cloud verbunden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Cloudfehler" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Druckauftrag konnte nicht exportiert werden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Daten konnten nicht in Drucker geladen werden." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Über Ultimaker Cloud hochladen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Druckaufträge mithilfe Ihres Ultimaker-Kontos von einem anderen Ort aus senden und überwachen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Verbinden mit Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Nicht mehr für diesen Drucker nachfragen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Erste Schritte" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Sie können jetzt Druckaufträge mithilfe Ihres Ultimaker-Kontos von einem anderen Ort aus senden und überwachen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Verbunden!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Ihre Verbindung überprüfen" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Anschluss über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Anleitung für Cura-Einstellungen" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "3MF-Datei" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Düse" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projektdatei {0} enthält einen unbekannten Maschinentyp {1}. Importieren der Maschine ist nicht möglich. Stattdessen werden die Modelle importiert." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Projektdatei öffnen" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "Nicht unterstützt" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Datei bereits vorhanden" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ungültige Datei-URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Die Einstellungen wurden passend für die aktuelle Verfügbarkeit der Extruder geändert: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Die Einstellungen wurden an die aktuell verfügbaren Extruder angepasst:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Einstellungen aktualisiert" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder deaktiviert" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Export des Profils nach {0} fehlgeschlagen: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Export des Profils nach {0} fehlgeschlagen: Fehlermeldung von Writer-Plugin." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil wurde nach {0} exportiert" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Export erfolgreich ausgeführt" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Import des Profils aus Datei {0}: {1} fehlgeschlagen" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Import des Profils aus Datei {0} kann erst durchgeführt werden, wenn ein Drucker hinzugefügt wurde." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Kein benutzerdefiniertes Profil für das Importieren in Datei {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Dieses Profil {0} enthält falsche Daten, Importieren nicht möglich." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "Die Maschine, die im Profil {0} ({1}) definiert wurde, entspricht nicht Ihrer derzeitigen Maschine ({2}). Importieren nicht möglich." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil erfolgreich importiert {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Datei {0} enthält kein gültiges Profil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} hat einen unbekannten Dateityp oder ist beschädigt." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Benutzerdefiniertes Profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Für das Profil fehlt eine Qualitätsangabe." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Weiter" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "Gruppe #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "Schließen" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Hinzufügen" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Unbekannt" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Der/die nachfolgende(n) Drucker kann/können nicht verbunden werden, weil er/sie Teil einer Gruppe ist/sind" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Verfügbare vernetzte Drucker" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Benutzerdefiniert" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "Die Höhe der Druckabmessung wurde aufgrund des Wertes der Einstellung „Druckreihenfolge“ reduziert, um eine Kollision der Brücke mit den gedruckten Modellen zu verhindern." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Produktabmessungen" @@ -1395,48 +1393,48 @@ msgstr "Protokolle" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Benutzerbeschreibung" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Benutzerbeschreibung (Hinweis: Bitte schreiben Sie auf Englisch, da die Entwickler Ihre Sprache möglicherweise nicht beherrschen.)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Bericht senden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Geräte werden geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Die Szene wird eingerichtet..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Die Benutzeroberfläche wird geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Es kann nur jeweils ein G-Code gleichzeitig geladen werden. Wichtige {0} werden übersprungen." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Wenn G-Code geladen wird, kann keine weitere Datei geöffnet werden. Wichtige {0} werden übersprungen." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Das gewählte Modell war zu klein zum Laden." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Druckereinstellungen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Breite)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Tiefe)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Höhe)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Druckbettform" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Ausgang in Mitte" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Heizbares Bett" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "G-Code-Variante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Druckkopfeinstellungen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X max." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y max." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Brückenhöhe" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Anzahl Extruder" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Ende G-Code" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "X-Versatz Düse" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Y-Versatz Düse" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Kühllüfter-Nr." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-Code Extruder-Start" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-Code Extruder-Ende" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "Installieren" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Installiert" @@ -1616,8 +1614,8 @@ msgstr "Plugins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materialien" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Ihre Bewertung" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Version" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Zuletzt aktualisiert" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Anmeldung für Installation oder Update erforderlich" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Materialspulen kaufen" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Aktualisierung" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Aktualisierung wird durchgeführt" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Die Firmware-Aktualisierung ist aufgrund von fehlender Firmware fehlgeschlagen." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Glas" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Diese Optionen sind nicht verfügbar, weil Sie einen Cloud-Drucker überwachen." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Damit Sie die Warteschlange aus der Ferne verwalten können, müssen Sie die Druckfirmware aktualisieren." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Die Webcam ist nicht verfügbar, weil Sie einen Cloud-Drucker überwachen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Lädt..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Nicht verfügbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Nicht erreichbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Leerlauf" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Unbenannt" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anonym" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Erfordert Konfigurationsänderungen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Details" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Drucker nicht verfügbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Zuerst verfügbar" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "In Warteschlange" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Gehe zu Cura Connect" +msgid "Manage in browser" +msgstr "Im Browser verwalten" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Die Warteschlange enthält keine Druckaufträge. Slicen Sie einen Auftrag und schicken Sie ihn ab, um ihn zur Warteschlange hinzuzufügen." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Druckaufträge" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Druckdauer insgesamt" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Warten auf" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Alle Aufträge wurden gedruckt." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Druckauftragshistorie anzeigen" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,14 +2034,14 @@ msgstr "Anschluss an vernetzten Drucker" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung von G-Code-Dateien auf Ihren Drucker verwenden.\n" -"\n" -"Wählen Sie Ihren Drucker aus der folgenden Liste:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Um direkt auf Ihrem Drucker über das Netzwerk zu drucken, muss der Drucker über ein Netzwerkkabel oder per WLAN mit dem Netzwerk verbunden sein. Wenn Sie" +" Cura nicht mit Ihrem Drucker verbinden, können Sie G-Code-Dateien auf einen USB-Stick kopieren und diesen am Drucker anschließen." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Wählen Sie Ihren Drucker aus der folgenden Liste aus:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2056,9 +2049,9 @@ msgid "Edit" msgstr "Bearbeiten" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Entfernen" @@ -2141,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abgebrochen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Beendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Vorbereitung..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Wird abgebrochen..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Wird pausiert..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Pausiert" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Wird fortgesetzt..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Handlung erforderlich" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Fertigstellung %1 auf %2" @@ -2288,44 +2281,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Überschreiben" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "Der zugewiesene Drucker %1 erfordert die folgende Konfigurationsänderung:" msgstr[1] "Der zugewiesene Drucker %1 erfordert die folgenden Konfigurationsänderungen:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "Der Drucker %1 wurde zugewiesen, allerdings enthält der Auftrag eine unbekannte Materialkonfiguration." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Material %1 von %2 auf %3 wechseln." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "%3 als Material %1 laden (Dies kann nicht übergangen werden)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Print Core %1 von %2 auf %3 wechseln." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Druckplatte auf %1 wechseln (Dies kann nicht übergangen werden)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Überschreiben verwendet die definierten Einstellungen mit der vorhandenen Druckerkonfiguration. Dies kann zu einem fehlgeschlagenen Druck führen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Aluminium" @@ -2335,7 +2328,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Mit einem Drucker verbinden" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Anleitung für Cura-Einstellungen" @@ -2345,11 +2338,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "" -"Stellen Sie bitte sicher, dass Ihr Drucker verbunden ist:\n" -"- Prüfen Sie, ob Ihr Drucker eingeschaltet ist.\n" -"- Prüfen Sie, ob der Drucker mit dem Netzwerk verbunden ist." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Stellen Sie sicher, dass der Drucker verbunden ist:\n– Prüfen Sie, ob der Drucker eingeschaltet ist.– Prüfen Sie, ob der Drucker mit dem Netzwerk verbunden" +" ist.\n– Prüfen Sie, ob Sie angemeldet sind, falls Sie über die Cloud verbundene Drucker suchen möchten." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2661,7 +2653,7 @@ msgid "Printer Group" msgstr "Druckergruppe" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Profileinstellungen" @@ -2674,19 +2666,19 @@ msgstr "Wie soll der Konflikt im Profil gelöst werden?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Name" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Nicht im Profil" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2858,18 +2850,24 @@ msgid "Previous" msgstr "Zurück" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Tipp" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Generisch" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Druckexperiment" @@ -2974,170 +2972,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Soll das Drucken wirklich abgebrochen werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Änderung Durchmesser bestätigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Der neue Filament-Durchmesser wurde auf %1 mm eingestellt, was nicht kompatibel mit dem aktuellen Extruder ist. Möchten Sie fortfahren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Namen anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marke" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Materialtyp" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Farbe" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Eigenschaften" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Dichte" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Durchmesser" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Filamentkosten" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Filamentgewicht" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Filamentlänge" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Kosten pro Meter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Dieses Material ist mit %1 verknüpft und teilt sich damit einige seiner Eigenschaften." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Material trennen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Beschreibung" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Haftungsinformationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Druckeinstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Aktivieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Import" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Drucker" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Entfernen bestätigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Möchten Sie %1 wirklich entfernen? Dies kann nicht rückgängig gemacht werden!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Material importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Material konnte nicht importiert werden %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material wurde erfolgreich importiert %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Material exportieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exportieren des Materials nach %1: %2 schlug fehl" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material erfolgreich nach %1 exportiert" @@ -3178,383 +3176,406 @@ msgid "Unit" msgstr "Einheit" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Allgemein" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Schnittstelle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Sprache:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Währung:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Die Anwendung muss neu gestartet werden, um die Änderungen zu übernehmen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Bei Änderung der Einstellungen automatisch schneiden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch schneiden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Viewport-Verhalten" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Nicht gestützte Bereiche des Modells in rot hervorheben. Ohne Support werden diese Bereiche nicht korrekt gedruckt." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Überhang anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bewegt die Kamera, bis sich das Modell im Mittelpunkt der Ansicht befindet, wenn ein Modell ausgewählt wurde" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Zentrieren Sie die Kamera, wenn das Element ausgewählt wurde" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Soll das standardmäßige Zoom-Verhalten von Cura umgekehrt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kehren Sie die Richtung des Kamera-Zooms um." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Soll das Zoomen in Richtung der Maus erfolgen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Das Zoomen in Mausrichtung wird in der Orthogonalansicht nicht unterstützt." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "In Mausrichtung zoomen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Sollen Modelle auf der Plattform so verschoben werden, dass sie sich nicht länger überschneiden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Stellen Sie sicher, dass die Modelle getrennt gehalten werden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Sollen Modelle auf der Plattform so nach unten verschoben werden, dass sie die Druckplatte berühren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Setzt Modelle automatisch auf der Druckplatte ab" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Warnmeldung im G-Code-Reader anzeigen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Warnmeldung in G-Code-Reader" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Soll die Schicht in den Kompatibilitätsmodus gezwungen werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Schichtenansicht Kompatibilitätsmodus erzwingen (Neustart erforderlich)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Welches Kamera-Rendering sollte verwendet werden?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Kamera-Rendering: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Ansicht" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Orthogonal" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Dateien öffnen und speichern" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Sollen Modelle an das Erstellungsvolumen angepasst werden, wenn sie zu groß sind?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Große Modelle anpassen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Ein Modell kann extrem klein erscheinen, wenn seine Maßeinheit z. B. in Metern anstelle von Millimetern angegeben ist. Sollen diese Modelle hoch skaliert werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extrem kleine Modelle skalieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Sollten Modelle gewählt werden, nachdem sie geladen wurden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modelle wählen, nachdem sie geladen wurden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Soll ein Präfix anhand des Druckernamens automatisch zum Namen des Druckauftrags hinzugefügt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Geräte-Präfix zu Auftragsnamen hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Soll beim Speichern einer Projektdatei eine Zusammenfassung angezeigt werden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialog Zusammenfassung beim Speichern eines Projekts anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standardverhalten beim Öffnen einer Projektdatei" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standardverhalten beim Öffnen einer Projektdatei: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Immer als Projekt öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Modelle immer importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wenn Sie Änderungen für ein Profil vorgenommen haben und zu einem anderen Profil gewechselt sind, wird ein Dialog angezeigt, der hinterfragt, ob Sie Ihre Änderungen beibehalten möchten oder nicht; optional können Sie ein Standardverhalten wählen, sodass dieser Dialog nicht erneut angezeigt wird." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standardverhalten für geänderte Einstellungswerte beim Wechsel zu einem anderen Profil: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Geänderte Einstellungen immer verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Geänderte Einstellungen immer auf neues Profil übertragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privatsphäre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Soll Cura bei Programmstart nach Updates suchen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bei Start nach Updates suchen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Sollen anonyme Daten über Ihren Druck an Ultimaker gesendet werden? Beachten Sie, dass keine Modelle, IP-Adressen oder andere personenbezogene Daten gesendet oder gespeichert werden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonyme) Druckinformationen senden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Mehr Informationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Experimentell" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Mehrfach-Druckplattenfunktion verwenden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Mehrfach-Druckplattenfunktion verwenden (Neustart erforderlich)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Drucker" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Umbenennen" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Profil erstellen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geben Sie bitte einen Namen für dieses Profil an." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profil duplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profil umbenennen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Profil importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Profil exportieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drucker: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Standardprofile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Benutzerdefinierte Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Aktuelle Änderungen verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dieses Profil verwendet die vom Drucker festgelegten Standardeinstellungen, deshalb sind in der folgenden Liste keine Einstellungen/Überschreibungen enthalten." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ihre aktuellen Einstellungen stimmen mit dem gewählten Profil überein." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Globale Einstellungen" @@ -3622,33 +3643,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "Einstellungen durchsuchen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Werte für alle Extruder kopieren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle geänderten Werte für alle Extruder kopieren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Diese Einstellung weiterhin anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Sichtbarkeit einstellen wird konfiguriert..." @@ -3664,32 +3685,32 @@ msgstr "" "\n" "Klicken Sie, um diese Einstellungen sichtbar zu machen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Diese Einstellung wird nicht verwendet, weil alle hierdurch beeinflussten Einstellungen aufgehoben werden." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Hat Einfluss auf" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Wird beeinflusst von" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Diese Einstellung wird stets zwischen allen Extrudern geteilt. Eine Änderung ändert den Wert für alle Extruder." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Der Wert wird von Pro-Extruder-Werten gelöst " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3700,7 +3721,7 @@ msgstr "" "\n" "Klicken Sie, um den Wert des Profils wiederherzustellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3716,7 +3737,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Empfohlen" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Benutzerdefiniert" @@ -3741,12 +3762,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Damit werden Strukturen zur Unterstützung von Modellteilen mit Überhängen generiert. Ohne diese Strukturen würden solche Teile während des Druckvorgangs zusammenfallen." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Haftung" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Drucken eines Brim- oder Raft-Elements aktivieren. Es wird ein flacher Bereich rund um oder unter Ihrem Objekt hinzugefügt, das im Anschluss leicht abgeschnitten werden kann." @@ -3832,7 +3853,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "G-Code senden" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Einen benutzerdefinierten G-Code-Befehl an den verbundenen Drucker senden. „Eingabe“ drücken, um den Befehl zu senden." @@ -3929,11 +3950,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoriten" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Generisch" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3984,7 +4000,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kameraposition" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Kameraansicht" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Ansicht" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Orthogonal" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Druckplatte" @@ -4103,22 +4134,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "&Zuletzt geöffnet" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Aktiver Druck" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Name des Auftrags" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Druckzeit" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Geschätzte verbleibende Zeit" @@ -4128,6 +4159,11 @@ msgctxt "@label" msgid "View type" msgstr "Typ anzeigen" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Objektliste" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4179,32 +4215,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Keine Kostenschätzung verfügbar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Vorschau" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Das Slicing läuft..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Slicing nicht möglich" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Verarbeitung läuft" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Slice" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Slicing-Vorgang starten" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Abbrechen" @@ -4239,233 +4280,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Voreingestellte Drucker" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Drucker hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Drucker verwalten" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Online-Fehlerbehebung anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Umschalten auf Vollbild-Modus" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Vollbildmodus beenden" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Rückgängig machen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Wiederholen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Beenden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-Ansicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vorderansicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Draufsicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Ansicht von links" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Ansicht von rechts" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura konfigurieren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Drucker hinzufügen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Dr&ucker verwalten..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialien werden verwaltet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Aktuelle Änderungen verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "P&rofil von aktuellen Einstellungen/Überschreibungen erstellen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profile verwalten..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online-&Dokumentation anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "&Fehler melden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Neuheiten" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Über..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Ausgewähltes Modell löschen" msgstr[1] "Ausgewählte Modelle löschen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Ausgewähltes Modell zentrieren" msgstr[1] "Ausgewählte Modelle zentrieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Ausgewähltes Modell multiplizieren" msgstr[1] "Ausgewählte Modelle multiplizieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modell löschen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modell auf Druckplatte ze&ntrieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelle &gruppieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Gruppierung für Modelle aufheben" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modelle &zusammenführen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Modell &multiplizieren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modelle wählen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Druckplatte reinigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modelle neu laden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Alle Modelle an allen Druckplatten anordnen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle Modelle anordnen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Anordnung auswählen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modellpositionen zurücksetzen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modelltransformationen zurücksetzen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Datei(en) öffnen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Neues Projekt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Konfigurationsordner anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marktplatz" @@ -4480,49 +4526,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dieses Paket wird nach einem Neustart installiert." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Einstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura wird geschlossen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Möchten Sie Cura wirklich beenden?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Datei(en) öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Paket installieren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Datei(en) öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Es wurden eine oder mehrere G-Code-Datei(en) innerhalb der von Ihnen gewählten Dateien gefunden. Sie können nur eine G-Code-Datei auf einmal öffnen. Wenn Sie eine G-Code-Datei öffnen möchten wählen Sie bitte nur eine Datei." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Drucker hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Neuheiten" @@ -4747,32 +4793,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projekt speichern" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Druckplatte" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Projektzusammenfassung beim Speichern nicht erneut anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Speichern" @@ -4948,12 +4994,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Störungen beheben" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Druckername" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Weisen Sie Ihrem Drucker bitte einen Namen zu" @@ -5012,21 +5058,6 @@ msgctxt "@button" msgid "Get started" msgstr "Erste Schritte" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Nur aktuelle Druckplatte anzeigen" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "An allen Druckplatten ausrichten" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "An aktueller Druckplatte ausrichten" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5117,6 +5148,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Profilglättfunktion" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Ermöglicht das Lesen von AMF-Dateien." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF-Reader" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5127,16 +5168,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB-Drucken" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Ermöglicht das Speichern des resultierenden Slices als X3G-Datei, um Drucker zu unterstützen, die dieses Format lesen (Malyan, Makerbot und andere Sailfish-basierte Drucker)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3G-Writer" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5387,6 +5418,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Upgrade von Version 3.0 auf 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Aktualisiert Konfigurationen von Cura 4.1 auf Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Upgrade von Version 4.1 auf 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5457,16 +5498,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF-Reader" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Liest SVG-Dateien als Werkzeugwege für die Fehlersuche bei Druckerbewegungen." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG-Werkzeugweg-Reader" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5557,6 +5588,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-Profil-Reader" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Anleitung für Cura-Einstellungen" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Die Einstellungen wurden passend für die aktuelle Verfügbarkeit der Extruder geändert: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Benutzerbeschreibung" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Diese Optionen sind nicht verfügbar, weil Sie einen Cloud-Drucker überwachen." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Gehe zu Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Alle Aufträge wurden gedruckt." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Druckauftragshistorie anzeigen" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung von G-Code-Dateien auf Ihren Drucker verwenden.\n" +#~ "\n" +#~ "Wählen Sie Ihren Drucker aus der folgenden Liste:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Stellen Sie bitte sicher, dass Ihr Drucker verbunden ist:\n" +#~ "- Prüfen Sie, ob Ihr Drucker eingeschaltet ist.\n" +#~ "- Prüfen Sie, ob der Drucker mit dem Netzwerk verbunden ist." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Nur aktuelle Druckplatte anzeigen" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "An allen Druckplatten ausrichten" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "An aktueller Druckplatte ausrichten" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Ermöglicht das Speichern des resultierenden Slices als X3G-Datei, um Drucker zu unterstützen, die dieses Format lesen (Malyan, Makerbot und andere Sailfish-basierte Drucker)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3G-Writer" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Liest SVG-Dateien als Werkzeugwege für die Fehlersuche bei Druckerbewegungen." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG-Werkzeugweg-Reader" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Änderungsprotokoll" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index 7d47548956..3df5bac5ef 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: German\n" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 8c8418ceed..99d81c92f2 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: German\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: German , German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "G-Code-Befehle, die zu Beginn ausgeführt werden sollen – getrennt durch \n." +msgstr "" +"G-Code-Befehle, die zu Beginn ausgeführt werden sollen – getrennt durch \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -69,7 +71,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "G-Code-Befehle, die am Ende ausgeführt werden sollen – getrennt durch \n." +msgstr "" +"G-Code-Befehle, die am Ende ausgeführt werden sollen – getrennt durch \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -333,7 +337,7 @@ msgstr "Die Mindestzeit, die ein Extruder inaktiv sein muss, bevor die Düse abk #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "G-Code-Variante" #: fdmprinter.def.json @@ -1293,8 +1297,12 @@ msgstr "Präferenz Nahtkante" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Definieren Sie, ob Kanten am Modell-Umriss die Nahtposition beeinflussen. Keine bedeutet, dass Kanten keinen Einfluss auf die Nahtposition haben. Naht verbergen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden Kante auftreten. Naht offenlegen lässt die Naht mit höherer Wahrscheinlichkeit an einer Außenkante auftreten. Naht verbergen oder offenlegen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden oder außenliegenden Kante auftreten." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Definieren Sie, ob Kanten am Modell-Umriss die Nahtposition beeinflussen. Keine bedeutet, dass Kanten keinen Einfluss auf die Nahtposition haben. Naht" +" verbergen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden Kante auftreten. Naht offenlegen lässt die Naht mit höherer Wahrscheinlichkeit" +" an einer Außenkante auftreten. Naht verbergen oder offenlegen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden oder außenliegenden" +" Kante auftreten. Intelligent verbergen lässt die Naht an innen- oder außenliegenden Kanten auftreten, verwendet aber – falls zweckmäßig – häufiger innenliegende" +" Kanten." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1316,6 +1324,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Naht verbergen oder offenlegen" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Intelligent verbergen" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1328,13 +1341,15 @@ msgstr "Bei Aktivierung sind die Z-Naht-Koordinaten relativ zur Mitte der jeweil #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Schmale Z-Lücken ignorieren" +msgid "No Skin in Z Gaps" +msgstr "Keine Außenhaut in Z-Lücken" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Wenn das Modell schmale vertikale Lücken hat, kann etwa 5 % zusätzliche Rechenzeit aufgewendet werden, um eine obere und untere Außenhaut in diesen engen Räumen zu generieren. In diesem Fall deaktivieren Sie die Einstellung." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Wenn das Modell kleine, nur wenige Schichten hohe vertikale Lücken aufweist, sind diese normalerweise von einer Außenhaut bedeckt. Aktivieren Sie diese" +" Einstellung, damit bei sehr kleinen Lücken keine Außenhaut gedruckt wird. Dies verkürzt die zum Drucken und Slicen benötigte Zeit, aber die Füllung bleibt" +" der Luft ausgesetzt." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1631,7 +1646,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Fügen Sie zusätzliche Wände um den Füllbereich hinzu. Derartige Wände können zu einem verringerten Absacken der oberen/unteren Außenhautlinien beitragen, was bedeutet, dass Sie weniger Außenhautschichten oben/unten bei derselben Qualität von Kosten für zusätzliches Material benötigen.\n Diese Funktion ist verknüpfbar mit „Füllungspolygone verbinden“, um alle Füllungen mit einem einzigen Extrusionspfad zu verbinden, ohne dass hierzu Vorwärtsbewegungen oder Rückzüge erforderlich sind, sofern die richtige Konfiguration gewählt wurde." +msgstr "" +"Fügen Sie zusätzliche Wände um den Füllbereich hinzu. Derartige Wände können zu einem verringerten Absacken der oberen/unteren Außenhautlinien beitragen, was bedeutet, dass Sie weniger Außenhautschichten oben/unten bei derselben Qualität von Kosten für zusätzliches Material benötigen.\n" +" Diese Funktion ist verknüpfbar mit „Füllungspolygone verbinden“, um alle Füllungen mit einem einzigen Extrusionspfad zu verbinden, ohne dass hierzu Vorwärtsbewegungen oder Rückzüge erforderlich sind, sofern die richtige Konfiguration gewählt wurde." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1870,8 +1887,8 @@ msgstr "Temperatur Druckabmessung" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "Die für die Druckabmessung verwendete Temperatur. Wenn dieser Wert 0 beträgt, wird die Temperatur der Druckabmessung nicht angepasst." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "Die Temperatur der Druckumgebung. Beträgt der Wert 0, wird die Druckraumtemperatur nicht angepasst." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1983,6 +2000,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Schrumpfungsverhältnis in Prozent." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Kristallines Material" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Lässt sich das Material im erhitzten Zustand leicht brechen (kristallin) oder bildet es lange, verflochtene Polymerketten (nicht kristallin)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Einzugsmaß für Sickerschutz" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Maß, um das das Material eingezogen werden muss, damit es nicht heraussickert." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Einzugsgeschwindigkeit für Sickerschutz" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Geschwindigkeit, mit der das Material beim Filamentwechsel eingezogen werden muss, damit es nicht heraussickert." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Einzugsmaß für Bruchvorbereitung" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Streckmaß für das Filament im erhitzten Zustand, bevor es bricht." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Einzugsgeschwindigkeit für Bruchvorbereitung" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Geschwindigkeit, mit der das Filament eingezogen werden muss, bevor es beim Einziehen abgebrochen wird." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Einzugsmaß für das Brechen" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Maß, um das das Filament eingezogen werden muss, damit es sauber abgebrochen werden kann." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Einzugsgeschwindigkeit für das Brechen" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "Geschwindigkeit, mit der das Filament eingezogen werden muss, damit es sauber abgebrochen werden kann." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Bruchtemperatur" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "Die Temperatur, bei der das Filament für eine saubere Bruchstelle gebrochen wird." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1993,6 +2090,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Fluss-Kompensation: Die extrudierte Materialmenge wird mit diesem Wert multipliziert." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Wandfluss" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Durchflusskompensation an Wandlinien." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Wandfluss außen" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Durchflusskompensation an der äußeren Wandlinie." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Wandfluss innen" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Durchflusskompensation an allen Wandlinien bis auf die äußere." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Fluss oben/unten" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Durchflusskompensation an oberen/unteren Linien." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Fluss Oberfläche Außenhaut" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Durchflusskompensation an Linien von Flächen an der Oberseite des Druckobjekts." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Fluss der Füllung" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Durchflusskompensation an Füllungslinien." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Skirt/Brim-Fluss" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Durchflusskompensation an Skirt- oder Brim-Linien." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Stützstruktur-Fluss" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Durchflusskompensation an Stützstrukturlinien." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Fluss Stützstruktur-Schnittstelle" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Durchflusskompensation an Dach- oder Bodenlinien der Stützstruktur." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Stützdachfluss" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Durchflusskompensation an Stützdachlinien." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Stützbodenfluss" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Durchflusskompensation an Stützbodenlinien." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Fluss Einzugsturm" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Durchflusskompensation an Einzugsturmlinien." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2110,8 +2327,9 @@ msgstr "Stützstruktur-Einzüge einschränken" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Lassen Sie den Einzug beim Vorgehen von Stützstruktur zu Stützstruktur in einer geraden Linie aus. Die Aktivierung dieser Einstellung spart Druckzeit, kann jedoch zu übermäßigem Fadenziehen innerhalb der Stützstruktur führen." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Lassen Sie den Einzug beim Vorgehen von Stützstruktur zu Stützstruktur in einer geraden Linie aus. Die Aktivierung dieser Einstellung spart Druckzeit," +" kann jedoch zu übermäßigem Fadenziehen innerhalb der Stützstruktur führen." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2163,6 +2381,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Die Geschwindigkeit, mit der das Filament während eines Düsenschaltereinzugs zurückgeschoben wird." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Zusätzliche Einzugsmenge bei Düsenwechsel" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Nach einem Düsenwechsel zusätzlich bereitzustellendes Material." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2354,14 +2582,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Die Geschwindigkeit, mit der die Skirt- und Brim-Elemente gedruckt werden. Normalerweise wird dafür die Geschwindigkeit der Basisschicht verwendet. In machen Fällen kann es jedoch vorteilhaft sein, das Skirt- oder Brim-Element mit einer anderen Geschwindigkeit zu drucken." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Maximale Z-Geschwindigkeit" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Sprunghöhe Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Die maximale Geschwindigkeit, mit der die Druckplatte bewegt wird. Eine Einstellung auf Null veranlasst die Verwendung der Firmware-Grundeinstellungen für die maximale Z-Geschwindigkeit." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Die Geschwindigkeit, mit der bei Z-Sprüngen die vertikale Bewegung (Z-Achse) erfolgt. Diese liegt in der Regel unterhalb der Druckgeschwindigkeit, da die" +" Bewegung von Druckbett oder Brücke schwieriger ist." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3279,12 +3508,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Der Abstand zwischen der ursprünglichen gedruckten Stützstrukturlinien. Diese Einstellung wird anhand der Dichte der Stützstruktur berechnet." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Unterstützung Linienrichtung Füllung" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Ausrichtung des Füllmusters für Unterstützung. Das Füllmuster für Unterstützung wird in der horizontalen Planfläche gedreht." @@ -3415,8 +3644,9 @@ msgstr "Abstand für Zusammenführung der Stützstrukturen" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Der Maximalabstand zwischen Stützstrukturen in der X- und Y-Richtung. Wenn sich einzelne Strukturen näher aneinander befinden, als dieser Wert, werden diese Strukturen in eine einzige Struktur zusammengefügt." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "Der Maximalabstand zwischen Stützstrukturen in der X- und Y-Richtung. Wenn der Abstand einzelner Strukturen zueinander diesen Wert unterschreitet, werden" +" diese Strukturen miteinander kombiniert und bilden eine Struktur." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3794,13 +4024,13 @@ msgid "The diameter of a special tower." msgstr "Der Durchmesser eines speziellen Pfeilers." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Mindestdurchmesser" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Maximaler Durchmesser für Stützpfeiler" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." msgstr "Der Mindestdurchmesser in den X/Y-Richtungen eines kleinen Bereichs, der durch einen speziellen Stützpfeiler gestützt wird." #: fdmprinter.def.json @@ -3923,7 +4153,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Der horizontale Abstand zwischen dem Skirt und der ersten Schicht des Drucks.\nEs handelt sich dabei um den Mindestabstand. Ab diesem Abstand werden mehrere Skirt-Linien in äußerer Richtung angebracht." +msgstr "" +"Der horizontale Abstand zwischen dem Skirt und der ersten Schicht des Drucks.\n" +"Es handelt sich dabei um den Mindestabstand. Ab diesem Abstand werden mehrere Skirt-Linien in äußerer Richtung angebracht." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4295,16 +4527,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Drucken Sie einen Turm neben dem Druck, der zum Einziehen des Materials nach jeder Düsenschaltung dient." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Einzugsturm kreisförmig" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Macht den Einzugsturm zu einer Kreisform." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4345,16 +4567,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Die Y-Koordinate der Position des Einzugsturms." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Fluss Einzugsturm" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Fluss-Kompensation: Die extrudierte Materialmenge wird mit diesem Wert multipliziert." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4657,8 +4869,9 @@ msgstr "Spiralisieren der äußeren Konturen glätten" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Glättet die spiralförmigen Konturen, um die Sichtbarkeit der Z-Naht zu reduzieren (die Z-Naht sollte auf dem Druck kaum sichtbar sein, ist jedoch in der Schichtenansicht erkennbar). Beachten Sie, dass das Glätten dazu neigt, feine Oberflächendetails zu verwischen." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Glättet die spiralförmigen Konturen, um die Sichtbarkeit der Z-Naht zu reduzieren (die Z-Naht sollte am Druckobjekt kaum sichtbar sein, ist jedoch in der" +" Schichtenansicht erkennbar). Beachten Sie, dass beim Glätten feine Oberflächendetails verwischt werden." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5157,8 +5370,8 @@ msgstr "Konische Stützstruktur aktivieren" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Experimentelle Funktion: Macht die Bereiche der Stützstruktur am Boden kleiner als beim Überhang." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Macht die Bereiche der Stützstruktur am Boden kleiner als beim Überhang." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5390,7 +5603,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "Die Strecke einer Aufwärtsbewegung, die mit halber Geschwindigkeit extrudiert wird.\nDies kann zu einer besseren Haftung an vorhergehenden Schichten führen, während gleichzeitig ein Überhitzen des Materials in diesen Schichten vermieden wird. Dies gilt nur für das Drucken mit Drahtstruktur." +msgstr "" +"Die Strecke einer Aufwärtsbewegung, die mit halber Geschwindigkeit extrudiert wird.\n" +"Dies kann zu einer besseren Haftung an vorhergehenden Schichten führen, während gleichzeitig ein Überhitzen des Materials in diesen Schichten vermieden wird. Dies gilt nur für das Drucken mit Drahtstruktur." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5957,6 +6172,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angewandt wird." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-Code-Variante" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Definieren Sie, ob Kanten am Modell-Umriss die Nahtposition beeinflussen. Keine bedeutet, dass Kanten keinen Einfluss auf die Nahtposition haben. Naht verbergen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden Kante auftreten. Naht offenlegen lässt die Naht mit höherer Wahrscheinlichkeit an einer Außenkante auftreten. Naht verbergen oder offenlegen lässt die Naht mit höherer Wahrscheinlichkeit an einer innenliegenden oder außenliegenden Kante auftreten." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Schmale Z-Lücken ignorieren" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Wenn das Modell schmale vertikale Lücken hat, kann etwa 5 % zusätzliche Rechenzeit aufgewendet werden, um eine obere und untere Außenhaut in diesen engen Räumen zu generieren. In diesem Fall deaktivieren Sie die Einstellung." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "Die für die Druckabmessung verwendete Temperatur. Wenn dieser Wert 0 beträgt, wird die Temperatur der Druckabmessung nicht angepasst." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Lassen Sie den Einzug beim Vorgehen von Stützstruktur zu Stützstruktur in einer geraden Linie aus. Die Aktivierung dieser Einstellung spart Druckzeit, kann jedoch zu übermäßigem Fadenziehen innerhalb der Stützstruktur führen." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Maximale Z-Geschwindigkeit" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Die maximale Geschwindigkeit, mit der die Druckplatte bewegt wird. Eine Einstellung auf Null veranlasst die Verwendung der Firmware-Grundeinstellungen für die maximale Z-Geschwindigkeit." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Der Maximalabstand zwischen Stützstrukturen in der X- und Y-Richtung. Wenn sich einzelne Strukturen näher aneinander befinden, als dieser Wert, werden diese Strukturen in eine einzige Struktur zusammengefügt." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Mindestdurchmesser" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Der Mindestdurchmesser in den X/Y-Richtungen eines kleinen Bereichs, der durch einen speziellen Stützpfeiler gestützt wird." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Einzugsturm kreisförmig" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Macht den Einzugsturm zu einer Kreisform." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Fluss-Kompensation: Die extrudierte Materialmenge wird mit diesem Wert multipliziert." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Glättet die spiralförmigen Konturen, um die Sichtbarkeit der Z-Naht zu reduzieren (die Z-Naht sollte auf dem Druck kaum sichtbar sein, ist jedoch in der Schichtenansicht erkennbar). Beachten Sie, dass das Glätten dazu neigt, feine Oberflächendetails zu verwischen." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Experimentelle Funktion: Macht die Bereiche der Stützstruktur am Boden kleiner als beim Überhang." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Anzahl der aktivierten Extruder" @@ -6162,7 +6441,6 @@ msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angew #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "Gcode-Befehle, die zu Beginn ausgeführt werden sollen – getrennt durch \n" #~ "." @@ -6175,7 +6453,6 @@ msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angew #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "Gcode-Befehle, die Am Ende ausgeführt werden sollen – getrennt durch \n" #~ "." @@ -6232,7 +6509,6 @@ msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angew #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "Der horizontale Abstand zwischen dem Skirt und der ersten Schicht des Drucks.\n" #~ "Es handelt sich dabei um den Mindestabstand. Ab diesem Abstand werden Skirt-Linien in äußerer Richtung angebracht." diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 4ab1a914da..834396b94c 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:34+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Spanish\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Spanish , Spanish \n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "El perfil se ha aplanado y activado." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "Archivo AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Se está realizando una impresión con USB, si cierra Cura detendrá la impresión. ¿Desea continuar?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Archivo X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Archivo X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Archivo X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "No se pudo guardar en unidad extraíble {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Error" @@ -230,8 +234,8 @@ msgstr "Expulsar dispositivo extraíble {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Advertencia" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "La configuración o calibración de la impresora y de Cura no coinciden. Para obtener el mejor resultado, segmente siempre los PrintCores y los materiales que se insertan en la impresora." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Envío de nuevos trabajos (temporalmente) bloqueado; se sigue enviando el trabajo de impresión previo." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Enviando datos a la impresora" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Enviando datos" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "El trabajo de impresión se ha enviado correctamente a la impresora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Fecha de envío" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver en pantalla" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} ha terminado de imprimir «{job_name}»." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "El trabajo de impresión '{job_name}' ha terminado." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Impresión terminada" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Vacío" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Desconocido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Imprimir mediante Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Imprimir mediante Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Conectado mediante Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Error de Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "No se ha podido exportar el trabajo de impresión." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "No se han podido cargar los datos en la impresora." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Cargando a través de Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Envíe y supervise sus trabajos de impresión desde cualquier lugar a través de su cuenta de Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Conectar a Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "No volver a preguntarme para esta impresora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Empezar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ahora ya puede enviar y supervisar sus trabajos de impresión desde cualquier lugar a través de su cuenta de Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "¡Conectado!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Revise su conexión" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar a través de la red" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Guía de ajustes de Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "Archivo 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Tobera" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "El archivo del proyecto {0} contiene un tipo de máquina desconocida {1}. No se puede importar la máquina, en su lugar, se importarán los modelos." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir archivo de proyecto" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "No compatible" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "El archivo ya existe" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL del archivo no válida:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "La configuración se ha cambiado para que coincida con los extrusores disponibles en este momento: [%s]." +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "La configuración se ha cambiado para que coincida con los extrusores disponibles en este momento:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes actualizados" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusores deshabilitados" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Error al exportar el perfil a {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Error al exportar el perfil a {0}: Error en el complemento de escritura." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado a {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportación correcta" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Error al importar el perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "No se puede importar el perfil de {0} antes de añadir una impresora." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "No hay ningún perfil personalizado para importar en el archivo {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Error al importar el perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Este perfil {0} contiene datos incorrectos, no se han podido importar." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "El equipo definido en el perfil {0} ({1}) no coincide con el equipo actual ({2}), no se ha podido importar." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Error al importar el perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado correctamente" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "El archivo {0} no contiene ningún perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "El perfil {0} tiene un tipo de archivo desconocido o está corrupto." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Al perfil le falta un tipo de calidad." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Siguiente" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "N.º de grupo {group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "Cerrar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Agregar" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Desconocido" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Las siguientes impresoras no pueden conectarse porque forman parte de un grupo" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Impresoras en red disponibles" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Personalizado" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "La altura del volumen de impresión se ha reducido debido al valor del ajuste «Secuencia de impresión» para evitar que el caballete colisione con los modelos impresos." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Volumen de impresión" @@ -1395,48 +1393,48 @@ msgstr "Registros" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Descripción del usuario" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Descripción del usuario (Nota: es posible que los desarrolladores no hablen su idioma; si es posible, utilice el inglés)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Enviar informe" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Cargando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando escena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Cargando interfaz..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Solo se puede cargar un archivo GCode a la vez. Se omitió la importación de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "No se puede abrir ningún archivo si se está cargando un archivo GCode. Se omitió la importación de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "No se puede cargar el modelo seleccionado, es demasiado pequeño." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Ajustes de la impresora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (anchura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (profundidad)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Forma de la placa de impresión" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Origen en el centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Plataforma calentada" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Tipo de GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ajustes del cabezal de impresión" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Altura del puente" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Iniciar GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Finalizar GCode" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Desplazamiento de la tobera sobre el eje X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Desplazamiento de la tobera sobre el eje Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número de ventilador de enfriamiento" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "GCode inicial del extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "GCode final del extrusor" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "Instalar" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -1616,8 +1614,8 @@ msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiales" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Su calificación" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Versión" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Última actualización" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Descargas" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Inicie sesión para realizar la instalación o la actualización" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar bobinas de material" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Actualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Actualizando" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Se ha producido un error al actualizar el firmware porque falta el firmware." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Vidrio" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Estas opciones no se encuentran disponibles porque está supervisando una impresora en la nube." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Actualice el firmware de la impresora para gestionar la cola de forma remota." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "La cámara web no se encuentra disponible porque está supervisando una impresora en la nube." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Cargando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "No disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "No se puede conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Sin actividad" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Sin título" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anónimo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Debe cambiar la configuración" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Detalles" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Impresora no disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Primera disponible" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "En cola" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Ir a Cura Connect" +msgid "Manage in browser" +msgstr "Gestionar en el navegador" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "No hay trabajos de impresión en la cola. Segmentar y enviar un trabajo para añadir uno." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Trabajos de impresión" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Tiempo de impresión total" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Esperando" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Se han imprimido todos los trabajos." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Ver historial de impresión" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,11 +2034,14 @@ msgstr "Conectar con la impresora en red" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "Para imprimir directamente en la impresora a través de la red, asegúrese de que ésta está conectada a la red utilizando un cable de red o conéctela a la red wifi. Si no conecta Cura con la impresora, también puede utilizar una unidad USB para transferir archivos GCode a la impresora.\n\nSeleccione la impresora de la siguiente lista:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Para imprimir directamente a través de la red, asegúrese de que la impresora está conectada a la red mediante un cable de red o conéctela a la red wifi." +" Si no conecta Cura con la impresora, también puede utilizar una unidad USB para transferir archivos GCode a la impresora." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Seleccione la impresora en la lista siguiente:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2053,9 +2049,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Eliminar" @@ -2138,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "Aceptar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Cancelado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Terminado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Preparando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Cancelando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Pausando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "En pausa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Reanudando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Acción requerida" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina el %1 a las %2" @@ -2285,44 +2281,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Anular" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "Es necesario realizar el siguiente cambio de configuración en la impresora asignada %1:" msgstr[1] "Es necesario realizar los siguientes cambios de configuración en la impresora asignada %1:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "Se ha asignado la impresora %1, pero el trabajo tiene una configuración de material desconocido." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Cambiar material %1, de %2 a %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Cargar %3 como material %1 (no se puede anular)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Cambiar print core %1, de %2 a %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Cambiar la placa de impresión a %1 (no se puede anular)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Al sobrescribir la configuración se usarán los ajustes especificados con la configuración de impresora existente. Esto podría provocar un fallo en la impresión." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Aluminio" @@ -2332,7 +2328,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Conecta a una impresora" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Guía de ajustes de Cura" @@ -2342,11 +2338,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "" -"Asegúrese de que su impresora está conectada:\n" -"- Compruebe que la impresora está encendida.\n" -"- Compruebe que la impresora está conectada a la red." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Asegúrese de que la impresora está conectada:\n- Compruebe que la impresora está encendida.\n- Compruebe que la impresora está conectada a la red.\n- Compruebe" +" que ha iniciado sesión para ver impresoras conectadas a la nube." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2658,7 +2653,7 @@ msgid "Printer Group" msgstr "Grupo de impresoras" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes del perfil" @@ -2671,19 +2666,19 @@ msgstr "¿Cómo debería solucionarse el conflicto en el perfil?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nombre" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "No está en el perfil" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2855,18 +2850,24 @@ msgid "Previous" msgstr "Anterior" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Consejo" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Ensayo de impresión" @@ -2971,170 +2972,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "¿Está seguro de que desea cancelar la impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Información" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar cambio de diámetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "El nuevo diámetro del filamento está ajustado en %1 mm y no es compatible con el extrusor actual. ¿Desea continuar?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Mostrar nombre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Tipo de material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Color" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Propiedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Densidad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diámetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Coste del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Anchura del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Longitud del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Coste por metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está vinculado a %1 y comparte alguna de sus propiedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Desvincular material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Descripción" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Información sobre adherencia" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Activar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Crear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Impresora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar eliminación" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "¿Seguro que desea eliminar %1? ¡Esta acción no se puede deshacer!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "No se pudo importar el material en %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "El material se ha importado correctamente en %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Se ha producido un error al exportar el material a %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "El material se ha exportado correctamente a %1" @@ -3175,383 +3176,406 @@ msgid "Unit" msgstr "Unidad" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "General" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interfaz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Moneda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Tendrá que reiniciar la aplicación para que estos cambios tengan efecto." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Segmentar automáticamente al cambiar los ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Segmentar automáticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamiento de la ventanilla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Resaltar en rojo las áreas del modelo sin soporte. Sin soporte, estas áreas no se imprimirán correctamente." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar voladizos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Mueve la cámara de manera que el modelo se encuentre en el centro de la vista cuando se selecciona un modelo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar cámara cuando se selecciona elemento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "¿Se debería invertir el comportamiento predeterminado del zoom de cura?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Invertir la dirección del zoom de la cámara." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "¿Debería moverse el zoom en la dirección del ratón?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Hacer zoom en la dirección del ratón no es compatible con la perspectiva ortogonal." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Hacer zoom en la dirección del ratón" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "¿Deben moverse los modelos en la plataforma de modo que no se crucen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Asegúrese de que los modelos están separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "¿Deben moverse los modelos del área de impresión de modo que no toquen la placa de impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Arrastrar modelos a la placa de impresión de forma automática" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Se muestra el mensaje de advertencia en el lector de GCode." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensaje de advertencia en el lector de GCode" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "¿Debe forzarse el modo de compatibilidad de la capa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzar modo de compatibilidad de la vista de capas (necesario reiniciar)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "¿Qué tipo de renderizado de cámara debería usarse?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Renderizado de cámara: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspectiva" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ortográfica" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir y guardar archivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "¿Deben ajustarse los modelos al volumen de impresión si son demasiado grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Escalar modelos de gran tamaño" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modelo puede mostrarse demasiado pequeño si su unidad son metros en lugar de milímetros, por ejemplo. ¿Deben escalarse estos modelos?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Escalar modelos demasiado pequeños" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "¿Se deberían seleccionar los modelos después de haberse cargado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Seleccionar modelos al abrirlos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "¿Debe añadirse automáticamente un prefijo basado en el nombre de la impresora al nombre del trabajo de impresión?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Agregar prefijo de la máquina al nombre del trabajo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "¿Mostrar un resumen al guardar un archivo de proyecto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar un cuadro de diálogo de resumen al guardar el proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamiento predeterminado al abrir un archivo del proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamiento predeterminado al abrir un archivo del proyecto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir siempre como un proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar modelos siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Si ha realizado cambios en un perfil y, a continuación, ha cambiado a otro, aparecerá un cuadro de diálogo que le preguntará si desea guardar o descartar los cambios. También puede elegir el comportamiento predeterminado, así ese cuadro de diálogo no volverá a aparecer." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Perfiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamiento predeterminado para los valores modificados al cambiar a otro perfil: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar siempre los ajustes modificados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir siempre los ajustes modificados al nuevo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privacidad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "¿Debe Cura buscar actualizaciones cuando se abre el programa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Buscar actualizaciones al iniciar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "¿Deben enviarse datos anónimos sobre la impresión a Ultimaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información de identificación personal." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar información (anónima) de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Más información" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Utilizar funcionalidad de placa de impresión múltiple" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Utilizar funcionalidad de placa de impresión múltiple (reinicio requerido)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Impresoras" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Cambiar nombre" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Crear" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplicado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Crear perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Introduzca un nombre para este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Cambiar nombre de perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impresora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Perfiles predeterminados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Perfiles personalizados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Actualizar perfil con ajustes o sobrescrituras actuales" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar cambios actuales" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza los ajustes predeterminados especificados por la impresora, por eso no aparece ningún ajuste o sobrescritura en la lista que se ve a continuación." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Los ajustes actuales coinciden con el perfil seleccionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globales" @@ -3619,33 +3643,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "buscar ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor en todos los extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos los valores cambiados en todos los extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "No mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidad de los ajustes..." @@ -3661,32 +3685,32 @@ msgstr "" "\n" "Haga clic para mostrar estos ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Este ajuste no se utiliza porque los ajustes a los que afecta están sobrescritos." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Afecta a" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afectado por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Este ajuste siempre se comparte entre extrusores. Si lo modifica, modificará el valor de todos los extrusores." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "El valor se resuelve según los valores de los extrusores. " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3697,7 +3721,7 @@ msgstr "" "\n" "Haga clic para restaurar el valor del perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3713,7 +3737,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Personalizado" @@ -3738,12 +3762,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Generar estructuras para soportar piezas del modelo que tengan voladizos. Sin estas estructuras, estas piezas se romperían durante la impresión." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Adherencia" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Habilita la impresión de un borde o una balsa. Esta opción agregará un área plana alrededor del objeto, que es fácil de cortar después." @@ -3829,7 +3853,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Enviar GCode" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Envíe un comando de GCode personalizado a la impresora conectada. Pulse «Intro» para enviar el comando." @@ -3926,11 +3950,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3981,7 +4000,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posición de la cámara" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Vista de cámara" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspectiva" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ortográfica" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&laca de impresión" @@ -4100,22 +4134,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &reciente" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Activar impresión" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nombre del trabajo" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Tiempo de impresión" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Tiempo restante estimado" @@ -4125,6 +4159,11 @@ msgctxt "@label" msgid "View type" msgstr "Ver tipo" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Lista de objetos" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4176,32 +4215,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Ningún cálculo de costes disponible" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Vista previa" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Segmentando..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "No se puede segmentar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Procesando" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Segmentación" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Iniciar el proceso de segmentación" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Cancelar" @@ -4236,233 +4280,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Impresoras preconfiguradas" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Agregar impresora" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Administrar impresoras" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostrar Guía de resolución de problemas en línea" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar pantalla completa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Salir de modo de pantalla completa" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Des&hacer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rehacer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Salir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista en 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista frontal" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista superior" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista del lado izquierdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista del lado derecho" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Agregar impresora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar impresoras ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar materiales..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Actualizar perfil con ajustes o sobrescrituras actuales" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar cambios actuales" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Crear perfil a partir de ajustes o sobrescrituras actuales..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfiles..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentación en línea" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Informar de un &error" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novedades" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Acerca de..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Eliminar modelo seleccionado" msgstr[1] "Eliminar modelos seleccionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Centrar modelo seleccionado" msgstr[1] "Centrar modelos seleccionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Multiplicar modelo seleccionado" msgstr[1] "Multiplicar modelos seleccionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Eliminar modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar modelo en plataforma" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleccionar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Borrar placa de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recargar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Organizar todos los modelos en todas las placas de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Organizar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Organizar selección" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Restablecer las posiciones de todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Restablecer las transformaciones de todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir archivo(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuevo proyecto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar carpeta de configuración" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marketplace" @@ -4477,49 +4526,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este paquete se instalará después de reiniciar." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cerrando Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "¿Seguro que desea salir de Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir archivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar paquete" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir archivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Hemos encontrado uno o más archivos de GCode entre los archivos que ha seleccionado. Solo puede abrir los archivos GCode de uno en uno. Si desea abrir un archivo GCode, seleccione solo uno." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Agregar impresora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Novedades" @@ -4744,32 +4793,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Placa de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 y material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "No mostrar resumen de proyecto al guardar de nuevo" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Guardar" @@ -4945,12 +4994,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Solución de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nombre de la impresora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Indique un nombre para su impresora" @@ -5009,21 +5058,6 @@ msgctxt "@button" msgid "Get started" msgstr "Empezar" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Ver solo placa de impresión actual" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Organizar todas las placas de impresión" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Organizar placa de impresión actual" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5114,6 +5148,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Aplanador de perfil" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Proporciona asistencia para leer archivos AMF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Lector de AMF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5124,16 +5168,6 @@ msgctxt "name" msgid "USB printing" msgstr "Impresión USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Permite guardar el segmento resultante como un archivo X3G para dar compatibilidad a impresoras que leen este formato (Malyan, Makerbot y otras impresoras basadas en Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5384,6 +5418,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Actualización de la versión 3.0 a la 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Actualiza la configuración de Cura 4.1 a Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Actualización de la versión 4.1 a la 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5454,16 +5498,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Lector de 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Lee archivos SVG como trayectorias de herramienta para solucionar errores en los movimientos de la impresora." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Lector de trayectoria de herramienta de SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5554,6 +5588,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lector de perfiles de Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Guía de ajustes de Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "La configuración se ha cambiado para que coincida con los extrusores disponibles en este momento: [%s]." + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Descripción del usuario" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Estas opciones no se encuentran disponibles porque está supervisando una impresora en la nube." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Ir a Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Se han imprimido todos los trabajos." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Ver historial de impresión" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Para imprimir directamente en la impresora a través de la red, asegúrese de que ésta está conectada a la red utilizando un cable de red o conéctela a la red wifi. Si no conecta Cura con la impresora, también puede utilizar una unidad USB para transferir archivos GCode a la impresora.\n" +#~ "\n" +#~ "Seleccione la impresora de la siguiente lista:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Asegúrese de que su impresora está conectada:\n" +#~ "- Compruebe que la impresora está encendida.\n" +#~ "- Compruebe que la impresora está conectada a la red." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Ver solo placa de impresión actual" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Organizar todas las placas de impresión" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Organizar placa de impresión actual" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Permite guardar el segmento resultante como un archivo X3G para dar compatibilidad a impresoras que leen este formato (Malyan, Makerbot y otras impresoras basadas en Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Lee archivos SVG como trayectorias de herramienta para solucionar errores en los movimientos de la impresora." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Lector de trayectoria de herramienta de SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Registro de cambios" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index 20529ad512..2183670518 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index d7e0cd2ff6..8ffd3969a6 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-05-28 09:34+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Spanish\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Spanish , Spanish \n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -337,7 +337,7 @@ msgstr "Tiempo mínimo que un extrusor debe permanecer inactivo antes de que la #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "Tipo de GCode" #: fdmprinter.def.json @@ -1297,8 +1297,12 @@ msgstr "Preferencia de esquina de costura" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Controlar si las esquinas del contorno del modelo influyen en la posición de la costura. «Ninguno» significa que las esquinas no influyen en la posición de la costura. «Ocultar costura» significa que es probable que la costura se realice en una esquina interior. «Mostrar costura» significa que es probable que la costura sea en una esquina exterior. «Ocultar o mostrar costura» significa que es probable que la costura se realice en una esquina interior o exterior." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Controlar si las esquinas del contorno del modelo influyen en la posición de la costura. «Ninguno» significa que las esquinas no influyen en la posición" +" de la costura. «Ocultar costura» significa que es probable que la costura se realice en una esquina interior. «Mostrar costura» significa que es probable" +" que la costura se realice en una esquina exterior. «Ocultar o mostrar costura» significa que es probable que la costura se realice en una esquina interior" +" o exterior. «Costura inteligente» permite realizar la costura en ambas esquinas, pero opta con más frecuencia por las esquinas interiores, si resulta" +" oportuno." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1320,6 +1324,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Ocultar o mostrar costura" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Costura inteligente" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1332,13 +1341,15 @@ msgstr "Cuando se habilita, las coordenadas de la costura en z son relativas al #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ignorar los pequeños huecos en Z" +msgid "No Skin in Z Gaps" +msgstr "Sin forro en huecos en Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Cuando el modelo tiene pequeños huecos verticales, el tiempo de cálculo puede aumentar alrededor de un 5 % para generar el forro superior e inferior en estos espacios estrechos. En tal caso, desactive este ajuste." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Cuando el modelo tiene pequeños huecos verticales de solo unas pocas capas, normalmente suele haber forro alrededor de ellas en el espacio estrecho. Active" +" este ajuste para no generar forro si el hueco vertical es muy pequeño. Esto mejora el tiempo de impresión y de segmentación, pero deja el relleno expuesto" +" al aire." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1876,8 +1887,8 @@ msgstr "Temperatura de volumen de impresión" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "La temperatura utilizada para el volumen de impresión. Si el valor es 0, la temperatura de volumen de impresión no se ajustará." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "La temperatura del entorno de impresión. Si el valor es 0, la temperatura de volumen de impresión no se ajustará." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1989,6 +2000,87 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Índice de compresión en porcentaje." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Material cristalino" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "¿Es este el tipo de material que se desprende limpiamente cuando se calienta (cristalino) o el que produce largas cadenas de polímeros entrelazadas (no" +" cristalino)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Velocidad de retracción antirrezumado" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Hasta dónde tiene que retraerse el material antes de detener el rezumado." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Velocidad de retracción antirrezumado" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Con qué velocidad tiene que retraerse el material durante un cambio de filamento para evitar el rezumado." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Posición retraída de preparación de rotura" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Hasta dónde puede estirarse el filamento antes de que se rompa mientras se calienta." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Velocidad de retracción de preparación de rotura" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Con qué velocidad debe retraerse el filamento justo antes de romperse en una retracción." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Posición retraída de rotura" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Hasta dónde debe retraerse el filamento para que se rompa limpiamente." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Velocidad de retracción de rotura" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "Velocidad a la que debe retraerse el filamento para que se rompa limpiamente." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Temperatura de rotura" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "Temperatura a la que se rompe el filamento de forma limpia." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1999,6 +2091,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Compensación de flujo: la cantidad de material extruido se multiplica por este valor." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Flujo de pared" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Compensación de flujo en líneas de pared." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Flujo de pared exterior" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Compensación de flujo en la línea de pared más externa." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Flujo de pared o paredes interiores" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Compensación de flujo en líneas de pared para todas las líneas excepto la más externa." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Flujo superior o inferior" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Compensación de flujo en las líneas superiores o inferiores." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Flujo de forro de superficie superior" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Compensación de flujo en líneas de las áreas superiores de la impresión." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Flujo de relleno" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Compensación de flujo en líneas de relleno." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Flujo de falda/borde" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Compensación de flujo en líneas de falda o borde." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Flujo de soporte" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Compensación de flujo en líneas de estructura de soporte." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Flujo de interfaz de soporte" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Compensación de flujo en líneas de techo o suelo de soporte." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Flujo de techo de soporte" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Compensación de flujo en líneas de techo de soporte." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Flujo de suelo de soporte" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Compensación de flujo en líneas de suelo de soporte." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Flujo de la torre auxiliar" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Compensación de flujo en líneas de la torre auxiliar." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2116,8 +2328,9 @@ msgstr "Limitar las retracciones de soporte" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Omitir la retracción al moverse de soporte a soporte en línea recta. Habilitar este ajuste ahorra tiempo de impresión pero puede ocasionar un encordado excesivo en la estructura de soporte." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Omitir la retracción al moverse de soporte a soporte en línea recta. Habilitar este ajuste ahorra tiempo de impresión pero puede ocasionar un encordado" +" excesivo en la estructura de soporte." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2169,6 +2382,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Velocidad a la que se retrae el filamento durante una retracción del cambio de tobera." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Volumen de cebado adicional tras cambio de tobera" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Material adicional que debe cebarse tras el cambio de tobera." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2360,14 +2583,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Velocidad a la que se imprimen la falda y el borde. Normalmente, esto se hace a la velocidad de la capa inicial, pero a veces es posible que se prefiera imprimir la falda o el borde a una velocidad diferente." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Velocidad máxima de Z" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Velocidad del salto en Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Velocidad máxima a la que se mueve la placa de impresión. Definir este valor en 0 hace que la impresión utilice los valores predeterminados de la velocidad máxima de Z." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Velocidad a la que se realiza el movimiento vertical en la dirección Z para los saltos en Z. Suele ser inferior a la velocidad de impresión porque la placa" +" de impresión o el puente de la máquina es más difícil de desplazar." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3285,12 +3509,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Distancia entre las líneas de estructuras del soporte de la capa inicial impresas. Este ajuste se calcula por la densidad del soporte." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Dirección de línea de relleno de soporte" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Orientación del patrón de relleno para soportes. El patrón de relleno de soporte se gira en el plano horizontal." @@ -3421,8 +3645,9 @@ msgstr "Distancia de unión del soporte" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Distancia máxima entre las estructuras del soporte en las direcciones X/Y. Cuando estructuras separadas están más cerca entre sí que de este valor, las estructuras se combinan en una." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "Distancia máxima entre las estructuras del soporte en las direcciones X/Y. Cuando las estructuras separadas están más cerca entre sí que este valor, se" +" combinan en una." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3800,14 +4025,14 @@ msgid "The diameter of a special tower." msgstr "Diámetro de una torre especial." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Diámetro mínimo" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Diámetro máximo soportado por la torre" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Diámetro mínimo en las direcciones X/Y de una pequeña área que soportará una torre de soporte especializada." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "Diámetro máximo en las direcciones X/Y de una pequeña área que debe ser soportada por una torre de soporte especializada." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4303,16 +4528,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir una torre junto a la impresión que sirve para preparar el material tras cada cambio de tobera." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Torre auxiliar circular" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Hacer que la torre auxiliar sea circular." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4353,16 +4568,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Coordenada Y de la posición de la torre auxiliar." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Flujo de la torre auxiliar" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Compensación de flujo: la cantidad de material extruido se multiplica por este valor." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4665,8 +4870,9 @@ msgstr "Contornos espiralizados suaves" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Suavice los contornos espiralizados para reducir la visibilidad de la costura Z (la costura Z debería ser apenas visible en la impresora pero seguirá siendo visible en la vista de capas). Tenga en cuenta que la suavización tenderá a desdibujar detalles finos de la superficie." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Suaviza los contornos espiralizados para reducir la visibilidad de la costura Z (la costura Z debería ser apenas visible en la impresora pero seguirá siendo" +" visible en la vista de capas). Tenga en cuenta que la suavización tenderá a desdibujar detalles finos de la superficie." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5165,8 +5371,8 @@ msgstr "Activar soporte cónico" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Función experimental: hace áreas de soporte más pequeñas en la parte inferior que en el voladizo." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Hace que las áreas de soporte sean más pequeñas en la parte inferior que en el voladizo." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5967,6 +6173,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformación que se aplicará al modelo cuando se cargue desde el archivo." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Tipo de GCode" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Controlar si las esquinas del contorno del modelo influyen en la posición de la costura. «Ninguno» significa que las esquinas no influyen en la posición de la costura. «Ocultar costura» significa que es probable que la costura se realice en una esquina interior. «Mostrar costura» significa que es probable que la costura sea en una esquina exterior. «Ocultar o mostrar costura» significa que es probable que la costura se realice en una esquina interior o exterior." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ignorar los pequeños huecos en Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Cuando el modelo tiene pequeños huecos verticales, el tiempo de cálculo puede aumentar alrededor de un 5 % para generar el forro superior e inferior en estos espacios estrechos. En tal caso, desactive este ajuste." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "La temperatura utilizada para el volumen de impresión. Si el valor es 0, la temperatura de volumen de impresión no se ajustará." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Omitir la retracción al moverse de soporte a soporte en línea recta. Habilitar este ajuste ahorra tiempo de impresión pero puede ocasionar un encordado excesivo en la estructura de soporte." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Velocidad máxima de Z" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Velocidad máxima a la que se mueve la placa de impresión. Definir este valor en 0 hace que la impresión utilice los valores predeterminados de la velocidad máxima de Z." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Distancia máxima entre las estructuras del soporte en las direcciones X/Y. Cuando estructuras separadas están más cerca entre sí que de este valor, las estructuras se combinan en una." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Diámetro mínimo" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Diámetro mínimo en las direcciones X/Y de una pequeña área que soportará una torre de soporte especializada." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Torre auxiliar circular" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Hacer que la torre auxiliar sea circular." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Compensación de flujo: la cantidad de material extruido se multiplica por este valor." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Suavice los contornos espiralizados para reducir la visibilidad de la costura Z (la costura Z debería ser apenas visible en la impresora pero seguirá siendo visible en la vista de capas). Tenga en cuenta que la suavización tenderá a desdibujar detalles finos de la superficie." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Función experimental: hace áreas de soporte más pequeñas en la parte inferior que en el voladizo." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Número de extrusores habilitados" diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot index 4238e291b3..991d418f7a 100644 --- a/resources/i18n/fdmextruder.def.json.pot +++ b/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: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index d6de2f2dc1..d1a75607cb 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/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: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -362,7 +362,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "" #: fdmprinter.def.json @@ -1448,7 +1448,9 @@ msgid "" "seam. None means that corners have no influence on the seam position. Hide " "Seam makes the seam more likely to occur on an inside corner. Expose Seam " "makes the seam more likely to occur on an outside corner. Hide or Expose " -"Seam makes the seam more likely to occur at an inside or outside corner." +"Seam makes the seam more likely to occur at an inside or outside corner. " +"Smart Hiding allows both inside and outside corners, but chooses inside " +"corners more frequently, if appropriate." msgstr "" #: fdmprinter.def.json @@ -1471,6 +1473,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1486,15 +1493,17 @@ msgstr "" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" +msgid "No Skin in Z Gaps" msgstr "" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" msgid "" -"When the model has small vertical gaps, about 5% extra computation time can " -"be spent on generating top and bottom skin in these narrow spaces. In such " -"case, disable the setting." +"When the model has small vertical gaps of only a few layers, there should " +"normally be skin around those layers in the narrow space. Enable this " +"setting to not generate skin if the vertical gap is very small. This " +"improves printing time and slicing time, but technically leaves infill " +"exposed to the air." msgstr "" #: fdmprinter.def.json @@ -2151,8 +2160,8 @@ msgstr "" #: fdmprinter.def.json msgctxt "build_volume_temperature description" msgid "" -"The temperature used for build volume. If this is 0, the build volume " -"temperature will not be adjusted." +"The temperature of the environment to print in. If this is 0, the build " +"volume temperature will not be adjusted." msgstr "" #: fdmprinter.def.json @@ -2278,6 +2287,94 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "" +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "" +"Is this material the type that breaks off cleanly when heated (crystalline), " +"or is it the type that produces long intertwined polymer chains (non-" +"crystalline)?" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "" +"How fast the material needs to be retracted during a filament switch to " +"prevent oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "" +"How fast the filament needs to be retracted just before breaking it off in a " +"retraction." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "" +"The speed at which to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -2290,6 +2387,127 @@ msgid "" "value." msgstr "" +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "" +"Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2426,7 +2644,7 @@ msgstr "" msgctxt "limit_support_retractions description" msgid "" "Omit retraction when moving from support to support in a straight line. " -"Enabling this setting saves print time, but can lead to excesive stringing " +"Enabling this setting saves print time, but can lead to excessive stringing " "within the support structure." msgstr "" @@ -2490,6 +2708,16 @@ msgid "" "retraction." msgstr "" +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2713,15 +2941,16 @@ msgid "" msgstr "" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" msgstr "" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" +msgctxt "speed_z_hop description" msgid "" -"The maximum speed with which the build plate is moved. Setting this to zero " -"causes the print to use the firmware defaults for the maximum z speed." +"The speed at which the vertical Z movement is made for Z Hops. This is " +"typically lower than the print speed since the build plate or machine's " +"gantry is harder to move." msgstr "" #: fdmprinter.def.json @@ -3784,12 +4013,12 @@ msgid "" msgstr "" #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "" "Orientation of the infill pattern for supports. The support infill pattern " "is rotated in the horizontal plane." @@ -3946,7 +4175,7 @@ msgstr "" msgctxt "support_join_distance description" msgid "" "The maximum distance between support structures in the X/Y directions. When " -"seperate structures are closer together than this value, the structures " +"separate structures are closer together than this value, the structures " "merge into one." msgstr "" @@ -4380,14 +4609,14 @@ msgid "The diameter of a special tower." msgstr "" #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" msgstr "" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" +msgctxt "support_tower_maximum_supported_diameter description" msgid "" -"Minimum diameter in the X/Y directions of a small area which is to be " +"Maximum diameter in the X/Y directions of a small area which is to be " "supported by a specialized support tower." msgstr "" @@ -4962,16 +5191,6 @@ msgid "" "each nozzle switch." msgstr "" -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "" - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -5014,18 +5233,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "" -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "" -"Flow compensation: the amount of material extruded is multiplied by this " -"value." -msgstr "" - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -5397,7 +5604,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" msgid "" -"Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-" +"Smooth the spiralized contours to reduce the visibility of the Z seam (the Z " "seam should be barely visible on the print but will still be visible in the " "layer view). Note that smoothing will tend to blur fine surface details." msgstr "" @@ -6017,9 +6224,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "" -"Experimental feature: Make support areas smaller at the bottom than at the " -"overhang." +msgid "Make support areas smaller at the bottom than at the overhang." msgstr "" #: fdmprinter.def.json diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index f1884abf56..4a49ee7835 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -79,6 +79,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profiili on tasoitettu ja aktivoitu." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -104,12 +109,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-tiedosto" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -120,6 +119,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G-tiedosto" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -192,9 +196,9 @@ msgstr "Ei voitu tallentaa siirrettävälle asemalle {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Virhe" @@ -224,8 +228,8 @@ msgstr "Poista siirrettävä asema {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Varoitus" @@ -356,39 +360,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Tulostimen ja Curan määrityksen tai kalibroinnin välillä on ristiriita. Parhaat tulokset saavutetaan viipaloimalla aina tulostimeen asetetuille PrintCoreille ja materiaaleille." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Uusien töiden lähettäminen (tilapäisesti) estetty, edellistä tulostustyötä lähetetään vielä." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Lähetetään tietoja tulostimeen" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Lähetetään tietoja" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Peruuta" @@ -437,82 +441,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} on tulostanut työn '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Tulosta valmis" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "" @@ -542,37 +546,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "" @@ -582,11 +586,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Yhdistä verkon kautta" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -760,18 +759,18 @@ msgid "3MF File" msgstr "3MF-tiedosto" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Suutin" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "" @@ -903,13 +902,13 @@ msgid "Not supported" msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Tiedosto on jo olemassa" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -921,117 +920,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Profiilin vienti epäonnistui tiedostoon {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Profiilin vienti epäonnistui tiedostoon {0}: Kirjoitin-lisäosa ilmoitti virheestä." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profiili viety tiedostoon {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Onnistuneesti tuotu profiili {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profiililla {0} on tuntematon tiedostotyyppi tai se on vioittunut." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Mukautettu profiili" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profiilista puuttuu laatutyyppi." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1109,7 +1107,7 @@ msgctxt "@action:button" msgid "Next" msgstr "" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1120,7 +1118,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1128,7 +1126,7 @@ msgstr "Sulje" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Lisää" @@ -1149,20 +1147,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Tuntematon" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "" @@ -1178,12 +1176,12 @@ msgctxt "@label" msgid "Custom" msgstr "Mukautettu" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "Tulostustilavuuden korkeutta on vähennetty tulostusjärjestysasetuksen vuoksi, jotta koroke ei osuisi tulostettuihin malleihin." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Tulostustilavuus" @@ -1381,48 +1379,48 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" msgstr "" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ladataan laitteita..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Asetetaan näkymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ladataan käyttöliittymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Vain yksi G-code-tiedosto voidaan ladata kerralla. Tiedoston {0} tuonti ohitettiin." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Muita tiedostoja ei voida ladata, kun G-code latautuu. Tiedoston {0} tuonti ohitettiin." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" @@ -1432,98 +1430,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (leveys)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (syvyys)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (korkeus)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Alustan muoto" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X väh." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y väh." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X enint." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y enint." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Suulakkeiden määrä" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -1553,22 +1551,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Suuttimen X-siirtymä" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Suuttimen Y-siirtymä" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "" @@ -1579,7 +1577,7 @@ msgid "Install" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Asennettu" @@ -1602,8 +1600,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiaalit" @@ -1613,49 +1611,49 @@ msgctxt "@label" msgid "Your rating" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1905,69 +1903,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Laiteohjelmiston päivitys epäonnistui puuttuvan laiteohjelmiston takia." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." +msgid "Please update your printer's firmware to manage the queue remotely." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "" @@ -1977,36 +1975,31 @@ msgctxt "@label" msgid "Queued" msgstr "Jonossa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" +msgid "Manage in browser" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2024,14 +2017,13 @@ msgstr "Yhdistä verkkotulostimeen" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" msgstr "" -"Tulosta suoraan tulostimeen verkon kautta yhdistämällä tulostin verkkoon verkkokaapelilla tai yhdistämällä tulostin Wi-Fi-verkkoon. Jos Curaa ei yhdistetä tulostimeen, GCode-tiedostot voidaan silti siirtää tulostimeen USB-aseman avulla.\n" -"\n" -"Valitse tulostin alla olevasta luettelosta:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2039,9 +2031,9 @@ msgid "Edit" msgstr "Muokkaa" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Poista" @@ -2124,50 +2116,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Valmis" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Vaatii toimenpiteitä" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "" @@ -2271,44 +2263,44 @@ msgctxt "@action:button" msgid "Override" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "" msgstr[1] "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "" @@ -2318,7 +2310,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Yhdistä tulostimeen" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "" @@ -2328,7 +2320,8 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 @@ -2641,7 +2634,7 @@ msgid "Printer Group" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Profiilin asetukset" @@ -2654,19 +2647,19 @@ msgstr "Miten profiilin ristiriita pitäisi ratkaista?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nimi" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Ei profiilissa" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2838,18 +2831,24 @@ msgid "Previous" msgstr "" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Vie" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "" @@ -2954,170 +2953,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Haluatko varmasti keskeyttää tulostuksen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Tiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Näytä nimi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Merkki" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Materiaalin tyyppi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Väri" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Ominaisuudet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Tiheys" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Läpimitta" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Tulostuslangan hinta" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Tulostuslangan paino" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Tulostuslangan pituus" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Hinta metriä kohden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Materiaali on linkitetty kohteeseen %1 ja niillä on joitain samoja ominaisuuksia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Poista materiaalin linkitys" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Kuvaus" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Tarttuvuustiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Tulostusasetukset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Aktivoi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Luo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Jäljennös" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Tuo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Tuo materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Materiaalin tuominen epäonnistui: %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaalin tuominen onnistui: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Vie materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Materiaalin vieminen epäonnistui kohteeseen %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaalin vieminen onnistui kohteeseen %1" @@ -3158,383 +3157,406 @@ msgid "Unit" msgstr "Yksikkö" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Yleiset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Käyttöliittymä" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Kieli:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Valuutta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Teema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Sovellus on käynnistettävä uudelleen, jotta nämä muutokset tulevat voimaan." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Viipaloi automaattisesti, kun asetuksia muutetaan." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Viipaloi automaattisesti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Näyttöikkunan käyttäytyminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Korosta mallin vailla tukea olevat alueet punaisella. Ilman tukea nämä alueet eivät tulostu kunnolla." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Näytä uloke" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Siirtää kameraa siten, että valittuna oleva malli on näkymän keskellä." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Keskitä kamera kun kohde on valittu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Pitääkö Curan oletusarvoinen zoom-toimintatapa muuttaa päinvastaiseksi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Käännä kameran zoomin suunta päinvastaiseksi." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Tuleeko zoomauksen siirtyä hiiren suuntaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomaa hiiren suuntaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Pitäisikö alustalla olevia malleja siirtää niin, etteivät ne enää leikkaa toisiaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Varmista, että mallit ovat erillään" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pitäisikö tulostusalueella olevia malleja siirtää alas niin, että ne koskettavat tulostusalustaa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pudota mallit automaattisesti alustalle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Pakotetaanko kerros yhteensopivuustilaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Pakota kerrosnäkymän yhteensopivuustila (vaatii uudelleenkäynnistyksen)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Tiedostojen avaaminen ja tallentaminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Pitäisikö mallit skaalata tulostustilavuuteen, jos ne ovat liian isoja?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaalaa suuret mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Malli voi vaikuttaa erittäin pieneltä, jos sen koko on ilmoitettu esimerkiksi metreissä eikä millimetreissä. Pitäisikö nämä mallit suurentaa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaalaa erittäin pienet mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Pitäisikö tulostustyön nimeen lisätä automaattisesti tulostimen nimeen perustuva etuliite?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Lisää laitteen etuliite työn nimeen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Näytetäänkö yhteenveto, kun projektitiedosto tallennetaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Näytä yhteenvetoikkuna, kun projekti tallennetaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Projektitiedoston avaamisen oletustoimintatapa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Projektitiedoston avaamisen oletustoimintatapa: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Avaa aina projektina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Tuo mallit aina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kun olet tehnyt muutokset profiiliin ja vaihtanut toiseen, näytetään valintaikkuna, jossa kysytään, haluatko säilyttää vai hylätä muutokset. Tässä voit myös valita oletuskäytöksen, jolloin valintaikkunaa ei näytetä uudelleen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Kysy aina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Tietosuoja" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Pitäisikö Curan tarkistaa saatavilla olevat päivitykset, kun ohjelma käynnistetään?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Tarkista päivitykset käynnistettäessä" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Lähetä (anonyymit) tulostustiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Tulostimet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Nimeä uudelleen" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiilit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Luo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Jäljennös" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Luo profiili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Monista profiili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Nimeä profiili uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiilin tuonti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiilin vienti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Tulostin: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Mukautetut profiilit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Päivitä nykyiset asetukset tai ohitukset profiiliin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Hylkää tehdyt muutokset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Tässä profiilissa käytetään tulostimen oletusarvoja, joten siinä ei ole alla olevan listan asetuksia tai ohituksia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Nykyiset asetukset vastaavat valittua profiilia." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Yleiset asetukset" @@ -3602,33 +3624,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Kopioi arvo kaikkiin suulakepuristimiin" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Piilota tämä asetus" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Älä näytä tätä asetusta" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pidä tämä asetus näkyvissä" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Määritä asetusten näkyvyys..." @@ -3644,32 +3666,32 @@ msgstr "" "\n" "Tee asetuksista näkyviä napsauttamalla." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Koskee seuraavia:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Riippuu seuraavista:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Arvo perustuu suulakepuristimien arvoihin " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3680,7 +3702,7 @@ msgstr "" "\n" "Palauta profiilin arvo napsauttamalla." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3696,7 +3718,7 @@ msgctxt "@button" msgid "Recommended" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "" @@ -3721,12 +3743,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Muodosta rakenteita, jotka tukevat mallin ulokkeita sisältäviä osia. Ilman tukirakenteita kyseiset osat luhistuvat tulostuksen aikana." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Ota reunuksen tai pohjaristikon tulostus käyttöön. Tämä lisää kappaleen ympärille tai alle tasaisen alueen, joka on helppo leikata pois myöhemmin." @@ -3812,7 +3834,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "" @@ -3909,11 +3931,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3964,7 +3981,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -4083,22 +4115,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Avaa &viimeisin" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Aktiivinen tulostustyö" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Työn nimi" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Tulostusaika" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Aikaa jäljellä arviolta" @@ -4108,6 +4140,11 @@ msgctxt "@label" msgid "View type" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4156,32 +4193,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Viipaloidaan..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "" @@ -4216,233 +4258,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Vaihda koko näyttöön" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Kumoa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Tee &uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Lopeta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Määritä Curan asetukset..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "L&isää tulostin..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Tulostinten &hallinta..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Hallitse materiaaleja..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Päivitä nykyiset asetukset tai ohitukset profiiliin" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Hylkää tehdyt muutokset" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Luo profiili nykyisten asetusten tai ohitusten perusteella..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profiilien hallinta..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Näytä sähköinen &dokumentaatio" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Ilmoita &virheestä" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Tietoja..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Poista valittu malli" msgstr[1] "Poista valitut mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Keskitä valittu malli" msgstr[1] "Keskitä valitut mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Kerro valittu malli" msgstr[1] "Kerro valitut mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Poista malli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ke&skitä malli alustalle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Ryhmittele mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Poista mallien ryhmitys" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Yhdistä mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Kerro malli..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Valitse kaikki mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Tyhjennä tulostusalusta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Lataa kaikki mallit uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Järjestä kaikki mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Järjestä valinta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Määritä kaikkien mallien positiot uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Määritä kaikkien mallien muutokset uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Avaa tiedosto(t)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Uusi projekti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Näytä määrityskansio" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "" @@ -4457,49 +4504,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Asetukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Avaa tiedosto(t)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Avaa tiedosto(t)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Löysimme vähintään yhden Gcode-tiedoston valitsemiesi tiedostojen joukosta. Voit avata vain yhden Gcode-tiedoston kerrallaan. Jos haluat avata Gcode-tiedoston, valitse vain yksi." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Lisää tulostin" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -4724,32 +4771,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Tallenna projekti" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Suulake %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Älä näytä projektin yhteenvetoa tallennettaessa" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Tallenna" @@ -4925,12 +4972,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "" @@ -4987,21 +5034,6 @@ msgctxt "@button" msgid "Get started" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5092,6 +5124,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5102,16 +5144,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB-tulostus" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "" - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5362,6 +5394,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5432,16 +5474,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF-lukija" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "" - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5532,6 +5564,16 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiilin lukija" +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Tulosta suoraan tulostimeen verkon kautta yhdistämällä tulostin verkkoon verkkokaapelilla tai yhdistämällä tulostin Wi-Fi-verkkoon. Jos Curaa ei yhdistetä tulostimeen, GCode-tiedostot voidaan silti siirtää tulostimeen USB-aseman avulla.\n" +#~ "\n" +#~ "Valitse tulostin alla olevasta luettelosta:" + #~ msgctxt "@item:inmenu" #~ msgid "Show Changelog" #~ msgstr "Näytä muutosloki" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index e03d0c345f..949d9518a5 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 9fb7cfcd8f..a00a4832a9 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -332,7 +332,7 @@ msgstr "Minimiaika, jonka suulakkeen on oltava ei-aktiivinen, ennen kuin suutin #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "" #: fdmprinter.def.json @@ -1292,8 +1292,8 @@ msgstr "Saumakulmien asetus" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Määritä, vaikuttavatko mallin ulkolinjan kulmat sauman sijaintiin. Ei mitään tarkoittaa, että kulmilla ei ole vaikutusta sauman sijaintiin. Piilota sauma -valinnalla sauman sijainti sisäkulmassa on todennäköisempää. Paljasta sauma -valinnalla sauman sijainti ulkokulmassa on todennäköisempää. Piilota tai paljasta sauma -valinnalla sauman sijainti sisä- tai ulkokulmassa on todennäköisempää." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1315,6 +1315,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Piilota tai paljasta sauma" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1327,13 +1332,13 @@ msgstr "Kun tämä on käytössä, Z-sauman koordinaatit ovat suhteessa kunkin o #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ohita pienet Z-raot" +msgid "No Skin in Z Gaps" +msgstr "" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Kun mallissa on pieniä pystyrakoja, ylä- ja alapuolen pintakalvon tekemiseen näihin kapeisiin paikkoihin voi kulua noin 5 % ylimääräistä laskenta-aikaa. Poista siinä tapauksessa tämä asetus käytöstä." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "" #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1869,7 +1874,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." msgstr "" #: fdmprinter.def.json @@ -1982,6 +1987,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "" +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1992,6 +2077,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Virtauksen kompensointi: pursotetun materiaalin määrä kerrotaan tällä arvolla." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Esitäyttötornin virtaus" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2109,7 +2314,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." msgstr "" #: fdmprinter.def.json @@ -2162,6 +2367,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Nopeus, jolla tulostuslanka työnnetään takaisin suuttimen vaihdon takaisinvedon jälkeen." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2353,14 +2568,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Nopeus, jolla helma ja reunus tulostetaan. Yleensä se tehdään alkukerroksen nopeudella. Joskus helma tai reunus halutaan kuitenkin tulostaa eri nopeudella." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Z:n maksiminopeus" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Maksiminopeus, jolla alustaa liikutetaan. Jos tämä määritetään nollaan, tulostuksessa käytetään laiteohjelmiston oletusasetuksia Z:n maksiminopeudelle." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "" #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3278,12 +3493,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "" #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "" @@ -3414,8 +3629,8 @@ msgstr "Tuen liitosetäisyys" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Tukirakenteiden maksimietäisyys toisistaan X-/Y-suunnissa. Kun erilliset rakenteet ovat tätä arvoa lähempänä toisiaan, rakenteet sulautuvat toisiinsa." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "" #: fdmprinter.def.json msgctxt "support_offset label" @@ -3793,14 +4008,14 @@ msgid "The diameter of a special tower." msgstr "Erityistornin läpimitta." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Minimiläpimitta" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Erityisellä tukitornilla tuettavan pienen alueen minimiläpimitta X- ja Y-suunnissa." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "" #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4294,16 +4509,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Tulosta tulosteen viereen torni, jolla materiaali esitäytetään aina suuttimen vaihdon jälkeen." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "" - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4344,16 +4549,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Esitäyttötornin sijainnin Y-koordinaatti." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Esitäyttötornin virtaus" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Virtauksen kompensointi: pursotetun materiaalin määrä kerrotaan tällä arvolla." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4656,8 +4851,8 @@ msgstr "Kierukoitujen ääriviivojen tasoittaminen" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Vähennä Z-sauman näkyvyyttä tasoittamalla kierukoidut ääriviivat (Z-sauman pitäisi olla lähes näkymätön tulosteessa, mutta kerrosnäkymässä sen voi edelleen havaita). Ota huomioon, että tasoittaminen usein sumentaa pinnan pieniä yksityiskohtia." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "" #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5156,8 +5351,8 @@ msgstr "Ota kartiomainen tuki käyttöön" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Kokeellinen ominaisuus: tekee tukialueet pienemmiksi alaosassa verrattuna ulokkeeseen." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "" #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5958,6 +6153,50 @@ 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 "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Määritä, vaikuttavatko mallin ulkolinjan kulmat sauman sijaintiin. Ei mitään tarkoittaa, että kulmilla ei ole vaikutusta sauman sijaintiin. Piilota sauma -valinnalla sauman sijainti sisäkulmassa on todennäköisempää. Paljasta sauma -valinnalla sauman sijainti ulkokulmassa on todennäköisempää. Piilota tai paljasta sauma -valinnalla sauman sijainti sisä- tai ulkokulmassa on todennäköisempää." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ohita pienet Z-raot" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Kun mallissa on pieniä pystyrakoja, ylä- ja alapuolen pintakalvon tekemiseen näihin kapeisiin paikkoihin voi kulua noin 5 % ylimääräistä laskenta-aikaa. Poista siinä tapauksessa tämä asetus käytöstä." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Z:n maksiminopeus" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Maksiminopeus, jolla alustaa liikutetaan. Jos tämä määritetään nollaan, tulostuksessa käytetään laiteohjelmiston oletusasetuksia Z:n maksiminopeudelle." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Tukirakenteiden maksimietäisyys toisistaan X-/Y-suunnissa. Kun erilliset rakenteet ovat tätä arvoa lähempänä toisiaan, rakenteet sulautuvat toisiinsa." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Minimiläpimitta" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Erityisellä tukitornilla tuettavan pienen alueen minimiläpimitta X- ja Y-suunnissa." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Virtauksen kompensointi: pursotetun materiaalin määrä kerrotaan tällä arvolla." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Vähennä Z-sauman näkyvyyttä tasoittamalla kierukoidut ääriviivat (Z-sauman pitäisi olla lähes näkymätön tulosteessa, mutta kerrosnäkymässä sen voi edelleen havaita). Ota huomioon, että tasoittaminen usein sumentaa pinnan pieniä yksityiskohtia." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Kokeellinen ominaisuus: tekee tukialueet pienemmiksi alaosassa verrattuna ulokkeeseen." + #~ msgctxt "machine_nozzle_tip_outer_diameter label" #~ msgid "Outer nozzle diameter" #~ msgstr "Suuttimen ulkoläpimitta" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index c79e12308a..41917b4933 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:35+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: French\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: French , French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Le profil a été aplati et activé." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "Fichier AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Une impression USB est en cours, la fermeture de Cura arrêtera cette impression. Êtes-vous sûr ?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Fichier X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Fichier X3G" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Fichier X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "Impossible d'enregistrer sur le lecteur {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Erreur" @@ -230,8 +234,8 @@ msgstr "Ejecter le lecteur amovible {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Avertissement" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Problème de compatibilité entre la configuration ou l'étalonnage de l'imprimante et Cura. Pour un résultat optimal, découpez toujours pour les PrintCores et matériaux insérés dans votre imprimante." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Envoi de nouvelles tâches (temporairement) bloqué, envoi de la tâche d'impression précédente en cours." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Envoi des données à l'imprimante" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Envoi des données" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Annuler" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Connecté sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "L'envoi de la tâche d'impression à l'imprimante a réussi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Données envoyées" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Afficher sur le moniteur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} a terminé d'imprimer '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "La tâche d'impression '{job_name}' est terminée." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Impression terminée" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Vide" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Inconnu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Imprimer via le cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Imprimer via le cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Connecté via le cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Erreur de cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Impossible d'exporter la tâche d'impression." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Impossible de transférer les données à l'imprimante." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Téléchargement via Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Lancez et surveillez des impressions où que vous soyez avec votre compte Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Se connecter à Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Ne plus me demander pour cette imprimante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Prise en main" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Vous pouvez maintenant lancer et surveiller des impressions où que vous soyez avec votre compte Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Connecté !" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Consulter votre connexion" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Connecter via le réseau" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Guide des paramètres de Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "Fichier 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Buse" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Le fichier projet {0} contient un type de machine inconnu {1}. Impossible d'importer la machine. Les modèles seront importés à la place." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Ouvrir un fichier de projet" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "Non pris en charge" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Le fichier existe déjà" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de fichier invalide :" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles : [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles :" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Paramètres mis à jour" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrudeuse(s) désactivée(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Échec de l'exportation du profil vers {0} : {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Échec de l'exportation du profil vers {0} : le plug-in du générateur a rapporté une erreur." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil exporté vers {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "L'exportation a réussi" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Impossible d'importer le profil depuis {0} : {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Impossible d'importer le profil depuis {0} avant l'ajout d'une imprimante." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Aucun profil personnalisé à importer dans le fichier {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Le profil {0} contient des données incorrectes ; échec de l'importation." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "La machine définie dans le profil {0} ({1}) ne correspond pas à votre machine actuelle ({2}) ; échec de l'importation." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Importation du profil {0} réussie" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Le fichier {0} ne contient pas de profil valide." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Le profil {0} est un type de fichier inconnu ou est corrompu." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Personnaliser le profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il manque un type de qualité au profil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Suivant" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "Groupe nº {group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "Fermer" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Ajouter" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Inconnu" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Les imprimantes ci-dessous ne peuvent pas être connectées car elles font partie d'un groupe" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Imprimantes en réseau disponibles" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Personnalisé" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "La hauteur du volume d'impression a été réduite en raison de la valeur du paramètre « Séquence d'impression » afin d'éviter que le portique ne heurte les modèles imprimés." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Volume d'impression" @@ -1395,48 +1393,48 @@ msgstr "Journaux" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Description de l'utilisateur" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Description de l'utilisateur (Remarque : les développeurs peuvent ne pas partler votre langue. Veuillez utiliser l'anglais si possible)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Envoyer rapport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Chargement des machines..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Préparation de la scène..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Chargement de l'interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Un seul fichier G-Code peut être chargé à la fois. Importation de {0} sautée" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossible d'ouvrir un autre fichier si le G-Code est en cours de chargement. Importation de {0} sautée" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Le modèle sélectionné était trop petit pour être chargé." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Paramètres de l'imprimante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Largeur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profondeur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Hauteur)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Forme du plateau" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Origine au centre" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Plateau chauffant" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Parfum G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Paramètres de la tête d'impression" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Hauteur du portique" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Nombre d'extrudeuses" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code de démarrage" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code de fin" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Décalage buse X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Décalage buse Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numéro du ventilateur de refroidissement" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Extrudeuse G-Code de démarrage" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Extrudeuse G-Code de fin" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "Installer" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Installé" @@ -1616,8 +1614,8 @@ msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Matériaux" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Votre évaluation" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Version" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Dernière mise à jour" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Auteur" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Téléchargements" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Connexion nécessaire pour l'installation ou la mise à jour" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Acheter des bobines de matériau" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Mise à jour" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Mise à jour" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Échec de la mise à jour du firmware en raison du firmware manquant." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Verre" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Ces options ne sont pas disponibles car vous surveillez une imprimante cloud." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Veuillez mettre à jour le Firmware de votre imprimante pour gérer la file d'attente à distance." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "La webcam n'est pas disponible car vous surveillez une imprimante cloud." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Chargement..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Indisponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Injoignable" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Inactif" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Sans titre" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anonyme" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Nécessite des modifications de configuration" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Détails" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Imprimante indisponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Premier disponible" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "Mis en file d'attente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Aller à Cura Connect" +msgid "Manage in browser" +msgstr "Gérer dans le navigateur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Il n'y a pas de travaux d'impression dans la file d'attente. Découpez et envoyez une tache pour en ajouter une." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Tâches d'impression" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Temps total d'impression" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Attente de" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Toutes les tâches ont été imprimées." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Voir l'historique d'impression" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,14 +2034,15 @@ msgstr "Connecter à l'imprimante en réseau" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"Pour imprimer directement sur votre imprimante sur le réseau, assurez-vous que votre imprimante est connectée au réseau via un câble réseau ou en connectant votre imprimante à votre réseau Wi-Fi. Si vous ne connectez pas Cura avec votre imprimante, vous pouvez utiliser une clé USB pour transférer les fichiers g-code sur votre imprimante.\n" -"\n" -"Sélectionnez votre imprimante dans la liste ci-dessous :" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Pour imprimer directement sur votre imprimante via le réseau, assurez-vous que votre imprimante est connectée au réseau via un câble Ethernet ou en connectant" +" votre imprimante à votre réseau Wi-Fi. Si vous ne connectez pas Cura avec votre imprimante, vous pouvez utiliser une clé USB pour transférer les fichiers" +" g-code sur votre imprimante." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Sélectionnez votre imprimante dans la liste ci-dessous :" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2056,9 +2050,9 @@ msgid "Edit" msgstr "Modifier" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Supprimer" @@ -2141,50 +2135,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abandonné" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Terminé" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Préparation..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Abandon..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Mise en pause..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "En pause" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Reprise..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Action requise" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Finit %1 à %2" @@ -2288,44 +2282,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Remplacer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "L'imprimante assignée, %1, nécessite la modification de configuration suivante :" msgstr[1] "L'imprimante assignée, %1, nécessite les modifications de configuration suivantes :" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "L'imprimante %1 est assignée, mais le projet contient une configuration matérielle inconnue." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Changer le matériau %1 de %2 à %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Charger %3 comme matériau %1 (Ceci ne peut pas être remplacé)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Changer le print core %1 de %2 à %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Changer le plateau en %1 (Ceci ne peut pas être remplacé)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Si vous sélectionnez « Remplacer », les paramètres de la configuration actuelle de l'imprimante seront utilisés. Cela peut entraîner l'échec de l'impression." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Aluminium" @@ -2335,7 +2329,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Connecter à une imprimante" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Guide des paramètres de Cura" @@ -2345,11 +2339,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "" -"Assurez-vous que votre imprimante est connectée :\n" -"- Vérifiez si l'imprimante est sous tension.\n" -"- Vérifiez si l'imprimante est connectée au réseau." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Assurez-vous que votre imprimante est connectée :\n- Vérifiez si l'imprimante est sous tension.\n- Vérifiez si l'imprimante est connectée au réseau.- Vérifiez" +" si vous êtes connecté pour découvrir les imprimantes connectées au cloud." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2661,7 +2654,7 @@ msgid "Printer Group" msgstr "Groupe d'imprimantes" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Paramètres de profil" @@ -2674,19 +2667,19 @@ msgstr "Comment le conflit du profil doit-il être résolu ?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nom" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Absent du profil" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2858,18 +2851,24 @@ msgid "Previous" msgstr "Précédent" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Exporter" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Astuce" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Générique" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Test d'impression" @@ -2974,170 +2973,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Êtes-vous sûr(e) de vouloir abandonner l'impression ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informations" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmer le changement de diamètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Le nouveau diamètre de filament est réglé sur %1 mm, ce qui n'est pas compatible avec l'extrudeuse actuelle. Souhaitez-vous poursuivre ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Afficher le nom" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marque" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Type de matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Couleur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Propriétés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Densité" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diamètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Coût du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Poids du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Longueur du filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Coût au mètre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Ce matériau est lié à %1 et partage certaines de ses propriétés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Délier le matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Description" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Informations d'adhérence" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Paramètres d'impression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Activer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Créer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliquer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Imprimante" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmer la suppression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Êtes-vous sûr de vouloir supprimer l'objet %1 ? Vous ne pourrez pas revenir en arrière !" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importer un matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossible d'importer le matériau %1 : %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Matériau %1 importé avec succès" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Exporter un matériau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Échec de l'exportation de matériau vers %1 : %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Matériau exporté avec succès vers %1" @@ -3178,383 +3177,406 @@ msgid "Unit" msgstr "Unité" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Général" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Langue :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Devise :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Thème :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Vous devez redémarrer l'application pour que ces changements prennent effet." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Découper automatiquement si les paramètres sont modifiés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Découper automatiquement" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportement Viewport" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Surligne les parties non supportées du modèle en rouge. Sans ajouter de support, ces zones ne s'imprimeront pas correctement." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Mettre en surbrillance les porte-à-faux" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Déplace la caméra afin que le modèle sélectionné se trouve au centre de la vue" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrer la caméra lorsqu'un élément est sélectionné" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Le comportement de zoom par défaut de Cura doit-il être inversé ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverser la direction du zoom de la caméra." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Le zoom doit-il se faire dans la direction de la souris ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Zoom vers la souris n'est pas pris en charge dans la perspective orthogonale." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomer vers la direction de la souris" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Les modèles dans la zone d'impression doivent-ils être déplacés afin de ne plus se croiser ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Veillez à ce que les modèles restent séparés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Les modèles dans la zone d'impression doivent-ils être abaissés afin de toucher le plateau ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Abaisser automatiquement les modèles sur le plateau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Afficher le message d'avertissement dans le lecteur G-Code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Message d'avertissement dans le lecteur G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "La couche doit-elle être forcée en mode de compatibilité ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forcer l'affichage de la couche en mode de compatibilité (redémarrage requis)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Quel type de rendu de la caméra doit-il être utilisé?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Rendu caméra : " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspective" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Orthogonale" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Ouvrir et enregistrer des fichiers" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Les modèles doivent-ils être mis à l'échelle du volume d'impression s'ils sont trop grands ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Réduire la taille des modèles trop grands" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modèle peut apparaître en tout petit si son unité est par exemple en mètres plutôt qu'en millimètres. Ces modèles doivent-ils être agrandis ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Mettre à l'échelle les modèles extrêmement petits" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Les modèles doivent-ils être sélectionnés après leur chargement ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Sélectionner les modèles lorsqu'ils sont chargés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Un préfixe basé sur le nom de l'imprimante doit-il être automatiquement ajouté au nom de la tâche d'impression ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Ajouter le préfixe de la machine au nom de la tâche" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Un résumé doit-il être affiché lors de l'enregistrement d'un fichier de projet ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Afficher la boîte de dialogue du résumé lors de l'enregistrement du projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet : " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Toujours ouvrir comme projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Toujours importer les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Lorsque vous apportez des modifications à un profil puis passez à un autre profil, une boîte de dialogue apparaît, vous demandant si vous souhaitez conserver les modifications. Vous pouvez aussi choisir une option par défaut, et le dialogue ne s'affichera plus." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportement par défaut pour les valeurs de paramètres modifiées lors du passage à un profil différent : " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Toujours rejeter les paramètres modifiés" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Toujours transférer les paramètres modifiés dans le nouveau profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Confidentialité" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura doit-il vérifier les mises à jour au démarrage du programme ?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Vérifier les mises à jour au démarrage" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information permettant de vous identifier personnellement ne seront envoyés ou stockés." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Envoyer des informations (anonymes) sur l'impression" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Plus d'informations" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Expérimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Utiliser la fonctionnalité multi-plateau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Utiliser la fonctionnalité multi-plateau (redémarrage requis)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Imprimantes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Renommer" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Créer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Dupliquer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Créer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Veuillez fournir un nom pour ce profil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Dupliquer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renommer le profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importer un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Exporter un profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Imprimante : %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Profils par défaut" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Personnaliser les profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Mettre à jour le profil à l'aide des paramètres / forçages actuels" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Ignorer les modifications actuelles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ce profil utilise les paramètres par défaut spécifiés par l'imprimante, de sorte qu'aucun paramètre / forçage n'apparaît dans la liste ci-dessous." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Vos paramètres actuels correspondent au profil sélectionné." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Paramètres généraux" @@ -3622,33 +3644,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "paramètres de recherche" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copier la valeur vers tous les extrudeurs" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copier toutes les valeurs modifiées vers toutes les extrudeuses" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Afficher ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurer la visibilité des paramètres..." @@ -3664,32 +3686,32 @@ msgstr "" "\n" "Cliquez pour rendre ces paramètres visibles." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Ce paramètre n'est pas utilisé car tous les paramètres qu'il influence sont remplacés." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Touche" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Touché par" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Ce paramètre est toujours partagé par toutes les extrudeuses. Le modifier ici entraînera la modification de la valeur pour toutes les extrudeuses." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "La valeur est résolue à partir des valeurs par extrudeur " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3700,7 +3722,7 @@ msgstr "" "\n" "Cliquez pour restaurer la valeur du profil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3716,7 +3738,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Recommandé" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Personnalisé" @@ -3741,12 +3763,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Générer des structures pour soutenir les parties du modèle qui possèdent des porte-à-faux. Sans ces structures, ces parties s'effondreront durant l'impression." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Adhérence" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Activez l'impression d'une bordure ou plaquette (Brim/Raft). Cela ajoutera une zone plate autour de ou sous votre objet qui est facile à découper par la suite." @@ -3832,7 +3854,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Envoyer G-Code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Envoyer une commande G-Code personnalisée à l'imprimante connectée. Appuyez sur « Entrée » pour envoyer la commande." @@ -3929,11 +3951,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoris" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Générique" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3984,7 +4001,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Position de la &caméra" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Vue de la caméra" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspective" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Orthographique" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Plateau" @@ -4103,22 +4135,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Ouvrir un fichier &récent" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Activer l'impression" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nom de la tâche" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Durée d'impression" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Durée restante estimée" @@ -4128,6 +4160,11 @@ msgctxt "@label" msgid "View type" msgstr "Type d'affichage" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Liste d'objets" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4179,32 +4216,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Aucune estimation des coûts n'est disponible" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Aperçu" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Découpe en cours..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Impossible de découper" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Traitement" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Découper" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Démarrer le processus de découpe" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Annuler" @@ -4239,233 +4281,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Imprimantes préréglées" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Ajouter une imprimante" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Gérer les imprimantes" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Afficher le guide de dépannage en ligne" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Passer en Plein écran" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Quitter le mode plein écran" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annuler" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rétablir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Quitter" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vue 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vue de face" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vue du dessus" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vue latérale gauche" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vue latérale droite" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurer Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Ajouter une imprimante..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gérer les &imprimantes..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gérer les matériaux..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Mettre à jour le profil à l'aide des paramètres / forçages actuels" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Ignorer les modifications actuelles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Créer un profil à partir des paramètres / forçages actuels..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gérer les profils..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Afficher la &documentation en ligne" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Notifier un &bug" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Quoi de neuf" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "À propos de..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Supprimer le modèle sélectionné" msgstr[1] "Supprimer les modèles sélectionnés" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Centrer le modèle sélectionné" msgstr[1] "Centrer les modèles sélectionnés" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Multiplier le modèle sélectionné" msgstr[1] "Multiplier les modèles sélectionnés" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Supprimer le modèle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrer le modèle sur le plateau" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grouper les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Dégrouper les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Fusionner les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplier le modèle..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Sélectionner tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Supprimer les objets du plateau" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recharger tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Réorganiser tous les modèles sur tous les plateaux" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Réorganiser tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Réorganiser la sélection" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Réinitialiser toutes les positions des modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Réinitialiser tous les modèles et transformations" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Ouvrir le(s) fichier(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nouveau projet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Afficher le dossier de configuration" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marché en ligne" @@ -4480,49 +4527,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ce paquet sera installé après le redémarrage." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Paramètres" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fermeture de Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Êtes-vous sûr de vouloir quitter Cura ?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Installer le paquet" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Nous avons trouvé au moins un fichier G-Code parmi les fichiers que vous avez sélectionné. Vous ne pouvez ouvrir qu'un seul fichier G-Code à la fois. Si vous souhaitez ouvrir un fichier G-Code, veuillez ne sélectionner qu'un seul fichier de ce type." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Ajouter une imprimante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Quoi de neuf" @@ -4747,32 +4794,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Enregistrer le projet" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Plateau" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrudeuse %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & matériau" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Matériau" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Ne pas afficher à nouveau le résumé du projet lors de l'enregistrement" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Enregistrer" @@ -4948,12 +4995,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Dépannage" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nom de l'imprimante" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Veuillez donner un nom à votre imprimante" @@ -5012,21 +5059,6 @@ msgctxt "@button" msgid "Get started" msgstr "Prise en main" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Afficher uniquement le plateau actuel" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Réorganiser sur tous les plateaux" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Réorganiser le plateau actuel" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5117,6 +5149,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Aplatisseur de profil" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Fournit la prise en charge de la lecture de fichiers AMF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Lecteur AMF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5127,16 +5169,6 @@ msgctxt "name" msgid "USB printing" msgstr "Impression par USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Permet de sauvegarder la tranche résultante sous forme de fichier X3G, pour prendre en charge les imprimantes qui lisent ce format (Malyan, Makerbot et autres imprimantes basées sur Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5387,6 +5419,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Mise à niveau de version, de 3.0 vers 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Configurations des mises à jour de Cura 4.1 vers Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Mise à jour de 4.1 vers 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5457,16 +5499,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Lecteur 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Lit les fichiers SVG comme des Toolpaths, pour déboguer les mouvements de l'imprimante." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Lecteur de Toolpaths SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5557,6 +5589,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lecteur de profil Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Guide des paramètres de Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles : [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Description de l'utilisateur" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Ces options ne sont pas disponibles car vous surveillez une imprimante cloud." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Aller à Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Toutes les tâches ont été imprimées." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Voir l'historique d'impression" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Pour imprimer directement sur votre imprimante sur le réseau, assurez-vous que votre imprimante est connectée au réseau via un câble réseau ou en connectant votre imprimante à votre réseau Wi-Fi. Si vous ne connectez pas Cura avec votre imprimante, vous pouvez utiliser une clé USB pour transférer les fichiers g-code sur votre imprimante.\n" +#~ "\n" +#~ "Sélectionnez votre imprimante dans la liste ci-dessous :" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Assurez-vous que votre imprimante est connectée :\n" +#~ "- Vérifiez si l'imprimante est sous tension.\n" +#~ "- Vérifiez si l'imprimante est connectée au réseau." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Afficher uniquement le plateau actuel" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Réorganiser sur tous les plateaux" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Réorganiser le plateau actuel" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Permet de sauvegarder la tranche résultante sous forme de fichier X3G, pour prendre en charge les imprimantes qui lisent ce format (Malyan, Makerbot et autres imprimantes basées sur Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Lit les fichiers SVG comme des Toolpaths, pour déboguer les mouvements de l'imprimante." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Lecteur de Toolpaths SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Récapitulatif des changements" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index c855187d83..da14c42d89 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: French\n" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index d250e6508f..80a36ffa5e 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: French\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: French , French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "Commandes G-Code à exécuter au tout début, séparées par \n." +msgstr "" +"Commandes G-Code à exécuter au tout début, séparées par \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -69,7 +71,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "Commandes G-Code à exécuter tout à la fin, séparées par \n." +msgstr "" +"Commandes G-Code à exécuter tout à la fin, séparées par \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -333,7 +337,7 @@ msgstr "La durée minimale pendant laquelle une extrudeuse doit être inactive a #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "Parfum G-Code" #: fdmprinter.def.json @@ -1293,8 +1297,11 @@ msgstr "Préférence de jointure d'angle" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Vérifie si les angles du contour du modèle influencent l'emplacement de la jointure. « Aucune » signifie que les angles n'ont aucune influence sur l'emplacement de la jointure. « Masquer jointure » génère généralement le positionnement de la jointure sur un angle intérieur. « Exposer jointure » génère généralement le positionnement de la jointure sur un angle extérieur. « Masquer ou exposer jointure » génère généralement le positionnement de la jointure sur un angle intérieur ou extérieur." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Vérifie si les angles du contour du modèle influencent l'emplacement de la jointure. « Aucune » signifie que les angles n'ont aucune influence sur l'emplacement" +" de la jointure. « Masquer la jointure » génère le positionnement de la jointure sur un angle intérieur. « Exposer la jointure » génère le positionnement" +" de la jointure sur un angle extérieur. « Masquer ou exposer la jointure » génère le positionnement de la jointure sur un angle intérieur ou extérieur." +" « Jointure intelligente » autorise les angles intérieurs et extérieurs, mais choisit plus fréquemment les angles intérieurs, le cas échéant." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1316,6 +1323,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Masquer ou exposer jointure" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Masquage intelligent" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1328,13 +1340,15 @@ msgstr "Si cette option est activée, les coordonnées de la jointure z sont rel #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ignorer les petits trous en Z" +msgid "No Skin in Z Gaps" +msgstr "Aucune couche dans les trous en Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Quand le modèle présente de petits trous verticaux, environ 5 % de temps de calcul supplémentaire peut être alloué à la génération de couches du dessus et du dessous dans ces espaces étroits. Dans ce cas, désactivez ce paramètre." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Lorsque le modèle comporte de petits trous verticaux de quelques couches seulement, il doit normalement y avoir une couche autour de celles-ci dans l'espace" +" étroit. Activez ce paramètre pour ne pas générer de couche si le trou vertical est très petit. Cela améliore le temps d'impression et le temps de découpage," +" mais laisse techniquement le remplissage exposé à l'air." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1631,7 +1645,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Ajoutez des parois supplémentaires autour de la zone de remplissage. De telles parois peuvent réduire l'affaissement des lignes de couche extérieure supérieure / inférieure, réduisant le nombre de couches extérieures supérieures / inférieures nécessaires pour obtenir la même qualité, au prix d'un peu de matériau supplémentaire.\nConfigurée correctement, cette fonctionnalité peut être combinée avec « Relier les polygones de remplissage » pour relier tous les remplissages en un seul mouvement d'extrusion sans avoir besoin de déplacements ou de rétractions." +msgstr "" +"Ajoutez des parois supplémentaires autour de la zone de remplissage. De telles parois peuvent réduire l'affaissement des lignes de couche extérieure supérieure / inférieure, réduisant le nombre de couches extérieures supérieures / inférieures nécessaires pour obtenir la même qualité, au prix d'un peu de matériau supplémentaire.\n" +"Configurée correctement, cette fonctionnalité peut être combinée avec « Relier les polygones de remplissage » pour relier tous les remplissages en un seul mouvement d'extrusion sans avoir besoin de déplacements ou de rétractions." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1870,8 +1886,8 @@ msgstr "Température du volume d'impression" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "La température utilisée pour le volume d'impression. Si cette valeur est 0, la température du volume d'impression ne sera pas ajustée." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "La température de l'environnement d'impression. Si cette valeur est 0, la température du volume d'impression ne sera pas ajustée." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1983,6 +1999,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Taux de contraction en pourcentage." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Matériau cristallin" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Ce matériau se casse-t-il proprement lorsqu'il est chauffé (cristallin) ou est-ce le type qui produit de longues chaînes polymères entrelacées (non cristallines) ?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Position anti-suintage rétractée" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Jusqu'où le matériau doit être rétracté avant qu'il cesse de suinter." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Vitesse de rétraction de l'anti-suintage" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "À quelle vitesse le matériau doit-il être rétracté lors d'un changement de filament pour empêcher le suintage." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Préparation de rupture Position rétractée" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Jusqu'où le filament peut être étiré avant qu'il ne se casse, pendant qu'il est chauffé." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Vitesse de rétraction de préparation de rupture" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "La vitesse à laquelle le filament doit être rétracté juste avant de le briser dans une rétraction." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Position rétractée de rupture" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Jusqu'où rétracter le filament afin de le casser proprement." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Vitesse de rétraction de rupture" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "La vitesse à laquelle rétracter le filament afin de le rompre proprement." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Température de rupture" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "La température à laquelle le filament est cassé pour une rupture propre." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1993,6 +2089,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Compensation du débit : la quantité de matériau extrudée est multipliée par cette valeur." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Débit de paroi" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Compensation de débit sur les lignes de la paroi." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Débit de paroi externe" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Compensation de débit sur la ligne de la paroi la plus à l'extérieur." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Débit de paroi(s) interne(s)" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Compensation de débit sur les lignes de la paroi pour toutes les lignes de paroi, à l'exception de la ligne la plus externe." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Débit du dessus/dessous" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Compensation de débit sur les lignes du dessus/dessous." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Débit de la surface du dessus" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Compensation de débit sur les lignes des zones en haut de l'impression." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Débit de remplissage" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Compensation de débit sur les lignes de remplissage." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Débit de la jupe/bordure" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Compensation de débit sur les lignes de jupe ou bordure." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Débit du support" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Compensation de débit sur les lignes de support." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Débit de l'interface de support" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Compensation de débit sur les lignes de plafond ou de bas de support." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Débit du plafond de support" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Compensation de débit sur les lignes du plafond de support." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Débit du bas de support" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Compensation de débit sur les lignes de bas de support." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Débit de la tour primaire" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Compensation de débit sur les lignes de la tour primaire." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2110,8 +2326,9 @@ msgstr "Limiter les rétractations du support" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Omettre la rétraction lors du passage entre supports en ligne droite. L'activation de ce paramètre permet de gagner du temps lors de l'impression, mais peut conduire à un cordage excessif à l'intérieur de la structure de support." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Omettre la rétraction lors du passage entre supports en ligne droite. L'activation de ce paramètre permet de gagner du temps lors de l'impression, mais" +" peut conduire à un stringing excessif à l'intérieur de la structure de support." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2163,6 +2380,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "La vitesse à laquelle le filament est poussé vers l'arrière après une rétraction de changement de buse." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Montant de l'amorce supplémentaire lors d'un changement de buse" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Matériel supplémentaire à amorcer après le changement de buse." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2354,14 +2581,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "La vitesse à laquelle la jupe et la bordure sont imprimées. Normalement, cette vitesse est celle de la couche initiale, mais il est parfois nécessaire d’imprimer la jupe ou la bordure à une vitesse différente." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Vitesse Z maximale" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Vitesse du décalage en Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "La vitesse maximale à laquelle le plateau se déplace. Définir cette valeur sur zéro impose à l'impression d'utiliser les valeurs par défaut du firmware pour la vitesse z maximale." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "La vitesse à laquelle le mouvement vertical en Z est effectué pour des décalages en Z. Cette vitesse est généralement inférieure à la vitesse d'impression" +" car le plateau ou le portique de la machine est plus difficile à déplacer." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3279,12 +3507,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Distance entre les lignes de la structure de support de la couche initiale imprimée. Ce paramètre est calculé en fonction de la densité du support." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Direction de ligne de remplissage du support" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Orientation du motif de remplissage pour les supports. Le motif de remplissage du support pivote dans le plan horizontal." @@ -3415,8 +3643,8 @@ msgstr "Distance de jointement des supports" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "La distance maximale entre les supports dans les directions X/Y. Lorsque des supports séparés sont plus rapprochés que cette valeur, ils fusionnent." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "La distance maximale entre les supports dans les directions X/Y. Lorsque des modèle séparés sont plus rapprochés que cette valeur, ils fusionnent." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3794,14 +4022,14 @@ msgid "The diameter of a special tower." msgstr "Le diamètre d’une tour spéciale." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Diamètre minimal" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Diamètre maximal supporté par la tour" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Le diamètre minimal sur les axes X/Y d’une petite zone qui doit être soutenue par une tour de soutien spéciale." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "Le diamètre maximal sur les axes X/Y d’une petite zone qui doit être soutenue par une tour de soutien spéciale." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3923,7 +4151,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "La distance horizontale entre la jupe et la première couche de l’impression.\nIl s’agit de la distance minimale séparant la jupe de l’objet. Si la jupe a d’autres lignes, celles-ci s’étendront vers l’extérieur." +msgstr "" +"La distance horizontale entre la jupe et la première couche de l’impression.\n" +"Il s’agit de la distance minimale séparant la jupe de l’objet. Si la jupe a d’autres lignes, celles-ci s’étendront vers l’extérieur." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4295,16 +4525,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimer une tour à côté de l'impression qui sert à amorcer le matériau après chaque changement de buse." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Tour primaire circulaire" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Réaliser la tour primaire en forme circulaire." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4345,16 +4565,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Les coordonnées Y de la position de la tour primaire." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Débit de la tour primaire" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Compensation du débit : la quantité de matériau extrudée est multipliée par cette valeur." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4657,8 +4867,9 @@ msgstr "Lisser les contours spiralisés" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Lisser les contours spiralisés pour réduire la visibilité de la jointure en Z (la jointure en Z doit être à peine visible sur l'impression mais sera toujours visible dans la vue en couches). Veuillez remarquer que le lissage aura tendance à estomper les détails fins de la surface." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Lisser les contours spiralisés pour réduire la visibilité de la jointure en Z (la jointure en Z doit être à peine visible sur l'impression mais sera toujours" +" visible dans la vue en couches). Veuillez remarquer que le lissage aura tendance à estomper les détails très fins de la surface." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5157,8 +5368,8 @@ msgstr "Activer les supports coniques" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Fonctionnalité expérimentale : rendre les aires de support plus petites en bas qu'au niveau du porte-à-faux à supporter." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Rendre les aires de support plus petites en bas qu'au niveau du porte-à-faux à supporter." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5390,7 +5601,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "Distance d’un déplacement ascendant qui est extrudé à mi-vitesse.\nCela peut permettre une meilleure adhérence aux couches précédentes sans surchauffer le matériau dans ces couches. Uniquement applicable à l'impression filaire." +msgstr "" +"Distance d’un déplacement ascendant qui est extrudé à mi-vitesse.\n" +"Cela peut permettre une meilleure adhérence aux couches précédentes sans surchauffer le matériau dans ces couches. Uniquement applicable à l'impression filaire." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5957,6 +6170,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice de transformation à appliquer au modèle lors de son chargement depuis le fichier." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Parfum G-Code" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Vérifie si les angles du contour du modèle influencent l'emplacement de la jointure. « Aucune » signifie que les angles n'ont aucune influence sur l'emplacement de la jointure. « Masquer jointure » génère généralement le positionnement de la jointure sur un angle intérieur. « Exposer jointure » génère généralement le positionnement de la jointure sur un angle extérieur. « Masquer ou exposer jointure » génère généralement le positionnement de la jointure sur un angle intérieur ou extérieur." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ignorer les petits trous en Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Quand le modèle présente de petits trous verticaux, environ 5 % de temps de calcul supplémentaire peut être alloué à la génération de couches du dessus et du dessous dans ces espaces étroits. Dans ce cas, désactivez ce paramètre." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "La température utilisée pour le volume d'impression. Si cette valeur est 0, la température du volume d'impression ne sera pas ajustée." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Omettre la rétraction lors du passage entre supports en ligne droite. L'activation de ce paramètre permet de gagner du temps lors de l'impression, mais peut conduire à un cordage excessif à l'intérieur de la structure de support." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Vitesse Z maximale" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "La vitesse maximale à laquelle le plateau se déplace. Définir cette valeur sur zéro impose à l'impression d'utiliser les valeurs par défaut du firmware pour la vitesse z maximale." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "La distance maximale entre les supports dans les directions X/Y. Lorsque des supports séparés sont plus rapprochés que cette valeur, ils fusionnent." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Diamètre minimal" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Le diamètre minimal sur les axes X/Y d’une petite zone qui doit être soutenue par une tour de soutien spéciale." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Tour primaire circulaire" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Réaliser la tour primaire en forme circulaire." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Compensation du débit : la quantité de matériau extrudée est multipliée par cette valeur." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Lisser les contours spiralisés pour réduire la visibilité de la jointure en Z (la jointure en Z doit être à peine visible sur l'impression mais sera toujours visible dans la vue en couches). Veuillez remarquer que le lissage aura tendance à estomper les détails fins de la surface." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Fonctionnalité expérimentale : rendre les aires de support plus petites en bas qu'au niveau du porte-à-faux à supporter." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Nombre d'extrudeuses activées" @@ -6162,7 +6439,6 @@ msgstr "Matrice de transformation à appliquer au modèle lors de son chargement #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "Commandes Gcode à exécuter au tout début, séparées par \n" #~ "." @@ -6175,7 +6451,6 @@ msgstr "Matrice de transformation à appliquer au modèle lors de son chargement #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "Commandes Gcode à exécuter à la toute fin, séparées par \n" #~ "." @@ -6232,7 +6507,6 @@ msgstr "Matrice de transformation à appliquer au modèle lors de son chargement #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "La distance horizontale entre le contour et la première couche de l’impression.\n" #~ "Il s’agit de la distance minimale séparant le contour de l’objet. Si le contour a d’autres lignes, celles-ci s’étendront vers l’extérieur." diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 6d6b5e0a6b..07a73aa191 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-03-14 14:31+0100\n" -"Last-Translator: Bothof \n" -"Language-Team: Italian\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0100\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Italian , Italian \n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,11 @@ msgid "" "

{model_names}

\n" "

Find out how to ensure the best possible print quality and reliability.

\n" "

View print quality guide

" -msgstr "

La stampa di uno o più modelli 3D può non avvenire in modo ottimale a causa della dimensioni modello e della configurazione materiale:

\n

{model_names}

\n

Scopri come garantire la migliore qualità ed affidabilità di stampa.

\n

Visualizza la guida alla qualità di stampa

" +msgstr "" +"

La stampa di uno o più modelli 3D può non avvenire in modo ottimale a causa della dimensioni modello e della configurazione materiale:

\n" +"

{model_names}

\n" +"

Scopri come garantire la migliore qualità ed affidabilità di stampa.

\n" +"

Visualizza la guida alla qualità di stampa

" #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 msgctxt "@action" @@ -81,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Il profilo è stato appiattito e attivato." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "File AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -106,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Stampa tramite USB in corso, la chiusura di Cura interrompe la stampa. Confermare?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "File X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -122,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "File X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "File X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -194,9 +202,9 @@ msgstr "Impossibile salvare su unità rimovibile {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Errore" @@ -226,8 +234,8 @@ msgstr "Rimuovi il dispositivo rimovibile {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Avvertenza" @@ -358,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Le configurazioni o la calibrazione della stampante e di Cura non corrispondono. Per ottenere i migliori risultati, sezionare sempre per i PrintCore e i materiali inseriti nella stampante utilizzata." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Invio nuovi processi (temporaneamente) bloccato, invio in corso precedente processo di stampa." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Invio dati alla stampante in corso" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Invio dati" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Annulla" @@ -439,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Collegato alla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Processo di stampa inviato con successo alla stampante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Dati inviati" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Visualizzazione in Controlla" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "La stampante '{printer_name}' ha finito di stampare '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "Il processo di stampa '{job_name}' è terminato." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Stampa finita" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Vuoto" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Sconosciuto" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Stampa tramite Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Stampa tramite Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Collegato tramite Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Errore cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Impossibile esportare il processo di stampa." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Impossibile caricare i dati sulla stampante." @@ -544,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Caricamento tramite Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Invia e controlla i processi di stampa ovunque con l’account Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Collegato a Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Non chiedere nuovamente per questa stampante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Per iniziare" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ora è possibile inviare e controllare i processi di stampa ovunque con l’account Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Collegato!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Controlla collegamento" @@ -584,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Collega tramite rete" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Guida alle impostazioni Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -762,18 +765,18 @@ msgid "3MF File" msgstr "File 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Ugello" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Il file di progetto {0} contiene un tipo di macchina sconosciuto {1}. Impossibile importare la macchina. Verranno invece importati i modelli." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Apri file progetto" @@ -905,13 +908,13 @@ msgid "Not supported" msgstr "Non supportato" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Il file esiste già" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -923,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "File URL non valido:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Le impostazioni sono state modificate in base all’attuale disponibilità di estrusori: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Le impostazioni sono state modificate in base all’attuale disponibilità di estrusori:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Impostazioni aggiornate" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Estrusore disabilitato" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Impossibile esportare il profilo su {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Impossibile esportare il profilo su {0}: Rilevata anomalia durante scrittura plugin." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profilo esportato su {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Esportazione riuscita" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Impossibile importare il profilo da {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Impossibile importare il profilo da {0} prima di aggiungere una stampante." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Nessun profilo personalizzato da importare nel file {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Impossibile importare il profilo da {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Questo profilo {0} contiene dati errati, impossibile importarlo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "La macchina definita nel profilo {0} ({1}) non corrisponde alla macchina corrente ({2}), impossibile importarla." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Impossibile importare il profilo da {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profilo importato correttamente {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Il file {0} non contiene nessun profilo valido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Il profilo {0} ha un tipo di file sconosciuto o corrotto." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Profilo personalizzato" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il profilo è privo del tipo di qualità." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1111,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Avanti" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1122,7 +1124,7 @@ msgstr "Gruppo #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1130,7 +1132,7 @@ msgstr "Chiudi" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Aggiungi" @@ -1151,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tutti i file (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Sconosciuto" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Le stampanti riportate di seguito non possono essere collegate perché fanno parte di un gruppo" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Stampanti disponibili in rete" @@ -1180,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Personalizzata" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "L’altezza del volume di stampa è stata ridotta a causa del valore dell’impostazione \"Sequenza di stampa” per impedire la collisione del gantry con i modelli stampati." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Volume di stampa" @@ -1278,7 +1280,12 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "

Oops, Ultimaker Cura ha rilevato qualcosa che non sembra corretto.

\n

Abbiamo riscontrato un errore irrecuperabile durante l’avvio. È stato probabilmente causato da alcuni file di configurazione errati. Suggeriamo di effettuare il backup e ripristinare la configurazione.

\n

I backup sono contenuti nella cartella configurazione.

\n

Si prega di inviare questo Rapporto su crash per correggere il problema.

\n " +msgstr "" +"

Oops, Ultimaker Cura ha rilevato qualcosa che non sembra corretto.

\n" +"

Abbiamo riscontrato un errore irrecuperabile durante l’avvio. È stato probabilmente causato da alcuni file di configurazione errati. Suggeriamo di effettuare il backup e ripristinare la configurazione.

\n" +"

I backup sono contenuti nella cartella configurazione.

\n" +"

Si prega di inviare questo Rapporto su crash per correggere il problema.

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:98 msgctxt "@action:button" @@ -1311,7 +1318,10 @@ msgid "" "

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " -msgstr "

Si è verificato un errore fatale in Cura. Si prega di inviare questo Rapporto su crash per correggere il problema

\n

Usare il pulsante “Invia report\" per inviare automaticamente una segnalazione errore ai nostri server

\n " +msgstr "" +"

Si è verificato un errore fatale in Cura. Si prega di inviare questo Rapporto su crash per correggere il problema

\n" +"

Usare il pulsante “Invia report\" per inviare automaticamente una segnalazione errore ai nostri server

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:173 msgctxt "@title:groupbox" @@ -1383,48 +1393,48 @@ msgstr "Registri" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Descrizione utente" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Descrizione utente (Nota: gli sviluppatori potrebbero non parlare la lingua dell'utente. Se possibile, usare l'inglese)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Invia report" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Caricamento macchine in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Impostazione scena in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Caricamento interfaccia in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "È possibile caricare un solo file codice G per volta. Importazione saltata {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossibile aprire altri file durante il caricamento del codice G. Importazione saltata {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Il modello selezionato è troppo piccolo per il caricamento." @@ -1434,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Impostazioni della stampante" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Larghezza)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profondità)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altezza)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Forma del piano di stampa" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Origine al centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Piano riscaldato" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Versione codice G" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Impostazioni della testina di stampa" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Altezza gantry" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Numero di estrusori" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Codice G avvio" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Codice G fine" @@ -1555,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Scostamento X ugello" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Scostamento Y ugello" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numero ventola di raffreddamento" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Codice G avvio estrusore" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Codice G fine estrusore" @@ -1581,7 +1591,7 @@ msgid "Install" msgstr "Installazione" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Installa" @@ -1604,8 +1614,8 @@ msgstr "Plugin" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiali" @@ -1615,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "I tuoi valori" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Versione" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Ultimo aggiornamento" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autore" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Download" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Log in deve essere installato o aggiornato" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Acquista bobine di materiale" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Aggiorna" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Aggiornamento in corso" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1769,7 +1779,10 @@ msgid "" "This plugin contains a license.\n" "You need to accept this license to install this plugin.\n" "Do you agree with the terms below?" -msgstr "Questo plugin contiene una licenza.\nÈ necessario accettare questa licenza per poter installare il plugin.\nAccetti i termini sotto riportati?" +msgstr "" +"Questo plugin contiene una licenza.\n" +"È necessario accettare questa licenza per poter installare il plugin.\n" +"Accetti i termini sotto riportati?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:55 msgctxt "@action:button" @@ -1907,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Aggiornamento firmware non riuscito per firmware mancante." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Vetro" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Queste opzioni non sono disponibili perché si sta controllando una stampante cloud." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Aggiornare il firmware della stampante per gestire la coda da remoto." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "La webcam non è disponibile perché si sta controllando una stampante cloud." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Caricamento in corso..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Non disponibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Non raggiungibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Ferma" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Senza titolo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anonimo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Richiede modifiche di configurazione" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Dettagli" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Stampante non disponibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Primo disponibile" @@ -1979,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "Coda di stampa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Vai a Cura Connect" +msgid "Manage in browser" +msgstr "Gestisci nel browser" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Non sono presenti processi di stampa nella coda. Eseguire lo slicing e inviare un processo per aggiungerne uno." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Processi di stampa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Tempo di stampa totale" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "In attesa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Tutti i processi sono stampati." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Visualizza cronologia di stampa" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2026,11 +2034,15 @@ msgstr "Collega alla stampante in rete" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "Per stampare direttamente sulla stampante in rete, verificare che la stampante desiderata sia collegata alla rete mediante un cavo di rete o mediante collegamento alla rete WIFI. Se si collega Cura alla stampante, è comunque possibile utilizzare una chiavetta USB per trasferire i file codice G alla stampante.\n\nSelezionare la stampante dall’elenco seguente:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Per stampare direttamente sulla stampante in rete, verificare che la stampante desiderata sia collegata alla rete mediante un cavo di rete o mediante collegamento" +" alla rete WIFI. Se non si esegue il collegamento di Cura alla stampante, è comunque possibile utilizzare una chiavetta USB per trasferire i file codice" +" G alla stampante." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Selezionare la stampante dall’elenco seguente:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2038,9 +2050,9 @@ msgid "Edit" msgstr "Modifica" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Rimuovi" @@ -2123,50 +2135,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Interrotto" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Terminato" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Preparazione in corso..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Interr. in corso..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Messa in pausa..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "In pausa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Ripresa in corso..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Richiede un'azione" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Finisce %1 a %2" @@ -2270,44 +2282,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Override" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "La stampante assegnata, %1, richiede la seguente modifica di configurazione:" msgstr[1] "La stampante assegnata, %1, richiede le seguenti modifiche di configurazione:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "La stampante %1 è assegnata, ma il processo contiene una configurazione materiale sconosciuta." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Cambia materiale %1 da %2 a %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Caricare %3 come materiale %1 (Operazione non annullabile)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Cambia print core %1 da %2 a %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Cambia piano di stampa a %1 (Operazione non annullabile)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "L’override utilizza le impostazioni specificate con la configurazione stampante esistente. Ciò può causare una stampa non riuscita." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Alluminio" @@ -2317,7 +2329,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Collega a una stampante" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Guida alle impostazioni Cura" @@ -2327,8 +2339,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "Accertarsi che la stampante sia collegata:\n- Controllare se la stampante è accesa.\n- Controllare se la stampante è collegata alla rete." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Accertarsi che la stampante sia collegata:\n- Controllare se la stampante è accesa.\n- Controllare se la stampante è collegata alla rete.\n- Controllare" +" se è stato effettuato l'accesso per rilevare le stampanti collegate al cloud." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2640,7 +2654,7 @@ msgid "Printer Group" msgstr "Gruppo stampanti" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Impostazioni profilo" @@ -2653,19 +2667,19 @@ msgstr "Come può essere risolto il conflitto nel profilo?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Non nel profilo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2837,18 +2851,24 @@ msgid "Previous" msgstr "Precedente" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Esporta" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Suggerimento" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Generale" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Prova di stampa" @@ -2953,170 +2973,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Sei sicuro di voler interrompere la stampa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informazioni" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Conferma modifica diametro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Il nuovo diametro del filamento impostato a %1 mm non è compatibile con l'attuale estrusore. Continuare?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Visualizza nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marchio" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Tipo di materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Colore" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Proprietà" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Densità" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diametro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Costo del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Peso del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Lunghezza del filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Costo al metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Questo materiale è collegato a %1 e condivide alcune delle sue proprietà." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Scollega materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Descrizione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Informazioni sull’aderenza" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Impostazioni di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Attiva" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Crea" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Stampante" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Conferma rimozione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Sei sicuro di voler rimuovere %1? Questa operazione non può essere annullata!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importa materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossibile importare materiale {1}: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiale importato correttamente %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Esporta materiale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Impossibile esportare il materiale su %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiale esportato correttamente su %1" @@ -3157,383 +3177,406 @@ msgid "Unit" msgstr "Unità" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Generale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interfaccia" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Lingua:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Riavviare l'applicazione per rendere effettive le modifiche." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seziona automaticamente alla modifica delle impostazioni." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seziona automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento del riquadro di visualizzazione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Evidenzia in rosso le zone non supportate del modello. In assenza di supporto, queste aree non saranno stampate in modo corretto." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Visualizza sbalzo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Sposta la fotocamera in modo che il modello si trovi al centro della visualizzazione quando è selezionato" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centratura fotocamera alla selezione dell'elemento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Il comportamento dello zoom predefinito di Cura dovrebbe essere invertito?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverti la direzione dello zoom della fotocamera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Lo zoom si muove nella direzione del mouse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Nella prospettiva ortogonale lo zoom verso la direzione del mouse non è supportato." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoom verso la direzione del mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "I modelli sull’area di stampa devono essere spostati per evitare intersezioni?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assicurarsi che i modelli siano mantenuti separati" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "I modelli sull’area di stampa devono essere portati a contatto del piano di stampa?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Rilascia automaticamente i modelli sul piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Visualizza il messaggio di avvertimento sul lettore codice G." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Messaggio di avvertimento sul lettore codice G" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Lo strato deve essere forzato in modalità di compatibilità?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzare la modalità di compatibilità visualizzazione strato (riavvio necessario)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Quale tipo di rendering della fotocamera è necessario utilizzare?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Rendering fotocamera: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Prospettiva" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ortogonale" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Apertura e salvataggio file" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "I modelli devono essere ridimensionati al volume di stampa, se troppo grandi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Ridimensiona i modelli troppo grandi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modello può apparire eccessivamente piccolo se la sua unità di misura è espressa in metri anziché in millimetri. Questi modelli devono essere aumentati?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Ridimensiona i modelli eccessivamente piccoli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "I modelli devono essere selezionati dopo essere stati caricati?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selezionare i modelli dopo il caricamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Al nome del processo di stampa deve essere aggiunto automaticamente un prefisso basato sul nome della stampante?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Aggiungi al nome del processo un prefisso macchina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Quando si salva un file di progetto deve essere visualizzato un riepilogo?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Visualizza una finestra di riepilogo quando si salva un progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinito all'apertura di un file progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinito all'apertura di un file progetto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Apri sempre come progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importa sempre i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Dopo aver modificato un profilo ed essere passati a un altro, si apre una finestra di dialogo che chiede se mantenere o eliminare le modifiche oppure se scegliere un comportamento predefinito e non visualizzare più tale finestra di dialogo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinito per i valori di impostazione modificati al passaggio a un profilo diverso: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Elimina sempre le impostazioni modificate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Trasferisci sempre le impostazioni modificate a un nuovo profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura deve verificare la presenza di eventuali aggiornamenti all’avvio del programma?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Controlla aggiornamenti all’avvio" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "I dati anonimi sulla stampa devono essere inviati a Ultimaker? Nota, non sono trasmessi o memorizzati modelli, indirizzi IP o altre informazioni personali." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Invia informazioni di stampa (anonime)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Ulteriori informazioni" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Sperimentale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Utilizzare la funzionalità piano di stampa multiplo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Utilizzare la funzionalità piano di stampa multiplo (necessario riavvio)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Stampanti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Rinomina" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Crea" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Crea profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Indica un nome per questo profilo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplica profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Rinomina profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importa profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Esporta profilo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Stampante: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Profili predefiniti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Profili personalizzati" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Elimina le modifiche correnti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Questo profilo utilizza le impostazioni predefinite dalla stampante, perciò non ci sono impostazioni/esclusioni nell’elenco riportato di seguito." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Le impostazioni correnti corrispondono al profilo selezionato." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Impostazioni globali" @@ -3601,33 +3644,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "impostazioni ricerca" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copia valore su tutti gli estrusori" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copia tutti i valori modificati su tutti gli estrusori" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mantieni visibile questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configura visibilità delle impostazioni..." @@ -3638,55 +3681,64 @@ msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "Alcune impostazioni nascoste utilizzano valori diversi dal proprio valore normale calcolato.\n\nFare clic per rendere visibili queste impostazioni." +msgstr "" +"Alcune impostazioni nascoste utilizzano valori diversi dal proprio valore normale calcolato.\n" +"\n" +"Fare clic per rendere visibili queste impostazioni." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Questa impostazione non è utilizzata perché tutte le impostazioni che influenza sono sottoposte a override." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Influisce su" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Influenzato da" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Questa impostazione è sempre condivisa tra tutti gli estrusori. La sua modifica varierà il valore per tutti gli estrusori." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Questo valore è risolto da valori per estrusore " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "Questa impostazione ha un valore diverso dal profilo.\n\nFare clic per ripristinare il valore del profilo." +msgstr "" +"Questa impostazione ha un valore diverso dal profilo.\n" +"\n" +"Fare clic per ripristinare il valore del profilo." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" "\n" "Click to restore the calculated value." -msgstr "Questa impostazione normalmente viene calcolata, ma attualmente ha impostato un valore assoluto.\n\nFare clic per ripristinare il valore calcolato." +msgstr "" +"Questa impostazione normalmente viene calcolata, ma attualmente ha impostato un valore assoluto.\n" +"\n" +"Fare clic per ripristinare il valore calcolato." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" msgstr "Consigliata" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Personalizzata" @@ -3711,12 +3763,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Genera strutture per supportare le parti del modello a sbalzo. Senza queste strutture, queste parti collasserebbero durante la stampa." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Adesione" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Abilita stampa di brim o raft. Questa funzione aggiunge un’area piana attorno o sotto l’oggetto, facile da tagliare successivamente." @@ -3762,7 +3814,10 @@ msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "Alcuni valori di impostazione/esclusione sono diversi dai valori memorizzati nel profilo.\n\nFare clic per aprire la gestione profili." +msgstr "" +"Alcuni valori di impostazione/esclusione sono diversi dai valori memorizzati nel profilo.\n" +"\n" +"Fare clic per aprire la gestione profili." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -3799,7 +3854,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Invia codice G" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Invia un comando codice G personalizzato alla stampante connessa. Premere ‘invio’ per inviare il comando." @@ -3896,11 +3951,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Preferiti" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Generale" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3951,7 +4001,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posizione fotocamera" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Visualizzazione fotocamera" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Prospettiva" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ortogonale" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&iano di stampa" @@ -4070,22 +4135,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Ap&ri recenti" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Stampa attiva" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nome del processo" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Tempo di stampa" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Tempo residuo stimato" @@ -4095,6 +4160,11 @@ msgctxt "@label" msgid "View type" msgstr "Visualizza tipo" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Elenco oggetti" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4126,7 +4196,10 @@ msgid "" "- Send print jobs to Ultimaker printers outside your local network\n" "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" "- Get exclusive access to print profiles from leading brands" -msgstr "- Invia i processi di stampa alle stampanti Ultimaker esterne alla rete locale\n- Invia le impostazioni Ultimaker Cura nel cloud per usarle ovunque\n- Ottieni l’accesso esclusivo ai profili di stampa dai principali marchi" +msgstr "" +"- Invia i processi di stampa alle stampanti Ultimaker esterne alla rete locale\n" +"- Invia le impostazioni Ultimaker Cura nel cloud per usarle ovunque\n" +"- Ottieni l’accesso esclusivo ai profili di stampa dai principali marchi" #: /home/ruben/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 msgctxt "@button" @@ -4143,32 +4216,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Nessuna stima di costo disponibile" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Anteprima" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Sezionamento in corso..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Sezionamento impossibile" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Elaborazione in corso" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Sezionamento" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Avvia il processo di sezionamento" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Annulla" @@ -4203,233 +4281,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Stampanti preimpostate" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Aggiungi stampante" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Gestione stampanti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostra la Guida ricerca e riparazione dei guasti online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Attiva/disattiva schermo intero" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Esci da schermo intero" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annulla" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Ri&peti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Esci" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visualizzazione 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visualizzazione frontale" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visualizzazione superiore" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visualizzazione lato sinistro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visualizzazione lato destro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configura Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Aggiungi stampante..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gestione stampanti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gestione materiali..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Elimina le modifiche correnti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Crea profilo dalle impostazioni/esclusioni correnti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gestione profili..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostra documentazione &online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Se&gnala un errore" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Scopri le novità" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Informazioni..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Cancella modello selezionato" msgstr[1] "Cancella modelli selezionati" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Centra modello selezionato" msgstr[1] "Centra modelli selezionati" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Moltiplica modello selezionato" msgstr[1] "Moltiplica modelli selezionati" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Elimina modello" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "C&entra modello su piattaforma" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Raggruppa modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Separa modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Unisci modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Mo<iplica modello..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleziona tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Cancellare piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Ricarica tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Sistema tutti i modelli su tutti i piani di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Sistema tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Sistema selezione" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Reimposta tutte le posizioni dei modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Reimposta tutte le trasformazioni dei modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Apri file..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuovo Progetto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostra cartella di configurazione" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercato" @@ -4444,49 +4527,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Questo pacchetto sarà installato dopo il riavvio." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Impostazioni" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Chiusura di Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Sei sicuro di voler uscire da Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Installa il pacchetto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Rilevata la presenza di uno o più file codice G tra i file selezionati. È possibile aprire solo un file codice G alla volta. Se desideri aprire un file codice G, selezionane uno solo." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Aggiungi stampante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Scopri le novità" @@ -4508,7 +4591,9 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "Sono state personalizzate alcune impostazioni del profilo.\nMantenere o eliminare tali impostazioni?" +msgstr "" +"Sono state personalizzate alcune impostazioni del profilo.\n" +"Mantenere o eliminare tali impostazioni?" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -4570,7 +4655,9 @@ msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura è stato sviluppato da Ultimaker B.V. in cooperazione con la comunità.\nCura è orgogliosa di utilizzare i seguenti progetti open source:" +msgstr "" +"Cura è stato sviluppato da Ultimaker B.V. in cooperazione con la comunità.\n" +"Cura è orgogliosa di utilizzare i seguenti progetti open source:" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 msgctxt "@label" @@ -4707,32 +4794,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salva progetto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Estrusore %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiale" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Materiale" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Non mostrare il riepilogo di progetto alla ripetizione di salva" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Salva" @@ -4908,12 +4995,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Ricerca e riparazione dei guasti" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nome stampante" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Assegna un nome alla stampante" @@ -4963,28 +5050,15 @@ msgctxt "@text" msgid "" "Please follow these steps to set up\n" "Ultimaker Cura. This will only take a few moments." -msgstr "Segui questa procedura per configurare\nUltimaker Cura. Questa operazione richiederà solo pochi istanti." +msgstr "" +"Segui questa procedura per configurare\n" +"Ultimaker Cura. Questa operazione richiederà solo pochi istanti." #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 msgctxt "@button" msgid "Get started" msgstr "Per iniziare" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Vedi solo il piano di stampa corrente" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Sistema su tutti i piani di stampa" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Sistema il piano di stampa corrente" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5075,6 +5149,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Appiattitore di profilo" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Fornisce il supporto per la lettura di file 3MF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Lettore 3MF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5085,16 +5169,6 @@ msgctxt "name" msgid "USB printing" msgstr "Stampa USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Consente di salvare il sezionamento risultante come un file X3G, per supportare le stampanti che leggono questo formato (Malyan, Makerbot ed altre stampanti basate su firmware Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5345,6 +5419,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Aggiornamento della versione da 3.0 a 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Aggiorna le configurazioni da Cura 4.1 a Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Aggiornamento della versione da 4.1 a 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5415,16 +5499,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Lettore 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Legge i file SVG come toolpath (percorsi utensile), per eseguire il debug dei movimenti della stampante." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Lettore di toolpath (percorso utensile) SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5515,6 +5589,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lettore profilo Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Guida alle impostazioni Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Le impostazioni sono state modificate in base all’attuale disponibilità di estrusori: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Descrizione utente" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Queste opzioni non sono disponibili perché si sta controllando una stampante cloud." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Vai a Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Tutti i processi sono stampati." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Visualizza cronologia di stampa" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Per stampare direttamente sulla stampante in rete, verificare che la stampante desiderata sia collegata alla rete mediante un cavo di rete o mediante collegamento alla rete WIFI. Se si collega Cura alla stampante, è comunque possibile utilizzare una chiavetta USB per trasferire i file codice G alla stampante.\n" +#~ "\n" +#~ "Selezionare la stampante dall’elenco seguente:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Accertarsi che la stampante sia collegata:\n" +#~ "- Controllare se la stampante è accesa.\n" +#~ "- Controllare se la stampante è collegata alla rete." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Vedi solo il piano di stampa corrente" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Sistema su tutti i piani di stampa" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Sistema il piano di stampa corrente" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Consente di salvare il sezionamento risultante come un file X3G, per supportare le stampanti che leggono questo formato (Malyan, Makerbot ed altre stampanti basate su firmware Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Legge i file SVG come toolpath (percorsi utensile), per eseguire il debug dei movimenti della stampante." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Lettore di toolpath (percorso utensile) SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Registro modifiche" @@ -5721,7 +5871,6 @@ msgstr "Lettore profilo Cura" #~ "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" #~ "- Get exclusive access to material profiles from leading brands" #~ msgstr "" - #~ "- Invia i processi di stampa alle stampanti Ultimaker esterne alla rete locale\n" #~ "- Invia le impostazioni Ultimaker Cura nel cloud per usarle ovunque\n" #~ "- Ottieni l’accesso esclusivo ai profili materiale da marchi leader" @@ -5748,7 +5897,6 @@ msgstr "Lettore profilo Cura" #~ "\n" #~ "If your printer is not in the list, use the \"Custom FFF Printer\" from the \"Custom\" category and adjust the settings to match your printer in the next dialog." #~ msgstr "" - #~ "Seleziona la stampante da usare dell’elenco seguente.\n" #~ "\n" #~ "Se la stampante non è nell’elenco, usare la “Stampante FFF personalizzata\" dalla categoria “Personalizzata\" e regolare le impostazioni in modo che corrispondano alla stampante nella finestra di dialogo successiva." @@ -5961,7 +6109,6 @@ msgstr "Lettore profilo Cura" #~ "Print Setup disabled\n" #~ "G-code files cannot be modified" #~ msgstr "" - #~ "Impostazione di stampa disabilitata\n" #~ "I file codice G non possono essere modificati" @@ -6214,7 +6361,6 @@ msgstr "Lettore profilo Cura" #~ "Could not export using \"{}\" quality!\n" #~ "Felt back to \"{}\"." #~ msgstr "" - #~ "Impossibile esportare utilizzando qualità \"{}\" quality!\n" #~ "Tornato a \"{}\"." @@ -6391,7 +6537,6 @@ msgstr "Lettore profilo Cura" #~ "2) Turn the fan off (only if there are no tiny details on the model).\n" #~ "3) Use a different material." #~ msgstr "" - #~ "Alcuni modelli potrebbero non essere stampati in modo ottimale a causa delle dimensioni dell’oggetto e del materiale scelto: {model_names}.\n" #~ "Suggerimenti utili per migliorare la qualità di stampa:\n" #~ "1) Utilizzare angoli arrotondati.\n" @@ -6408,7 +6553,6 @@ msgstr "Lettore profilo Cura" #~ "\n" #~ "Thanks!" #~ msgstr "" - #~ "Nessun modello trovato nel disegno. Si prega di controllare nuovamente il contenuto e accertarsi che all’interno vi sia un componente o gruppo.\n" #~ "\n" #~ "Grazie." @@ -6419,7 +6563,6 @@ msgstr "Lettore profilo Cura" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "Trovato più di un componente o gruppo all’interno del disegno. Attualmente sono supportati solo i disegni con esattamente un componente o gruppo all’interno.\n" #~ "\n" #~ " Spiacenti." @@ -6444,7 +6587,6 @@ msgstr "Lettore profilo Cura" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Gentile cliente,\n" #~ "non abbiamo trovato un’installazione valida di SolidWorks nel suo sistema. Questo significa che SolidWorks non è installato o che non possiede una licenza valida. La invitiamo a verificare che l’esecuzione di SolidWorks avvenga senza problemi e/o a contattare il suo ICT.\n" #~ "\n" @@ -6459,7 +6601,6 @@ msgstr "Lettore profilo Cura" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Gentile cliente,\n" #~ "attualmente ha in esecuzione questo plugin su un sistema operativo diverso da Windows. Questo plugin funziona solo su Windows con SolidWorks installato, con inclusa una licenza valida. Si prega di installare questo plugin su una macchina Windows con SolidWorks installato.\n" #~ "\n" @@ -6564,7 +6705,6 @@ msgstr "Lettore profilo Cura" #~ "Open the directory\n" #~ "with macro and icon" #~ msgstr "" - #~ "Aprire la directory\n" #~ "con macro e icona" @@ -6863,7 +7003,6 @@ msgstr "Lettore profilo Cura" #~ "\n" #~ " Thanks!." #~ msgstr "" - #~ "Nessun modello trovato nel disegno. Si prega di controllare nuovamente il contenuto e accertarsi che all’interno vi sia un componente o gruppo.\n" #~ "\n" #~ " Grazie." @@ -6874,7 +7013,6 @@ msgstr "Lettore profilo Cura" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "Trovato più di un componente o gruppo all’interno del disegno. Attualmente sono supportati solo i disegni con esattamente un componente o gruppo all’interno.\n" #~ "\n" #~ " Spiacenti." @@ -6909,7 +7047,6 @@ msgstr "Lettore profilo Cura" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Si è verificato un errore fatale. Si prega di inviare questo Report su crash per correggere il problema

\n" #~ "

Usare il pulsante “Invia report\" per inviare automaticamente una segnalazione errore ai nostri server

\n" #~ " " @@ -7076,7 +7213,6 @@ msgstr "Lettore profilo Cura" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Si è verificata un'eccezione irreversibile. Si prega di inviarci questo crash report per risolvere il problema

\n" #~ "

Utilizzare il pulsante \"Invia report\" per inviare un report sui bug automaticamente ai nostri server

\n" #~ " " @@ -7223,7 +7359,6 @@ msgstr "Lettore profilo Cura" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Si è verificata un'eccezione fatale che non stato possibile superare!

\n" #~ "

Utilizzare le informazioni sotto riportate per inviare un rapporto sull'errore a http://github.com/Ultimaker/Cura/issues

\n" #~ " " @@ -7266,7 +7401,6 @@ msgstr "Lettore profilo Cura" #~ "You need to accept this license to install this plugin.\n" #~ "Do you agree with the terms below?" #~ msgstr "" - #~ " I plugin contengono una licenza.\n" #~ "È necessario accettare questa licenza per poter installare il plugin.\n" #~ "Accetti i termini sotto riportati?" @@ -7794,7 +7928,6 @@ msgstr "Lettore profilo Cura" #~ msgid "Print Selected Model with %1" #~ msgid_plural "Print Selected Models With %1" #~ msgstr[0] "Stampa modello selezionato con %1" - #~ msgstr[1] "Stampa modelli selezionati con %1" #~ msgctxt "@info:status" @@ -7824,7 +7957,6 @@ msgstr "Lettore profilo Cura" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Si è verificata un'eccezione fatale impossibile da ripristinare!

\n" #~ "

Ci auguriamo che l’immagine di questo gattino vi aiuti a superare lo shock.

\n" #~ "

Utilizzare le informazioni riportate di seguito per pubblicare una segnalazione errori all'indirizzo http://github.com/Ultimaker/Cura/issues

" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index aa477c4fd4..79562add8e 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index e5be994c85..ace590cbfb 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Italian\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Italian , Italian \n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "I comandi codice G da eseguire all’avvio, separati da \n." +msgstr "" +"I comandi codice G da eseguire all’avvio, separati da \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -69,7 +71,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "I comandi codice G da eseguire alla fine, separati da \n." +msgstr "" +"I comandi codice G da eseguire alla fine, separati da \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -333,8 +337,8 @@ msgstr "Il tempo minimo in cui un estrusore deve essere inattivo prima che l’u #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" -msgstr "Tipo di codice G" +msgid "G-code Flavor" +msgstr "Versione codice G" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1293,8 +1297,11 @@ msgstr "Preferenze angolo giunzione" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Controlla se gli angoli sul profilo del modello influenzano la posizione della giunzione. Nessuno significa che gli angoli non hanno alcuna influenza sulla posizione della giunzione. Nascondi giunzione favorisce la presenza della giunzione su un angolo interno. Esponi giunzione favorisce la presenza della giunzione su un angolo esterno. Nascondi o esponi giunzione favorisce la presenza della giunzione su un angolo interno o esterno." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Controlla se gli angoli sul profilo del modello influenzano la posizione della giunzione. Nessuno significa che gli angoli non hanno alcuna influenza sulla" +" posizione della giunzione. Nascondi giunzione favorisce la presenza della giunzione su un angolo interno. Esponi giunzione favorisce la presenza della" +" giunzione su un angolo esterno. Nascondi o esponi giunzione favorisce la presenza della giunzione su un angolo interno o esterno. Smart Hiding consente" +" sia gli angoli interni che quelli esterni ma sceglie con maggiore frequenza gli angoli interni, se opportuno." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1316,6 +1323,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Nascondi o esponi giunzione" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Occultamento intelligente" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1328,13 +1340,15 @@ msgstr "Se abilitato, le coordinate della giunzione Z sono riferite al centro di #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ignora i piccoli interstizi a Z" +msgid "No Skin in Z Gaps" +msgstr "Nessun rivest. est. negli interstizi a Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Quando il modello presenta piccoli spazi vuoti verticali, circa il 5% del tempo di calcolo supplementare può essere utilizzato per la generazione di rivestimenti esterni superiori ed inferiori in questi interstizi. In questo caso disabilitare l’impostazione." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Quando il modello presenta piccoli spazi vuoti verticali composti da un numero ridotto di strati, intorno a questi strati di norma dovrebbe essere presente" +" un rivestimento esterno nell'interstizio. Abilitare questa impostazione per non generare il rivestimento esterno se l'interstizio verticale è molto piccolo." +" Ciò consente di migliorare il tempo di stampa e il tempo di sezionamento, ma dal punto di vista tecnico lascia il riempimento esposto all'aria." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1631,7 +1645,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Aggiunge pareti supplementari intorno alla zona di riempimento. Queste pareti possono ridurre l’abbassamento delle linee del rivestimento esterno superiore/inferiore, pertanto saranno necessari meno strati di rivestimento esterno superiore/inferiore per ottenere la stessa qualità al costo del materiale supplementare.\nQuesta funzione può essere abbinata a Collega poligoni riempimento per collegare tutto il riempimento in un unico percorso di estrusione senza necessità di avanzamenti o arretramenti, se configurata correttamente." +msgstr "" +"Aggiunge pareti supplementari intorno alla zona di riempimento. Queste pareti possono ridurre l’abbassamento delle linee del rivestimento esterno superiore/inferiore, pertanto saranno necessari meno strati di rivestimento esterno superiore/inferiore per ottenere la stessa qualità al costo del materiale supplementare.\n" +"Questa funzione può essere abbinata a Collega poligoni riempimento per collegare tutto il riempimento in un unico percorso di estrusione senza necessità di avanzamenti o arretramenti, se configurata correttamente." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1870,8 +1886,8 @@ msgstr "Temperatura volume di stampa" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "La temperatura utilizzata per il volume di stampa. Se il valore è 0, la temperatura del volume di stampa non verrà regolata." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "La temperatura dell'ambiente in cui stampare. Se il valore è 0, la temperatura del volume di stampa non verrà regolata." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1983,6 +1999,87 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Il tasso di contrazione in percentuale." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Materiale cristallino" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Questo tipo di materiale è quello che si stacca in modo netto quando viene riscaldato (cristallino) oppure è il tipo che produce lunghe catene di polimeri" +" intrecciati (non cristallino)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Posizione retratta anti fuoriuscita di materiale" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "La distanza alla quale deve essere retratto il materiale prima che smetta di fuoriuscire." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Velocità di retrazione anti fuoriuscita del materiale" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "La velocità a cui deve essere retratto il materiale durante un cambio di filamento per evitare la fuoriuscita di materiale." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Posizione di retrazione prima della rottura" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "La lunghezza massima di estensione del filamento prima che si rompa durante il riscaldamento." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Velocità di retrazione prima della rottura" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "La velocità massima di retrazione del filamento prima che si rompa durante questa operazione." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Posizione di retrazione per la rottura" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "La distanza di retrazione del filamento al fine di consentirne la rottura netta." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Velocità di retrazione per la rottura" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "La velocità alla quale retrarre il filamento al fine di romperlo in modo netto." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Temperatura di rottura" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "La temperatura a cui il filamento viene rotto, con una rottura netta." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1993,6 +2090,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Determina la compensazione del flusso: la quantità di materiale estruso viene moltiplicata per questo valore." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Flusso della parete" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Compensazione del flusso sulle linee perimetrali." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Flusso della parete esterna" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Compensazione del flusso sulla linea perimetrale più esterna." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Flusso pareti interne" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Compensazione del flusso sulle linee perimetrali per tutte le linee perimetrali tranne quella più esterna." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Flusso superiore/inferiore" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Compensazione del flusso sulle linee superiore/inferiore." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Flusso rivestimento esterno superficie superiore" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Compensazione del flusso sulle linee delle aree nella parte superiore della stampa." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Flusso di riempimento" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Compensazione del flusso sulle linee di riempimento." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Flusso dello skirt/brim" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Compensazione del flusso sulle linee dello skirt o del brim." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Flusso del supporto" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Compensazione del flusso sulle linee di supporto." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Flusso interfaccia di supporto" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Compensazione del flusso sulle linee di supporto superiore o inferiore." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Flusso supporto superiore" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Compensazione del flusso sulle linee di supporto superiore." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Flusso supporto inferiore" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Compensazione del flusso sulle linee di supporto inferiore." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Flusso torre di innesco" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Compensazione del flusso sulle linee della torre di innesco." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2110,8 +2327,9 @@ msgstr "Limitazione delle retrazioni del supporto" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Omettere la retrazione negli spostamenti da un supporto ad un altro in linea retta. L'abilitazione di questa impostazione riduce il tempo di stampa, ma può comportare un'eccessiva produzione di filamenti all'interno della struttura del supporto." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Omettere la retrazione negli spostamenti da un supporto ad un altro in linea retta. L'abilitazione di questa impostazione riduce il tempo di stampa, ma" +" può comportare un'eccessiva produzione di filamenti all'interno della struttura del supporto." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2163,6 +2381,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Indica la velocità alla quale il filamento viene sospinto indietro dopo la retrazione per cambio ugello." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Quantità di materiale extra della Prime Tower, al cambio ugello" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Materiale extra per l'innesco dopo il cambio dell'ugello." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2354,14 +2582,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Indica la velocità a cui sono stampati lo skirt ed il brim. Normalmente questa operazione viene svolta alla velocità di stampa dello strato iniziale, ma a volte è possibile che si desideri stampare lo skirt o il brim ad una velocità diversa." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Velocità massima Z" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Velocità di sollevamento Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Indica la velocità massima di spostamento del piano di stampa. L’impostazione di questo valore a zero causa l’utilizzo per la stampa dei valori preimpostati in fabbrica per la velocità massima Z." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Velocità alla quale viene eseguito il movimento Z verticale per i sollevamenti in Z. In genere è inferiore alla velocità di stampa, dal momento che il" +" piano o il corpo di stampa della macchina sono più difficili da spostare." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3279,12 +3508,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Indica la distanza tra le linee della struttura di supporto dello strato iniziale stampato. Questa impostazione viene calcolata mediante la densità del supporto." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Direzione delle linee di riempimento supporto" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Indica l’orientamento della configurazione del riempimento per i supporti. La configurazione del riempimento del supporto viene ruotata sul piano orizzontale." @@ -3415,8 +3644,9 @@ msgstr "Distanza giunzione supporto" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Indica la distanza massima tra le strutture di supporto nelle direzioni X/Y. Quando la distanza tra le strutture è inferiore al valore indicato, le strutture convergono in una unica." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "La distanza massima tra le strutture di supporto nelle direzioni X/Y. Quando la distanza tra le strutture è inferiore al valore indicato, le strutture" +" convergono in una unica." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3794,14 +4024,14 @@ msgid "The diameter of a special tower." msgstr "Corrisponde al diametro di una torre speciale." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Diametro minimo" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Diametro supportato dalla torre" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "È il diametro minimo nelle direzioni X/Y di una piccola area, che deve essere sostenuta da una torre speciale." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "È il diametro massimo nelle direzioni X/Y di una piccola area, che deve essere sostenuta da una torre speciale." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3923,7 +4153,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Indica la distanza orizzontale tra lo skirt ed il primo strato della stampa.\nQuesta è la distanza minima. Più linee di skirt aumenteranno tale distanza." +msgstr "" +"Indica la distanza orizzontale tra lo skirt ed il primo strato della stampa.\n" +"Questa è la distanza minima. Più linee di skirt aumenteranno tale distanza." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4295,16 +4527,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Stampa una torre accanto alla stampa che serve per innescare il materiale dopo ogni cambio ugello." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Torre di innesco circolare" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Conferisce alla torre di innesco una forma circolare." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4345,16 +4567,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Indica la coordinata Y della posizione della torre di innesco." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Flusso torre di innesco" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Determina la compensazione del flusso: la quantità di materiale estruso viene moltiplicata per questo valore." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4657,8 +4869,9 @@ msgstr "Levigazione dei profili con movimento spiraliforme" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Leviga i profili con movimento spiraliforme per ridurre la visibilità della giunzione Z (la giunzione Z dovrebbe essere appena visibile sulla stampa, ma rimane visibile nella vista dello strato). Notare che la levigatura tende a rimuovere le bavature fini della superficie." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Leviga i profili con movimento spiraliforme per ridurre la visibilità della giunzione Z (la giunzione Z dovrebbe essere appena visibile sulla stampa, ma" +" rimane visibile nella visualizzazione a strati). Notare che la levigatura tende a rimuovere le bavature fini della superficie." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5157,8 +5370,8 @@ msgstr "Abilitazione del supporto conico" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Funzione sperimentale: realizza aree di supporto più piccole nella parte inferiore che in corrispondenza dello sbalzo." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Realizza aree di supporto più piccole nella parte inferiore che in corrispondenza dello sbalzo." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5390,7 +5603,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "Indica la distanza di uno spostamento verso l'alto con estrusione a velocità dimezzata.\nCiò può garantire una migliore adesione agli strati precedenti, senza eccessivo riscaldamento del materiale su questi strati. Applicabile solo alla funzione Wire Printing." +msgstr "" +"Indica la distanza di uno spostamento verso l'alto con estrusione a velocità dimezzata.\n" +"Ciò può garantire una migliore adesione agli strati precedenti, senza eccessivo riscaldamento del materiale su questi strati. Applicabile solo alla funzione Wire Printing." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5957,6 +6172,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Tipo di codice G" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Controlla se gli angoli sul profilo del modello influenzano la posizione della giunzione. Nessuno significa che gli angoli non hanno alcuna influenza sulla posizione della giunzione. Nascondi giunzione favorisce la presenza della giunzione su un angolo interno. Esponi giunzione favorisce la presenza della giunzione su un angolo esterno. Nascondi o esponi giunzione favorisce la presenza della giunzione su un angolo interno o esterno." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ignora i piccoli interstizi a Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Quando il modello presenta piccoli spazi vuoti verticali, circa il 5% del tempo di calcolo supplementare può essere utilizzato per la generazione di rivestimenti esterni superiori ed inferiori in questi interstizi. In questo caso disabilitare l’impostazione." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "La temperatura utilizzata per il volume di stampa. Se il valore è 0, la temperatura del volume di stampa non verrà regolata." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Omettere la retrazione negli spostamenti da un supporto ad un altro in linea retta. L'abilitazione di questa impostazione riduce il tempo di stampa, ma può comportare un'eccessiva produzione di filamenti all'interno della struttura del supporto." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Velocità massima Z" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Indica la velocità massima di spostamento del piano di stampa. L’impostazione di questo valore a zero causa l’utilizzo per la stampa dei valori preimpostati in fabbrica per la velocità massima Z." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Indica la distanza massima tra le strutture di supporto nelle direzioni X/Y. Quando la distanza tra le strutture è inferiore al valore indicato, le strutture convergono in una unica." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Diametro minimo" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "È il diametro minimo nelle direzioni X/Y di una piccola area, che deve essere sostenuta da una torre speciale." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Torre di innesco circolare" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Conferisce alla torre di innesco una forma circolare." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Determina la compensazione del flusso: la quantità di materiale estruso viene moltiplicata per questo valore." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Leviga i profili con movimento spiraliforme per ridurre la visibilità della giunzione Z (la giunzione Z dovrebbe essere appena visibile sulla stampa, ma rimane visibile nella vista dello strato). Notare che la levigatura tende a rimuovere le bavature fini della superficie." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Funzione sperimentale: realizza aree di supporto più piccole nella parte inferiore che in corrispondenza dello sbalzo." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Numero di estrusori abilitati" @@ -6162,7 +6441,6 @@ msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "I comandi del Gcode da eseguire all’avvio, separati da \n" #~ "." @@ -6175,7 +6453,6 @@ msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "I comandi del Gcode da eseguire alla fine, separati da \n" #~ "." @@ -6232,7 +6509,6 @@ msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "Indica la distanza orizzontale tra lo skirt ed il primo strato della stampa.\n" #~ "Questa è la distanza minima, più linee di skirt aumenteranno tale distanza." diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index f01c2af9f2..574fb89d7b 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -5,18 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:46+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Japanese\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 16:09+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Japanese , Japanese \n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.2.1\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:27 msgctxt "@action" @@ -86,6 +86,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "プロファイルが平らになり、アクティベートされました。" +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF ファイル" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -111,12 +116,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USBプリントを実行しています。Cura を閉じるとこのプリントも停止します。実行しますか？" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3Gファイル" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -127,6 +126,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3Gファイル" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3Gファイル" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -199,9 +203,9 @@ msgstr "リムーバブルドライブ{0}に保存することができません #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "エラー" @@ -231,8 +235,8 @@ msgstr "リムーバブルデバイス{0}を取り出す" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -363,39 +367,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "プリンターの設定、キャリブレーションとCuraの構成にミスマッチがあります。プリンターに設置されたプリントコア及びフィラメントを元にCuraをスライスすることで最良の印刷結果を出すことができます。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "新しいデータの送信 (temporarily) をブロックします、前のプリントジョブが送信中です。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "プリンターにプリントデータを送信中" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "プリントデータを送信中" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "キャンセル" @@ -444,82 +448,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "ネットワーク上で接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "プリントジョブは正常にプリンターに送信されました。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "データを送信しました" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "モニター表示" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "プリンター’{printer_name}’が’{job_name}’のプリントを終了しました。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "プリントジョブ '{job_name}' は完了しました。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "プリント終了" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "空にする" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "不明" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "クラウドからプリントする" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "クラウドからプリントする" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "クラウドを使って接続しました" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "クラウドエラー" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "印刷ジョブをエクスポートできませんでした。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "データをプリンタにアップロードできませんでした。" @@ -549,37 +553,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Ultimaker Cloud 経由でアップロード中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ultimaker のアカウントを使用して、どこからでも印刷ジョブを送信およびモニターします。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Ultimaker Cloud に接続する" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "このプリンタでは次回から質問しない。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "はじめに" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ultimaker のアカウントを使用して、どこからでも印刷ジョブを送信およびモニターできるようになりました。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "接続しました！" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "接続の確認" @@ -589,11 +593,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "ネットワーク上にて接続" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura 設定ガイド" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -767,18 +766,18 @@ msgid "3MF File" msgstr "3MF ファイル" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "ノズル" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "プロジェクトファイル {0} に不明なマシンタイプ {1} があります。マシンをインポートできません。代わりにモデルをインポートします。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "プロジェクトファイルを開く" @@ -910,13 +909,13 @@ msgid "Not supported" msgstr "サポート対象外" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "すでに存在するファイルです" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -928,117 +927,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無効なファイルのURL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "現在利用可能なエクストルーダー [%s] に合わせて設定が変更されました。" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "現在利用可能な次のエクストルーダーに合わせて設定が変更されました:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "設定が更新されました" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "エクストルーダーを無効にしました" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "{0}にプロファイルを書き出すのに失敗しました: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "{0}にプロファイルを書き出すことに失敗しました。：ライタープラグイン失敗の報告。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "{0}にプロファイルを書き出しました" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "書き出し完了" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0}からプロファイルの取り込に失敗しました:{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "プリンタを追加する前に、{0}からプロファイルの取り込はできません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "ファイル{0}にはカスタムプロファイルがインポートされていません" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0}からプロファイルの取り込に失敗しました:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "このプロファイル{0}には、正しくないデータが含まれているため、インポートできません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "プロファイル{0}の中で定義されているマシン({1})は、現在お使いのマシン({2})と一致しないため、インポートできませんでした。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "{0}からプロファイルの取り込に失敗しました:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "プロファイル {0}の取り込み完了" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "ファイル{0}には、正しいプロファイルが含まれていません。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "プロファイル{0}は不特定なファイルまたは破損があります。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "カスタムプロファイル" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "プロファイルはクオリティータイプが不足しています。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1116,7 +1114,7 @@ msgctxt "@action:button" msgid "Next" msgstr "次" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1127,7 +1125,7 @@ msgstr "グループ #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1135,7 +1133,7 @@ msgstr "閉める" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "追加" @@ -1156,20 +1154,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "全てのファイル" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "不明" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "下のプリンターはグループの一員であるため接続できません" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "ネットワークで利用可能なプリンター" @@ -1185,12 +1183,12 @@ msgctxt "@label" msgid "Custom" msgstr "カスタム" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "プリントシークエンス設定値により、ガントリーと造形物の衝突を避けるため印刷データの高さを低くしました。" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "造形サイズ" @@ -1396,48 +1394,48 @@ msgstr "ログ" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "ユーザー詳細" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "ユーザー説明 (注: 開発者はユーザーの言語を理解できない場合があるため、可能な限り英語を使用してください)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "レポート送信" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "プリンターを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "シーンをセットアップ中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "インターフェイスを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一度に一つのG-codeしか読み取れません。{0}の取り込みをスキップしました。" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-codeを読み込み中は他のファイルを開くことができません。{0}の取り込みをスキップしました。" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選択したモデルは読み込むのに小さすぎます。" @@ -1447,98 +1445,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "プリンターの設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X（幅）" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (奥行き)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高さ)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "ビルドプレート形" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "センターを出します" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "ヒーテッドドベッド" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "G-codeフレーバー" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "プリントヘッド設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X分" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y分" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "最大X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "最大Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "ガントリーの高さ" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "エクストルーダーの数" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Codeの開始" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "G-codeの終了" @@ -1568,22 +1566,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "ノズルオフセットX" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "ノズルオフセットY" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷却ファンの番号" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "エクストルーダーがG-Codeを開始する" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "エクストルーダーがG-Codeを終了する" @@ -1594,7 +1592,7 @@ msgid "Install" msgstr "インストール" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "インストールした" @@ -1617,8 +1615,8 @@ msgstr "プラグイン" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "マテリアル" @@ -1628,49 +1626,49 @@ msgctxt "@label" msgid "Your rating" msgstr "ユーザー評価" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "バージョン" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "最終更新日" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "著者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "ダウンロード" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "インストールまたはアップデートにはログインが必要です" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "材料スプールの購入" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "アップデート" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "更新中" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1923,69 +1921,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "ファームウェアが見つからず、ファームウェアアップデート失敗しました。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "ガラス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "クラウドプリンタをモニタリングしている場合は、これらのオプションは利用できません。" +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "キューをリモートで管理するには、プリンターのファームウェアを更新してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "クラウドプリンタをモニタリングしている場合は、ウェブカムを利用できません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "読み込み中..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "利用不可" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "到達不能" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "アイドル" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "無題" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "構成の変更が必要です" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "詳細" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "利用できないプリンター" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "次の空き" @@ -1995,36 +1993,31 @@ msgctxt "@label" msgid "Queued" msgstr "順番を待つ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Cura Connectに移動する" +msgid "Manage in browser" +msgstr "ブラウザで管理する" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "キューに印刷ジョブがありません。追加するには、スライスしてジョブを送信します。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "プリントジョブ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "合計印刷時間" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "待ち時間" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "すべてのジョブが印刷されます。" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "印刷履歴の表示" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2042,14 +2035,13 @@ msgstr "ネットワーク上で繋がったプリンターに接続" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"ネットワーク接続にて直接プリントするためには、必ずケーブルまたはWifiネットワークにて繋がっていることを確認してください。Curaをプリンターに接続していない場合でも、USBメモリを使って直接プリンターにg-codeファイルをトランスファーできます。\n" -"\n" -"下のリストからプリンターを選択してください：" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "印刷ジョブをネットワークを介してプリンターに直接送信するには、ネットワークケーブルを使用してプリンターを確実にネットワークに接続するか、プリンターを WIFI ネットワークに接続します。Cura をプリンタに接続していない場合でも、USB ドライブを使用して g コードファイルをプリンターに転送することはできます。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "以下のリストからプリンタを選択します:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2057,9 +2049,9 @@ msgid "Edit" msgstr "編集" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "取り除く" @@ -2142,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "中止しました" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "終了" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "準備中..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "中止しています..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "一時停止しています..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "一時停止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "再開しています…" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "アクションが必要です" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%1 を %2 に終了します" @@ -2289,43 +2281,43 @@ msgctxt "@action:button" msgid "Override" msgstr "上書き" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "割り当てられたプリンター %1 には以下の構成変更が必要です:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "プリンター %1 が割り当てられましたが、ジョブには不明な材料構成があります。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "材料 ％1 を ％2 から %3 に変更します。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "%3 を 材料 %1 にロードします（これは上書きできません）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "プリントコア ％1 を ％2 から %3 に変更します。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "ビルドプレートを %1 に変更します（これは上書きできません）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "上書きは、既存のプリンタ構成で指定された設定を使用します。これにより、印刷が失敗する場合があります。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "アルミニウム" @@ -2335,7 +2327,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "プリンターにつなぐ" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura 設定ガイド" @@ -2345,11 +2337,12 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" -"プリンタが接続されていること確認してください:\n" -"- プリンタの電源が入っていることを確認してください。\n" -"- プリンタがネットワークに接続されているか確認してください。" +"プリンタが接続されているか確認し、以下を行います。\n" +"- プリンタの電源が入っているか確認します。\n" +"- プリンタがネットワークに接続されているかどうかを確認します。- クラウドに接続されたプリンタを検出するためにサインインしているかどうかを確認します。" #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2661,7 +2654,7 @@ msgid "Printer Group" msgstr "プリンターグループ" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "プロファイル設定" @@ -2674,20 +2667,20 @@ msgstr "このプロファイルの問題をどのように解決すればいい #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "ネーム" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "プロファイル内にない" # Can’t edit the Japanese text #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2860,18 +2853,24 @@ msgid "Previous" msgstr "前" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "書き出す" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "ヒント" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "汎用" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "試し印刷" @@ -2976,170 +2975,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "本当にプリントを中止してもいいですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "インフォメーション" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "直径変更の確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新しいフィラメントの直径は %1 mm に設定されています。これは現在のエクストルーダーに適応していません。続行しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "ディスプレイ名" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "ブランド" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "フィラメントタイプ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "プロパティ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "直径" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "フィラメントコスト" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "フィラメントの重さ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "フィラメントの長さ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "毎メーターコスト" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "このフィラメントは %1にリンクすプロパティーを共有する。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "フィラメントをリンクを外す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "記述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "接着のインフォメーション" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "プリント設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "アクティベート" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "作成する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "プリンター" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "モデルを取り除きました" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1を取り外しますか？この作業はやり直しが効きません！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "フィラメントを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "%1フィラメントを取り込むことができない: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "フィラメント%1の取り込みに成功しました" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "フィラメントを書き出す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "フィラメントの書き出しに失敗しました %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "フィラメントの%1への書き出しが完了ました" @@ -3180,383 +3179,406 @@ msgid "Unit" msgstr "ユニット" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "一般" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "インターフェイス" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "言語:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "通貨:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "テーマ:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "それらの変更を有効にするためにはアプリケーションを再起動しなけらばなりません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "セッティングを変更すると自動にスライスします。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動的にスライスする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "ビューポイント機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "赤でサポートができないエリアをハイライトしてください。サポートがない場合、正確にプリントができない場合があります。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "ディスプレイオーバーハング" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "モデルの選択時にモデルがカメラの中心に見えるようにカメラを移動する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "アイテムを選択するとカメラが中心にきます" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Curaのデフォルトのズーム機能は変更できるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "カメラのズーム方向を反転する。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "ズームはマウスの方向に動くべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "平行投影表示では、マウスの方向にズームする操作がサポートされていません。" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "マウスの方向にズームする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "交差を避けるためにプラットホーム上のモデルを移動するべきですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "モデルの距離が離れているように確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "プラットホーム上のモデルはブルドプレートに触れるように下げるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動的にモデルをビルドプレートに落とす" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-codeリーダーに注意メッセージを表示します。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-codeリーダーに注意メッセージ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "レイヤーはコンパティビリティモードに強制されるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "レイヤービューコンパティビリティモードを強制する。（再起動が必要）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "どのような種類のカメラレンダリングを使用する必要がありますか?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "カメラレンダリング: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "パースペクティブ表示" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "平行投影表示" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "ファイルを開くまた保存" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "モデルがビルドボリュームに対して大きすぎる場合はスケールされるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "大きなモデルをスケールする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "ユニット値がミリメートルではなくメートルの場合、モデルが極端に小さく現れる場合があります。モデルはスケールアップされるべきですか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "極端に小さなモデルをスケールアップする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "モデルはロード後に選択しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "ロード後にモデルを選択" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "プリンター名の敬称はプリントジョブの名前に自動的に加えられるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "プリンターの敬称をジョブネームに加える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "プロジェクトファイルを保存時にサマリーを表示するべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "プロジェクトを保存時にダイアログサマリーを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "プロジェクトファイルを開く際のデフォルト機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "プロジェクトファイル開く際のデフォルト機能: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "常にプロジェクトとして開く" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "常にモデルを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "プロファイル内を変更し異なるプロファイルにしました、どこの変更点を保持、破棄したいのダイアログが表示されます、また何度もダイアログが表示されないようにデフォルト機能を選ぶことができます。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "プロファイル交換時に設定値を変更するためのデフォルト処理： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "常に変更した設定を廃棄する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "常に変更した設定を新しいプロファイルに送信する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "プライバシー" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Curaのプログラム開始時にアップデートがあるかチェックしますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "スタート時にアップデートあるかどうかのチェック" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "プリンターの不明なデータをUltimakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(不特定な) プリントインフォメーションを送信" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "詳細" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "実験" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "マルチビルドプレート機能を使用" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "マルチビルドプレート機能を使用 (再起動が必要)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "プリンター" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "名を変える" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "作成する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "プロファイルを作る" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "このプロファイルの名前を指定してください。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "プロファイルを複製する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "プロファイル名を変える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "プロファイルを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "プロファイルを書き出す" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "プリンター:%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "デフォルトプロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "カスタムプロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "プロファイルを現在のセッティング" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "今の変更を破棄する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "このプロファイルはプリンターによりデフォルトを使用、従いこのプロファイルはセッティング/書き換えが以下のリストにありません。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "設定は選択したプロファイルにマッチしています。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "グローバル設定" @@ -3624,33 +3646,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "検索設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "すべてのエクストルーダーの値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "すべてのエクストルーダーに対して変更された値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "この設定を非表示にする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "この設定を表示しない" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "常に見えるように設定する" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "視野のセッティングを構成する…" @@ -3665,32 +3687,32 @@ msgstr "" "いくらかの非表示設定は通常の計算された値と異なる値を使用します。\n" "表示されるようにクリックしてください。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "影響を与えるすべての設定がオーバーライドされるため、この設定は使用されません。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "影響" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "次によって影響を受ける" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "この設定は常に全てのエクストルーダーに共有されています。ここですべてのエクストルーダーの数値を変更できます。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "この値は各エクストルーダーの値から取得します " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3700,7 +3722,7 @@ msgstr "" "この設定にプロファイルと異なった値があります。\n" "プロファイルの値を戻すためにクリックしてください。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3715,7 +3737,7 @@ msgctxt "@button" msgid "Recommended" msgstr "推奨" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "カスタム" @@ -3740,12 +3762,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩壊してしまいます。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "密着性" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "ブリムまたはラフトのプリントの有効化。それぞれ、プリントの周り、また造形物の下に底面を加え切り取りやすくします。" @@ -3830,7 +3852,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "G-codeの送信" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "カスタムG-codeコマンドを接続されているプリンターに送信します。「Enter」を押してコマンドを送信します。" @@ -3927,11 +3949,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "お気に入り" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "汎用" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3982,7 +3999,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "カメラ位置 (&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "カメラビュー" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "パースペクティブ表示" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "平行投影表示" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "ビルドプレート (&B)" @@ -4101,22 +4133,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "最近開いたファイルを開く" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "プリントをアクティベートする" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "ジョブネーム" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "プリント時間" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "残り時間" @@ -4126,6 +4158,11 @@ msgctxt "@label" msgid "View type" msgstr "タイプ表示" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "オブジェクトリスト" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4177,32 +4214,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "コスト予測がありません" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "プレビュー" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "スライス中…" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "スライスできません" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "処理" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "スライス" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "スライス処理の開始" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "キャンセル" @@ -4237,233 +4279,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "プリンターのプリセット" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "プリンターの追加" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "プリンター管理" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "オンラインでトラブルシューティングガイドを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "留め金 フルスクリーン" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "全画面表示を終了する" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&取り消す" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&やりなおす" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&やめる" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3Dビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "フロントビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "トップビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左サイドビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右サイドビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Curaを構成する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "＆プリンターを追加する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "プリンターを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "フィラメントを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&現在の設定/無効にプロファイルをアップデートする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&変更を破棄する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&今の設定/無効からプロファイルを作成する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "プロファイルを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "オンラインドキュメントを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "報告＆バグ" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新情報" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "アバウト..." # can’t enter japanese text -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "&選択したモデルを削除" # can’t enter japanese text -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "選択したモデルを中央に移動" # can’t edit japanese text -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "選択した複数のモデル" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "モデルを消去する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "プラットホームの中心にモデルを配置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&モデルグループ" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "モデルを非グループ化" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "モ&デルの合体" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&モデルを増倍する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "すべてのモデル選択" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "ビルドプレート上のクリア" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "すべてのモデルを読み込む" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "すべてのモデルをすべてのビルドプレートに配置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "すべてのモデルをアレンジする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "選択をアレンジする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "すべてのモデルのポジションをリセットする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "すべてのモデル＆変更点をリセットする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&ファイルを開く(s)…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&新しいプロジェクト…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "コンフィグレーションのフォルダーを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&マーケットプレース" @@ -4478,49 +4525,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "このパッケージは再起動後にインストールされます。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura を閉じる" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura を終了しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "ファイルを開く" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "パッケージをインストール" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "ファイルを開く(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "選択したファイルの中に複数のG-codeが存在します。1つのG-codeのみ一度に開けます。G-codeファイルを開く場合は、1点のみ選んでください。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "プリンターを追加する" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "新情報" @@ -4741,32 +4788,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "プロジェクトを保存" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "ビルドプレート" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "エクストルーダー%1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1とフィラメント" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "保存中のプロジェクトサマリーを非表示にする" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "保存" @@ -4942,12 +4989,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "トラブルシューティング" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "プリンター名" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "プリンター名を入力してください" @@ -5006,21 +5053,6 @@ msgctxt "@button" msgid "Get started" msgstr "はじめに" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "現在のビルドプレートのみを表示" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "すべてのビルドプレートに配置" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "現在のビルドプレートを配置" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5111,6 +5143,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "プロファイルフラッター" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "AMFファイルの読込みをサポートしています。" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMFリーダー" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5121,16 +5163,6 @@ msgctxt "name" msgid "USB printing" msgstr "USBプリンティング" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "結果スライスをX3Gファイルとして保存して、このフォーマット（Malyan、Makerbot、およびその他のSailfishベースのプリンター）を読むプリンターをサポートできるようにします。" - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5381,6 +5413,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "3.0から3.1にバージョンアップグレート" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "コンフィギュレーションを Cura 4.1 から Cura 4.2 にアップグレートする。" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "4.0 から 4.1 にバージョンアップグレート" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5451,16 +5493,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MFリーダー" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "プリンターの動きをデバッグするためのツールパスとして SVG ファイルを読み込みます。" - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG ツールパスリーダー" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5551,6 +5583,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Curaプロファイルリーダー" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura 設定ガイド" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "現在利用可能なエクストルーダー [%s] に合わせて設定が変更されました。" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "ユーザー詳細" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "クラウドプリンタをモニタリングしている場合は、これらのオプションは利用できません。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Cura Connectに移動する" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "すべてのジョブが印刷されます。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "印刷履歴の表示" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "ネットワーク接続にて直接プリントするためには、必ずケーブルまたはWifiネットワークにて繋がっていることを確認してください。Curaをプリンターに接続していない場合でも、USBメモリを使って直接プリンターにg-codeファイルをトランスファーできます。\n" +#~ "\n" +#~ "下のリストからプリンターを選択してください：" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "プリンタが接続されていること確認してください:\n" +#~ "- プリンタの電源が入っていることを確認してください。\n" +#~ "- プリンタがネットワークに接続されているか確認してください。" + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "現在のビルドプレートのみを表示" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "すべてのビルドプレートに配置" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "現在のビルドプレートを配置" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "結果スライスをX3Gファイルとして保存して、このフォーマット（Malyan、Makerbot、およびその他のSailfishベースのプリンター）を読むプリンターをサポートできるようにします。" + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "プリンターの動きをデバッグするためのツールパスとして SVG ファイルを読み込みます。" + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG ツールパスリーダー" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Changelog" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 1da7befadd..3454139715 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index ae7c83c552..a99e608a93 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-05-28 09:49+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Japanese\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Japanese , Japanese \n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -359,7 +359,7 @@ msgstr "ノズルが冷却される前にエクストルーダーが静止しな #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "G-codeフレーバー" #: fdmprinter.def.json @@ -1344,11 +1344,10 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "シームコーナー設定" -# msgstr "薄層のプレファレンス" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "モデル輪郭のコーナーがシーム（縫い目）の位置に影響するかどうかを制御します。 Noneはコーナーがシームの位置に影響を与えないことを意味します。 Seam（縫い目）を非表示にすると、内側のコーナーでシームが発生しやすくなります。 Seamを表示すると、外側の角にシームが発生する可能性が高くなります。 シームを隠す、または表示するを選択することにより、内側または外側コーナーでシームを発生させる可能性が高くなります。" +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "モデル輪郭の角がシームの位置に影響を及ぼすかどうかを制御します。[なし] は、角がシームの位置に影響を及ぼさないことを意味します。シームを隠すにすると、シームが内側の角に生じる可能性が高くなります。シームを外側にすると、シームが外側の角に生じる可能性が高くなります。シームを隠す／外側に出すは、シームが内側または外側の角に生じる可能性が高くなります。スマート・シームを使用すると、内外両側の角を使用できますが、適切な場合には内側の角が選択される頻度が高まります。" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1373,6 +1372,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "シーム表示/非表示" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "スマート・シーム" + # msgstr "シームを非表示または表示する" #: fdmprinter.def.json msgctxt "z_seam_relative label" @@ -1387,14 +1391,13 @@ msgstr "有効時は、Zシームは各パーツの真ん中に設定されま #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "小さいZギャップは無視" +msgid "No Skin in Z Gaps" +msgstr "Z 軸ギャップにスキンなし" -# msgstr "小さなZギャップを無視する" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "モデルに垂直方向のギャップが小さくある場合、これらの狭いスペースにおいて上部および下部スキンを生成するために、約5％の計算時間が追加されます。そのような場合は、設定を無効にしてください。" +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "モデルの垂直方向に少数層のみの小さなギャップがある場合、通常は、その狭いスペース内にある層の周囲にスキンが存在する必要があります。垂直方向のギャップが非常に小さい場合は、この設定を有効にしてスキンが生成されないようにします。これにより、印刷時間とスライス時間が向上しますが、技術的には空気にさらされたインフィルを残します。" #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1960,8 +1963,8 @@ msgstr "造形温度" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "造形に使用した温度。これがゼロ (0) の場合、造形温度は調整できません。" +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "印刷するプリンタ内の温度。これがゼロ (0) の場合、造形温度は調整できません。" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -2073,6 +2076,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "収縮率をパーセントで示す。" +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "結晶性材料" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "この材料は加熱時にきれいに分解するタイプ (結晶性) または長く絡み合ったポリマー鎖 (非結晶) を作り出すタイプのいずれですか?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "滲出防止引戻し位置" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "滲出を止めるには材料をどこまで引き戻す必要があるか。" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "滲出防止引戻し速度" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "滲出を防止するにはフィラメントスイッチ中に材料をどの程度速く引き戻す必要があるか。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "フィラメントの引き出し準備引戻し位置" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "加熱中にフィラメントの引き出しが生じる距離。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "フィラメント引き出し準備引戻し速度" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "フィラメントの引き出しが起こるための引き戻しの距離。" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "フィラメント引き出しの引戻し位置" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "フィラメントをきれいに引き出すにはフィラメントをどこまで引き戻すか。" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "フィラメント引き出しの引戻し速度" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "フィラメントをきれいに引き出すために維持すべきフィラメントの引戻し速度。" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "フィラメント引き出し温度" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "フィラメントがきれいに引き出される温度。" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -2083,6 +2166,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "流れの補修: 押出されるマテリアルの量は、この値から乗算されます。" +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "壁のフロー" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "壁のフロー補正。" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "外壁のフロー" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "最外壁のフロー補正。" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "内壁のフロー" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "最外壁以外の壁のフロー補正。" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "上面/下面フロー" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "上面/下面のフロー補正。" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "上部表面スキンフロー" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "印刷物の上部表面のフロー補正。" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "インフィルフロー" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "インフィルのフロー補正。" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "スカート/ブリムのフロー" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "スカートまたはブリムのフロー補正。" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "支持材のフロー" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "支持材のフロー補正。" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "支持材界面フロー" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "支持材の天井面または床面のフロー補正。" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "支持材天井面フロー" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "支持材天井面のフロー補正。" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "支持材床面フロー" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "支持材床面のフロー補正。" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "プライムタワーのフロー" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "プライムタワーのフロー補正。" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2200,8 +2403,8 @@ msgstr "サポート引き戻し限界" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "サポートからサポートに直線移動する場合は、引き戻しを省略します。この設定を有効にすると、印刷時間が短縮されますが、サポート構造内部の糸引きが多くなります。" +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "支持材から支持材に直線移動する場合は、引戻しを省略します。この設定を有効にすると、印刷時間は節約できますが、支持材内で過剰な糸引きが発生する可能性があります。" #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2253,6 +2456,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "ノズル スイッチ後にフィラメントが押し戻される速度。" +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "ノズル切替え後のプライムに必要な余剰量" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "ノズル切替え後のプライムに必要な余剰材料。" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2447,14 +2660,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "スカートとブリムのプリント速度　通常は一層目のスピードと同じですが、異なる速度でスカートやブリムをプリントしたい場合に設定してください。" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "最大Z速度" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Z 軸ホップ速度" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "ビルトプレートが移動する最高速度　この値を0に設定すると、ファームウェアのデフォルト値のZの最高速度が適用されます。" +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Z 軸ホップに対して垂直 Z 軸方向の動きが行われる速度。これは通常、ビルドプレートまたはマシンのガントリーが動きにくいため、印刷速度よりも低くなります。" #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3385,12 +3598,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "印刷した初期層間の距離が構造ライをサポートします。この設定は、対応濃度で算出されます。" #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "サポートインフィルラインの向き" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "対応するインフィルラインの向きです。サポートインフィルパターンは平面で回転します。" @@ -3522,8 +3735,8 @@ msgstr "サポート接合距離" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "X/Y方向のサポート構造間の最大距離。別の構造がこの値より近づいた場合、構造は 1 つにマージします。" +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "支持材間における X/Y 軸方向の最大距離。個別の支持材間の距離がこの値よりも近い場合、支持材は 1 つにマージされます。" #: fdmprinter.def.json msgctxt "support_offset label" @@ -3922,14 +4135,14 @@ msgid "The diameter of a special tower." msgstr "特別な塔の直径。" #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "最小直径" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "最大タワーサポート直径" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "特殊なサポート塔によって支持される小さな領域のX / Y方向の最小直径。" +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "特殊なサポートタワーにより支持される小さな領域のX / Y方向の最小直径。" #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4431,16 +4644,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "印刷物の横にタワーを造形して、ノズル交換後にフィラメントの調整をします。" -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "円形プライムタワー" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "プライムタワーを円形にします。" - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4481,16 +4684,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "プライムタワーの位置のy座標。" -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "プライムタワーのフロー" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "吐出量: マテリアルの吐出量はこの値の乗算で計算されます。" - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4796,11 +4989,10 @@ msgctxt "smooth_spiralized_contours label" msgid "Smooth Spiralized Contours" msgstr "滑らかな輪郭" -# msgstr "滑らかならせん状の輪郭" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "らせん状の輪郭を滑らかにしてZシームの視認性を低下させます（Zシームは印刷物上でほとんどみえませんが、レイヤービューでは確認できます。）スムージングは​​細かいサーフェスの詳細をぼかす傾向があることに注意してください。" +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "らせん状の輪郭を滑らかにしてZシームの視認性を低下させます (Zシームは印刷物上でほとんどみえませんが、層ビューでは確認できます)。スムージングは、細かい表面の詳細をぼかす傾向があることに注意してください。" #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5316,8 +5508,8 @@ msgstr "円錐サポートを有効にする" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "実験的機能：オーバーハング部分よりも底面のサポート領域を小さくする。" +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "オーバーハング部分よりも底面の支持領域を小さくする。" #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -6116,6 +6308,73 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。" +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-codeフレーバー" + +# msgstr "薄層のプレファレンス" +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "モデル輪郭のコーナーがシーム（縫い目）の位置に影響するかどうかを制御します。 Noneはコーナーがシームの位置に影響を与えないことを意味します。 Seam（縫い目）を非表示にすると、内側のコーナーでシームが発生しやすくなります。 Seamを表示すると、外側の角にシームが発生する可能性が高くなります。 シームを隠す、または表示するを選択することにより、内側または外側コーナーでシームを発生させる可能性が高くなります。" + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "小さいZギャップは無視" + +# msgstr "小さなZギャップを無視する" +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "モデルに垂直方向のギャップが小さくある場合、これらの狭いスペースにおいて上部および下部スキンを生成するために、約5％の計算時間が追加されます。そのような場合は、設定を無効にしてください。" + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "造形に使用した温度。これがゼロ (0) の場合、造形温度は調整できません。" + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "サポートからサポートに直線移動する場合は、引き戻しを省略します。この設定を有効にすると、印刷時間が短縮されますが、サポート構造内部の糸引きが多くなります。" + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "最大Z速度" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "ビルトプレートが移動する最高速度　この値を0に設定すると、ファームウェアのデフォルト値のZの最高速度が適用されます。" + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "X/Y方向のサポート構造間の最大距離。別の構造がこの値より近づいた場合、構造は 1 つにマージします。" + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "最小直径" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "特殊なサポート塔によって支持される小さな領域のX / Y方向の最小直径。" + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "円形プライムタワー" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "プライムタワーを円形にします。" + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "吐出量: マテリアルの吐出量はこの値の乗算で計算されます。" + +# msgstr "滑らかならせん状の輪郭" +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "らせん状の輪郭を滑らかにしてZシームの視認性を低下させます（Zシームは印刷物上でほとんどみえませんが、レイヤービューでは確認できます。）スムージングは​​細かいサーフェスの詳細をぼかす傾向があることに注意してください。" + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "実験的機能：オーバーハング部分よりも底面のサポート領域を小さくする。" + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "有効なエクストルーダーの数" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 9ca0fa4a84..2c2a37ad1b 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -5,18 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:50+0200\n" -"Last-Translator: Korean \n" -"Language-Team: Jinbum Kim , Korean \n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 16:09+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Korean , Jinbum Kim , Korean \n" "Language: ko_KR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.2.1\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:27 msgctxt "@action" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "프로파일이 병합되고 활성화되었습니다." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF 파일" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USB 인쇄가 진행 중입니다. Cura를 닫으면 인쇄도 중단됩니다. 계속하시겠습니까?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 파일" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g 파일" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G 파일" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "이동식 드라이브 {0}: {1} 에 저장할 수 없습니다 :" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "오류" @@ -230,8 +234,8 @@ msgstr "이동식 장치 {0} 꺼내기" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "경고" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "프린터와 Cura의 설정이 일치하지 않습니다. 최상의 결과를 얻으려면 프린터에 삽입 된 PrintCores 및 재료로 슬라이싱을 하십시오." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "새로운 작업 전송 (일시적)이 차단되어 이전 프린팅 작업을 계속 보냅니다." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "프린터로 데이터 보내기" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "데이터 전송 중" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "취소" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "네트워크를 통해 연결됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "출력 작업이 프린터에 성공적으로 보내졌습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "데이터 전송 됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "모니터에서 보기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "'{printer_name} 프린터가 '{job_name}' 프린팅을 완료했습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "인쇄 작업 ‘{job_name}’이 완료되었습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "프린팅이 완료됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "비어 있음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "알 수 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Cloud를 통해 인쇄" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Cloud를 통해 인쇄" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Cloud를 통해 연결됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Cloud 오류" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "인쇄 작업을 내보낼 수 없음." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "데이터를 프린터로 업로드할 수 없음." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Ultimaker Cloud를 통해 업로드하는 중" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ultimaker 계정을 사용하여 어디에서든 인쇄 작업을 전송하고 모니터링하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Ultimaker Cloud에 연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "이 프린터에 대해 다시 물어보지 마십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "시작하기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "이제 Ultimaker 계정을 사용하여 어디에서든 인쇄 작업을 전송하고 모니터링할 수 있습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "연결됨!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "연결 검토" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "네트워크를 통해 연결" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura 설정 가이드" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "3MF 파일" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "노즐" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "프로젝트 파일 {0}에 알 수 없는 기기 유형 {1}이(가) 포함되어 있습니다. 기기를 가져올 수 없습니다. 대신 모델을 가져옵니다." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "프로젝트 파일 열기" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "지원되지 않음" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "파일이 이미 있습니다" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "유효하지 않은 파일 URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "현재 사용가능한 익스트루더: [% s]에 맞도록 설정이 변경되었습니다" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "익스트루더의 현재 가용성과 일치하도록 설정이 변경되었습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "설정이 업데이트되었습니다" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "익스트루더 비활성화됨" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "프로파일을 {0}: {1}로 내보내는데 실패했습니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "프로파일을 {0}로 내보내지 못했습니다. Writer 플러그인이 오류를 보고했습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "프로파일을 {0} 에 내보냅니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "내보내기 완료" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0}에서 프로파일을 가져오지 못했습니다 {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "프린터가 추가되기 전 {0}에서 프로파일을 가져올 수 없습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "{0}(으)로 가져올 사용자 정의 프로파일이 없습니다" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0}에서 프로파일을 가져오지 못했습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "프로파일 {0}에는 정확하지 않은 데이터가 포함되어 있으므로, 불러올 수 없습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "프로필 {0}({1})에 정의된 제품이 현재 제품({2})과 일치하지 않으므로, 불러올 수 없습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "{0}에서 프로파일을 가져오지 못했습니다:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "프로파일 {0}을 성공적으로 가져 왔습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "파일 {0}에 유효한 프로파일이 포함되어 있지 않습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "프로파일 {0}에 알 수 없는 파일 유형이 있거나 손상되었습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "사용자 정의 프로파일" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "프로파일에 품질 타입이 누락되었습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "다음" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "그룹 #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "닫기" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "추가" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "모든 파일 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "알 수 없는" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "아래 프린터는 그룹에 속해 있기 때문에 연결할 수 없습니다" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "사용 가능한 네트워크 프린터" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "사용자 정의" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "\"프린팅 순서\"설정 값으로 인해 갠트리가 프린팅 된 모델과 충돌하지 않도록 출력물 높이가 줄어 들었습니다." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "출력물 크기" @@ -1395,48 +1393,48 @@ msgstr "로그" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "사용자 설명" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "사용자 설명(참고: 개발자가 다른 언어 사용자일 수 있으므로 가능하면 영어를 사용하십시오.)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "보고서 전송" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "기기로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "장면 설정 중..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "인터페이스 로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "한 번에 하나의 G-코드 파일만 로드 할 수 있습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-코드가 로드되어 있으면 다른 파일을 열 수 없습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "선택한 모델이 너무 작아서 로드할 수 없습니다." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "프린터 설정" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (너비)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (깊이)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (높이)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "빌드 플레이트 모양" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "중앙이 원점" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "히트 베드" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Gcode 유형" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "프린트헤드 설정" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X 최소값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y 최소값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X 최대값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y 최대값" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "갠트리 높이" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "익스트루더의 수" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "시작 GCode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "End GCode" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "노즐 오프셋 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "노즐 오프셋 Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "냉각 팬 번호" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "익스트루더 시작 Gcode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "익스트루더 종료 Gcode" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "설치" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "설치됨" @@ -1616,8 +1614,8 @@ msgstr "플러그인" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "재료" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "귀하의 평가" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "버전" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "마지막으로 업데이트한 날짜" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "원작자" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "다운로드" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "설치 또는 업데이트에 로그인 필요" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "재료 스플 구입" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "업데이트" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "업데이트 중" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "펌웨어 누락으로 인해 펌웨어 업데이트에 실패했습니다." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "유리" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Cloud 프린터를 모니터링하고 있기 때문에 이 옵션을 사용할 수 없습니다." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "대기열을 원격으로 관리하려면 프린터 펌웨어를 업데이트하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Cloud 프린터를 모니터링하고 있기 때문에 웹캠을 사용할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "로딩 중..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "사용불가" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "연결할 수 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "대기 상태" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "제목 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "익명" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "구성 변경 필요" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "세부 사항" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "사용할 수 없는 프린터" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "첫 번째로 사용 가능" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "대기 중" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Cura Connect로 이동" +msgid "Manage in browser" +msgstr "브라우저에서 관리" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "대기열에 프린팅 작업이 없습니다. 작업을 추가하려면 슬라이스하여 전송하십시오." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "인쇄 작업" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "총 인쇄 시간" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "대기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "모든 작업이 인쇄됩니다." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "인쇄 내역 보기" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,14 +2034,13 @@ msgstr "네트워크 프린터에 연결" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"네트워크를 통해 프린터로 직접 프린팅하려면 네트워크 케이블을 사용하거나 프린터를 WIFI 네트워크에 연결하여 프린터가 네트워크에 연결되어 있는지 확인하십시오. Cura를 프린터에 연결하지 않은 경우에도 USB 드라이브를 사용하여 g 코드 파일을 프린터로 전송할 수 있습니다\n" -"\n" -"아래 목록에서 프린터를 선택하십시오:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "네트워크를 통해 프린터로 직접 프린팅하려면 네트워크 케이블을 사용하거나 프린터를 WIFI 네트워크에 연결하여 프린터가 네트워크에 연결되어 있는지 확인하십시오. Cura를 프린터에 연결하지 않은 경우에도 USB 드라이브를 사용하여 g-코드 파일을 프린터로 전송할 수 있습니다." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "아래 목록에서 프린터를 선택하십시오:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2056,9 +2048,9 @@ msgid "Edit" msgstr "편집" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "제거" @@ -2141,50 +2133,50 @@ msgctxt "@action:button" msgid "OK" msgstr "확인" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "중단됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "끝마친" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "준비 중..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "중지 중…" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "일시 정지 중…" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "일시 중지됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "다시 시작..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "조치가 필요함" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%2에서 %1 완료" @@ -2288,43 +2280,43 @@ msgctxt "@action:button" msgid "Override" msgstr "무시하기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "할당된 프린터 %1의 구성을 다음과 같이 변경해야 합니다:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "프린터 %1이(가) 할당되었으나 작업에 알 수 없는 재료 구성이 포함되어 있습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "재료 %1을(를) %2에서 %3(으)로 변경합니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "%3을(를) 재료 %1(으)로 로드합니다(이 작업은 무효화할 수 없음)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "PrintCore %1을(를) %2에서 %3(으)로 변경합니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "빌드 플레이트를 %1(으)로 변경합니다(이 작업은 무효화할 수 없음)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "무시하기는 기존 프린터 구성과 함께 지정된 설정을 사용하게 됩니다. 이는 인쇄 실패로 이어질 수 있습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "알루미늄" @@ -2334,7 +2326,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "프린터에 연결" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura 설정 가이드" @@ -2344,11 +2336,11 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" -"프린터에 연결이 있는지 확인하십시오.\n" -"- 프린터가 켜져 있는지 확인하십시오.\n" -"- 프린터가 네트워크에 연결되어 있는지 확인하십시오." +"프린터에 연결이 있는지 확인하십시오.⏎- 프린터가 켜져 있는지 확인하십시오.\n" +"- 프린터가 네트워크에 연결되어 있는지 확인하십시오.⏎- 클라우드로 연결된 프린터를 탐색할 수 있도록 로그인되어 있는지 확인하십시오." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2660,7 +2652,7 @@ msgid "Printer Group" msgstr "프린터 그룹" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "프로파일 설정" @@ -2673,19 +2665,19 @@ msgstr "프로파일의 충돌을 어떻게 해결해야합니까?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "이름" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "프로파일에 없음" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2855,18 +2847,24 @@ msgid "Previous" msgstr "이전" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "내보내기" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "팁" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "일반" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "인쇄 실험" @@ -2971,170 +2969,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "프린팅를 중단 하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "직경 변경 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "새 필라멘트의 직경은 %1 mm로 설정되었으며, 현재 압출기와 호환되지 않습니다. 계속하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "표시 이름" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "상표" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "재료 유형" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "색깔" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "속성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "밀도" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "직경" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "필라멘트 비용" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "필라멘트 무게" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "필라멘트 길이" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "미터 당 비용" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "이 재료는 %1에 연결되어 있으며 일부 속성을 공유합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "재료 연결 해제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "설명" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "접착 정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "프린팅 설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "활성화" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "생성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "복제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "가져오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "프린터" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "제거 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1을 제거 하시겠습니까? 이것은 취소 할 수 없습니다!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "재료 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "재료를 가져올 수 없습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "재료를 성공적으로 가져왔습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "재료 내보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "재료를 내보내는데 실패했습니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "재료를 성공적으로 내보냈습니다" @@ -3175,383 +3173,406 @@ msgid "Unit" msgstr "단위" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "일반" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "인터페이스" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "언어:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "통화:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "테마:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "이러한 변경 사항을 적용하려면 응용 프로그램을 다시 시작해야합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "설정이 변경되면 자동으로 슬라이싱 합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "자동으로 슬라이싱" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "뷰포트 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "지원되지 않는 모델 영역을 빨간색으로 강조 표시하십시오. 서포트가 없으면 이 영역이 제대로 프린팅되지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "오버행 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "모델을 선택하면 모델이 뷰의 가운데에 오도록 카메라를 이동합니다" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "항목을 선택하면 카메라를 중앙에 위치" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "큐라의 기본 확대 동작을 반전시켜야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "카메라 줌의 방향을 반전시키기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "확대가 마우스 방향으로 이동해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "직교 시점에서는 마우스 방향으로 확대가 지원되지 않습니다." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "마우스 방향으로 확대" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "모델을 더 이상 교차시키지 않도록 이동해야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "모델이 분리되어 있는지 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "모델을 빌드 플레이트에 닿도록 아래로 움직여야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "모델을 빌드 플레이트에 자동으로 놓기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "g-code 리더에 주의 메시지를 표시하기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "g-code 리더의 주의 메시지" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "레이어가 호환 모드로 강제 설정되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "레이어 뷰 호환성 모드로 전환 (다시 시작해야 함)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "어떤 유형의 카메라 렌더링을 사용해야 합니까?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "카메라 렌더링: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "원근" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "직교" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "파일 열기 및 저장" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "크기가 너무 큰 경우 모델을 빌드 볼륨에 맞게 조정해야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "큰 모델의 사이즈 수정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "단위가 밀리미터가 아닌 미터 단위 인 경우 모델이 매우 작게 나타날 수 있습니다. 이 모델을 확대할까요?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "매우 작은 모델의 크기 조정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "모델을 로드한 후에 선택해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "로드된 경우 모델 선택" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "프린터 이름에 기반한 접두어가 프린팅 작업 이름에 자동으로 추가되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "작업 이름에 기기 접두어 추가" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "프로젝트 파일을 저장할 때 요약이 표시되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "프로젝트 저장시 요약 대화 상자 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "프로젝트 파일을 열 때 기본 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "프로젝트 파일을 열 때 기본 동작 " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "항상 프로젝트로 열기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "항상 모델 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "프로파일을 변경하고 다른 프로파일로 전환하면 수정 사항을 유지할지 여부를 묻는 대화 상자가 표시됩니다. 기본 행동을 선택하면 해당 대화 상자를 다시 표시 하지 않을 수 있습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "다른 프로파일로 변경하는 경우 변경된 설정값에 대한 기본 동작 " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "항상 변경된 설정 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "항상 변경된 설정을 새 프로파일로 전송" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "보안" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura가 프로그램이 시작될 때 업데이트를 확인할까요?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "시작시 업데이트 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "프린터에 대한 익명의 데이터를 Ultimaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(익명) 프린터 정보 보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "추가 정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "실험적 설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "다수의 빌드 플레이트 사용하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "다수의 빌드 플레이트 사용하기(다시 시작해야 합니다)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "프린터" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "이름 바꾸기" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "생성" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "복제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "프로파일 생성하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "이 프로파일에 대한 이름을 제공하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "프로파일 복제하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "프로파일 이름 바꾸기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "프로파일 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "프로파일 내보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "프린터: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "기본 프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "사용자 정의 프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "현재 설정 / 재정의 프로파일 업데이트" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "현재 변경 사항 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "이 프로파일은 프린터에서 지정한 기본값을 사용하므로 아래 목록에 아무런 설정/재정의가 없습니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "현재 설정이 선택한 프로파일과 일치합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "전역 설정" @@ -3619,33 +3640,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "검색 설정" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "모든 익스트루더에 값 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "변경된 사항을 모든 익스트루더에 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "이 설정 숨기기" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "이 설정을 표시하지 않음" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "이 설정을 계속 표시하십시오" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "설정 보기..." @@ -3661,32 +3682,32 @@ msgstr "" "\n" "이 설정을 표시하려면 클릭하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "영향을 미치는 모든 설정이 무효화되기 때문에 이 설정을 사용하지 않습니다." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "영향" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "영향을 받다" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "이 설정은 항상 모든 익스트루더 사이에 공유됩니다. 여기서 변경하면 모든 익스트루더에 대한 값이 변경됩니다." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "이 값은 익스트루더마다 결정됩니다 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3697,7 +3718,7 @@ msgstr "" "\n" "프로파일 값을 복원하려면 클릭하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3713,7 +3734,7 @@ msgctxt "@button" msgid "Recommended" msgstr "추천" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "사용자 정의" @@ -3738,12 +3759,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "오버행이 있는 모델 서포트를 생성합니다. 이러한 구조가 없으면 이러한 부분이 프린팅 중에 붕괴됩니다." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "부착" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "브림이나 라프트를 사용합니다. 이렇게하면 출력물 주변이나 아래에 평평한 영역이 추가되어 나중에 쉽게 자를 수 있습니다." @@ -3829,7 +3850,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Gcode 보내기" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "연결된 프린터에 사용자 정의 G 코드 명령을 보냅니다. ‘Enter’키를 눌러 명령을 전송하십시오." @@ -3926,11 +3947,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "즐겨찾기" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "일반" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3981,7 +3997,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "카메라 위치(&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "카메라 뷰" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "원근" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "직교" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "빌드 플레이트(&B)" @@ -4098,22 +4129,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "최근 열어본 파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "활성화된 프린트" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "작업 이름" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "프린팅 시간" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "예상 남은 시간" @@ -4123,6 +4154,11 @@ msgctxt "@label" msgid "View type" msgstr "유형 보기" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "개체 목록" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4174,32 +4210,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "비용 추산 이용 불가" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "미리 보기" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "슬라이싱..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "슬라이스 할 수 없습니다" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "처리" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "슬라이스" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "슬라이싱 프로세스 시작" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "취소" @@ -4234,230 +4275,235 @@ msgctxt "@label" msgid "Preset printers" msgstr "프린터 사전 설정" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "프린터 추가" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "프린터 관리" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "온라인 문제 해결 가이드 표시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "전채 화면 전환" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "전체 화면 종료" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "되돌리기(&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "다시하기(&R)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "종료(&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "앞에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "위에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "왼쪽에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "오른쪽에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura 구성 ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "프린터 추가..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "프린터 관리 ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "재료 관리..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "현재 설정으로로 프로파일 업데이트" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "현재 변경 사항 무시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "현재 설정으로 프로파일 생성..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "프로파일 관리..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "온라인 문서 표시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "버그 리포트" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "새로운 기능" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "소개..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "선택한 모델 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "선택한 모델 중심에 놓기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "선택한 모델 복제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "모델 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "플랫폼중심에 모델 위치하기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "모델 그룹화" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "모델 그룹 해제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "모델 합치기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "모델 복제..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "모든 모델 선택" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "빌드 플레이트 지우기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "모든 모델 다시 로드" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "모든 모델을 모든 빌드 플레이트에 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "모든 모델 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "선택한 모델 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "모든 모델의 위치 재설정" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "모든 모델의 변환 재설정" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "파일 열기..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "새로운 프로젝트..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "설정 폴더 표시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&시장" @@ -4472,49 +4518,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "다시 시작한 후에 이 패키지가 설치됩니다." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "설정" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura 닫기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura를 정말로 종료하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "패키지 설치" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "선택한 파일 내에 하나 이상의 G-코드 파일이 있습니다. 한 번에 하나의 G-코드 파일 만 열 수 있습니다. G-코드 파일을 열려면 하나만 선택하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "프린터 추가" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "새로운 기능" @@ -4738,32 +4784,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "프로젝트 저장" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "빌드 플레이트" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "%1익스트루더" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 재료" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "재료" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "프로젝트 요약을 다시 저장하지 마십시오" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "저장" @@ -4939,12 +4985,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "문제 해결" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "프린터 이름" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "프린터의 이름을 설정하십시오" @@ -5001,21 +5047,6 @@ msgctxt "@button" msgid "Get started" msgstr "시작하기" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "현재의 빌드 플레이트만 보기" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "모든 빌드 플레이트 정렬" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "현재의 빌드 플레이트 정렬" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5106,6 +5137,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "프로필 플래트너" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "AMF 파일 읽기가 지원됩니다." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF 리더" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5116,16 +5157,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB 프린팅" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "결과로 생성된 슬라이스를 X3G 파일로 저장해, 이 형식을 읽는 프린터를 지원합니다(Malyan, Makerbot 및 다른 Sailfish 기반 프린터)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5376,6 +5407,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "3.0에서 3.1로 버전 업그레이드" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Cura 4.1에서 Cura 4.2로 구성을 업그레이드합니다." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "4.1에서 4.2로 버전 업그레이드" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5446,16 +5487,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF 리더" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "프린터 이동 디버깅을 위해 Toolpath로 SVG 파일을 읽습니다." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG Toolpath 리더기" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5546,6 +5577,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 프로파일 리더" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura 설정 가이드" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "현재 사용가능한 익스트루더: [% s]에 맞도록 설정이 변경되었습니다" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "사용자 설명" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Cloud 프린터를 모니터링하고 있기 때문에 이 옵션을 사용할 수 없습니다." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Cura Connect로 이동" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "모든 작업이 인쇄됩니다." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "인쇄 내역 보기" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "네트워크를 통해 프린터로 직접 프린팅하려면 네트워크 케이블을 사용하거나 프린터를 WIFI 네트워크에 연결하여 프린터가 네트워크에 연결되어 있는지 확인하십시오. Cura를 프린터에 연결하지 않은 경우에도 USB 드라이브를 사용하여 g 코드 파일을 프린터로 전송할 수 있습니다\n" +#~ "\n" +#~ "아래 목록에서 프린터를 선택하십시오:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "프린터에 연결이 있는지 확인하십시오.\n" +#~ "- 프린터가 켜져 있는지 확인하십시오.\n" +#~ "- 프린터가 네트워크에 연결되어 있는지 확인하십시오." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "현재의 빌드 플레이트만 보기" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "모든 빌드 플레이트 정렬" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "현재의 빌드 플레이트 정렬" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "결과로 생성된 슬라이스를 X3G 파일로 저장해, 이 형식을 읽는 프린터를 지원합니다(Malyan, Makerbot 및 다른 Sailfish 기반 프린터)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "프린터 이동 디버깅을 위해 Toolpath로 SVG 파일을 읽습니다." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG Toolpath 리더기" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "변경 내역" diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index d9ef6694d5..193031e1ae 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Korean \n" "Language-Team: Jinbum Kim , Korean \n" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index e1b0790855..fa2b0c5314 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Korean \n" -"Language-Team: Jinbum Kim , Korean \n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Korean , Jinbum Kim , Korean \n" "Language: ko_KR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "시작과 동시에형실행될 G 코드 명령어 \n." +msgstr "" +"시작과 동시에형실행될 G 코드 명령어 \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -70,7 +72,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "맨 마지막에 실행될 G 코드 명령 \n." +msgstr "" +"맨 마지막에 실행될 G 코드 명령 \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -334,8 +338,8 @@ msgstr "노즐이 냉각되기 전에 익스트루더가 비활성이어야하 #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" -msgstr "G-code Flavour" +msgid "G-code Flavor" +msgstr "Gcode 유형" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1294,8 +1298,9 @@ msgstr "솔기 코너 환경 설정" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "모델 외곽선의 모서리가 솔기의 위치에 영향을 줄지 여부를 제어합니다. 이것은 코너가 솔기 위치에 영향을 미치지 않는다는 것을 의미하지 않습니다. 솔기 숨기기는 이음새가 안쪽 모서리에서 발생할 가능성을 높입니다. 솔기 노출은 솔기이 외부 모서리에서 발생할 가능성을 높입니다. 솔기 숨기기 또는 노출은 솔기이 내부나 외부 모서리에서 발생할 가능성을 높입니다." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "모델 외곽선의 모서리가 이음선의 위치에 영향을 주는지 여부를 제어합니다. 이것은 모서리가 이음선 위치에 영향을 미치지 않는다는 것을 의미하지 않습니다. 이음선 숨김은 이음선이 안쪽 모서리에서 발생할 가능성을 높입니다. 이음선 노출은 이음선이 외부 모서리에서 발생할 가능성을" +" 높입니다. 이음선 숨김 또는 노출은 이음선이 내부나 외부 모서리에서 발생할 가능성을 높입니다. 스마트 숨김은 내외부 모서리 모두 가능하지만, 적절하다면 내부 모서리를 더욱 빈번하게 선택합니다." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1317,6 +1322,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "솔기 숨기기 또는 노출" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "스마트 숨김" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1329,13 +1339,14 @@ msgstr "활성화 된 경우 z 솔기 좌표는 각 부품의 중심을 기준 #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "작은 Z 간격 무시" +msgid "No Skin in Z Gaps" +msgstr "Z 간격에 스킨 없음" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "모델에 수직 간격이 작으면 이 좁은 공간에서 상단 및 하단 스킨을 생성하는 데 약 5%의 추가적인 계산시간을 소비 할 수 있습니다. 이 경우 설정을 해제하십시오." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "모델의 몇 가지 레이어에만 수직 간격이 작을 경우 보통 좁은 공간의 본 레이어 주위에도 스킨이 있어야 합니다. 수직 간격이 매우 작을 경우 스킨을 생성하지 않도록 이 설정을 활성화합니다. 이렇게 하면 프린팅 시간과 슬라이싱 시간은 개선되지만 기술적으로 내부채움이 공기 중에" +" 노출된 상태로 남게 됩니다." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1632,7 +1643,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "내부채움 영역 주변에 여분의 벽을 추가합니다. 이러한 벽은 상단/하단 스킨 라인이 늘어지는 것을 줄여줄 수 있습니다. 일부 여분 재료를 사용해도 같은 품질을 유지하는 데 필요한 필요한 상단/하단 스킨 층이 감소한다는 의미입니다.\n이 기능을 올바르게 구성하는 경우 내부채움 다각형 연결과 함께 사용해 이동 또는 리트랙션없이 모든 내부채움을 단일 돌출 경로에 연결할 수 있습니다." +msgstr "" +"내부채움 영역 주변에 여분의 벽을 추가합니다. 이러한 벽은 상단/하단 스킨 라인이 늘어지는 것을 줄여줄 수 있습니다. 일부 여분 재료를 사용해도 같은 품질을 유지하는 데 필요한 필요한 상단/하단 스킨 층이 감소한다는 의미입니다.\n" +"이 기능을 올바르게 구성하는 경우 내부채움 다각형 연결과 함께 사용해 이동 또는 리트랙션없이 모든 내부채움을 단일 돌출 경로에 연결할 수 있습니다." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1871,8 +1884,8 @@ msgstr "빌드 볼륨 온도" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "빌드 볼륨에 사용되는 온도입니다. 0인 경우 빌드 볼륨 온도는 조정되지 않습니다." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "프린팅되는 환경의 온도입니다. 이 값이 0인 경우 빌드 볼륨 온도는 조정되지 않습니다." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1984,6 +1997,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "수축 비율 퍼센트." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "결정형 소재" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "이 소재는 가열 시 깔끔하게 분리되는 유형(결정형)입니까? 아니면 길게 얽힌 폴리머 체인을 생성하는 유형(비결정형)입니까?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "흐름 방지 리트랙션 위치" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "흐름이 멈추기 전에 소재가 후퇴해야 하는 거리입니다." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "흐름 방지 리트랙션 속도" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "흐름을 방지하기 위해 필라멘트 스위치 중 소재가 후퇴해야 하는 속도입니다." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "파단 준비 리트랙션 위치" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "가열 시 파단되기 전까지 필라멘트가 늘어날 수 있는 거리입니다." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "파단 준비 리트랙션 속도" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "리트랙션 시 파단되기 직전까지 필라멘트가 후퇴해야 하는 속도입니다." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "파단 리트랙션 위치" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "필라멘트가 깔끔하게 파단되기 위해 후퇴해야 하는 거리입니다." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "파단 리트랙션 속도" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "필라멘트가 깔끔하게 파단되기 위해 후퇴해야 하는 속도입니다." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "파단 온도" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "필라멘트가 깔끔하게 파단되는 온도입니다." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1994,6 +2087,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "압출량 보상: 압출 된 재료의 양에 이 값을 곱합니다." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "벽 압출량" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "벽 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "외벽 압출량" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "가장 외측 벽 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "내벽 압출량" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "가장 외측 벽을 제외한 모든 벽 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "상단/하단 압출량" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "상단/하단 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "상단 표면 스킨 압출량" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "프린트 상단 부분 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "내부채움 압출량" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "내부채움 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "스커트/브림 압출량" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "스커트 또는 브림 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "지지대 압출량" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "지지대 구조 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "지지대 인터페이스 압출량" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "지지대 지붕 또는 바닥 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "지지대 지붕 압출량" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "지지대 지붕 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "지지대 바닥 압출량" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "지지대 바닥 라인의 압출 보상입니다." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "프라임 타워 압출량" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "프라임 타워 라인의 압출 보상입니다." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2111,8 +2324,8 @@ msgstr "지지대 후퇴 제한" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "직선으로 지지대 사이를 이동하는 경우 후퇴는 불가능합니다. 이 설정을 사용하면 인쇄 시간은 절약할 수 있지만, 지지 구조물 내에 스트링이 과도하게 증가할 수 있습니다." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "직선으로 지지대 사이를 이동하는 경우 리트랙션은 생략합니다. 이 설정을 사용하면 프린팅 시간은 절약할 수 있지만, 지지대 구조물 내에 스트링이 과도하게 증가할 수 있습니다." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2164,6 +2377,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "노즐 스위치 리트렉션 후 필라멘트가 뒤로 밀리는 속도." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "노즐 스위치 엑스트라 프라임 양" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "노즐 스위치 후 프라이밍하는 추가 소재의 양입니다." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2355,14 +2578,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "스커트와 브림이 프린팅되는 속도입니다. 일반적으로 이것은 초기 레이어 속도에서 수행되지만 때로는 스커트나 브림을 다른 속도로 프린팅하려고 할 수 있습니다." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "최대 Z 속도" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Z 홉 속도" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "빌드 플레이트가 움직이는 최대 속도. 이 값을 0으로 설정하면 프린팅시 최대 z 속도의 펌웨어 기본값이 사용됩니다." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Z 홉을 위해 수직 Z 이동이 이루어지는 속도입니다. 빌드 플레이트 또는 기기의 갠트리를 움직이기가 더 어렵기 때문에 프린트 속도보다 낮은 것이 일반적입니다." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3280,12 +3503,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "인쇄된 초기 레이어 서포트 구조 선 사이의 거리. 이 설정은 서포트 밀도로 계산됩니다." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "서포트 내부채움 선 방향" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "서포트에 대한 내부채움 패턴 방향. 서포트 내부채움 패턴은 수평면에서 회전합니다." @@ -3416,8 +3639,8 @@ msgstr "서포트 Join 거리" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "X/Y 방향으로서포트 구조물 사이의 최대 거리. 별도의 구조가 이 값보다 가깝게 있으면 구조가 하나로 합쳐집니다." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "X/Y 방향으로 지지대 구조물 사이의 최대 거리입니다. 별도의 구조가 이 값보다 가깝게 있으면 구조가 하나로 합쳐집니다." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3795,14 +4018,14 @@ msgid "The diameter of a special tower." msgstr "특수 타워의 지름." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "최소 지름" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "최대 타워 지지 직경" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "특수 서포트 타워에 의해서 서포트 될 작은 영역의 X/Y 방향의 최소 직경." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "특수 지지대 타워에 의해서 지지될 작은 영역의 X/Y 방향의 최대 직경입니다." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3924,7 +4147,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "프린트의 스커트와 첫 번째 레이어 사이의 수평 거리입니다.\n이것은 최소 거리입니다. 여러 개의 스커트 선이 이 거리에서 바깥쪽으로 연장됩니다." +msgstr "" +"프린트의 스커트와 첫 번째 레이어 사이의 수평 거리입니다.\n" +"이것은 최소 거리입니다. 여러 개의 스커트 선이 이 거리에서 바깥쪽으로 연장됩니다." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4296,16 +4521,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "각 노즐을 교체 한 후에 재료를 프라이밍(Priming)하는 프린팅 옆에 타워를 프린팅하십시오." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "원형 프라임 타워" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "프라임 타워를 원형으로 만들기." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4346,16 +4561,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "프라임 타워 위치의 y 좌표입니다." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "프라임 타워 압출량" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "압출량 보정 : 압출된 재료의 양에 이 값을 곱합니다." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4658,8 +4863,8 @@ msgstr "부드러운 나선형 윤곽" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "나선형 윤곽선을 부드럽게하여 Z 솔기의 가시성을 줄입니다. (Z- 솔기는 출력물에서는 거의 보이지 않지만 레이어 뷰에서는 여전히 보임). 매끄러움은 표면의 세부 묘사를 흐릿하게하는 경향이 있습니다." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "나선형 윤곽선을 부드럽게 하여 Z 이음선이 잘 보이지 않도록 합니다(Z- 이음선은 출력물에서는 거의 보이지 않지만 레이어 뷰에서는 여전히 보임). 매끄러움은 표면의 세부 묘사를 흐릿하게 만드는 경향이 있습니다." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5158,8 +5363,8 @@ msgstr "원추형 서포트 사용" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "실험적 기능 : 오버행보다 하단에서 서포트 영역을 작게 만듭니다." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "오버행보다 하단에서 지지대 영역을 작게 만듭니다." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5958,6 +6163,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-code Flavour" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "모델 외곽선의 모서리가 솔기의 위치에 영향을 줄지 여부를 제어합니다. 이것은 코너가 솔기 위치에 영향을 미치지 않는다는 것을 의미하지 않습니다. 솔기 숨기기는 이음새가 안쪽 모서리에서 발생할 가능성을 높입니다. 솔기 노출은 솔기이 외부 모서리에서 발생할 가능성을 높입니다. 솔기 숨기기 또는 노출은 솔기이 내부나 외부 모서리에서 발생할 가능성을 높입니다." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "작은 Z 간격 무시" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "모델에 수직 간격이 작으면 이 좁은 공간에서 상단 및 하단 스킨을 생성하는 데 약 5%의 추가적인 계산시간을 소비 할 수 있습니다. 이 경우 설정을 해제하십시오." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "빌드 볼륨에 사용되는 온도입니다. 0인 경우 빌드 볼륨 온도는 조정되지 않습니다." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "직선으로 지지대 사이를 이동하는 경우 후퇴는 불가능합니다. 이 설정을 사용하면 인쇄 시간은 절약할 수 있지만, 지지 구조물 내에 스트링이 과도하게 증가할 수 있습니다." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "최대 Z 속도" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "빌드 플레이트가 움직이는 최대 속도. 이 값을 0으로 설정하면 프린팅시 최대 z 속도의 펌웨어 기본값이 사용됩니다." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "X/Y 방향으로서포트 구조물 사이의 최대 거리. 별도의 구조가 이 값보다 가깝게 있으면 구조가 하나로 합쳐집니다." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "최소 지름" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "특수 서포트 타워에 의해서 서포트 될 작은 영역의 X/Y 방향의 최소 직경." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "원형 프라임 타워" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "프라임 타워를 원형으로 만들기." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "압출량 보정 : 압출된 재료의 양에 이 값을 곱합니다." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "나선형 윤곽선을 부드럽게하여 Z 솔기의 가시성을 줄입니다. (Z- 솔기는 출력물에서는 거의 보이지 않지만 레이어 뷰에서는 여전히 보임). 매끄러움은 표면의 세부 묘사를 흐릿하게하는 경향이 있습니다." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "실험적 기능 : 오버행보다 하단에서 서포트 영역을 작게 만듭니다." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "활성화된 익스트루더의 수" @@ -6163,7 +6432,6 @@ msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬 #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "시작과 동시에 실행될 G 코드 명령어 \n" #~ "." @@ -6176,7 +6444,6 @@ msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬 #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "맨 마지막에 실행될 G 코드 명령 \n" #~ "." diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 8b1cb9f21d..943c792aea 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Dutch\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Dutch , Dutch \n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,11 @@ msgid "" "

{model_names}

\n" "

Find out how to ensure the best possible print quality and reliability.

\n" "

View print quality guide

" -msgstr "

Een of meer 3D-modellen worden mogelijk niet optimaal geprint vanwege het modelformaat en de materiaalconfiguratie:

\n

{model_names}

\n

Ontdek hoe u de best mogelijke printkwaliteit en betrouwbaarheid verkrijgt.

\n

Handleiding printkwaliteit bekijken

" +msgstr "" +"

Een of meer 3D-modellen worden mogelijk niet optimaal geprint vanwege het modelformaat en de materiaalconfiguratie:

\n" +"

{model_names}

\n" +"

Ontdek hoe u de best mogelijke printkwaliteit en betrouwbaarheid verkrijgt.

\n" +"

Handleiding printkwaliteit bekijken

" #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 msgctxt "@action" @@ -81,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profiel is platgemaakt en geactiveerd." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF-bestand" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -106,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Er wordt momenteel via USB geprint. Wanneer u Cura afsluit, wordt het printen gestopt. Weet u zeker dat u wilt afsluiten?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G-bestand" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -122,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g-bestand" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G-bestand" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -194,9 +202,9 @@ msgstr "Kan niet opslaan op verwisselbaar station {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Fout" @@ -226,8 +234,8 @@ msgstr "Verwisselbaar station {0} uitwerpen" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Waarschuwing" @@ -358,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "De configuratie of kalibratie van de printer komt niet overeen met de configuratie van Cura. Slice voor het beste resultaat altijd voor de PrintCores en materialen die in de printer zijn ingevoerd." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Het verzenden van nieuwe taken is (tijdelijk) geblokkeerd. Nog bezig met het verzenden van de vorige printtaak." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "De gegevens worden naar de printer verzonden" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Gegevens Verzenden" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Annuleren" @@ -439,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Via het netwerk verbonden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "De printtaak is naar de printer verzonden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Gegevens verzonden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "In monitor weergeven" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "Printer '{printer_name}' is klaar met het printen van '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "De printtaak '{job_name}' is voltooid." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Print klaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Leeg" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Onbekend" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Printen via Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Printen via Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Verbonden via Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Cloud-fout" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Kan de printtaak niet exporteren." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Kan de gegevens niet uploaden naar de printer." @@ -544,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Uploaden via Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Verzend en controleer overal printtaken met uw Ultimaker-account." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Verbinden met Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Niet opnieuw vragen voor deze printer." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Aan de slag" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "U kunt nu overal vandaan printtaken verzenden en controleren met uw Ultimaker-account." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Verbonden!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Uw verbinding controleren" @@ -584,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Verbinding Maken via Netwerk" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura-instellingengids" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -762,18 +765,18 @@ msgid "3MF File" msgstr "3MF-bestand" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projectbestand {0} bevat een onbekend type machine {1}. Kan de machine niet importeren. In plaats daarvan worden er modellen geïmporteerd." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Projectbestand Openen" @@ -905,13 +908,13 @@ msgid "Not supported" msgstr "Niet ondersteund" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Het Bestand Bestaat Al" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -923,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ongeldige bestands-URL:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "De instellingen zijn gewijzigd zodat deze overeenkomen met de huidige beschikbaarheid van de extruders: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "De instellingen zijn gewijzigd zodat deze overeenkomen met de huidige beschikbaarheid van extruders:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "De instellingen zijn bijgewerkt" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(s) uitgeschakeld" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Kan het profiel niet exporteren als {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Kan het profiel niet exporteren als {0}: Invoegtoepassing voor de schrijver heeft een fout gerapporteerd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Het profiel is geëxporteerd als {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "De export is voltooid" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Kan het profiel niet importeren uit {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Kan het profiel niet importeren uit {0} voordat een printer toegevoegd is." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Er is geen aangepast profiel om in het bestand {0} te importeren" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Dit profiel {0} bevat incorrecte gegevens. Kan het profiel niet importeren." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "De machine die is vastgelegd in het profiel {0} ({1}), komt niet overeen met uw huidige machine ({2}). Kan het profiel niet importeren." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Het profiel {0} is geïmporteerd" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Het bestand {0} bevat geen geldig profiel." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Het profiel {0} heeft een onbekend bestandstype of is beschadigd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Aangepast profiel" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Er ontbreekt een kwaliteitstype in het profiel." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1111,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Volgende" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1122,7 +1124,7 @@ msgstr "Groepsnummer {group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1130,7 +1132,7 @@ msgstr "Sluiten" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Toevoegen" @@ -1151,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Bestanden (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Onbekend" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Kan de onderstaande printer(s) niet verbinden omdat deze deel uitmaakt/uitmaken van een groep" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Beschikbare netwerkprinters" @@ -1180,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Aangepast" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "De hoogte van het bouwvolume is verminderd wegens de waarde van de instelling “Printvolgorde”, om te voorkomen dat de rijbrug tegen geprinte modellen botst." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Werkvolume" @@ -1278,7 +1280,12 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "

Oeps, Ultimaker Cura heeft een probleem gedetecteerd.

\n

Tijdens het opstarten is een onherstelbare fout opgetreden. Deze fout is mogelijk veroorzaakt door enkele onjuiste configuratiebestanden. Het wordt aanbevolen een back-up te maken en de standaardinstelling van uw configuratie te herstellen.

\n

Back-ups bevinden zich in de configuratiemap.

\n

Stuur ons dit crashrapport om het probleem op te lossen.

\n " +msgstr "" +"

Oeps, Ultimaker Cura heeft een probleem gedetecteerd.

\n" +"

Tijdens het opstarten is een onherstelbare fout opgetreden. Deze fout is mogelijk veroorzaakt door enkele onjuiste configuratiebestanden. Het wordt aanbevolen een back-up te maken en de standaardinstelling van uw configuratie te herstellen.

\n" +"

Back-ups bevinden zich in de configuratiemap.

\n" +"

Stuur ons dit crashrapport om het probleem op te lossen.

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:98 msgctxt "@action:button" @@ -1311,7 +1318,10 @@ msgid "" "

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " -msgstr "

Er is een fatale fout opgetreden in Cura. Stuur ons het crashrapport om het probleem op te lossen

\n

Druk op de knop \"Rapport verzenden\" om het foutenrapport automatisch naar onze servers te verzenden

\n " +msgstr "" +"

Er is een fatale fout opgetreden in Cura. Stuur ons het crashrapport om het probleem op te lossen

\n" +"

Druk op de knop \"Rapport verzenden\" om het foutenrapport automatisch naar onze servers te verzenden

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:173 msgctxt "@title:groupbox" @@ -1383,48 +1393,48 @@ msgstr "Logboeken" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Gebruikersbeschrijving" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Gebruikersbeschrijving (opmerking: ontwikkelaars spreken uw taal mogelijk niet; gebruik indien mogelijk Engels)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Rapport verzenden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Machines laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Scene instellen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Interface laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Er kan slechts één G-code-bestand tegelijkertijd worden geladen. Het importeren van {0} is overgeslagen" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Kan geen ander bestand openen als G-code wordt geladen. Het importeren van {0} is overgeslagen" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Het geselecteerde model is te klein om te laden." @@ -1434,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Printerinstellingen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Breedte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Diepte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Hoogte)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Vorm van het platform" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Centraal oorsprongpunt" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Verwarmd bed" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Versie G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Printkopinstellingen" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Rijbrughoogte" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Aantal extruders" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Eind G-code" @@ -1555,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Nozzle-offset X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Nozzle-offset Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Nummer van koelventilator" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Start-G-code van extruder" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Eind-G-code van extruder" @@ -1581,7 +1591,7 @@ msgid "Install" msgstr "Installeren" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Geïnstalleerd" @@ -1604,8 +1614,8 @@ msgstr "Invoegtoepassingen" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materialen" @@ -1615,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Uw beoordeling" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Versie" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Laatst bijgewerkt" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Auteur" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Aanmelden is vereist voor installeren of bijwerken" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Materiaalspoelen kopen" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Bijwerken" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Bijwerken" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1769,7 +1779,10 @@ msgid "" "This plugin contains a license.\n" "You need to accept this license to install this plugin.\n" "Do you agree with the terms below?" -msgstr "Deze invoegtoepassing bevat een licentie.\nU moet akkoord gaan met deze licentie om deze invoegtoepassing te mogen installeren.\nGaat u akkoord met de onderstaande voorwaarden?" +msgstr "" +"Deze invoegtoepassing bevat een licentie.\n" +"U moet akkoord gaan met deze licentie om deze invoegtoepassing te mogen installeren.\n" +"Gaat u akkoord met de onderstaande voorwaarden?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:55 msgctxt "@action:button" @@ -1907,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Firmware-update mislukt door ontbrekende firmware." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Glas" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Deze opties zijn niet beschikbaar omdat u een cloudprinter controleert." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Werk de firmware van uw printer bij om de wachtrij op afstand te beheren." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "De webcam is niet beschikbaar omdat u een cloudprinter controleert." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Laden..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Niet beschikbaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Onbereikbaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Inactief" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Zonder titel" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anoniem" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Hiervoor zijn configuratiewijzigingen vereist" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Details" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Niet‑beschikbare printer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Eerst beschikbaar" @@ -1979,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "In wachtrij" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Ga naar Cura Connect" +msgid "Manage in browser" +msgstr "Beheren in browser" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Er staan geen afdruktaken in de wachtrij. Slice een taak en verzend deze om er een toe te voegen." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Printtaken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Totale printtijd" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Wachten op" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Alle taken zijn geprint." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Printgeschiedenis weergeven" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2026,11 +2034,15 @@ msgstr "Verbinding Maken met Printer in het Netwerk" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "Als u rechtstreeks via het netwerk wilt printen naar de printer, moet u ervoor zorgen dat de printer met een netwerkkabel is verbonden met het netwerk of moet u verbinding maken met de printer via het wifi-netwerk. Als u geen verbinding maakt tussen Cura en de printer, kunt u een USB-station gebruiken om G-code-bestanden naar de printer over te zetten.\n\nSelecteer uw printer in de onderstaande lijst:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Als u rechtstreeks via het netwerk wilt printen naar de printer, moet u ervoor zorgen dat de printer met een netwerkkabel is verbonden met het netwerk" +" of moet u verbinding maken met de printer via het wifi-netwerk. Als u geen verbinding maakt tussen Cura en de printer, kunt u een USB-station gebruiken" +" om G-code-bestanden naar de printer over te zetten." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Selecteer uw printer in de onderstaande lijst:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2038,9 +2050,9 @@ msgid "Edit" msgstr "Bewerken" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Verwijderen" @@ -2123,50 +2135,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Afgebroken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Gereed" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Voorbereiden..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Afbreken..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Pauzeren..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Gepauzeerd" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Hervatten..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Handeling nodig" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Voltooit %1 om %2" @@ -2270,44 +2282,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Overschrijven" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "Voor de toegewezen printer, %1, is de volgende configuratiewijziging vereist:" msgstr[1] "Voor de toegewezen printer, %1, zijn de volgende configuratiewijzigingen vereist:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "De printer %1 is toegewezen. De taak bevat echter een onbekende materiaalconfiguratie." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Wijzig het materiaal %1 van %2 in %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Laad %3 als materiaal %1 (kan niet worden overschreven)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Wijzig de print core %1 van %2 in %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Wijzig het platform naar %1 (kan niet worden overschreven)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Met het overschrijven worden de opgegeven instellingen gebruikt met de bestaande printerconfiguratie. De print kan hierdoor mislukken." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Aluminium" @@ -2317,7 +2329,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Verbinding maken met een printer" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura-instellingengids" @@ -2327,8 +2339,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "Controleer of de printer verbonden is:\n- Controleer of de printer ingeschakeld is.\n- Controleer of de printer verbonden is met het netwerk." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Controleer of de printer verbonden is:\n- Controleer of de printer ingeschakeld is.\n- Controleer of de printer verbonden is met het netwerk.\n- Controleer" +" of u bent aangemeld om met de cloud verbonden printers te detecteren." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2640,7 +2654,7 @@ msgid "Printer Group" msgstr "Printergroep" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Profielinstellingen" @@ -2653,19 +2667,19 @@ msgstr "Hoe dient het conflict in het profiel te worden opgelost?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Naam" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Niet in profiel" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2837,18 +2851,24 @@ msgid "Previous" msgstr "Vorige" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Exporteren" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Tip" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Standaard" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Print experiment" @@ -2953,170 +2973,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Weet u zeker dat u het printen wilt afbreken?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informatie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Diameterwijziging bevestigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Het nieuwe filament is ingesteld op %1 mm. Dit is niet compatibel met de huidige extruder. Wilt u verder gaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Naam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Merk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Type Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Kleur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Eigenschappen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Dichtheid" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diameter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Kostprijs Filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Gewicht filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Lengte filament" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Kostprijs per meter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Dit materiaal is gekoppeld aan %1 en deelt hiermee enkele eigenschappen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Materiaal ontkoppelen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Beschrijving" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Gegevens Hechting" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Instellingen voor printen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Activeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Printer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Verwijderen Bevestigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Weet u zeker dat u %1 wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Materiaal Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Kon materiaal %1 niet importeren: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaal %1 is geïmporteerd" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Materiaal Exporteren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exporteren van materiaal naar %1 is mislukt: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaal is geëxporteerd naar %1" @@ -3157,383 +3177,406 @@ msgid "Unit" msgstr "Eenheid" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Algemeen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Taal:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "U moet de toepassing opnieuw starten voordat deze wijzigingen van kracht worden." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Automatisch slicen bij wijzigen van instellingen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch slicen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Gedrag kijkvenster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Geef niet-ondersteunde gedeelten van het model een rode markering. Zonder ondersteuning zullen deze gedeelten niet goed worden geprint." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Overhang weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Verplaatst de camera zodanig dat wanneer een model wordt geselecteerd, het model in het midden van het beeld wordt weergegeven" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Camera centreren wanneer een item wordt geselecteerd" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Moet het standaard zoomgedrag van Cura worden omgekeerd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Keer de richting van de camerazoom om." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Moet het zoomen in de richting van de muis gebeuren?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Zoomen in de richting van de muis wordt niet ondersteund in het orthogonale perspectief." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomen in de richting van de muis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Moeten modellen op het platform zodanig worden verplaatst dat ze elkaar niet meer doorsnijden?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellen gescheiden houden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Moeten modellen in het printgebied omlaag worden gebracht zodat ze het platform raken?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modellen automatisch op het platform laten vallen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Toon het waarschuwingsbericht in de G-code-lezer." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Waarschuwingsbericht in de G-code-lezer" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Moet de laag in de compatibiliteitsmodus worden geforceerd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Compatibiliteitsmodus voor laagweergave forceren (opnieuw opstarten vereist)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Welk type cameraweergave moet worden gebruikt?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Cameraweergave: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspectief" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Orthografisch" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Bestanden openen en opslaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Moeten modellen worden geschaald naar het werkvolume als ze te groot zijn?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Grote modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Een model wordt mogelijk extreem klein weergegeven als de eenheden bijvoorbeeld in meters zijn in plaats van in millimeters. Moeten dergelijke modellen worden opgeschaald?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extreem kleine modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Moeten modellen worden geselecteerd nadat ze zijn geladen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modellen selecteren wanneer ze geladen zijn" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Moet er automatisch een op de printernaam gebaseerde voorvoegsel aan de naam van de printtaak worden toegevoegd?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Machinevoorvoegsel toevoegen aan taaknaam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Dient er een samenvatting te worden weergegeven wanneer een projectbestand wordt opgeslagen?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialoogvenster voor samenvatting weergeven tijdens het opslaan van een project" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standaardgedrag tijdens het openen van een projectbestand" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standaardgedrag tijdens het openen van een projectbestand: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Altijd als project openen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Altijd modellen importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wanneer u wijzigingen hebt aangebracht aan een profiel en naar een ander profiel wisselt, wordt een dialoogvenster weergegeven waarin u wordt gevraagd of u de aanpassingen wilt behouden. U kunt ook een standaardgedrag kiezen en het dialoogvenster nooit meer laten weergeven." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standaardgedrag voor gewijzigde instellingen wanneer er naar een ander profiel wordt overgeschakeld: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Gewijzigde instellingen altijd verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Gewijzigde instellingen altijd naar nieuw profiel overbrengen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Moet Cura op updates controleren wanneer het programma wordt gestart?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bij starten op updates controleren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Mogen anonieme gegevens over uw print naar Ultimaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare gegevens verzonden of opgeslagen." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonieme) printgegevens verzenden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Meer informatie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Experimenteel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Functionaliteit voor meerdere platformen gebruiken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Functionaliteit voor meerdere platformen gebruiken (opnieuw opstarten vereist)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Printers" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Hernoemen" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Profiel Maken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geef een naam op voor dit profiel." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profiel Dupliceren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profiel Hernoemen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiel Importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiel Exporteren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Printer: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Standaardprofielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Aangepaste profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profiel bijwerken met huidige instellingen/overschrijvingen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Huidige wijzigingen verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dit profiel gebruikt de standaardinstellingen die door de printer zijn opgegeven, dus er zijn hiervoor geen instellingen/overschrijvingen in de onderstaande lijst." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Uw huidige instellingen komen overeen met het geselecteerde profiel." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Algemene Instellingen" @@ -3601,33 +3644,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "instellingen zoeken" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Waarde naar alle extruders kopiëren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle gewijzigde waarden naar alle extruders kopiëren" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Deze instelling zichtbaar houden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Zichtbaarheid Instelling Configureren..." @@ -3638,55 +3681,64 @@ msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "Een aantal verborgen instellingen gebruiken andere waarden dan hun normale berekende waarde.\n\nKlik om deze instellingen zichtbaar te maken." +msgstr "" +"Een aantal verborgen instellingen gebruiken andere waarden dan hun normale berekende waarde.\n" +"\n" +"Klik om deze instellingen zichtbaar te maken." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Deze instelling wordt niet gebruikt omdat alle instellingen waarop deze invloed heeft, worden overschreven." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Beïnvloedt" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Beïnvloed door" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Deze instelling wordt altijd door alle extruders gedeeld. Als u hier de instelling wijzigt, wordt de waarde voor alle extruders gewijzigd." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "De waarde wordt afgeleid van de waarden per extruder " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "Deze instelling heeft een andere waarde dan in het profiel.\n\nKlik om de waarde van het profiel te herstellen." +msgstr "" +"Deze instelling heeft een andere waarde dan in het profiel.\n" +"\n" +"Klik om de waarde van het profiel te herstellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" "\n" "Click to restore the calculated value." -msgstr "Deze instelling wordt normaliter berekend, maar is nu ingesteld op een absolute waarde.\n\nKlik om de berekende waarde te herstellen." +msgstr "" +"Deze instelling wordt normaliter berekend, maar is nu ingesteld op een absolute waarde.\n" +"\n" +"Klik om de berekende waarde te herstellen." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" msgstr "Aanbevolen" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Aangepast" @@ -3711,12 +3763,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Genereer structuren om delen van het model met overhang te ondersteunen. Zonder deze structuren zakken dergelijke delen in tijdens het printen." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Hechting" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Het printen van een brim of raft inschakelen. Deze optie zorgt ervoor dat er extra materiaal rondom of onder het object wordt neergelegd, dat er naderhand eenvoudig kan worden afgesneden." @@ -3762,7 +3814,10 @@ msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "Sommige waarden of aanpassingen van instellingen zijn anders dan de waarden die in het profiel zijn opgeslagen.\n\nKlik om het profielbeheer te openen." +msgstr "" +"Sommige waarden of aanpassingen van instellingen zijn anders dan de waarden die in het profiel zijn opgeslagen.\n" +"\n" +"Klik om het profielbeheer te openen." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -3799,7 +3854,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "G-code verzenden" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Verzend een aangepaste G-code-opdracht naar de verbonden printer. Druk op Enter om de opdracht te verzenden." @@ -3896,11 +3951,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favorieten" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Standaard" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3951,7 +4001,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Camerapositie" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Camerabeeld" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspectief" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Orthografisch" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Platform" @@ -4070,22 +4135,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "&Recente bestanden openen" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Actieve print" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Taaknaam" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Printtijd" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Geschatte resterende tijd" @@ -4095,6 +4160,11 @@ msgctxt "@label" msgid "View type" msgstr "Type weergeven" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Lijst met objecten" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4126,7 +4196,10 @@ msgid "" "- Send print jobs to Ultimaker printers outside your local network\n" "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" "- Get exclusive access to print profiles from leading brands" -msgstr "- Printtaken verzenden naar Ultimaker-printers buiten uw lokale netwerk\n- Ultimaker Cura-instellingen opslaan in de cloud zodat u ze overal kunt gebruiken\n- Exclusieve toegang verkrijgen tot printprofielen van toonaangevende merken" +msgstr "" +"- Printtaken verzenden naar Ultimaker-printers buiten uw lokale netwerk\n" +"- Ultimaker Cura-instellingen opslaan in de cloud zodat u ze overal kunt gebruiken\n" +"- Exclusieve toegang verkrijgen tot printprofielen van toonaangevende merken" #: /home/ruben/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 msgctxt "@button" @@ -4143,32 +4216,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Geen kostenraming beschikbaar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Voorbeeld" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Slicen..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Kan niet slicen" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Verwerken" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Slicen" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Het sliceproces starten" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Annuleren" @@ -4203,233 +4281,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Vooraf ingestelde printers" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Printer toevoegen" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Printers beheren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Online gids voor probleemoplossing weergegeven" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Volledig Scherm In-/Uitschakelen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Volledig scherm sluiten" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Ongedaan &Maken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Opnieuw" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Afsluiten" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-weergave" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Weergave voorzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Weergave bovenzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Weergave linkerzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Weergave rechterzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura Configureren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Printer Toevoegen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Pr&inters Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialen Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Profiel bijwerken met h&uidige instellingen/overschrijvingen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Hui&dige wijzigingen verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Profiel maken op basis van huidige instellingen/overs&chrijvingen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profielen Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online &Documentatie Weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Een &Bug Rapporteren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Nieuwe functies" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Over..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Geselecteerd model verwijderen" msgstr[1] "Geselecteerde modellen verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Geselecteerd model centreren" msgstr[1] "Geselecteerde modellen centreren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Geselecteerd model verveelvoudigen" msgstr[1] "Geselecteerde modellen verveelvoudigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Model Verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Model op Platform Ce&ntreren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modellen &Groeperen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Groeperen van Modellen Opheffen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modellen Samen&voegen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Model verveelvoudigen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modellen Selecteren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Platform Leegmaken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modellen Opnieuw Laden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Alle modellen schikken op alle platformen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle modellen schikken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Selectie schikken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modelposities Herstellen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modeltransformaties Herstellen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Bestand(en) &openen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nieuw project..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Open Configuratiemap" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marktplaats" @@ -4444,49 +4527,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dit package wordt na opnieuw starten geïnstalleerd." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Instellingen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura afsluiten" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Weet u zeker dat u Cura wilt verlaten?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Bestand(en) openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Package installeren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Bestand(en) openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Binnen de door u geselecteerde bestanden zijn een of meer G-code-bestanden aangetroffen. U kunt maximaal één G-code-bestand tegelijk openen. Selecteer maximaal één bestand als u dit wilt openen als G-code-bestand." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Printer Toevoegen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Nieuwe functies" @@ -4508,7 +4591,9 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "U hebt enkele profielinstellingen aangepast.\nWilt u deze instellingen behouden of verwijderen?" +msgstr "" +"U hebt enkele profielinstellingen aangepast.\n" +"Wilt u deze instellingen behouden of verwijderen?" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -4570,7 +4655,9 @@ msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura is ontwikkeld door Ultimaker B.V. in samenwerking met de community.\nCura maakt met trots gebruik van de volgende opensourceprojecten:" +msgstr "" +"Cura is ontwikkeld door Ultimaker B.V. in samenwerking met de community.\n" +"Cura maakt met trots gebruik van de volgende opensourceprojecten:" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 msgctxt "@label" @@ -4707,32 +4794,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Project opslaan" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Platform" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 &materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Bij opnieuw opslaan projectsamenvatting niet weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Opslaan" @@ -4908,12 +4995,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Probleemoplossing" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Printernaam" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Voer een naam in voor uw printer" @@ -4963,28 +5050,15 @@ msgctxt "@text" msgid "" "Please follow these steps to set up\n" "Ultimaker Cura. This will only take a few moments." -msgstr "Volg deze stappen voor het instellen van\nUltimaker Cura. Dit duurt slechts even." +msgstr "" +"Volg deze stappen voor het instellen van\n" +"Ultimaker Cura. Dit duurt slechts even." #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 msgctxt "@button" msgid "Get started" msgstr "Aan de slag" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Alleen huidig platform weergeven" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Schikken naar alle platformen" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Huidig platform schikken" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5075,6 +5149,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Profielvlakker" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Biedt ondersteuning voor het lezen van AMF-bestanden." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF-lezer" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5085,16 +5169,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB-printen" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Hiermee slaat u de resulterende slice op als X3G-bestand, om printers te ondersteunen die deze indeling lezen (Malyan, Makerbot en andere Sailfish-gebaseerde printers)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3G-schrijver" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5345,6 +5419,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Versie-upgrade van 3.0 naar 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.1 naar Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Versie-upgrade van 4.1 naar 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5415,16 +5499,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF-lezer" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Hiermee leest u SVG-bestanden als gereedschapsbanen, voor probleemoplossing in printerverplaatsingen." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG-gereedschapsbaanlezer" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5515,6 +5589,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiellezer" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura-instellingengids" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "De instellingen zijn gewijzigd zodat deze overeenkomen met de huidige beschikbaarheid van de extruders: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Gebruikersbeschrijving" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Deze opties zijn niet beschikbaar omdat u een cloudprinter controleert." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Ga naar Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Alle taken zijn geprint." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Printgeschiedenis weergeven" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Als u rechtstreeks via het netwerk wilt printen naar de printer, moet u ervoor zorgen dat de printer met een netwerkkabel is verbonden met het netwerk of moet u verbinding maken met de printer via het wifi-netwerk. Als u geen verbinding maakt tussen Cura en de printer, kunt u een USB-station gebruiken om G-code-bestanden naar de printer over te zetten.\n" +#~ "\n" +#~ "Selecteer uw printer in de onderstaande lijst:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Controleer of de printer verbonden is:\n" +#~ "- Controleer of de printer ingeschakeld is.\n" +#~ "- Controleer of de printer verbonden is met het netwerk." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Alleen huidig platform weergeven" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Schikken naar alle platformen" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Huidig platform schikken" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Hiermee slaat u de resulterende slice op als X3G-bestand, om printers te ondersteunen die deze indeling lezen (Malyan, Makerbot en andere Sailfish-gebaseerde printers)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3G-schrijver" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Hiermee leest u SVG-bestanden als gereedschapsbanen, voor probleemoplossing in printerverplaatsingen." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG-gereedschapsbaanlezer" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Wijzigingenlogboek" @@ -5721,7 +5871,6 @@ msgstr "Cura-profiellezer" #~ "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" #~ "- Get exclusive access to material profiles from leading brands" #~ msgstr "" - #~ "- Printtaken verzenden naar Ultimaker-printers buiten uw lokale netwerk\n" #~ "- Ultimaker Cura-instellingen opslaan in de cloud zodat u ze overal kunt gebruiken\n" #~ "- Exclusieve toegang verkrijgen tot materiaalprofielen van toonaangevende merken" @@ -5748,7 +5897,6 @@ msgstr "Cura-profiellezer" #~ "\n" #~ "If your printer is not in the list, use the \"Custom FFF Printer\" from the \"Custom\" category and adjust the settings to match your printer in the next dialog." #~ msgstr "" - #~ "Selecteer de printer die u wilt gebruiken, uit de onderstaande lijst.\n" #~ "\n" #~ "Als uw printer niet in de lijst wordt weergegeven, gebruikt u de 'Custom FFF Printer' (Aangepaste FFF-printer) uit de categorie 'Custom' (Aangepast) en past u in het dialoogvenster dat wordt weergegeven, de instellingen aan zodat deze overeenkomen met uw printer." @@ -5961,7 +6109,6 @@ msgstr "Cura-profiellezer" #~ "Print Setup disabled\n" #~ "G-code files cannot be modified" #~ msgstr "" - #~ "Instelling voor printen uitgeschakeld\n" #~ "G-code-bestanden kunnen niet worden aangepast" @@ -6214,7 +6361,6 @@ msgstr "Cura-profiellezer" #~ "Could not export using \"{}\" quality!\n" #~ "Felt back to \"{}\"." #~ msgstr "" - #~ "Kan niet exporteren met de kwaliteit \"{}\"!\n" #~ "Instelling teruggezet naar \"{}\"." @@ -6391,7 +6537,6 @@ msgstr "Cura-profiellezer" #~ "2) Turn the fan off (only if there are no tiny details on the model).\n" #~ "3) Use a different material." #~ msgstr "" - #~ "Sommige modellen worden mogelijk niet optimaal geprint vanwege de grootte van het object en de gekozen materialen voor modellen: {model_names}.\n" #~ "Mogelijk nuttige tips om de printkwaliteit te verbeteren:\n" #~ "1) Gebruik afgeronde hoeken.\n" @@ -6408,7 +6553,6 @@ msgstr "Cura-profiellezer" #~ "\n" #~ "Thanks!" #~ msgstr "" - #~ "In uw tekening zijn geen modellen gevonden. Controleer de inhoud nogmaals en zorg ervoor dat één onderdeel of assemblage zich in de tekening bevindt.\n" #~ "\n" #~ "Hartelijk dank." @@ -6419,7 +6563,6 @@ msgstr "Cura-profiellezer" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "In uw tekening is meer dan één onderdeel of assemblage gevonden. Momenteel worden alleen tekeningen met precies één onderdeel of assemblage ondersteund.\n" #~ "\n" #~ "Sorry." @@ -6444,7 +6587,6 @@ msgstr "Cura-profiellezer" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Beste klant,\n" #~ "Op uw systeem is geen geldige installatie van SolidWorks aangetroffen. Dit betekent dat SolidWorks niet is geïnstalleerd of dat u niet over een geldige licentie beschikt. Controleer of SolidWorks zelf zonder problemen kan worden uitgevoerd en/of neem contact op met uw IT-afdeling.\n" #~ "\n" @@ -6459,7 +6601,6 @@ msgstr "Cura-profiellezer" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Beste klant,\n" #~ "Momenteel voert u deze invoegtoepassing uit op een ander besturingssysteem dan Windows. Deze invoegtoepassing werkt alleen op systemen waarop Windows en SolidWorks met een geldige licentie zijn geïnstalleerd. Installeer deze invoegtoepassing op een Windows-systeem waarop SolidWorks is geïnstalleerd.\n" #~ "\n" @@ -6564,7 +6705,6 @@ msgstr "Cura-profiellezer" #~ "Open the directory\n" #~ "with macro and icon" #~ msgstr "" - #~ "Open de map\n" #~ "met macro en pictogram" @@ -6863,7 +7003,6 @@ msgstr "Cura-profiellezer" #~ "\n" #~ " Thanks!." #~ msgstr "" - #~ "In uw tekening zijn geen modellen gevonden. Controleer de inhoud en zorg ervoor dat zich in de tekening een onderdeel of assemblage bevindt.\n" #~ "\n" #~ " Hartelijk dank." @@ -6874,7 +7013,6 @@ msgstr "Cura-profiellezer" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "In uw tekening is meer dan één onderdeel of assemblage gevonden. Momenteel worden alleen tekeningen met precies één onderdeel of assemblage ondersteund.\n" #~ "\n" #~ "Sorry." @@ -6909,7 +7047,6 @@ msgstr "Cura-profiellezer" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Er is een fatale fout opgetreden. Stuur ons het Crashrapport om het probleem op te lossen

\n" #~ "

Druk op de knop \"Rapport verzenden\" om het foutenrapport automatisch naar onze servers te verzenden

\n" #~ " " @@ -7076,7 +7213,6 @@ msgstr "Cura-profiellezer" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Er is een fatale uitzondering opgetreden. Stuur ons het Crashrapport om het probleem op te lossen

\n" #~ "

Druk op de knop \"Rapport verzenden\" om het foutenrapport automatisch naar onze servers te verzenden

\n" #~ " " @@ -7223,7 +7359,6 @@ msgstr "Cura-profiellezer" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Er is een fatale fout opgetreden die niet kan worden hersteld!

\n" #~ "

Gebruik de onderstaande informatie om een bugrapport te plaatsen op http://github.com/Ultimaker/Cura/issues

\n" #~ " " @@ -7266,7 +7401,6 @@ msgstr "Cura-profiellezer" #~ "You need to accept this license to install this plugin.\n" #~ "Do you agree with the terms below?" #~ msgstr "" - #~ " invoegtoepassing bevat een licentie.\n" #~ "U moet akkoord gaan met deze licentie om deze invoegtoepassing te mogen installeren.\n" #~ "Gaat u akkoord met onderstaande voorwaarden?" @@ -7794,7 +7928,6 @@ msgstr "Cura-profiellezer" #~ msgid "Print Selected Model with %1" #~ msgid_plural "Print Selected Models With %1" #~ msgstr[0] "Geselecteerd model printen met %1" - #~ msgstr[1] "Geselecteerde modellen printen met %1" #~ msgctxt "@info:status" @@ -7824,7 +7957,6 @@ msgstr "Cura-profiellezer" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Er is een fatale fout opgetreden die niet kan worden hersteld!

\n" #~ "

Hopelijk komt u met de afbeelding van deze kitten wat bij van de schrik.

\n" #~ "

Gebruik de onderstaande informatie om een bugrapport te plaatsen op http://github.com/Ultimaker/Cura/issues

\n" diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index dc2164aa24..a9714f790a 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index f8ed41154b..bba19e213e 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Dutch\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Dutch , Dutch \n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "G-code-opdrachten die aan het begin worden uitgevoerd, gescheiden door \n." +msgstr "" +"G-code-opdrachten die aan het begin worden uitgevoerd, gescheiden door \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -69,7 +71,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "G-code-opdrachten die aan het eind worden uitgevoerd, gescheiden door \n." +msgstr "" +"G-code-opdrachten die aan het eind worden uitgevoerd, gescheiden door \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -333,7 +337,7 @@ msgstr "De minimale tijd die een extruder inactief moet zijn, voordat de nozzle #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "Versie G-code" #: fdmprinter.def.json @@ -1293,8 +1297,12 @@ msgstr "Voorkeur van naad en hoek" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Instellen of hoeken in het model invloed hebben op de positie van de naad. Geen wil zeggen dat hoeken geen invloed hebben op de positie van de naad. Met Naad verbergen is de kans groter dat de naad op een binnenhoek komt. Met Naad zichtbaar maken is de kans groter dat de naad op een buitenhoek komt. Met Naad verbergen of Naad zichtbaar maken is de kans groter dat de naad op een binnen- of buitenhoek komt." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Instellen of hoeken in het model invloed hebben op de positie van de naad. Geen wil zeggen dat hoeken geen invloed hebben op de positie" +" van de naad. Met Naad Verbergen is de kans groter dat de naad op een binnenhoek komt. Met Naad Zichtbaar Maken is de" +" kans groter dat de naad op een buitenhoek komt. Met Naad Verbergen of Naad Zichtbaar Maken is de kans groter dat de" +" naad op een binnen- of buitenhoek komt. Met Slim Verbergen zijn zowel binnen- als buitenhoeken mogelijk, maar wordt er vaker (indien van" +" toepassing) gebruikgemaakt van binnenhoeken." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1316,6 +1324,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Naad verbergen of zichtbaar maken" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Slim verbergen" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1328,13 +1341,15 @@ msgstr "Als deze optie ingeschakeld is, zijn de Z-naadcoördinaten relatief ten #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Kleine Z-gaten Negeren" +msgid "No Skin in Z Gaps" +msgstr "Geen skin in Z-gaten" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Wanneer het model kleine verticale gaten heeft, kan er circa 5% berekeningstijd extra worden besteed aan het genereren van de boven- en onderskin in deze kleine ruimten. Indien u dit wenst, schakelt u de instelling uit." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Als het model kleine verticale gaten van slechts een paar lagen heeft, bevindt er zich doorgaans een skin rond die lagen in de kleine ruimte. Schakel deze" +" instelling in om geen skin te genereren als de verticale tussenruimte erg klein is. Zo verloopt printen en slicen sneller, maar technisch nadeel is dat" +" de vulling aan de lucht wordt blootgesteld." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1631,7 +1646,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Voeg extra wanden toe rondom de vulling. Deze wanden kunnen ervoor zorgen dat de skin aan de boven-/onderkant minder doorzakt. Dit betekent dat u met alleen wat extra materiaal voor dezelfde kwaliteit minder skinlagen aan de boven-/onderkant nodig hebt.\nDeze optie kan in combinatie met de optie 'Polygonen voor de vulling verbinden' worden gebruikt om alle vulling in één doorvoerpad te verbinden zonder extra bewegingen of intrekkingen, mits correct ingesteld." +msgstr "" +"Voeg extra wanden toe rondom de vulling. Deze wanden kunnen ervoor zorgen dat de skin aan de boven-/onderkant minder doorzakt. Dit betekent dat u met alleen wat extra materiaal voor dezelfde kwaliteit minder skinlagen aan de boven-/onderkant nodig hebt.\n" +"Deze optie kan in combinatie met de optie 'Polygonen voor de vulling verbinden' worden gebruikt om alle vulling in één doorvoerpad te verbinden zonder extra bewegingen of intrekkingen, mits correct ingesteld." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1870,8 +1887,8 @@ msgstr "Temperatuur werkvolume" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "De temperatuur van het werkvolume. Als deze waarde is ingesteld op 0, wordt de temperatuur van het werkvolume niet aangepast." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "De omgevingstemperatuur waarin wordt geprint. Als deze waarde is ingesteld op 0, wordt de temperatuur van het werkvolume niet aangepast." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1983,6 +2000,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Krimpverhouding in procenten." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Kristallijnmateriaal" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Breekt dit materiaal recht af wanneer het wordt verwarmd (kristallijn) of produceert het lange, met elkaar verweven polymeerketens (niet-kristallijn)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Intrekpositie voor niet-uitlopen" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Hoe ver het materiaal moet worden ingetrokken voordat het niet meer uitloopt." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Intreksnelheid voor niet-uitlopen" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Hoe snel het materiaal moet worden ingetrokken tijdens het wisselen van een filament om uitlopen te voorkomen." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Intrekpositie voor voorbereiding van afbreken" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Hoe ver het filament kan worden uitgerekt voordat het afbreekt, wanneer het wordt verwarmd." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Intreksnelheid voor voorbereiding van afbreken" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Hoe snel het filament moet worden ingetrokken voordat het bij het intrekken afbreekt." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Intrekpositie voor afbreken" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Hoe ver het filament moet worden ingetrokken om het recht af te breken." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Intreksnelheid voor afbreken" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "De snelheid waarmee het filament wordt ingetrokken om het recht af te breken." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Temperatuur voor afbreken" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "De temperatuur waarbij het filament wordt afgebroken om het recht af te breken." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1993,6 +2090,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Doorvoercompensatie: de hoeveelheid materiaal die wordt doorgevoerd, wordt vermenigvuldigd met deze waarde." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Wanddoorvoer" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Doorvoercompensatie op wandlijnen." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Buitenste wanddoorvoer" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Doorvoercompensatie op de buitenste wandlijn." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Doorvoer binnenwand(en)" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Doorvoercompensatie op wandlijnen voor alle wandlijnen behalve de buitenste." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Doorvoer boven/onder" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Doorvoercompensatie op bovenste/onderste lijn." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Bovenste oppervlak skindoorvoer" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Doorvoercompensatie op lijnen van de gebieden bovenaan de print." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Doorvoer vulling" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Doorvoercompensatie op vullijnen." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Doorvoer skirt/brim" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Doorvoercompensatie op skirt- of brimlijnen." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Doorvoer support" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Doorvoercompensatie op de supportstructuurlijnen." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Doorvoer supportinterface" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Doorvoercompensatie op de lijnen van supportdak of de supportvloer." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Doorvoer supportdak" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Doorvoercompensatie op supportdaklijnen." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Doorvoer supportvloer" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Doorvoercompensatie op de supportvloerlijnen." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Doorvoer Primepijler" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Doorvoercompensatie op primepijlerlijnen." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2110,8 +2327,9 @@ msgstr "Supportintrekkingen beperken" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Sla intrekking over tijdens bewegingen in een rechte lijn van support naar support. Deze instelling verkort de printtijd, maar kan leiden tot overmatige draadvorming in de supportstructuur." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Sla intrekking over tijdens bewegingen in een rechte lijn van support naar support. Deze instelling verkort de printtijd, maar kan leiden tot overmatige" +" draadvorming in de supportstructuur." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2163,6 +2381,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "De snelheid waarmee het filament tijdens een intrekbeweging na het wisselen van de nozzles wordt geprimed." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Extra primehoeveelheid na wisselen van nozzle" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Extra primemateriaal na het wisselen van de nozzle." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2354,14 +2582,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "De snelheid waarmee de skirt en de brim worden geprint. Normaal gebeurt dit met dezelfde snelheid als de snelheid van de eerste laag, maar in sommige situaties wilt u de skirt of de brim mogelijk met een andere snelheid printen." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Maximale Z-snelheid" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Snelheid Z-sprong" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "De maximale snelheid waarmee het platform wordt bewogen. Wanneer u deze optie instelt op 0, worden voor het printen de standaardwaarden voor de maximale Z-snelheid gebruikt." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "De snelheid waarmee de verticale Z-beweging wordt gemaakt voor Z-sprongen. Dit is meestal lager dan de printsnelheid, omdat het platform of de rijbrug" +" van de machine moeilijker te verplaatsen is." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3279,12 +3508,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Afstand tussen de lijnen van de supportstructuur voor de eerste laag. Deze wordt berekend op basis van de dichtheid van de supportstructuur." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Lijnrichting Vulling Supportstructuur" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Richting van het vulpatroon voor supportstructuren. Het vulpatroon voor de supportstructuur wordt in het horizontale vlak gedraaid." @@ -3415,8 +3644,9 @@ msgstr "Samenvoegafstand Supportstructuur" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "De maximale afstand tussen de supportstructuren in de X- en Y-richting. Wanneer afzonderlijke structuren dichter bij elkaar staan dan deze waarde, worden deze samengevoegd tot één structuur." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "De maximale afstand tussen de supportstructuren in de X- en Y-richting. Wanneer afzonderlijke structuren dichter bij elkaar staan dan deze waarde, worden" +" deze samengevoegd tot één structuur." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3794,14 +4024,14 @@ msgid "The diameter of a special tower." msgstr "De diameter van een speciale pijler." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Minimale Diameter" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Maximale pijler-ondersteunde diameter" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "De minimale diameter in de X- en Y-richting van een kleiner gebied dat moet worden ondersteund door een speciale steunpijler." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "De maximale diameter in de X- en Y-richting van een kleiner gebied dat moet worden ondersteund door een speciale steunpijler." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3923,7 +4153,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "De horizontale afstand tussen de skirt en de eerste laag van de print.\nDit is de minimumafstand. Als u meerdere skirtlijnen print, worden deze vanaf deze afstand naar buiten geprint." +msgstr "" +"De horizontale afstand tussen de skirt en de eerste laag van de print.\n" +"Dit is de minimumafstand. Als u meerdere skirtlijnen print, worden deze vanaf deze afstand naar buiten geprint." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4295,16 +4527,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Print een pijler naast de print, waarop het materiaal na iedere nozzlewisseling wordt ingespoeld." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Ronde primepijler" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Geef de primepijler een ronde vorm." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4345,16 +4567,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "De Y-coördinaat van de positie van de primepijler." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Doorvoer Primepijler" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Doorvoercompensatie: de hoeveelheid materiaal die wordt doorgevoerd, wordt vermenigvuldigd met deze waarde." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4657,8 +4869,9 @@ msgstr "Gespiraliseerde contouren effenen" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Maak de gespiraliseerde contouren vlak om de zichtbaarheid van de Z-naad te verminderen (de Z-naad mag in de print nauwelijks zichtbaar zijn, maar is nog wel zichtbaar in de laagweergave). Houd er rekening mee dat fijne oppervlaktedetails worden vervaagd door het effenen." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Maak de gespiraliseerde contouren vlak om de zichtbaarheid van de Z-naad te verminderen (de Z-naad mag in de print nauwelijks zichtbaar zijn, maar is nog" +" wel zichtbaar in de laagweergave). Houd er rekening mee dat fijne oppervlaktedetails worden vervaagd door het effenen." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5157,8 +5370,8 @@ msgstr "Conische supportstructuur inschakelen" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Experimentele functie: maak draagvlakken aan de onderkant kleiner dan bij de overhang." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Maak draagvlakken aan de onderkant kleiner dan bij de overhang." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5390,7 +5603,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "De afstand van een opwaartse beweging waarbij de doorvoersnelheid wordt gehalveerd.\nHierdoor ontstaat een betere hechting aan voorgaande lagen, zonder dat het materiaal in die lagen te zeer wordt verwarmd. Alleen van toepassing op Draadprinten." +msgstr "" +"De afstand van een opwaartse beweging waarbij de doorvoersnelheid wordt gehalveerd.\n" +"Hierdoor ontstaat een betere hechting aan voorgaande lagen, zonder dat het materiaal in die lagen te zeer wordt verwarmd. Alleen van toepassing op Draadprinten." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5957,6 +6172,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Omzettingsmatrix die moet worden toegepast op het model wanneer dit wordt geladen vanuit een bestand." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Versie G-code" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Instellen of hoeken in het model invloed hebben op de positie van de naad. Geen wil zeggen dat hoeken geen invloed hebben op de positie van de naad. Met Naad verbergen is de kans groter dat de naad op een binnenhoek komt. Met Naad zichtbaar maken is de kans groter dat de naad op een buitenhoek komt. Met Naad verbergen of Naad zichtbaar maken is de kans groter dat de naad op een binnen- of buitenhoek komt." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Kleine Z-gaten Negeren" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Wanneer het model kleine verticale gaten heeft, kan er circa 5% berekeningstijd extra worden besteed aan het genereren van de boven- en onderskin in deze kleine ruimten. Indien u dit wenst, schakelt u de instelling uit." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "De temperatuur van het werkvolume. Als deze waarde is ingesteld op 0, wordt de temperatuur van het werkvolume niet aangepast." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Sla intrekking over tijdens bewegingen in een rechte lijn van support naar support. Deze instelling verkort de printtijd, maar kan leiden tot overmatige draadvorming in de supportstructuur." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Maximale Z-snelheid" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "De maximale snelheid waarmee het platform wordt bewogen. Wanneer u deze optie instelt op 0, worden voor het printen de standaardwaarden voor de maximale Z-snelheid gebruikt." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "De maximale afstand tussen de supportstructuren in de X- en Y-richting. Wanneer afzonderlijke structuren dichter bij elkaar staan dan deze waarde, worden deze samengevoegd tot één structuur." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Minimale Diameter" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "De minimale diameter in de X- en Y-richting van een kleiner gebied dat moet worden ondersteund door een speciale steunpijler." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Ronde primepijler" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Geef de primepijler een ronde vorm." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Doorvoercompensatie: de hoeveelheid materiaal die wordt doorgevoerd, wordt vermenigvuldigd met deze waarde." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Maak de gespiraliseerde contouren vlak om de zichtbaarheid van de Z-naad te verminderen (de Z-naad mag in de print nauwelijks zichtbaar zijn, maar is nog wel zichtbaar in de laagweergave). Houd er rekening mee dat fijne oppervlaktedetails worden vervaagd door het effenen." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Experimentele functie: maak draagvlakken aan de onderkant kleiner dan bij de overhang." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Het aantal extruders dat ingeschakeld is" @@ -6226,7 +6505,6 @@ msgstr "Omzettingsmatrix die moet worden toegepast op het model wanneer dit word #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "De horizontale afstand tussen de skirt en de eerste laag van de print.\n" #~ "Dit is de minimumafstand; als u meerdere skirtlijnen print, worden deze vanaf deze afstand naar buiten geprint." diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 2edf2a4f27..574f3886ec 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" "PO-Revision-Date: 2019-05-27 13:29+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -86,6 +86,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profil został spłaszczony i aktywowany." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -111,12 +116,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Trwa drukowanie przez USB, zamknięcie Cura spowoduje jego zatrzymanie. Jesteś pewien?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Plik X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -127,6 +126,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Plik X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Plik X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -199,9 +203,9 @@ msgstr "Nie można zapisać na wymiennym dysku {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Błąd" @@ -231,8 +235,8 @@ msgstr "Wyjmij urządzenie wymienne {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Ostrzeżenie" @@ -363,39 +367,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Występuje niezgodność między konfiguracją lub kalibracją drukarki a Curą. Aby uzyskać najlepszy rezultat, zawsze tnij dla Print core'ów i materiałów włożonych do drukarki." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Wysyłanie nowych zadań (tymczasowo) zostało zablokowane, dalej wysyłane jest poprzednie zadanie." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Wysyłanie danych do drukarki" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Wysyłanie danych" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Anuluj" @@ -444,82 +448,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Połączone przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Zadanie drukowania zostało pomyślnie wysłane do drukarki." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Dane Wysłane" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Zobacz w Monitorze" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} skończyła drukowanie '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "Zadanie '{job_name}' zostało zakończone." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Drukowanie zakończone" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Pusty" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Nieznany" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Drukuj przez Chmurę" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Drukuj przez Chmurę" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Połączony z Chmurą" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Błąd Chmury" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Nie można eksportować zadania druku." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Nie można wgrać danych do drukarki." @@ -549,37 +553,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Przesyłanie z Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Wyślij i nadzoruj zadania druku z każdego miejsca, używając konta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Połącz z Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Nie pytaj więcej dla tej drukarki." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Rozpocznij" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Możesz teraz wysłać i nadzorować zadania druku z każdego miejsca, używając konta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Połączono!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Odnów połączenie" @@ -589,11 +593,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Połącz przez sieć" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Przewodnik po ustawieniach Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -767,18 +766,18 @@ msgid "3MF File" msgstr "Plik 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Dysza" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Plik projektu {0} zawiera nieznany typ maszyny {1}. Nie można zaimportować maszyny. Zostaną zaimportowane modele." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Otwórz Plik Projektu" @@ -910,13 +909,13 @@ msgid "Not supported" msgstr "Niewspierany" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Plik już istnieje" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -928,117 +927,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Nieprawidłowy adres URL pliku:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Ustawienia został zmienione, aby pasowały do obecnej dostępności extruderów: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Ustawienia zostały zaaktualizowane" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstruder(y) wyłączony(/e)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Nie udało się wyeksportować profilu do {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Nie można eksportować profilu do {0}: Wtyczka pisarza zgłosiła błąd." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Wyeksportowano profil do {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Eksport udany" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Nie powiódł się import profilu z {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Nie można importować profilu z {0} przed dodaniem drukarki." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Brak niestandardowego profilu do importu w pliku {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Nie powiódł się import profilu z {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Profil {0} zawiera błędne dane, nie można go importować." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "Drukarka zdefiniowana w profilu {0} ({1}) nie jest zgodna z bieżącą drukarką ({2}), nie można jej importować." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Nie powiódł się import profilu z {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil zaimportowany {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Plik {0} nie zawiera żadnego poprawnego profilu." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} ma nieznany typ pliku lub jest uszkodzony." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Niestandardowy profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilowi brakuje typu jakości." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1116,7 +1114,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Następny" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1127,7 +1125,7 @@ msgstr "Grupa #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1135,7 +1133,7 @@ msgstr "Zamknij" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Dodaj" @@ -1156,20 +1154,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Wszystkie Pliki (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Nieznany" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Poniższa drukarka nie może być podłączona, ponieważ jest częścią grupy" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Dostępne drukarki sieciowe" @@ -1185,12 +1183,12 @@ msgctxt "@label" msgid "Custom" msgstr "Niestandardowy" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "Wysokość obszaru roboczego została zmniejszona ze względu na wartość ustawienia Print Sequence (Sekwencja wydruku), aby zapobiec kolizji z wydrukowanymi modelami." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Obszar Roboczy" @@ -1396,48 +1394,48 @@ msgstr "Logi" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Opis użytkownika" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Wyślij raport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ładowanie drukarek..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Ustawianie sceny ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ładowanie interfejsu ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Jednocześnie można załadować tylko jeden plik G-code. Pominięto importowanie {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Nie można otworzyć żadnego innego pliku, jeśli ładuje się G-code. Pominięto importowanie {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Wybrany model był zbyta mały do załadowania." @@ -1447,98 +1445,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Ustawienia drukarki" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Szerokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Głębokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Wysokość)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Kształt stołu roboczego" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Początek na środku" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Podgrzewany stół" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Wersja G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ustawienia głowicy" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y max" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Wysokość wózka" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Liczba ekstruderów" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Początkowy G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Końcowy G-code" @@ -1568,22 +1566,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Korekcja dyszy X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Korekcja dyszy Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numer Wentylatora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Początkowy G-code ekstrudera" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Końcowy G-code ekstrudera" @@ -1594,7 +1592,7 @@ msgid "Install" msgstr "Instaluj" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Zainstalowane" @@ -1617,8 +1615,8 @@ msgstr "Wtyczki" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiał" @@ -1628,49 +1626,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Twoja ocena" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Wersja" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Ostatnia aktualizacja" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Pobrań" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Zaloguj aby zainstalować lub aktualizować" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Kup materiał na szpulach" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Aktualizuj" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Aktualizowanie" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1923,69 +1921,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Aktualizacja oprogramowania nie powiodła się z powodu utraconego oprogramowania." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Szkło" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Te opcje nie są dostępne, ponieważ nadzorujesz drukarkę w chmurze." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Kamera nie jest dostępna, ponieważ nadzorujesz drukarkę w chmurze." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Wczytywanie..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Niedostępne" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Nieosiągalna" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Zajęta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Bez tytułu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anonimowa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Wymaga zmian konfiguracji" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Szczegóły" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Drukarka niedostępna" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Pierwsza dostępna" @@ -1995,36 +1993,31 @@ msgctxt "@label" msgid "Queued" msgstr "W kolejce" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Idź do Cura Connect" +msgid "Manage in browser" +msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Zadania druku" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Łączny czas druku" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Oczekiwanie na" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Wszystkie zadania są drukowane." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Poważ historię druku" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2042,14 +2035,13 @@ msgstr "Połącz się z drukarką sieciową" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" msgstr "" -"Aby drukować bezpośrednio w drukarce w sieci, upewnij się, że drukarka jest podłączona do sieci przy użyciu kabla sieciowego lub sieci WIFI. Jeśli nie podłączasz Cury do drukarki, możesz nadal używać dysku USB do przesyłania plików g-code do drukarki.\n" -"\n" -"Wybierz drukarkę z poniższej listy:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2057,9 +2049,9 @@ msgid "Edit" msgstr "Edycja" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Usunąć" @@ -2142,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Anulowano" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Zakończono" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Przygotowyję..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Przerywanie..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Zatrzymywanie..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Wstrzymana" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Przywracanie..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Konieczne są działania" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Zakończone %1 z %2" @@ -2289,44 +2281,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Nadpisz" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "Przypisana drukarka, %1, wymaga następującej zmiany konfiguracji:" msgstr[1] "Przypisana drukarka, %1, wymaga następujących zmian konfiguracji:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "Drukarka %1 jest przypisana, ale zadanie zawiera nieznaną konfigurację materiału." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Zmień materiał %1 z %2 na %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Załaduj %3 jako materiał %1 (Nie można nadpisać)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Zmień rdzeń drukujący %1 z %2 na %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Zmień stół na %1 (Nie można nadpisać)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Nadpisanie spowoduje użycie określonych ustawień w istniejącej konfiguracji drukarki. Może to spowodować niepowodzenie druku." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Aluminum" @@ -2336,7 +2328,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Podłącz do drukarki" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Przewodnik po ustawieniach Cura" @@ -2346,11 +2338,9 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" -"Upewnij się czy drukarka jest połączona:\n" -"- Sprawdź czy drukarka jest włączona.\n" -"- Sprawdź czy drukarka jest podłączona do sieci." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2662,7 +2652,7 @@ msgid "Printer Group" msgstr "Grupa drukarek" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Ustawienia profilu" @@ -2675,19 +2665,19 @@ msgstr "Jak powinien zostać rozwiązany problem z profilem?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nazwa" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Nie w profilu" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2859,18 +2849,24 @@ msgid "Previous" msgstr "Poprzedni" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Eksportuj" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Końcówka" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Podstawowe" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Próbny wydruk" @@ -2975,170 +2971,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Czy na pewno chcesz przerwać drukowanie?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informacja" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Potwierdź Zmianę Średnicy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Średnica nowego filamentu została ustawiona na %1mm, i nie jest kompatybilna z bieżącym ekstruderem. Czy chcesz kontynuować?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Wyświetlana nazwa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Typ Materiału" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Kolor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Właściwości" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Gęstość" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Średnica" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Koszt Filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Waga filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Długość Filamentu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Koszt na metr" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Ten materiał jest powiązany z %1 i dzieli się niekórymi swoimi właściwościami." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Odłącz materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Opis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Informacje dotyczące przyczepności" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ustawienia druku" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Aktywuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Stwórz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplikuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Drukarka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Potwierdź Usunięcie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Czy na pewno chcesz usunąć %1? Nie można tego cofnąć!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importuj Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Nie można zaimportować materiału %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Udało się zaimportować materiał %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Eksportuj Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Nie udało się wyeksportować materiału do %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Udało się wyeksportować materiał do %1" @@ -3179,383 +3175,406 @@ msgid "Unit" msgstr "Jednostka" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Ogólny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interfejs" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Język:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Waluta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Motyw:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Musisz zrestartować aplikację, aby te zmiany zaczęły obowiązywać." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Tnij automatycznie podczas zmiany ustawień." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatyczne Cięcie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Zachowanie okna edycji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Zaznacz nieobsługiwane obszary modelu na czerwono. Bez wsparcia te obszary nie będą drukowane prawidłowo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Wyświetl zwis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Przenosi kamerę, aby model był w centrum widoku, gdy wybrano model" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Wyśrodkuj kamerę kiedy przedmiot jest zaznaczony" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Czy domyślne zachowanie zoomu powinno zostać odwrócone?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Odwróć kierunek zoomu kamery." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Czy przybliżanie powinno poruszać się w kierunku myszy?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Przybliżaj w kierunku myszy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Czy modele na platformie powinny być przenoszone w taki sposób, aby nie przecinały się?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Upewnij się, że modele są oddzielone" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Czy modele na platformie powinny być przesunięte w dół, aby dotknęły stołu roboczego?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automatycznie upuść modele na stół roboczy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Pokaż wiadomości ostrzegawcze w czytniku g-code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Wiadomość ostrzegawcza w czytniku g-code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Czy warstwa powinna być wymuszona w trybie zgodności?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Wymuszenie widoku warstw w trybie zgodności (wymaga ponownego uruchomienia)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Otwieranie i zapisywanie plików" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Czy modele powinny być skalowane do wielkości obszaru roboczego, jeśli są zbyt duże?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaluj duże modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Model może wydawać się bardzo mały, jeśli jego jednostka jest na przykład w metrach, a nie w milimetrach. Czy takie modele powinny być skalowane?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaluj bardzo małe modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Czy modele powinny zostać zaznaczone po załadowaniu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Zaznaczaj modele po załadowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Czy przedrostek oparty na nazwie drukarki powinien być automatycznie dodawany do nazwy zadania?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Dodaj przedrostek maszyny do nazwy zadania" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Czy podsumowanie powinno być wyświetlane podczas zapisu projektu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Pokaż okno podsumowania podczas zapisywaniu projektu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Domyślne zachowanie podczas otwierania pliku projektu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Domyślne zachowanie podczas otwierania pliku projektu: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Zawsze pytaj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Zawsze otwieraj jako projekt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Zawsze importuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kiedy dokonasz zmian w profilu i przełączysz się na inny, zostanie wyświetlone okno z pytaniem, czy chcesz zachować twoje zmiany, czy nie. Możesz też wybrać domyślne zachowanie, żeby to okno już nigdy nie było pokazywane." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Domyślne zachowanie dla zmienionych ustawień podczas zmiany profilu na inny: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Zawsze pytaj o to" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Zawsze odrzucaj wprowadzone zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Zawsze przenoś wprowadzone zmiany do nowego profilu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Prywatność" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Czy Cura ma sprawdzać dostępność aktualizacji podczas uruchamiania programu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Sprawdź, dostępność aktualizacji podczas uruchamiania" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do Ultimaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Wyślij (anonimowe) informacje o drukowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Więcej informacji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Eksperymentalne" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Użyj funkcji wielu pól roboczych" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Użyj funkcji wielu pól roboczych (wymagany restart)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Drukarki" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Zmień nazwę" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Stwórz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplikuj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Stwórz profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Podaj nazwę tego profilu." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplikuj profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Zmień nazwę profilu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importuj Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Eksportuj Profil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drukarka: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Domyślne profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Profile niestandardowe" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aktualizuj profil z bieżącymi ustawieniami" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Odrzuć bieżące zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ten profil używa ustawień domyślnych określonych przez drukarkę, dlatego nie ma żadnych ustawień z poniższej liście." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Aktualne ustawienia odpowiadają wybranemu profilowi." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ustawienia ogólne" @@ -3623,33 +3642,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "ustawienia wyszukiwania" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Skopiuj wartość do wszystkich ekstruderów" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Skopiuj wszystkie zmienione wartości do wszystkich ekstruderów" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ukryj tę opcję" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nie pokazuj tej opcji" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pozostaw tę opcję widoczną" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Skonfiguruj widoczność ustawień ..." @@ -3665,32 +3684,32 @@ msgstr "" "\n" "Kliknij, aby te ustawienia były widoczne." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "To ustawienie nie jest używane, ponieważ wszystkie ustawienia, na które wpływa, są nadpisane." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Wpływać" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Pod wpływem" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "To ustawienie jest dzielone pomiędzy wszystkimi ekstruderami. Zmiana tutaj spowoduje zmianę dla wszystkich ekstruderów." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Wartość jest pobierana z osobna dla każdego ekstrudera " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3701,7 +3720,7 @@ msgstr "" "\n" "Kliknij, aby przywrócić wartość z profilu." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3717,7 +3736,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Polecane" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Niestandardowe" @@ -3742,12 +3761,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Generuje podpory wspierające części modelu, które mają zwis. Bez tych podpór takie części mogłyby spaść podczas drukowania." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Przyczepność" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Włącz drukowanie obrysu lub tratwy. Spowoduje to dodanie płaskiej powierzchni wokół lub pod Twoim obiektem, która jest łatwa do usunięcia po wydruku." @@ -3833,7 +3852,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Wyślij G-code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Wyślij niestandardową komendę G-code do podłączonej drukarki. Naciśnij 'enter', aby wysłać komendę." @@ -3930,11 +3949,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Ulubione" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Podstawowe" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3985,7 +3999,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Pozycja kamery" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&ole robocze" @@ -4104,22 +4133,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Otwórz &ostatnio używane" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Aktywny wydruk" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nazwa pracy" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Czas druku" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Szacowany czas pozostały" @@ -4129,6 +4158,11 @@ msgctxt "@label" msgid "View type" msgstr "Typ widoku" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4180,32 +4214,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Szacunkowy koszt niedostępny" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Podgląd" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Cięcie..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Nie można pociąć" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Potnij" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Rozpocznij proces cięcia" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Anuluj" @@ -4240,233 +4279,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Zdefiniowane drukarki" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Dodaj drukarkę" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Zarządzaj drukarkami" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Pokaż przewodnik rozwiązywania problemów online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Przełącz tryb pełnoekranowy" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Cofnij" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Ponów" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Zamknij" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Widok 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Widok z przodu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Widok z góry" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Widok z lewej strony" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Widok z prawej strony" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Konfiguruj Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Dodaj drukarkę..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Zarządzaj drukarkami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Zarządzaj materiałami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Aktualizuj profil z bieżącymi ustawieniami" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Odrzuć bieżące zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Utwórz profil z bieżących ustawień..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Zarządzaj profilami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Pokaż dokumentację internetową" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Zgłoś błąd" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Co nowego" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "O..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Usuń wybrany model" msgstr[1] "Usuń wybrane modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Wyśrodkuj wybrany model" msgstr[1] "Wyśrodkuj wybrane modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Rozmnóż wybrany model" msgstr[1] "Rozmnóż wybrane modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Usuń model" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Wyśrodkuj model na platformie" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grupuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozgrupuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Połącz modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Powiel model..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Wybierz wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Wyczyść stół" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Przeładuj wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Rozłóż Wszystkie Modele na Wszystkie Platformy Robocze" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Ułóż wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Wybór ułożenia" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Zresetuj wszystkie pozycje modelu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Zresetuj wszystkie przekształcenia modelu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Otwórz plik(i)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nowy projekt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Pokaż folder konfiguracji" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marketplace" @@ -4481,49 +4525,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ten pakiet zostanie zainstalowany po ponownym uruchomieniu." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Zamykanie Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Czy jesteś pewien, że chcesz zakończyć Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Otwórz plik(i)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Instaluj pakiety" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Otwórz plik(i)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Znaleziono jeden lub więcej plików G-code w wybranych plikach. Możesz otwierać tylko jeden plik G-code jednocześnie. Jeśli chcesz otworzyć plik G-code, proszę wybierz tylko jeden." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Dodaj drukarkę" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Co nowego" @@ -4748,32 +4792,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Zapisz projekt" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Pole robocze" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Ekstruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & materiał" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Nie pokazuj podsumowania projektu podczas ponownego zapisywania" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Zapisz" @@ -4949,12 +4993,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Rozwiązywanie problemów" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nazwa drukarki" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Podaj nazwę drukarki" @@ -5013,21 +5057,6 @@ msgctxt "@button" msgid "Get started" msgstr "Rozpocznij" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Pokaż tylko aktualną platformę roboczą" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Rozłóż na wszystkich platformach roboczych" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Rozłóż na obecnej platformie roboczej" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5118,6 +5147,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Spłaszcz profil" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5128,16 +5167,6 @@ msgctxt "name" msgid "USB printing" msgstr "Drukowanie USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Umożliwia zapisanie wyników cięcia jako plik X3G, aby wspierać drukarki obsługujące ten format (Malyan, Makerbot oraz inne oparte o oprogramowanie Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "Zapisywacz X3G" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5388,6 +5417,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Ulepszenie Wersji 3.0 do 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5458,16 +5497,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Czytnik 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Czyta pliki SVG jako ścieżki, do debugowania ruchów drukarki." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Czytnik ścieżek SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5558,6 +5587,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Czytnik Profili Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Przewodnik po ustawieniach Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Ustawienia został zmienione, aby pasowały do obecnej dostępności extruderów: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Opis użytkownika" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Te opcje nie są dostępne, ponieważ nadzorujesz drukarkę w chmurze." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Idź do Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Wszystkie zadania są drukowane." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Poważ historię druku" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Aby drukować bezpośrednio w drukarce w sieci, upewnij się, że drukarka jest podłączona do sieci przy użyciu kabla sieciowego lub sieci WIFI. Jeśli nie podłączasz Cury do drukarki, możesz nadal używać dysku USB do przesyłania plików g-code do drukarki.\n" +#~ "\n" +#~ "Wybierz drukarkę z poniższej listy:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Upewnij się czy drukarka jest połączona:\n" +#~ "- Sprawdź czy drukarka jest włączona.\n" +#~ "- Sprawdź czy drukarka jest podłączona do sieci." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Pokaż tylko aktualną platformę roboczą" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Rozłóż na wszystkich platformach roboczych" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Rozłóż na obecnej platformie roboczej" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Umożliwia zapisanie wyników cięcia jako plik X3G, aby wspierać drukarki obsługujące ten format (Malyan, Makerbot oraz inne oparte o oprogramowanie Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "Zapisywacz X3G" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Czyta pliki SVG jako ścieżki, do debugowania ruchów drukarki." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Czytnik ścieżek SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Lista zmian" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index e121281cad..6670b113b6 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Mariusz 'Virgin71' Matłosz \n" "Language-Team: reprapy.pl\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index cc869d37a8..5113665656 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-05-27 22:32+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -337,8 +337,8 @@ msgstr "Minimalny czas, w jakim ekstruder musi być nieużywany, aby schłodzić #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" -msgstr "Wersja G-code" +msgid "G-code Flavor" +msgstr "" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1297,8 +1297,8 @@ msgstr "Wybór Rogu Szwu" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Kontroluje, czy rogi na zewn. linii modelu wpływają na pozycję szwu. Brak oznacza, że rogi nie mają wpływu na pozycję szwu. Ukryj Szew powoduje, że szew będzie się bardziej pojawiał na wewn. rogach. Pokaż Szew powoduje, że szew będzie się bardziej pojawiał na zewn. rogach. Ukryj lub Pokaż Szew powoduje, że szew będzie się bardziej pojawiał na wewn. lub zewn. rogach." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1320,6 +1320,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Ukryj lub Pokaż Szew" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1332,13 +1337,13 @@ msgstr "Kiedy włączone, współrzędne szwu są względne do każdego środka #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Zignoruj Małe Luki Z" +msgid "No Skin in Z Gaps" +msgstr "" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Jeśli model ma małe, pionowe szczeliny, to można wykorzystać dodatkowe 5% mocy obliczeniowej do wygenerowania górnej i dolnej skóry w wąskich przestrzeniach. W takim wypadku, wyłącz tę opcję." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "" #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1876,8 +1881,8 @@ msgstr "Temperatura obszaru roboczego" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "Temperatura stosowana dla obszaru roboczego. Jeżeli jest ustawione 0, temperatura nie będzie ustawiona." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1989,6 +1994,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Współczynnik skurczu w procentach." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1999,6 +2084,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Kompensacja przepływu: ilość ekstrudowanego materiału jest mnożona przez tę wartość." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Przepływ Wieży Czyszczącej" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2116,8 +2321,8 @@ msgstr "Ogranicz Retrakcje Pomiędzy Podporami" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Unikaj retrakcji podczas poruszania się od podpory do podpory w linii prostej. Załączenie tej funkcji spowoduje skrócenie czasu druku, lecz może prowadzić do nadmiernego nitkowania wewnątrz struktur podporowych." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "" #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2169,6 +2374,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Prędkość, z jaką filament jest cofany podczas retrakcji po zmianie dyszy." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2360,14 +2575,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Prędkość, z jaką jest drukowana obwódka i obrys. Zwykle jest to wykonywane przy szybkości początkowej warstwy, ale czasami możesz chcieć drukować obwódkę lub obrys z inną prędkością." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Maksymalna Prędk. Z" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Maksymalna prędkość przesuwu stołu. Ustawienie na zero powoduje, że druk używa domyślnych ustawień oprogramowania dla maksymalnej prędkości z." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "" #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3285,12 +3500,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Odległość między drukowanymi liniami struktury podpory w początkowej warstwie. To ustawienie jest obliczane na podstawie gęstości podpory." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Kierunek Linii Wypełnienia Podpory" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Orientacja wzoru wypełnienia dla podpór. Wzór podpory jest obracany w płaszczyźnie poziomej." @@ -3421,8 +3636,8 @@ msgstr "Odległość Łączenia Podpór" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Maksymalna odległość między podporami w kierunkach X/Y. Gdy oddzielne struktury są bliżej siebie niż ta wartość, struktury łączą się w jedną." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "" #: fdmprinter.def.json msgctxt "support_offset label" @@ -3800,14 +4015,14 @@ msgid "The diameter of a special tower." msgstr "Średnica wieży specjalnej." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Minimalna Średnica" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Minimalna średnica w kierunkach X/Y o małej powierzchni, który jest wspierana przez specjalną wieżę wspierającą." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "" #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4303,16 +4518,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Wydrukuj wieżę obok wydruku, która służy do zmiany materiału po każdym przełączeniu dyszy." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Okrągła Wieża Czyszcząca" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Twórz wieżę czyszczącą o okrągłym kształcie." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4353,16 +4558,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Współrzędna Y położenia wieży czyszczącej." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Przepływ Wieży Czyszczącej" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Kompensacja przepływu: ilość ekstrudowanego materiału jest mnożona przez tę wartość." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4665,8 +4860,8 @@ msgstr "Wygładź Spiralne Kontury" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Wygładź spiralny kontur, aby zmniejszyć widoczność szwu Z (szew Z powinien być ledwo widoczny na wydruku, ale nadal będzie widoczny w widoku warstwy). Należy pamiętać, że wygładzanie będzie miało tendencję do rozmycia drobnych szczegółów powierzchni." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "" #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5165,8 +5360,8 @@ msgstr "Włącz Podpory Stożkowe" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Opcja eksperymentalna: W dolnym obszarze podpory powinny być mniejsze niż na zwisie." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "" #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5967,6 +6162,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Forma przesunięcia, która ma być zastosowana do modelu podczas ładowania z pliku." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Wersja G-code" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Kontroluje, czy rogi na zewn. linii modelu wpływają na pozycję szwu. Brak oznacza, że rogi nie mają wpływu na pozycję szwu. Ukryj Szew powoduje, że szew będzie się bardziej pojawiał na wewn. rogach. Pokaż Szew powoduje, że szew będzie się bardziej pojawiał na zewn. rogach. Ukryj lub Pokaż Szew powoduje, że szew będzie się bardziej pojawiał na wewn. lub zewn. rogach." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Zignoruj Małe Luki Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Jeśli model ma małe, pionowe szczeliny, to można wykorzystać dodatkowe 5% mocy obliczeniowej do wygenerowania górnej i dolnej skóry w wąskich przestrzeniach. W takim wypadku, wyłącz tę opcję." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "Temperatura stosowana dla obszaru roboczego. Jeżeli jest ustawione 0, temperatura nie będzie ustawiona." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Unikaj retrakcji podczas poruszania się od podpory do podpory w linii prostej. Załączenie tej funkcji spowoduje skrócenie czasu druku, lecz może prowadzić do nadmiernego nitkowania wewnątrz struktur podporowych." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Maksymalna Prędk. Z" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Maksymalna prędkość przesuwu stołu. Ustawienie na zero powoduje, że druk używa domyślnych ustawień oprogramowania dla maksymalnej prędkości z." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Maksymalna odległość między podporami w kierunkach X/Y. Gdy oddzielne struktury są bliżej siebie niż ta wartość, struktury łączą się w jedną." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Minimalna Średnica" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Minimalna średnica w kierunkach X/Y o małej powierzchni, który jest wspierana przez specjalną wieżę wspierającą." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Okrągła Wieża Czyszcząca" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Twórz wieżę czyszczącą o okrągłym kształcie." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Kompensacja przepływu: ilość ekstrudowanego materiału jest mnożona przez tę wartość." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Wygładź spiralny kontur, aby zmniejszyć widoczność szwu Z (szew Z powinien być ledwo widoczny na wydruku, ale nadal będzie widoczny w widoku warstwy). Należy pamiętać, że wygładzanie będzie miało tendencję do rozmycia drobnych szczegółów powierzchni." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Opcja eksperymentalna: W dolnym obszarze podpory powinny być mniejsze niż na zwisie." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Liczba Ekstruderów, które są dostępne" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index ba07e9ac3b..3723f35cff 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:51+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-28 06:51-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "O perfil foi achatado & ativado." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "Arquivo AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Uma impressão USB está em progresso, fechar o Cura interromperá esta impressão. Tem certeza?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Arquivo X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Arquivo X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Arquivo X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "Não foi possível salvar em unidade removível {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -230,8 +234,8 @@ msgstr "Ejetar dispositivo removível {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Há divergências entre a configuração ou calibração da impressora e do Cura. Para melhores resultados, sempre fatie com os PrintCores e materiais que estão carregados em sua impressora." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Envio de novos trabalhos (temporariamente) bloqueado, ainda enviando o trabalho de impressão anterior." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Enviando dados à impressora" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Enviando Dados" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Trabalho de impressão enviado à impressora com sucesso." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Dados Enviados" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver no Monitor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} acabou de imprimir '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "O trabalho de impressão '{job_name}' terminou." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Impressão Concluída" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Vazio" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Desconhecido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Imprimir por Nuvem" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Imprimir por Nuvem" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Conectado por Nuvem" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Erro de nuvem" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Não foi possível exportar o trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Não foi possível transferir os dados para a impressora." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Transferindo via Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Envia e monitora trabalhos de impressão de qualquer lugar usando sua conta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Conectar à Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Não me pergunte novamente para esta impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Começar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Você agora pode enviar e monitorar trabalhoas de impressão de qualquer lugar usando sua conta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Conectado!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Rever sua conexão" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar pela rede" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Guia de Ajustes do Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "Arquivo 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Bico" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O arquivo de projeto {0} contém um tipo de máquina desconhecido {1}. Não foi possível importar a máquina. Os modelos serão importados ao invés dela." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir Arquivo de Projeto" @@ -806,7 +805,7 @@ msgstr "Detalhes do G-Code" #: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:481 msgctxt "@info:generic" msgid "Make sure the g-code is suitable for your printer and printer configuration before sending the file to it. The g-code representation may not be accurate." -msgstr "Assegure-se que o g-code é adequado para sua impressora e configuração antes de enviar o arquivo. A representação de g-code pode não ser acurada." +msgstr "Certifique que o g-code é adequado para sua impressora e configuração antes de enviar o arquivo. A representação de g-code pode não ser acurada." #: /home/ruben/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:64 msgctxt "@item:inmenu" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "Não Suportado" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Os ajustes foram mudados para atender à atual disponibilidade de extrusores: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Os ajustes foram alterados para seguir a disponibilidade de extrusores atuais:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes atualizados" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Falha ao exportar perfil para {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Falha ao exportar perfil para {0}: complemento escritor relatou erro." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado para {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportação concluída" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Falha ao importar perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Não foi possível importar perfil de {0} antes de uma impressora ser adicionada." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Não há perfil personalizado a importar no arquivo {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Este perfil {0} contém dados incorretos, não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "A máquina definida no perfil {0} ({1}) não equivale à sua máquina atual ({2}), não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado com sucesso" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Arquivo {0} não contém nenhum perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O Perfil {0} tem tipo de arquivo desconhecido ou está corrompido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Falta um tipo de qualidade ao Perfil." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Próximo" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "Grupo #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "Fechar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos Os Arquivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "As impressoras abaixo não podem ser conectadas por serem parte de um grupo" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Impressoras de rede disponíveis" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Personalizado" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "A altura do volume de impressão foi reduzida para que o valor da \"Sequência de Impressão\" impeça o eixo de colidir com os modelos impressos." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Volume de Impressão" @@ -1395,48 +1393,48 @@ msgstr "Registros" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Descrição do usuário" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Descrição do usuário (Nota: Os desenvolvedores podem não falar sua língua, por favor use inglês se possível)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Carregando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando cena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Carregando interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado é pequenos demais para carregar." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Ajustes de Impressora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (largura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profundidade)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Forma da plataforma de impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Origem no centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Mesa aquecida" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Sabor de G-Code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Ajustes da Cabeça de Impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y mín." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y máx." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Altura do Eixo" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code Inicial" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code Final" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Deslocamento X do Bico" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Deslocamento Y do Bico" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número da Ventoinha de Resfriamento" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-Code Inicial do Extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-Code Final do Extrusor" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "Instalar" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -1616,8 +1614,8 @@ msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Sua nota" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Versão" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Última atualização" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Entrar na conta é necessário para instalar ou atualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar rolos de material" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Atualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Atualizando" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "A atualização de firmware falhou devido a firmware não encontrado." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Vidro" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Estas opçÕes não estão disponíveis porque você está monitorando uma impressora de nuvem." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remotamente." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "A webcam não está disponível porque você está monitorando uma impressora de nuvem." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Carregando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Indisponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Inacessivel" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Ocioso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Sem Título" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anônimo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Requer mudanças na configuração" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Detalhes" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Impressora indisponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Primeira disponível" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "Enfileirados" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Ir ao Cura Connect" +msgid "Manage in browser" +msgstr "Gerir no navegador" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Não há trabalhos de impressão na fila. Fatie e envie um trabalho para adicioná-lo." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Trabalhos de impressão" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Tempo total de impressão" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Esperando por" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Todos os trabalhos foram impressos." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Ver histórico de impressão" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,14 +2034,13 @@ msgstr "Conectar a Impressora de Rede" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-Code para sua impressora.\n" -"\n" -"Selecione sua impressora da lista abaixo:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Para imprimir diretamente na sua impressora pela rede, certifique-se que ela esteja conectada à rede usando um cabo de rede ou conectando sua impressora à sua WIFI. Se você não conectar Cura à sua impressora, você ainda pode usar um drive USB ou SDCard para transferir arquivos G-Code a ela." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Selecione sua impressora da lista abaixo:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2056,9 +2048,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Remover" @@ -2141,50 +2133,50 @@ msgctxt "@action:button" msgid "OK" msgstr "Ok" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abortado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Finalizado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Preparando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Abortando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Pausando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Pausado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Continuando..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Necessária uma ação" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina %1 em %2" @@ -2288,44 +2280,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Sobrepor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "A impressora associada, %1, requer a seguinte alteração de configuração:" msgstr[1] "A impressora associada, %1, requer as seguintes alterações de configuração:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "A impressora %1 está associada, mas o trabalho contém configuração de material desconhecida." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Alterar material %1 de %2 para %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Carregar %3 como material %1 (isto não pode ser sobreposto)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Alterar núcleo de impressão %1 de %2 para %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Alterar mesa de impressão para %1 (Isto não pode ser sobreposto)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Sobrepor irá usar os ajustes especificados com a configuração existente da impressora. Isto pode causar falha da impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Alumínio" @@ -2335,7 +2327,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Conecta a uma impressora" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Guia de Ajustes do Cura" @@ -2345,11 +2337,13 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" -"Por favor certifique-se que sua impressora está conectada:\n" -"- Verifique se a impressora está ligada.\n" -"- Verifique se a impressora está conectada à rede." +"Por favor certifique-se que sua impressora está conectada>\n" +"- Verifique se ela está ligada.\n" +"- Verifique se ela está conectada à rede.\n" +"- Verifique se você está logado para descobrir impressoras conectadas à nuvem." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2661,7 +2655,7 @@ msgid "Printer Group" msgstr "Grupo de Impressora" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" @@ -2674,19 +2668,19 @@ msgstr "Como o conflito no perfil deve ser resolvido?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2858,18 +2852,24 @@ msgid "Previous" msgstr "Anterior" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Dica" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Imprimir experimento" @@ -2974,170 +2974,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem certeza que deseja abortar a impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informação" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar Mudança de Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "O novo diâmetro de filamento está ajustado em %1 mm, que não é compatível com o extrusor atual. Você deseja continuar?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Exibir Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Tipo de Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Cor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Propriedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Densidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Custo do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Peso do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Comprimento do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Custo por Metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está vinculado a %1 e compartilha algumas de suas propriedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Desvincular Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Descrição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Informação sobre Aderência" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com sucesso" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha em exportar material para %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado para %1 com sucesso" @@ -3178,383 +3178,406 @@ msgid "Unit" msgstr "Unidade" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Você precisará reiniciar a aplicação para que essas mudanças tenham efeito." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Fatiar automaticamente quando mudar ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Fatiar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da área de visualização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Ressaltar áreas sem suporte do modelo em vermelho. Sem suporte, estas áreas não serão impressas corretamente." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Exibir seções pendentes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmera de modo que o modelo fique no centro da visão quando for selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centralizar câmera quanto o item é selecionado" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento default de ampliação deve ser invertido?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverter a direção da ampliação de câmera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "A ampliação (zoom) deve se mover na direção do mouse?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Ampliar na direção do mouse não é suportado na perspectiva ortogonal." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Ampliar na direção do mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos devem ser movidos na plataforma de modo que não se sobreponham?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assegurar que os modelos sejam mantidos separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Os modelos devem ser movidos pra baixo pra se assentar na plataforma de impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automaticamente fazer os modelos caírem na mesa de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Exibir mensagem de alerta no leitor de G-Code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de alera no leitor de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A Visão de Camada deve ser forçada a ficar em modo de compatibilidade?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar modo de compatibilidade da visão de camadas (requer reinício)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Que tipo de renderização de câmera deve ser usada?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Renderização de câmera:" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspectiva" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ortogonal" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrindo e salvando arquivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados dentro do volume de impressão se forem muito grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode ser carregado diminuto se sua unidade for por exemplo em metros ao invés de milímetros. Devem esses modelos ser redimensionados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos minúsculos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Os modelos devem ser selecionados após serem carregados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar modelos ao carregar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Um prefixo baseado no nome da impressora deve ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo de máquina ao nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Um resumo deve ser exibido ao salvar um arquivo de projeto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Exibir diálogo de resumo ao salvar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento default ao abrir um arquivo de projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento default ao abrir um arquivo de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Sempre me perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Sempre abrir como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Sempre importar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento default para valores de configuração alterados ao mudar para um perfil diferente: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Sempre descartar alterações da configuração" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Sempre transferir as alterações para o novo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve verificar novas atualizações quando o programa for iniciado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Verificar atualizações na inicialização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar informação (anônima) de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Usar funcionalidade de plataforma múltipla de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Usar funcionalidade de plataforma múltipla de impressão (reinício requerido)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Criar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Por favor dê um nome a este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renomear Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Perfis default" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Perfis personalizados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil usa os defaults especificados pela impressora, portanto não tem ajustes/sobreposições na lista abaixo." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Seus ajustes atuais coincidem com o perfil selecionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globais" @@ -3622,33 +3645,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "procurar nos ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não exibir este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter este ajuste visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar a visibilidade dos ajustes..." @@ -3660,36 +3683,36 @@ msgid "" "\n" "Click to make these settings visible." msgstr "" -"Alguns ajustes ocultados usam valores diferentes de seu valor calculado normal.\n" +"Alguns ajustes ocultos usam valores diferentes de seu valor calculado normal.\n" "\n" "Clique para tornar estes ajustes visíveis." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Este ajuste não é usado porque todos os ajustes que ele influencia estão sobrepostos." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Afeta" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afetado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Este ajuste é sempre compartilhado entre todos os extrusores. Modificá-lo aqui mudará o valor para todos." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "O valor é resolvido de valores específicos de cada extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3700,7 +3723,7 @@ msgstr "" "\n" "Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3716,7 +3739,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Personalizado" @@ -3741,12 +3764,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Gera estrutura que suportarão partes do modelo que têm seções pendentes. Sem estas estruturas, tais partes desabariam durante a impressão." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Aderência" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Habilita imprimir um brim (bainha) ou raft (jangada). Adicionará uma área chata em volta ou sob o objeto que é fácil de remover após a impressão ter finalizado." @@ -3832,7 +3855,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Enviar G-Code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Enviar comando G-Code personalizado para a impressora conectada. Pressione 'enter' para enviar o comando." @@ -3929,11 +3952,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3984,7 +4002,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Posição da &câmera" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Visão de câmera" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspectiva" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ortográfico" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Plataforma de Impressão (&B)" @@ -4103,22 +4136,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &Recente" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Impressão ativa" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nome do Trabalho" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Tempo de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Tempo restante estimado" @@ -4128,6 +4161,11 @@ msgctxt "@label" msgid "View type" msgstr "Tipo de Visão" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Lista de objetos" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4179,32 +4217,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Sem estimativa de custo disponível" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Pré-visualização" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Fatiando..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Não foi possível fatiar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Processando" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Fatiar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Inicia o processo de fatiamento" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Cancelar" @@ -4239,233 +4282,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Impressoras pré-ajustadas" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Adicionar impressora" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Gerenciar impressoras" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostra Guia de Resolução de Problemas Online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar Tela Cheia" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Sair da Tela Cheia" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Desfazer (&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Sair (&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visão &3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visão Frontal" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visão Superior" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visão do Lado Esquerdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visão do Lado Direito" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar Impressoras..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar Materiais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "At&ualizar perfil com valores e sobreposições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar ajustes atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Criar perfil a partir de ajustes/sobreposições atuais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfis..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Exibir &Documentação Online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Relatar um &Bug" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novidades" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Remover Modelo Selecionado" msgstr[1] "Remover Modelos Selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Centralizar Modelo Selecionado" msgstr[1] "Centralizar Modelos Selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Multiplicar Modelo Selecionado" msgstr[1] "Multiplicar Modelos Selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Remover Modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntralizar Modelo na Mesa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Esvaziar a Mesa de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Posicionar Todos os Modelos em Todas as Plataformas de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Posicionar Todos os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Posicionar Seleção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Reestabelecer as Posições de Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Remover as Transformações de Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Abrir Arquiv&o(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Exibir Pasta de Configuração" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercado" @@ -4480,49 +4528,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após o reinício." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechando o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Você tem certeza que deseja sair do Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir Arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontramos um ou mais arquivos de G-Code entre os arquivos que você selecionou. Você só pode abrir um arquivo de G-Code por vez. Se você quiser abrir um arquivo de G-Code, por favor selecione somente um." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -4747,32 +4795,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salvar Projeto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Plataforma de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Não exibir resumo do projeto ao salvar novamente" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Salvar" @@ -4948,12 +4996,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Resolução de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nome da impressora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Por favor dê um nome à sua impressora" @@ -5012,21 +5060,6 @@ msgctxt "@button" msgid "Get started" msgstr "Começar" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Ver somente a plataforma de impressão atual" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Posicionar em todas as plataformas de impressão" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Reposicionar a plataforma de impressão atual" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5117,6 +5150,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Achatador de Perfil" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Provê suporta à leitura de arquivos AMF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Leitor AMF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5127,16 +5170,6 @@ msgctxt "name" msgid "USB printing" msgstr "Impressão USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Permite salvar a fatia resultante como um arquivo X3G, para suportar impressoras que leem este formato (Malyan, Makerbot e outras impressoras baseadas em Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "Gerador de X3G" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5387,6 +5420,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Atualização de Versão 3.0 para 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Atualiza configurações do Cura 4.1 para o Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Atualização de Versão 4.1 para 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5457,16 +5500,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Leitor de 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Lê arquivos SVG como caminhos do extrusor, para depurar movimentos da impressora." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Leitor de Toolpath SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5557,6 +5590,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis do Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Guia de Ajustes do Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Os ajustes foram mudados para atender à atual disponibilidade de extrusores: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Descrição do usuário" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Estas opçÕes não estão disponíveis porque você está monitorando uma impressora de nuvem." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Ir ao Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Todos os trabalhos foram impressos." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Ver histórico de impressão" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-Code para sua impressora.\n" +#~ "\n" +#~ "Selecione sua impressora da lista abaixo:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Por favor certifique-se que sua impressora está conectada:\n" +#~ "- Verifique se a impressora está ligada.\n" +#~ "- Verifique se a impressora está conectada à rede." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Ver somente a plataforma de impressão atual" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Posicionar em todas as plataformas de impressão" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Reposicionar a plataforma de impressão atual" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Permite salvar a fatia resultante como um arquivo X3G, para suportar impressoras que leem este formato (Malyan, Makerbot e outras impressoras baseadas em Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "Gerador de X3G" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Lê arquivos SVG como caminhos do extrusor, para depurar movimentos da impressora." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Leitor de Toolpath SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Registro de Alterações" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index fed6da63f1..56015990a4 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-18 11:27+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index 4fdc0dc441..e613029ddb 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-05-28 09:51+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-28 07:41-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -338,7 +338,7 @@ msgstr "Tempo mínimo em que um extrusor precisará estar inativo antes que o bi #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "Sabor de G-Code" #: fdmprinter.def.json @@ -1298,8 +1298,8 @@ msgstr "Preferência do Canto da Costura" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Controla se cantos no contorno do modelo influenciam a posição da costura. Nenhum significa que cantos não têm influência na posição da costura. Esconder Costura torna mais provável que ela ocorra em um canto interior. Expor Costura torna mais provável que ela ocorra em um canto exterior. Esconder ou Expor Costura torna mais provável que ocorra em um canto, externo ou externo." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Controla se os cantos do contorno do modelo influenciam a posição da costura. Nenhum significa que os cantos não terão influência na posição da costura. Ocultar Costura torna mais provável que a costura ocorra em um canto interior. Expôr Costura torna mais provável que a costura ocorra em um canto exterior. Ocultar ou Expôr Costura torna mais provável que a costura ocorra em um canto interior ou exterior. Ocultação Inteligente permite tanto cantos interiores quanto exteriores, mas escolhe os interiores mais frequentemente se apropriado." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1309,17 +1309,22 @@ msgstr "Nenhum" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_inner" msgid "Hide Seam" -msgstr "Esconder Costura" +msgstr "Ocultar Costura" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_outer" msgid "Expose Seam" -msgstr "Expor Costura" +msgstr "Expôr Costura" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" -msgstr "Esconder ou Expor Costura" +msgstr "Ocultar ou Expor Costura" + +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Ocultação Inteligente" #: fdmprinter.def.json msgctxt "z_seam_relative label" @@ -1333,13 +1338,13 @@ msgstr "Quando habilitado, as coordenadas da costura Z são relativas ao centro #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ignorar Pequenas Lacunas em Z" +msgid "No Skin in Z Gaps" +msgstr "Sem Contorno nas Lacunas Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Quando o modelo tem pequenas lacunas verticais, aproximadamente 5% de tempo de computação adicional pode ser gasto ao gerar camada externa superior e inferior nestes espaços estreitos. Em tal caso, desabilite este ajuste." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Quando o modelo tem pequenas lacunas verticais de apenas umas poucas camadas, normalmente há contorno em volta dessas camadas no espaço estreito. Habilite este ajuste para não gerar o contorno se a lacuna vertical for bem pequena. Isso melhora o tempo de impressão e fatiamento, mas tecnicamente deixa preenchimento exposto ao ar." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1877,8 +1882,8 @@ msgstr "Temperatura do Volume de Impressão" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "A temperatura usada para o volume de construção. Se o valor for zero, a temperatura de volume de impressão não será ajustada." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "A temperatura do ambiente em que imprimir. Se este valor for 0, a temperatura de volume de impressão não será ajustada." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1990,6 +1995,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Raio de contração do material em porcentagem." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Material Cristalino" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Este material é do tipo que se destaca completamente quando aquecido (cristalino), ou é o tipo que produz cadeias de polímero entrelaçadas (não-cristalino)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Posição Retraída Anti-escorrimento" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "De quanto o material precisa ser retraído antes que pare de escorrer." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Velocidade de Retração Anti-escorrimento" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Qual a velocidade do material para que seja retraído durante a troca de filamento sem escorrimento." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Posição Retraída de Preparação de Quebra" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Quanto o filamento pode ser esticado antes que quebre, quando aquecido." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Velocidade de Retração de Preparação de Quebra" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Qual a velocidade do material para que seja retraído antes de quebrar em uma retração." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Posição Retraída de Quebra" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "De quanto o filamento deve ser retraído para se destacar completamente." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Velocidade de Retração de Quebra" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "A velocidade com a qual retrair o filamento para que se destaque completamente." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Temperatura de Quebra" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "A temperatura em que o filamento é destacado completamente." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -2000,6 +2085,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Compensação de fluxo: a quantidade de material extrudado é multiplicado por este valor." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Fluxo de Parede" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Compensação de fluxo em filetes das paredes." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Fluxo da Parede Externa" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Compensação de fluxo no filete de parede mais externo." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Fluxo da(s) Parede(s) Interna(s)" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Compensação de fluxo em todos os filetes de parede excetuando o mais externo." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Fluxo de Topo/Base" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Compensação de fluxo em filetes do topo e base." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Fluxo do Contorno da Superfície Superior" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Compensação de Fluxo em filetes das áreas no topo da impressão." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Fluxo de Preenchimento" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Compensação de fluxo em filetes de preenchimento." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Fluxo de Skirt/Brim" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Compensação de Fluxo em filetes de Skirt e Brim." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Fluxo de Suporte" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Compensação de fluxo em filetes de estruturas de suporte." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Fluxo de Interface de Suporte" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Compensação de fluxo em filetes do teto ou base do suporte." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Fluxo do Teto de Suporte" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Compensação de fluxo em filetes do teto de suporte." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Fluxo da Base de Suporte" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Compensação de fluxo nos filetes da base do suporte." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Fluxo da Torre de Purga" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2117,8 +2322,8 @@ msgstr "Limitar Retrações de Suporte" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Omitir retrações quando mudar de suporte a suporte em linha reta. Habilitar este ajuste economiza tempo de impressão, mas pode levar a fiapos entremeados à estrutura de suporte." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Omitir a retração ao mover de suporte a suporte em linha reta. Habilitar este ajuste economiza tempo de impressão, mas pode levar a fiapos excessivos na estrutura de suporte." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2170,6 +2375,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "A velocidade em que o filamento é empurrado para a frente depois de uma retração de troca de bico." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Quantidade de Avanço Extra da Troca de Bico" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Material extra a avançar depois da troca de bico." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2361,14 +2576,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Velocidade em que o Brim (Bainha) e Skirt (Saia) são impressos. Normalmente isto é feito na velocidade de camada inicial, mas você pode querer imprimi-los em velocidade diferente." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Velocidade Máxima em Z" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Velocidade do Salto Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "A velocidade máxima com que o eixo Z é movido. Colocar isto em zero faz com que a impressão use os defaults de firmware para a velocidade máxima de Z." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "A velocidade em que o movimento Z vertical é feito para os saltos Z. Tipicamente mais baixa que a velocidade de impressão já que mover a mesa de impressão ou eixos da máquina é mais difícil." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3286,12 +3501,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Distância entre os filetes da camada inicial da camada de suporte. Este ajuste é calculado pela densidade de suporte." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Direção de Filete do Preenchimento de Suporte" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Orientação do padrão de preenchimento para suportes. O padrão de preenchimento do suporte é rotacionado no plano horizontal." @@ -3422,8 +3637,8 @@ msgstr "Distância de União do Suporte" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Distância máxima entre as estruturas de suporte nas direções X/Y. Quando estrutura separadas estão mais perto que este valor, as estruturas são combinadas em uma única." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "A distância máxima entre as estruturas de suporte nas direções X/Y. Quando estruturas separadas estão mais próximas que este valor, elas são fundidas em uma só." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3801,14 +4016,14 @@ msgid "The diameter of a special tower." msgstr "O diâmetro da torre especial." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Diâmetro mínimo" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Diâmetro Máximo Suportado por Torres" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Diâmeto mínimo nas direções X/Y de uma área pequena que deverá ser suportada por uma torre de suporte especial." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "Diâmetro máximo nas direções X e Y da pequena área que será suportada por uma torre especializada de suporte." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4304,16 +4519,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprimir uma torre próxima à impressão que serve para purgar o material a cada troca de bico." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Torre de Purga Circular" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Faz a torre de purga na forma circular." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4354,16 +4559,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "A coordenada Y da posição da torre de purga." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Fluxo da Torre de Purga" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Compensação de Fluxo: a quantidade de material extrudado é multiplicado por este valor." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4666,8 +4861,8 @@ msgstr "Suavizar Contornos Espiralizados" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Suaviza os contornos espiralizados para reduzir a visibilidade da costura em Z (esta costura será quase invisível na impressão mas ainda pode ser vista na visão de camadas). Note que suavizar tenderá a remover detalhes finos de superfície." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Suavizar os contornos espiralizados para reduzir a visibilidade da costura Z (a costura Z deve ser quase invisível na impressão mas ainda será visível na visão de camadas). Note que a suavização tenderá a embaçar detalhes finos de superfície." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5166,8 +5361,8 @@ msgstr "Habilitar Suporte Cônico" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Recurso experimental: Faz as áreas de suporte menores na base que na seção pendente." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Faz as áreas de suporte menores na base que na seção pendente." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5968,6 +6163,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo após o carregamento do arquivo." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Sabor de G-Code" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Controla se cantos no contorno do modelo influenciam a posição da costura. Nenhum significa que cantos não têm influência na posição da costura. Esconder Costura torna mais provável que ela ocorra em um canto interior. Expor Costura torna mais provável que ela ocorra em um canto exterior. Esconder ou Expor Costura torna mais provável que ocorra em um canto, externo ou externo." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ignorar Pequenas Lacunas em Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Quando o modelo tem pequenas lacunas verticais, aproximadamente 5% de tempo de computação adicional pode ser gasto ao gerar camada externa superior e inferior nestes espaços estreitos. Em tal caso, desabilite este ajuste." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "A temperatura usada para o volume de construção. Se o valor for zero, a temperatura de volume de impressão não será ajustada." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Omitir retrações quando mudar de suporte a suporte em linha reta. Habilitar este ajuste economiza tempo de impressão, mas pode levar a fiapos entremeados à estrutura de suporte." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Velocidade Máxima em Z" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "A velocidade máxima com que o eixo Z é movido. Colocar isto em zero faz com que a impressão use os defaults de firmware para a velocidade máxima de Z." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Distância máxima entre as estruturas de suporte nas direções X/Y. Quando estrutura separadas estão mais perto que este valor, as estruturas são combinadas em uma única." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Diâmetro mínimo" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Diâmeto mínimo nas direções X/Y de uma área pequena que deverá ser suportada por uma torre de suporte especial." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Torre de Purga Circular" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Faz a torre de purga na forma circular." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Compensação de Fluxo: a quantidade de material extrudado é multiplicado por este valor." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Suaviza os contornos espiralizados para reduzir a visibilidade da costura em Z (esta costura será quase invisível na impressão mas ainda pode ser vista na visão de camadas). Note que suavizar tenderá a remover detalhes finos de superfície." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Recurso experimental: Faz as áreas de suporte menores na base que na seção pendente." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Número de Extrusores habilitados" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 0ceb5cbe66..be32a17c96 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-03-14 14:15+0100\n" -"Last-Translator: Portuguese \n" -"Language-Team: Paulo Miranda , Portuguese \n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0100\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Portuguese , Paulo Miranda , Portuguese \n" "Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +65,11 @@ msgid "" "

{model_names}

\n" "

Find out how to ensure the best possible print quality and reliability.

\n" "

View print quality guide

" -msgstr "

Um, ou mais, dos modelos 3D podem ter menos qualidade de impressão devido à dimensão do modelo 3D e definição de material:

\n

{model_names}

\n

Descubra como assegurar a melhor qualidade e fiabilidade possível da impressão.

\n

Ver o guia de qualidade da impressão

" +msgstr "" +"

Um, ou mais, dos modelos 3D podem ter menos qualidade de impressão devido à dimensão do modelo 3D e definição de material:

\n" +"

{model_names}

\n" +"

Descubra como assegurar a melhor qualidade e fiabilidade possível da impressão.

\n" +"

Ver o guia de qualidade da impressão

" #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 msgctxt "@action" @@ -85,6 +89,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "O perfil foi nivelado & ativado." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "Ficheiro AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +119,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Existe uma impressão por USB em curso; fechar o Cura irá interromper esta impressão. Tem a certeza?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Ficheiro X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +129,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Ficheiro X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Ficheiro X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -200,9 +208,9 @@ msgstr "Não foi possível guardar no Disco Externo {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -235,8 +243,8 @@ msgstr "Ejetar Disco Externo {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -372,39 +380,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Existe uma divergência entre a configuração ou calibração da impressora e o Cura. Para se obter os melhores resultados, o seccionamento (no Cura) deve ser sempre feito para os núcleos de impressão e para os materiais que estão introduzidos na impressora." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "O envio de novos trabalhos está (temporariamente) bloqueado; o trabalho de impressão anterior ainda está a ser enviado." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "A enviar dados para a impressora" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "A Enviar Dados" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -453,34 +461,34 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Ligado através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "O trabalho de impressão foi enviado com sucesso para a impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Dados Enviados" # rever! # contexto -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver no Monitor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "A impressora {printer_name} terminou a impressão de \"{job_name}\"." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." @@ -488,51 +496,51 @@ msgstr "O trabalho de impressão '{job_name}' terminou." # rever! # Concluída? -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Impressão terminada" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Vazio" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Desconhecido" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Imprimir através da cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Imprimir através da cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Ligada através da cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Erro da cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Não foi possível exportar o trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Não foi possível carregar os dados para a impressora." @@ -562,37 +570,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "A carregar através da cloud do Ultimaker" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Envie e monitorize trabalhos de impressão a partir de qualquer lugar através da sua conta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Ligar à cloud do Ultimaker" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Não perguntar novamente sobre esta impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Iniciar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Agora pode enviar e monitorizar trabalhos de impressão a partir de qualquer lugar através da sua conta Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Ligada!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Reveja a sua ligação" @@ -602,11 +610,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ligar Através da Rede" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Guia de definições do Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -780,18 +783,18 @@ msgid "3MF File" msgstr "Ficheiro 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O ficheiro de projeto {0} contém um tipo de máquina desconhecido {1}. Não é possível importar a máquina. Em vez disso, serão importados os modelos." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir ficheiro de projeto" @@ -923,13 +926,13 @@ msgid "Not supported" msgstr "Não suportado" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Ficheiro Já Existe" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -941,117 +944,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de ficheiro inválido:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "As definições foram alteradas de forma a corresponder aos extrusores disponíveis de momento: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "As definições foram alteradas de forma a corresponder aos extrusores disponíveis de momento:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Definições atualizadas" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) desativado(s)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Falha ao exportar perfil para {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Falha ao exportar perfil para {0}: O plug-in de gravação comunicou uma falha." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Perfil exportado para {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Exportação bem-sucedida" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Falha ao importar perfil de {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Não é possível importar o perfil de {0} antes de ser adicionada uma impressora." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Nenhum perfil personalizado para importar no ficheiro {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Falha ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "O perfil {0} contém dados incorretos, não foi possível importá-lo." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "A máquina definida no perfil {0} ({1}) não corresponde à sua máquina atual ({2}), não foi possível importá-la." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Falha ao importar perfil de {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Perfil {0} importado com êxito" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "O ficheiro {0} não contém qualquer perfil válido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O perfil {0} é de um formato de ficheiro desconhecido ou está corrompido." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "O perfil não inclui qualquer tipo de qualidade." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1129,7 +1131,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Seguinte" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1140,7 +1142,7 @@ msgstr "Grupo #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1148,7 +1150,7 @@ msgstr "Fechar" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" @@ -1171,20 +1173,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos os Ficheiros (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Não é possível ligar a(s) impressora(s) abaixo porque faz(em) parte de um grupo" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Impressoras em rede disponíveis" @@ -1200,12 +1202,12 @@ msgctxt "@label" msgid "Custom" msgstr "Personalizado" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "A altura do volume de construção foi reduzida devido ao valor da definição \"Sequência de impressão\" para impedir que o pórtico colida com os modelos impressos." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Volume de construção" @@ -1299,7 +1301,12 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "

Ups, o Ultimaker Cura encontrou um possível problema.

\n

Foi encontrado um erro irrecuperável durante o arranque da aplicação. Este pode ter sido causado por alguns ficheiros de configuração incorrectos. Sugerimos que faça um backup e reponha a sua configuração.

\n

Os backups estão localizados na pasta de configuração.

\n

Por favor envie-nos este Relatório de Falhas para podermos resolver o problema.

\n " +msgstr "" +"

Ups, o Ultimaker Cura encontrou um possível problema.

\n" +"

Foi encontrado um erro irrecuperável durante o arranque da aplicação. Este pode ter sido causado por alguns ficheiros de configuração incorrectos. Sugerimos que faça um backup e reponha a sua configuração.

\n" +"

Os backups estão localizados na pasta de configuração.

\n" +"

Por favor envie-nos este Relatório de Falhas para podermos resolver o problema.

\n" +" " # rever! # button size? @@ -1334,7 +1341,10 @@ msgid "" "

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " -msgstr "

Ocorreu um erro fatal no Cura. Por favor envie-nos este Relatório de Falhas para podermos resolver o problema

\n

Por favor utilize o botão \"Enviar relatório\" para publicar um relatório de erros automaticamente nos nossos servidores

\n " +msgstr "" +"

Ocorreu um erro fatal no Cura. Por favor envie-nos este Relatório de Falhas para podermos resolver o problema

\n" +"

Por favor utilize o botão \"Enviar relatório\" para publicar um relatório de erros automaticamente nos nossos servidores

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:173 msgctxt "@title:groupbox" @@ -1408,48 +1418,48 @@ msgstr "Relatórios" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Descrição do utilizador" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Descrição do utilizador (Nota: os programadores podem não falar a sua língua, pelo que, se possível, deve utilizar o inglês)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "A carregar máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "A configurar cenário..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "A carregar interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Apenas pode ser carregado um ficheiro G-code de cada vez. Importação {0} ignorada" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir outro ficheiro enquanto o G-code estiver a carregar. Importação {0} ignorada" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado era demasiado pequeno para carregar." @@ -1459,98 +1469,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Definições da impressora" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Largura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Profundidade)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Altura)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Forma da base de construção" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Origem no centro" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Base aquecida" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Variante do G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Definições da cabeça de impressão" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X mín" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y mín" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X máx" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y máx" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Altura do pórtico" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code inicial" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "G-code final" @@ -1580,22 +1590,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Desvio X do Nozzle" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Desvio Y do Nozzle" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número de ventoinha de arrefecimento" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-code inicial do extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-code final do extrusor" @@ -1606,7 +1616,7 @@ msgid "Install" msgstr "Instalar" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -1629,8 +1639,8 @@ msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" @@ -1640,49 +1650,49 @@ msgctxt "@label" msgid "Your rating" msgstr "A sua classificação" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Versão" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Actualizado em" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Transferências" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "É necessário Log in para instalar ou atualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar bobinas de material" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Atualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "A Actualizar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1794,7 +1804,10 @@ msgid "" "This plugin contains a license.\n" "You need to accept this license to install this plugin.\n" "Do you agree with the terms below?" -msgstr "Este plug-in contém uma licença.\nÉ necessário aceitar esta licença para instalar o plug-in.\nConcorda com os termos abaixo?" +msgstr "" +"Este plug-in contém uma licença.\n" +"É necessário aceitar esta licença para instalar o plug-in.\n" +"Concorda com os termos abaixo?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:55 msgctxt "@action:button" @@ -1933,69 +1946,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "A atualização de firmware falhou devido à ausência de firmware." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Vidro" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Estas opções não estão disponíveis pois está a monitorizar uma impressora na cloud." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Atualize o firmware da impressora para gerir a fila remotamente." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Esta webcam não está disponível pois está a monitorizar uma impressora na cloud." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "A carregar..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Indisponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Inacessível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Inativa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Sem título" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anónimo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Requer alterações na configuração" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Detalhes" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Impressora indisponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Primeira disponível" @@ -2005,36 +2018,31 @@ msgctxt "@label" msgid "Queued" msgstr "Em fila" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Ir para o Cura Connect" +msgid "Manage in browser" +msgstr "Gerir no browser" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Não existem trabalhos de impressão na fila. Para adicionar um trabalho, seccione e envie." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Trabalhos em Impressão" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Tempo de impressão total" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "A aguardar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Todos os trabalhos foram impressos." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Ver histórico de impressão" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2052,11 +2060,15 @@ msgstr "Ligar a uma Impressora em Rede" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "Para imprimir diretamente para a sua impressora através da rede, certifique-se de que a sua impressora está ligada à rede por meio de um cabo de rede ou através de ligação à rede Wi-Fi. Se não ligar o Cura por rede à impressora, poderá ainda assim utilizar uma unidade USB para transferir ficheiros g-code para a impressora.\n\nSelecione a sua impressora na lista em baixo:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Para imprimir diretamente para a sua impressora através da rede, certifique-se de que a impressora está ligada à rede através de um cabo de rede ou através" +" de ligação à rede Wi-Fi. Se não ligar o Cura por rede à impressora, poderá ainda assim utilizar uma unidade USB para transferir ficheiros g-code para" +" a impressora." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Selecione a impressora a partir da lista abaixo:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2064,9 +2076,9 @@ msgid "Edit" msgstr "Editar" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Remover" @@ -2149,52 +2161,52 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Cancelado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Impressão terminada" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "A preparar..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "A cancelar..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "A colocar em pausa..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Em Pausa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "A recomeçar..." # rever! # ver contexto! -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Ação necessária" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Termina %1 a %2" @@ -2298,44 +2310,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Ignorar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "A impressora atribuída %1 requer a seguinte alteração na configuração:" msgstr[1] "A impressora atribuída %1 requer as seguintes alterações na configuração:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "A impressora %1 está atribuída, mas o trabalho tem uma configuração de material desconhecida." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Alterar o material %1 de %2 para %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Carregar %3 como material %1 (isto não pode ser substituído)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Substituir o print core %1 de %2 para %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Alterar base de construção para %1 (isto não pode ser substituído)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Ignorar utilizará as definições especificadas com a configuração da impressora existente. Tal pode resultar numa falha de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Alumínio" @@ -2345,7 +2357,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Ligar a uma impressora" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Guia de definições do Cura" @@ -2355,8 +2367,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "Certifique-se de que é possível estabelecer ligação com a impressora:\n- Verifique se a impressora está ligada.\n- Verifique se a impressora está ligada à rede." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Certifique-se de que é possível estabelecer ligação com a impressora:\n- Verifique se a impressora está ligada.\n- Verifique se a impressora está ligada" +" à rede.\n- Verifique se tem sessão iniciada para encontrar impressoras ligadas através da cloud." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2672,7 +2686,7 @@ msgid "Printer Group" msgstr "Grupo da Impressora" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Definições do perfil" @@ -2685,13 +2699,13 @@ msgstr "Como deve ser resolvido o conflito no perfil?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Nome" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Inexistente no perfil" @@ -2699,7 +2713,7 @@ msgstr "Inexistente no perfil" # rever! # contexto?! #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2871,18 +2885,24 @@ msgid "Previous" msgstr "Anterior" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Sugestão" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genérico" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Experimento de impressão" @@ -2987,170 +3007,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem a certeza de que deseja cancelar a impressão?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Confirmar Alteração de Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "O novo diâmetro do filamento está definido como %1 mm, o que não é compatível com o extrusor actual. Pretende prosseguir?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Nome" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marca" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Tipo de Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Cor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Propriedades" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Densidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Diâmetro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Custo do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Peso do Filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Comprimento do filamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Custo por Metro" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Este material está associado a %1 e partilha algumas das suas propriedades." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Desassociar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Descrição" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Informações de Aderência" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Definições de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem a certeza de que deseja remover o perfil %1? Não é possível desfazer esta ação!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar o material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com êxito" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha ao exportar material para %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado com êxito para %1" @@ -3191,387 +3211,410 @@ msgid "Unit" msgstr "Unidade" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "É necessário reiniciar a aplicação para que estas alterações sejam aplicadas." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seccionar automaticamente ao alterar as definições." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seccionar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da janela" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Realçar, a vermelho, as áreas do modelo sem apoio. Sem suporte, estas áreas podem não ser impressas correctamente." # rever! # consolas? -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar Saliências (Overhangs)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmara de forma que o modelo fique no centro da visualização quando é selecionado um modelo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar câmara ao selecionar item" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento de zoom predefinido do Cura deve ser invertido?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverta a direção do zoom da câmera." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "O zoom deve deslocar-se na direção do rato?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Fazer zoom em direção ao rato não é suportado na perspetiva ortogonal." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Fazer Zoom na direção do rato" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos, na plataforma, devem ser movidos para que não se intersectem?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Garantir que os modelos não se interceptam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pousar os modelos na base de construção?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pousar automaticamente os modelos na base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Mostrar mensagem de aviso no leitor de g-code." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de aviso no leitor de g-code" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A vista por camada deve ser forçada a utilizar o modo de compatibilidade?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar o modo de compatibilidade na visualização por camada (é necessário reiniciar)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Que tipo de composição de câmara deve ser utilizado?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Composição de câmara: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspetiva" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ortogonal" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir e guardar ficheiros" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados até ao volume de construção se forem demasiado grandes?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos demasiado grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode parecer extremamente pequeno se, por exemplo, este tiver sido criado em metros e não em milímetros. Estes modelos devem ser redimensionados?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos extremamente pequenos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Selecionar os modelos depois de abertos?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar os modelos depois de abertos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Deve um prefixo com base no nome da impressora ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo da máquina ao nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Deve ser apresentado um resumo ao guardar um ficheiro de projeto?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar caixa de diálogo de resumo ao guardar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinido ao abrir um ficheiro de projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinido ao abrir um ficheiro de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir sempre como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar sempre modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando tiver realizado alterações a um perfil e mudado para outro, será apresentada uma caixa de diálogo a perguntar se pretende manter as alterações. Caso contrário, pode escolher um comportamento predefinido, sendo que a caixa de diálogo nunca mais é apresentada." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinido para valores de definição alterados ao mudar para um perfil diferente: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar sempre definições alteradas" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir sempre definições alteradas para o novo perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve procurar atualizações quando o programa é iniciado?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Procurar atualizações ao iniciar" # rever! # legal wording -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Podem alguns dados anónimos sobre a impressão ser enviados para a Ultimaker? Não são enviadas, nem armazenadas, quaisquer informações pessoais, incluindo modelos, endereços IP ou outro tipo de identificação pessoal." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar dados (anónimos) sobre a impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Usar a funcionalidade de múltiplas bases de construção" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Usar a funcionalidade de múltiplas bases de construção (é necessário reiniciar)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Mudar Nome" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Criar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Duplicar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Criar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Forneça um nome para este perfil." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Mudar Nome do Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Perfis predefinidos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Perfis personalizados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com as definições/substituições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar alterações atuais" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza as predefinições especificadas pela impressora, pelo que não tem quaisquer definições/substituições na lista seguinte." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "As suas definições atuais correspondem ao perfil selecionado." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Definições Globais" @@ -3639,33 +3682,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "procurar definições" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Esconder esta definição" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não mostrar esta definição" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter esta definição visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidade das definições..." @@ -3680,9 +3723,12 @@ msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "Algumas das definições invisíveis têm valores diferentes dos valores normais calculados automaticamente.\n\nClique para tornar estas definições visíveis." +msgstr "" +"Algumas das definições invisíveis têm valores diferentes dos valores normais calculados automaticamente.\n" +"\n" +"Clique para tornar estas definições visíveis." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Esta definição não é utilizada porque todas as definições influenciadas foram substituídas." @@ -3692,17 +3738,17 @@ msgstr "Esta definição não é utilizada porque todas as definições influenc # Influencia? # Altera? # Modifica? -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Modifica" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Modificado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Esta definição é sempre partilhada entre todos os extrusores. Ao alterá-la aqui, o valor será alterado em todos os extrusores." @@ -3711,33 +3757,39 @@ msgstr "Esta definição é sempre partilhada entre todos os extrusores. Ao alte # contexto?! # resolvido? # por-extrusor -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "O valor é calculado com base nos valores por-extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "Esta definição tem um valor que é diferente do perfil.\n\nClique para restaurar o valor do perfil." +msgstr "" +"Esta definição tem um valor que é diferente do perfil.\n" +"\n" +"Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" "\n" "Click to restore the calculated value." -msgstr "Normalmente, o valor desta definição é calculado, mas atualmente tem definido um valor diferente.\n\nClique para restaurar o valor calculado." +msgstr "" +"Normalmente, o valor desta definição é calculado, mas atualmente tem definido um valor diferente.\n" +"\n" +"Clique para restaurar o valor calculado." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" msgstr "Recomendado" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Personalizado" @@ -3765,12 +3817,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Criar estruturas para suportar partes do modelo, suspensas ou com saliências. Sem estas estruturas, essas partes do modelo podem desmoronar durante a impressão." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Aderência à Base de Construção" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Permite a impressão de uma aba ou raft. Isto irá adicionar, respetivamente, uma área plana em torno ou sob a base do seu objeto, que são fáceis de retirar posteriormente." @@ -3816,7 +3868,10 @@ msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "Alguns valores de definição/substituição são diferentes dos valores armazenados no perfil.\n\nClique para abrir o gestor de perfis." +msgstr "" +"Alguns valores de definição/substituição são diferentes dos valores armazenados no perfil.\n" +"\n" +"Clique para abrir o gestor de perfis." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -3859,7 +3914,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Enviar G-code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Enviar um comando G-code personalizado para a impressora ligada. Prima \"Enter\" para enviar o comando." @@ -3956,11 +4011,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoritos" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genérico" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4011,7 +4061,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posição da câmara" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Vista da câmara" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspetiva" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ortográfica" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Base de construção" @@ -4130,22 +4195,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &Recente" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Impressão ativa" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Nome do trabalho" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Tempo de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Tempo restante estimado" @@ -4155,6 +4220,11 @@ msgctxt "@label" msgid "View type" msgstr "Ver tipo" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Lista de objetos" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4186,7 +4256,10 @@ msgid "" "- Send print jobs to Ultimaker printers outside your local network\n" "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" "- Get exclusive access to print profiles from leading brands" -msgstr "- Envie trabalhos de impressão para impressoras Ultimaker fora da sua rede local\n- Guarde as definições do seu Ultimaker Cura na cloud para utilizar em qualquer lugar\n- Obtenha acesso exclusivo a perfis de impressão de marcas de referência" +msgstr "" +"- Envie trabalhos de impressão para impressoras Ultimaker fora da sua rede local\n" +"- Guarde as definições do seu Ultimaker Cura na cloud para utilizar em qualquer lugar\n" +"- Obtenha acesso exclusivo a perfis de impressão de marcas de referência" #: /home/ruben/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 msgctxt "@button" @@ -4203,32 +4276,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Nenhuma estimativa de custos disponível" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Pré-visualizar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "A Seccionar..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Não é possível seccionar" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "A processar" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Segmentação" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Iniciar o processo de segmentação" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Cancelar" @@ -4263,235 +4341,240 @@ msgctxt "@label" msgid "Preset printers" msgstr "Impressoras predefinidas" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Gerir impressoras" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostrar Guia de resolução de problemas online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar para ecrã inteiro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Sair do Ecrã Inteiro" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Desfazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Sair" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista Frente" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista Cima" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista Lado Esquerdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista Lado Direito" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gerir Im&pressoras..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gerir Materiais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Atualizar perfil com as definições/substituições atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar alterações atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Criar perfil a partir das definições/substituições atuais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gerir Perfis..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentação online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Reportar um &erro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novidades" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Apagar Modelo Selecionado" msgstr[1] "Apagar Modelos Selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Centrar modelo selecionado" msgstr[1] "Centrar modelos selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Multiplicar modelo selecionado" msgstr[1] "Multiplicar modelos selecionados" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Apagar Modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar Modelo na Base" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Agrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Combinar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Limpar base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Dispor todos os modelos em todas as bases de construção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Dispor todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Dispor seleção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Repor todas as posições de modelos" # rever! # Cancelar todas? -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Repor Todas as Transformações do Modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir Ficheiro(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar pasta de configuração" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercado" @@ -4506,49 +4589,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após reiniciar." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Definições" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechar Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Tem a certeza de que deseja sair do Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir ficheiro(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir ficheiro(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontrámos um ou mais ficheiros G-code nos ficheiros selecionados. Só é possível abrir um ficheiro G-code de cada vez. Se pretender abrir um ficheiro G-code, selecione apenas um." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -4570,7 +4653,9 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "Alterou algumas das definições do perfil.\nGostaria de manter ou descartar essas alterações?" +msgstr "" +"Alterou algumas das definições do perfil.\n" +"Gostaria de manter ou descartar essas alterações?" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -4632,7 +4717,9 @@ msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "O Cura foi desenvolvido pela Ultimaker B.V. em colaboração com a comunidade.\nO Cura tem o prazer de utilizar os seguintes projetos open source:" +msgstr "" +"O Cura foi desenvolvido pela Ultimaker B.V. em colaboração com a comunidade.\n" +"O Cura tem o prazer de utilizar os seguintes projetos open source:" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 msgctxt "@label" @@ -4772,32 +4859,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar projeto" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Extrusor %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Não mostrar novamente o resumo do projeto ao guardar" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Guardar" @@ -4973,12 +5060,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Resolução de problemas" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Nome da impressora" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Atribua um nome à sua impressora" @@ -5028,28 +5115,15 @@ msgctxt "@text" msgid "" "Please follow these steps to set up\n" "Ultimaker Cura. This will only take a few moments." -msgstr "Siga estes passos para configurar o\nUltimaker Cura. Este processo deverá demorar apenas alguns momentos." +msgstr "" +"Siga estes passos para configurar o\n" +"Ultimaker Cura. Este processo deverá demorar apenas alguns momentos." #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 msgctxt "@button" msgid "Get started" msgstr "Iniciar" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Ver só a base de construção ativa" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Dispor em todas as bases" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Dispor só na base ativa" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5140,6 +5214,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Aplanador de perfis" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Fornece suporte para ler ficheiros AMF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Leitor de AMF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5150,16 +5234,6 @@ msgctxt "name" msgid "USB printing" msgstr "Impressão USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Permite guardar o resultado do seccionamento como um ficheiro X3G, para poder ser usado com impressoras 3D que usam este formato (Kalyan, Makerbot e outras impressoras baseadas no Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5411,6 +5485,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Atualização da versão 3.0 para 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Atualiza as configurações do Cura 4.1 para o Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Atualização da versão 4.1 para 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5481,16 +5565,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Leitor de 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Lê ficheiros SVG como caminhos de ferramenta para efeitos de depuração dos movimentos da impressora." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Leitor de caminhos de ferramenta SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5583,6 +5657,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Guia de definições do Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "As definições foram alteradas de forma a corresponder aos extrusores disponíveis de momento: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Descrição do utilizador" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Estas opções não estão disponíveis pois está a monitorizar uma impressora na cloud." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Ir para o Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Todos os trabalhos foram impressos." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Ver histórico de impressão" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Para imprimir diretamente para a sua impressora através da rede, certifique-se de que a sua impressora está ligada à rede por meio de um cabo de rede ou através de ligação à rede Wi-Fi. Se não ligar o Cura por rede à impressora, poderá ainda assim utilizar uma unidade USB para transferir ficheiros g-code para a impressora.\n" +#~ "\n" +#~ "Selecione a sua impressora na lista em baixo:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Certifique-se de que é possível estabelecer ligação com a impressora:\n" +#~ "- Verifique se a impressora está ligada.\n" +#~ "- Verifique se a impressora está ligada à rede." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Ver só a base de construção ativa" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Dispor em todas as bases" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Dispor só na base ativa" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Permite guardar o resultado do seccionamento como um ficheiro X3G, para poder ser usado com impressoras 3D que usam este formato (Kalyan, Makerbot e outras impressoras baseadas no Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Lê ficheiros SVG como caminhos de ferramenta para efeitos de depuração dos movimentos da impressora." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Leitor de caminhos de ferramenta SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Lista das Alterações" @@ -5794,7 +5944,6 @@ msgstr "Leitor de Perfis Cura" #~ "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" #~ "- Get exclusive access to material profiles from leading brands" #~ msgstr "" - #~ "- Envie trabalhos de impressão para impressoras Ultimaker fora da sua rede local\n" #~ "- Guarde as definições do seu Ultimaker Cura na cloud para utilizar em qualquer lugar\n" #~ "- Obtenha acesso exclusivo a perfis de materiais de marcas de referência" @@ -5821,7 +5970,6 @@ msgstr "Leitor de Perfis Cura" #~ "\n" #~ "If your printer is not in the list, use the \"Custom FFF Printer\" from the \"Custom\" category and adjust the settings to match your printer in the next dialog." #~ msgstr "" - #~ "Selecione a impressora que deseja utilizar da lista abaixo.\n" #~ "\n" #~ "Se a sua impressora não constar da lista, utilize a opção \"Impressora FFF personalizada\" da categoria \"Personalizado\" e ajuste as definições para corresponder à sua impressora na próxima caixa de diálogo." @@ -6045,7 +6193,6 @@ msgstr "Leitor de Perfis Cura" #~ "Print Setup disabled\n" #~ "G-code files cannot be modified" #~ msgstr "" - #~ "Configuração da Impressão desativada\n" #~ "Os ficheiros G-code não podem ser modificados" @@ -6318,7 +6465,6 @@ msgstr "Leitor de Perfis Cura" #~ "Could not export using \"{}\" quality!\n" #~ "Felt back to \"{}\"." #~ msgstr "" - #~ "Não foi possível exportar utilizando a qualidade \"{}\"!\n" #~ "Foi revertido para \"{}\"." @@ -6495,7 +6641,6 @@ msgstr "Leitor de Perfis Cura" #~ "2) Turn the fan off (only if there are no tiny details on the model).\n" #~ "3) Use a different material." #~ msgstr "" - #~ "Alguns modelos poderão não ser impressos com a melhor qualidade devido ás dimensões do objecto e aos materiais escolhidos para os modelos: {model_names}.\n" #~ "Sugestões que poderão ser úteis para melhorar a qualidade da impressão dos modelos:\n" #~ "1) Utilize cantos arredondados.\n" @@ -6512,7 +6657,6 @@ msgstr "Leitor de Perfis Cura" #~ "\n" #~ "Thanks!" #~ msgstr "" - #~ "Não foram encontrados quaisquer modelos no seu desenho. Por favor verifique novamente o conteúdo do desenho e confirme que este inclui uma peça ou uma \"assembly\"?\n" #~ "\n" #~ "Obrigado!" @@ -6523,7 +6667,6 @@ msgstr "Leitor de Perfis Cura" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "Foram encontradas mais do que uma peça ou uma \"assembly\" no seu desenho. De momento só são suportados ficheiros com uma só peça ou só uma \"assembly\".\n" #~ "\n" #~ "As nossa desculpas!" @@ -6552,7 +6695,6 @@ msgstr "Leitor de Perfis Cura" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Caro Cliente,\n" #~ "Não foi possível encontrar uma instalação válida do SolidWorks no seu sistema. O que significa que o SolidWorks não está instalado ou não dispõe de uma licença válida. Por favor verifique se o próprio SolidWorks funciona sem qualquer problema e/ou contacte o seu ICT.\n" #~ "\n" @@ -6567,7 +6709,6 @@ msgstr "Leitor de Perfis Cura" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Caro cliente,\n" #~ "Está atualmente a executar este plug-in num sistema operativo que não o Windows. Este plug-in apenas funciona no Windows com o SolidWorks instalado e com uma licença válida. Instale este plug-in num computador com o Windows e com o SolidWorks instalado.\n" #~ "\n" @@ -6672,7 +6813,6 @@ msgstr "Leitor de Perfis Cura" #~ "Open the directory\n" #~ "with macro and icon" #~ msgstr "" - #~ "Abrir o diretório\n" #~ "com macro e ícone" diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index f62b25719f..accda6bab4 100644 --- a/resources/i18n/pt_PT/fdmextruder.def.json.po +++ b/resources/i18n/pt_PT/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-14 14:15+0100\n" "Last-Translator: Portuguese \n" "Language-Team: Paulo Miranda , Portuguese \n" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index f495125ff9..06f1795490 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-14 14:15+0100\n" -"Last-Translator: Portuguese \n" -"Language-Team: Paulo Miranda , Portuguese \n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0100\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Portuguese , Paulo Miranda , Portuguese \n" "Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "Comandos G-code a serem executados no início – separados por \n." +msgstr "" +"Comandos G-code a serem executados no início – separados por \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -70,7 +72,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "Comandos G-code a serem executados no fim – separados por \n." +msgstr "" +"Comandos G-code a serem executados no fim – separados por \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -338,8 +342,8 @@ msgstr "O tempo mínimo durante o qual um extrusor tem de estar inativo antes de #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" -msgstr "Variante de G-code" +msgid "G-code Flavor" +msgstr "Variante do G-code" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1330,13 +1334,14 @@ msgctxt "z_seam_corner label" msgid "Seam Corner Preference" msgstr "Preferência Canto Junta" -# rever! -# torna mais provável que esta surja num canto -# aconteça? surja? apareça? #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Controla se os cantos do contorno do modelo influenciam a posição da junta. Nenhum significa que os cantos não influenciam a posição da junta. Ocultar Junta faz com que seja mais provável que a junta surja num canto interior. Expor Junta faz com que seja mais provável que a junta aconteça num canto exterior. Ocultar ou Expor Junta faz com que seja mais provável que a junta aconteça num canto interior ou exterior." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Controla se os cantos do contorno do modelo influenciam a posição da junta. Nenhum significa que os cantos não influenciam a posição da" +" junta. Ocultar Junta faz com que seja mais provável que a junta surja num canto interior. Expor Junta faz com que seja" +" mais provável que a junta aconteça num canto exterior. Ocultar ou Expor Junta faz com que seja mais provável que a junta aconteça num" +" canto interior ou exterior. Ocultação Inteligente permite os cantos interiores e exteriores, mas opta pelos cantos interiores com mais" +" frequência, se apropriado." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1364,6 +1369,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Ocultar ou Expor Junta" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Ocultação Inteligente" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1374,17 +1384,17 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Quando ativado, as coordenadas da junta-Z são relativas ao centro de cada peça. Quando desativado, as coordenadas definem uma posição absoluta na base de construção." -# rever! -# gaps? Espaços? intervalos? folgas? #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Ignorar Pequenos Espaços Z" +msgid "No Skin in Z Gaps" +msgstr "Sem Revestimento nos Espaços Z" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Quando o modelo tem pequenos espaços verticais, cerca de mais 5% de tempo de cálculo pode ser despendido na criação das superfícies de revestimentos superior e inferior nestes pequenos espaços. Nesse caso desative esta definição." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Quando o modelo tem pequenos espaços verticais de apenas algumas camadas, deverá normalmente existir revestimento à volta dessas camadas no espaço estreito." +" Ative esta definição para não gerar revestimento se o espaço vertical for muito pequeno. Isto melhora o tempo de impressão e o tempo de seccionamento," +" mas deixa tecnicamente o enchimento exposto ao ar." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1695,7 +1705,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Adicionar paredes adicionais em torno da área de enchimento. Essas paredes podem fazer com que as linhas de revestimento superiores/inferiores desçam menos, o que significa que são necessárias menos camadas de revestimento superior/inferior para a mesma qualidade à custa de algum material adicional.\nEsta funcionalidade pode ser combinada com a opção Ligar polígonos de enchimento para unir todo o enchimento num único caminho de extrusão sem necessidade de deslocações ou retrações, se configurado corretamente." +msgstr "" +"Adicionar paredes adicionais em torno da área de enchimento. Essas paredes podem fazer com que as linhas de revestimento superiores/inferiores desçam menos, o que significa que são necessárias menos camadas de revestimento superior/inferior para a mesma qualidade à custa de algum material adicional.\n" +"Esta funcionalidade pode ser combinada com a opção Ligar polígonos de enchimento para unir todo o enchimento num único caminho de extrusão sem necessidade de deslocações ou retrações, se configurado corretamente." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1939,8 +1951,8 @@ msgstr "Temperatura do volume de construção" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "A temperatura utilizada para o volume de construção. Se for 0, a temperatura do volume de construção não será ajustada." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "A temperatura do ambiente para a impressão. Se este valor for 0, a temperatura do volume de construção não será ajustada." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -2052,6 +2064,87 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Proporção de Contração em percentagem." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Material Cristalino" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Este tipo de material é daquele que se separa de forma regular quando aquecido (cristalino) ou daquele que cria longas cadeias de polímero entrelaçado" +" (não cristalino)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Posição Retraída Antiescorrimento" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "A distância a que o material tem de ser retraído antes de parar o escorrimento." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Velocidade de Retração Antiescorrimento" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "A velocidade a que o material tem de ser retraído durante uma substituição de filamentos para evitar o escorrimento." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Posição Retraída de Preparação da Separação" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "A distância a que o filamento pode ser esticado antes de se separar, enquanto é aquecido." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Velocidade de Retração de Preparação da Separação" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "A velocidade a que o filamento tem de ser retraído imediatamente antes de se separar numa retração." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Posição Retraída de Separação" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "A distância de retração do filamento para separá-lo de forma regular." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Velocidade de Retração de Separação" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "A velocidade de retração do filamento para separá-lo de forma regular." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Temperatura de Separação" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "A temperatura a que o filamento se quebra para uma separação regular." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -2062,6 +2155,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Compensação de fluxo: a quantidade de material extrudido é multiplicada por este valor." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Fluxo da Parede" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Compensação de fluxo nas linhas de parede." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Fluxo de Parede Exterior" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Compensação de fluxo na linha de parede exterior." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Parede de Parede(s) Interior(es)" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "A compensação de fluxo nas linhas de parede para todas as linhas de parede exceto a mais exterior." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Fluxo Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Compensação de fluxo nas linhas superiores/inferiores." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Fluxo de Revestimento da Superfície Superior" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Compensação de fluxo nas linhas das áreas na parte superior da impressora." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Fluxo de Enchimento" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Compensação de fluxo nas linhas de enchimento." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Fluxo de Contorno/Aba" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Compensação de fluxo nas linhas de contorno ou abas." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Fluxo de Suporte" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Compensação de fluxo nas linhas das estruturas de suporte." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Fluxo da Interface do Suporte" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Compensação de fluxo nas linhas de suporte do teto ou do chão." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Fluxo do Teto do Suporte" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Compensação de fluxo nas linhas do teto do suporte." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Fluxo do Chão do Suporte" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Compensação de fluxo nas linhas do chão do suporte." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Fluxo da torre de preparação" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Compensação de fluxo nas linhas da torre de preparação." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2190,8 +2403,9 @@ msgstr "Limitar Retrações de Suportes" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Eliminar a retração quando o movimento de suporte para suporte é em linha recta. Ativar esta definição reduz o tempo de impressão, mas pode levar a que aja um excessivo numero de fios nas estruturas de suporte." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Eliminar a retração quando o movimento de suporte para suporte é em linha reta. Ativar esta definição reduz o tempo de impressão, mas pode levar a que" +" aja um excessivo numero de fios nas estruturas de suporte." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2245,6 +2459,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "A velocidade a que o filamento é empurrado após uma retração de substituição do nozzle." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Quantidade de Preparação Extra de Substituição do Nozzle" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Material extra a preparar após a substituição do nozzle." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2450,15 +2674,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "A velocidade a que o contorno e a aba são impressos. Geralmente, isto é efetuado à velocidade de camada inicial, mas, por vezes, pode preferir imprimir o contorno ou a aba a uma velocidade diferente." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Velocidade Z máxima" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Velocidade do Salto Z" -# a que a base de construção é movida. Defini-la como zero #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "A velocidade máxima do movimento da base de construção. Definir esta como zero faz com que a impressão utilize as predefinições de firmware para a velocidade Z máxima." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "A velocidade a que o movimento Z vertical é efetuado para Saltos Z. Este valor é geralmente inferior à velocidade de impressão, uma vez que é mais difícil" +" mover a base de construção ou o pórtico da máquina." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3410,12 +3634,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Distância entre as linhas da estrutura de suporte da camada inicial impressas. Esta definição é calculada pela densidade do suporte." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Direção da linha de enchimento do suporte" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Orientação do padrão de enchimento para suportes. O padrão de enchimento do suporte gira no plano horizontal." @@ -3546,8 +3770,9 @@ msgstr "Distância da junção do suporte" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "A distância máxima entre as estruturas de suporte nas direções X/Y. Quando a distância entre as estruturas de suporte for menor do que este valor, as estruturas fundem-se numa só." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "A distância máxima entre as estruturas de suporte nas direções X/Y. Quando a distância entre as estruturas de suporte for menor do que este valor, as estruturas" +" fundem-se numa só." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3928,14 +4153,14 @@ msgid "The diameter of a special tower." msgstr "O diâmetro de uma torre especial." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Diâmetro mínimo" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Diâmetro Máximo Suportado pela Torre" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "O diâmetro mínimo nas direções X/Y de uma pequena área que deverá ser suportada por uma torre de suporte especializada." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "O diâmetro máximo nas direções X/Y de uma pequena área que deverá ser suportada por uma torre de suporte especializada." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4060,7 +4285,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "A distância horizontal entre o contorno e o perímetro exterior da primeira camada da impressão.\nEsta é a distância mínima. Linhas múltiplas de contorno serão impressas para o exterior." +msgstr "" +"A distância horizontal entre o contorno e o perímetro exterior da primeira camada da impressão.\n" +"Esta é a distância mínima. Linhas múltiplas de contorno serão impressas para o exterior." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4433,16 +4660,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Imprime uma torre próxima da impressão que prepara o material depois de cada substituição do nozzle." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Torre de preparação circular" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Faça a torre de preparação como uma forma circular." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4483,16 +4700,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "A coordenada Y da posição da torre de preparação." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Fluxo da torre de preparação" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Compensação de fluxo: a quantidade de material extrudido é multiplicada por este valor." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4820,8 +5027,9 @@ msgstr "\"Spiralize\" Suavizar Contornos" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Suaviza os contornos, criados pelo \"Spiralize\", para reduzir a visibilidade da junta Z (a junta Z deve ser praticamente imperceptível na impressão, mas continuará a ser visível na visualização por camadas). Ter em conta que a suavização tenderá a reduzir/desfocar pequenos detalhes da superfície." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Suaviza os contornos, criados pelo \"Spiralize\", para reduzir a visibilidade da junta Z (a junta Z deve ser praticamente impercetível na impressão, mas" +" continuará a ser visível na visualização por camadas). Tenha em conta que a suavização tenderá a reduzir/desfocar pequenos detalhes da superfície." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5336,8 +5544,8 @@ msgstr "Ativar suporte cónico" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Funcionalidade experimental: torna as áreas de suporte mais reduzidas na parte inferior do que na saliência." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Torna as áreas de suporte mais reduzidas na parte inferior do que na saliência." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5569,7 +5777,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "A distância de um movimento ascendente que é extrudido a metade da velocidade.\nIsto pode causar melhor aderência às camadas anteriores, sendo que o material nessas camadas não é demasiado aquecido. Aplica-se apenas à impressão de fios." +msgstr "" +"A distância de um movimento ascendente que é extrudido a metade da velocidade.\n" +"Isto pode causar melhor aderência às camadas anteriores, sendo que o material nessas camadas não é demasiado aquecido. Aplica-se apenas à impressão de fios." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -6136,6 +6346,76 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo quando abrir o ficheiro." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Variante de G-code" + +# rever! +# torna mais provável que esta surja num canto +# aconteça? surja? apareça? +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Controla se os cantos do contorno do modelo influenciam a posição da junta. Nenhum significa que os cantos não influenciam a posição da junta. Ocultar Junta faz com que seja mais provável que a junta surja num canto interior. Expor Junta faz com que seja mais provável que a junta aconteça num canto exterior. Ocultar ou Expor Junta faz com que seja mais provável que a junta aconteça num canto interior ou exterior." + +# rever! +# gaps? Espaços? intervalos? folgas? +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Ignorar Pequenos Espaços Z" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Quando o modelo tem pequenos espaços verticais, cerca de mais 5% de tempo de cálculo pode ser despendido na criação das superfícies de revestimentos superior e inferior nestes pequenos espaços. Nesse caso desative esta definição." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "A temperatura utilizada para o volume de construção. Se for 0, a temperatura do volume de construção não será ajustada." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Eliminar a retração quando o movimento de suporte para suporte é em linha recta. Ativar esta definição reduz o tempo de impressão, mas pode levar a que aja um excessivo numero de fios nas estruturas de suporte." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Velocidade Z máxima" + +# a que a base de construção é movida. Defini-la como zero +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "A velocidade máxima do movimento da base de construção. Definir esta como zero faz com que a impressão utilize as predefinições de firmware para a velocidade Z máxima." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "A distância máxima entre as estruturas de suporte nas direções X/Y. Quando a distância entre as estruturas de suporte for menor do que este valor, as estruturas fundem-se numa só." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Diâmetro mínimo" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "O diâmetro mínimo nas direções X/Y de uma pequena área que deverá ser suportada por uma torre de suporte especializada." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Torre de preparação circular" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Faça a torre de preparação como uma forma circular." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Compensação de fluxo: a quantidade de material extrudido é multiplicada por este valor." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Suaviza os contornos, criados pelo \"Spiralize\", para reduzir a visibilidade da junta Z (a junta Z deve ser praticamente imperceptível na impressão, mas continuará a ser visível na visualização por camadas). Ter em conta que a suavização tenderá a reduzir/desfocar pequenos detalhes da superfície." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Funcionalidade experimental: torna as áreas de suporte mais reduzidas na parte inferior do que na saliência." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "O numero de Extrusores que estão activos" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 6769a02211..481960a783 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-28 09:52+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Ruslan Popov , Russian \n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Russian , Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Профиль был нормализован и активирован." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "Файл AMF" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Выполняется печать через USB, закрытие Cura остановит эту печать. Вы уверены?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "Файл X3G" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "Файл X3g" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "Файл X3G" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "Невозможно сохранить на внешний носите #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Ошибка" @@ -230,8 +234,8 @@ msgstr "Извлекает внешний носитель {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Внимание" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Есть несовпадение между конфигурацией или калибровкой принтера и Cura. Для лучшего результата, всегда производите слайсинг для PrintCore и материала, которые установлены в вашем принтере." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Отправка новых заданий (временно) заблокирована, идёт отправка предыдущего задания." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Отправка данных на принтер" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Отправка данных" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "Отмена" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Подключен по сети" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Задание печати успешно отправлено на принтер." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Данные отправлены" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Просмотр на мониторе" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name} завершил печать '{job_name}'." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "Задание печати '{job_name}' выполнено." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Печать завершена" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Пусто" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Неизвестн" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Печать через облако" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Печать через облако" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Подключено через облако" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Ошибка облака" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Облако не экспортировало задание печати." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Облако не залило данные на принтер." @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Заливка через облако Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Отправляйте и отслеживайте задания печати из любого места с помощью вашей учетной записи Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Подключиться к облаку Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Не спрашивать меня снова для этого принтера." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Приступить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Теперь вы можете отправлять и отслеживать задания печати из любого места с помощью вашей учетной записи Ultimaker." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Подключено!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Проверьте свое подключение" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Подключиться через сеть" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Руководство по параметрам Cura" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -766,18 +765,18 @@ msgid "3MF File" msgstr "Файл 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Сопло" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Файл проекта {0} содержит неизвестный тип принтера {1}. Не удалось импортировать принтер. Вместо этого будут импортированы модели." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Открыть файл проекта" @@ -909,13 +908,13 @@ msgid "Not supported" msgstr "Не поддерживается" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Файл уже существует" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -927,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Неправильный URL-адрес файла:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Настройки изменены в соответствии с текущей доступностью экструдеров: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Настройки изменены в соответствии с текущей доступностью экструдеров:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Настройки обновлены" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Экструдер (-ы) отключен (-ы)" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Невозможно экспортировать профиль в {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Невозможно экспортировать профиль в {0}: Плагин записи уведомил об ошибке." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Экспортирование профиля в {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Экспорт успешно завершен" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "Не удалось импортировать профиль из {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Невозможно импортировать профиль из {0}, пока не добавлен принтер." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "Отсутствует собственный профиль для импорта в файл {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Не удалось импортировать профиль из {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Данный профиль {0} содержит неверные данные, поэтому его невозможно импортировать." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "Принтер, заданный в профиле {0} ({1}), не совпадает с вашим текущим принтером ({2}), поэтому его невозможно импортировать." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "Не удалось импортировать профиль из {0}:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Успешно импортирован профиль {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "В файле {0} нет подходящих профилей." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Профиль {0} имеет неизвестный тип файла или повреждён." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Собственный профиль" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "У профайла отсутствует тип качества." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1115,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Следующий" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1126,7 +1124,7 @@ msgstr "Группа #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1134,7 +1132,7 @@ msgstr "Закрыть" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Добавить" @@ -1155,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Все файлы (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Неизвестно" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Перечисленные ниже принтеры невозможно подключить, поскольку они входят в состав группы" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Доступные сетевые принтеры" @@ -1184,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Своё" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "Высота печатаемого объёма была уменьшена до значения параметра \"Последовательность печати\", чтобы предотвратить касание портала за напечатанные детали." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Объём печати" @@ -1395,48 +1393,48 @@ msgstr "Журналы" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Описание пользователя" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Пользовательское описание (примечание: по возможности пишите на английском языке, так как разработчики могут не знать вашего языка)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Отправить отчёт" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Загрузка принтеров..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Настройка сцены..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Загрузка интерфейса..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f мм" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Только один G-code файла может быть загружен в момент времени. Пропускаю импортирование {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Невозможно открыть любой другой файл, если G-code файл уже загружен. Пропускаю импортирование {0}" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Выбранная модель слишком мала для загрузки." @@ -1446,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Параметры принтера" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Ширина)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "мм" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Глубина)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Высота)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Форма стола" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Начало координат в центре" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Нагреваемый стол" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "Вариант G-кода" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Параметры головы" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X минимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y минимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X максимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y максимум" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Высота портала" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Количество экструдеров" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "Стартовый G-код" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "Завершающий G-код" @@ -1567,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Смещение сопла по оси X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Смещение сопла по оси Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Номер охлаждающего вентилятора" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Стартовый G-код экструдера" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Завершающий G-код экструдера" @@ -1593,7 +1591,7 @@ msgid "Install" msgstr "Установить" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Установлено" @@ -1616,8 +1614,8 @@ msgstr "Плагины" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Материалы" @@ -1627,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Ваша оценка" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Версия" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Последнее обновление" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Автор" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "Загрузки" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Для выполнения установки или обновления необходимо войти" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Приобретение катушек с материалом" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Обновить" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Обновление" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1922,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Обновление прошивки не удалось из-за её отсутствия." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Стекло" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Указанные опции недоступны, поскольку вы отслеживаете облачный принтер." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Для удаленного управления очередью необходимо обновить программное обеспечение принтера." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Веб-камера недоступна, поскольку вы отслеживаете облачный принтер." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Загрузка..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Недоступен" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Недостижимо" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Простой" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Без имени" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Анонимн" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Необходимо внести изменения конфигурации" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Подробности" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Недоступный принтер" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "Первое доступное" @@ -1994,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "Запланировано" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Перейти к Cura Connect" +msgid "Manage in browser" +msgstr "Управление через браузер" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "В очереди нет заданий печати. Выполните нарезку и отправьте задание." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Задания печати" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Общее время печати" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Ожидание" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Все задания печати выполнены." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Просмотреть архив печати" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2041,14 +2034,14 @@ msgstr "Подключение к сетевому принтеру" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"Для печати на вашем принтере через сеть, пожалуйста, удостоверьтесь, что ваш принтер подключен к сети с помощью кабеля или через WiFi. Если вы не подключили Cura к вашему принтеру, вы по-прежнему можете использовать USB флешку для переноса G-Code файлов на ваш принтер.\n" -"\n" -"Укажите ваш принтер в списке ниже:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Для печати непосредственно на принтере через сеть необходимо подключить принтер к сети с помощью сетевого кабеля или подключить его к сети Wi-Fi. Если" +" вы не подключили Cura к принтеру, вы можете использовать USB-накопитель для переноса файлов G-Code на принтер." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Выберите свой принтер из приведенного ниже списка:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2056,9 +2049,9 @@ msgid "Edit" msgstr "Правка" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Удалить" @@ -2141,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Прервано" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Завершено" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Подготовка..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "Прерывается..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Приостановка..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Приостановлено" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Возобновляется..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Необходимое действие" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "Завершение %1 в %2" @@ -2288,7 +2281,7 @@ msgctxt "@action:button" msgid "Override" msgstr "Переопределить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" @@ -2296,37 +2289,37 @@ msgstr[0] "Для назначенного принтера %1 требуетс msgstr[1] "Для назначенного принтера %1 требуются следующие изменения конфигурации:" msgstr[2] "Для назначенного принтера %1 требуются следующие изменения конфигурации:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "Принтер %1 назначен, однако в задании указана неизвестная конфигурация материала." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "Изменить материал %1 с %2 на %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "Загрузите %3 как материал %1 (переопределение этого действия невозможно)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "Изменить экструдер %1 с %2 на %3." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Заменить рабочий стол на %1 (переопределение этого действия невозможно)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "При переопределении к имеющейся конфигурации принтера будут применены указанные настройки. Это может привести к ошибке печати." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Алюминий" @@ -2336,7 +2329,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Подключение к принтеру" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Руководство по параметрам Cura" @@ -2346,11 +2339,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "" -"Проверьте наличие подключения к принтеру:\n" -"- Убедитесь, что принтер включен.\n" -"- Проверьте, подключен ли принтер к сети." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Проверьте наличие подключения к принтеру:\n- Убедитесь, что принтер включен.\n- Убедитесь, что принтер подключен к сети.\n- Убедитесь, что вы вошли в систему" +" (это необходимо для поиска принтеров, подключенных к облаку)." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2662,7 +2654,7 @@ msgid "Printer Group" msgstr "Группа принтеров" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Параметры профиля" @@ -2675,19 +2667,19 @@ msgstr "Как следует решать конфликт в профиле?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "Название" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Вне профиля" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2861,18 +2853,24 @@ msgid "Previous" msgstr "Предыдущий" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Экспорт" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "Кончик" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Универсальные" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Пробная печать" @@ -2977,170 +2975,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Вы уверены, что желаете прервать печать?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Информация" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Подтвердить изменение диаметра" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Установлен новый диаметр пластиковой нити %1 мм. Это значение несовместимо с текущим экструдером. Продолжить?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Отображаемое имя" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Брэнд" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Тип материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Цвет" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Свойства" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Плотность" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Диаметр" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Стоимость материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Вес материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Длина материала" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Стоимость метра" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Данный материал привязан к %1 и имеет ряд его свойств." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Отвязать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Описание" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Информация об адгезии" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Параметры печати" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Активировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Создать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Дублировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "Импорт" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Принтер" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Подтвердите удаление" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Вы уверены, что желаете удалить %1? Это нельзя будет отменить!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Импортировать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Не могу импортировать материал %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Успешно импортированный материал %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Экспортировать материал" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Не могу экспортировать материал %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Материал успешно экспортирован в %1" @@ -3181,383 +3179,406 @@ msgid "Unit" msgstr "Единица" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Общее" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Интерфейс" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Язык:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Валюта:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Тема:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Для применения данных изменений вам потребуется перезапустить приложение." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Нарезать автоматически при изменении настроек." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Нарезать автоматически" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Поведение окна" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Подсвечивать красным области модели, требующие поддержек. Без поддержек эти области не будут напечатаны правильно." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Отобразить нависания" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Перемещать камеру так, чтобы выбранная модель помещалась в центр экрана" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Центрировать камеру на выбранном объекте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Следует ли инвертировать стандартный способ увеличения в Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Инвертировать направление увеличения камеры." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Увеличивать по мере движения мышкой?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "В ортогональной проекции изменение масштаба мышью не поддерживается." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Увеличивать по движению мышки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Следует ли размещать модели на столе так, чтобы они больше не пересекались?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Удостовериться, что модели размещены рядом" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Следует ли опустить модели на стол?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Автоматически опускать модели на стол" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Показывать предупреждающее сообщение в средстве считывания G-кода." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Предупреждающее сообщение в средстве считывания G-кода" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Должен ли слой быть переведён в режим совместимости?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Просматривать слои в режиме совместимости (требуется перезапуск)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Рендеринг камеры какого типа следует использовать?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Рендеринг камеры: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Перспективная" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ортогональная" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Открытие и сохранение файлов" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Масштабировать ли модели для размещения внутри печатаемого объёма, если они не влезают в него?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Масштабировать большие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Модель может показаться очень маленькой, если её размерность задана в метрах, а не миллиметрах. Следует ли масштабировать такие модели?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Масштабировать очень маленькие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Выбрать модели после их загрузки?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Выбрать модели при загрузке" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Надо ли автоматически добавлять префикс, основанный на имени принтера, к названию задачи на печать?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Добавить префикс принтера к имени задачи" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Показывать сводку при сохранении файла проекта?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Показывать сводку при сохранении проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Стандартное поведение при открытии файла проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Стандартное поведение при открытии файла проекта: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Всегда открывать как проект" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Всегда импортировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "При внесении изменений в профиль и переключении на другой, будет показан диалог, запрашивающий ваше решение о сохранении ваших изменений, или вы можете указать стандартное поведение и не показывать такой диалог." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Поведение по умолчанию для измененных значений настройки при переключении на другой профиль: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Всегда сбрасывать измененные настройки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Всегда передавать измененные настройки новому профилю" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Приватность" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Должна ли Cura проверять обновления программы при старте?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Проверять обновления при старте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Можно ли отправлять анонимную информацию о вашей печати в Ultimaker? Следует отметить, что ни модели, ни IP-адреса и никакая другая персональная информация не будет отправлена или сохранена." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Отправлять (анонимно) информацию о печати" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Дополнительная информация" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Экспериментальное" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Использовать функционал нескольких рабочих столов" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Использовать функционал нескольких рабочих столов (требуется перезапуск)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Принтеры" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Переименовать" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Создать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Дублировать" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Создать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Укажите имя для данного профиля." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Скопировать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Переименовать профиль" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Импорт профиля" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Экспорт профиля" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Принтер: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Профили по умолчанию" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Собственные профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Данный профиль использует настройки принтера по умолчанию, поэтому список ниже пуст." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ваши текущие параметры совпадают с выбранным профилем." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Общие параметры" @@ -3625,33 +3646,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "параметры поиска" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Скопировать значение для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Копировать все измененные значения для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Спрятать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Не показывать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Оставить этот параметр видимым" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Видимость параметров..." @@ -3667,32 +3688,32 @@ msgstr "" "\n" "Щёлкните, чтобы сделать эти параметры видимыми." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Этот параметр не используется, поскольку все параметры, на которые он влияет, переопределяются." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Влияет на" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Зависит от" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Данная настройка всегда используется совместно всеми экструдерами. Изменение данного значения приведет к изменению значения для всех экструдеров." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Значение получается из параметров каждого экструдера " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3703,7 +3724,7 @@ msgstr "" "\n" "Щёлкните для восстановления значения из профиля." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3719,7 +3740,7 @@ msgctxt "@button" msgid "Recommended" msgstr "Рекомендован" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Свое" @@ -3744,12 +3765,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Генерация структур для поддержки нависающих частей модели. Без этих структур такие части будут складываться во время печати." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Прилипание" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Разрешает печать каймы или подложки. Это добавляет плоскую область вокруг или под вашим объектом, которую легко удалить после печати." @@ -3835,7 +3856,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "Отправить G-код" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Отправить свою команду в G-коде подключенному принтеру. Нажмите Enter (Ввод) для отправки команды." @@ -3932,11 +3953,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Избранные" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Универсальные" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3987,7 +4003,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Положение камеры" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Вид камеры" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Перспективная" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ортографическая" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Рабочий стол" @@ -4108,22 +4139,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Открыть недавние" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Идёт печать" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "Имя задачи" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Время печати" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Осталось примерно" @@ -4133,6 +4164,11 @@ msgctxt "@label" msgid "View type" msgstr "Просмотр типа" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Список объектов" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4184,32 +4220,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Оценка расходов недоступна" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Предварительный просмотр" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Нарезка на слои..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Невозможно нарезать" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "Обработка" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Нарезка на слои" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Запустить нарезку на слои" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "Отмена" @@ -4244,127 +4285,132 @@ msgctxt "@label" msgid "Preset printers" msgstr "Предварительно настроенные принтеры" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Добавить принтер" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Управление принтерами" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Показать онлайн-руководство по решению проблем" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Полный экран" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Выйти из полноэкранного режима" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Отмена" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Возврат" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Выход" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Трехмерный вид" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Вид спереди" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Вид сверху" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Вид слева" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Вид справа" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Настроить Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "Добавить принтер..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Управление принтерами..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Управление материалами..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Создать профиль из текущих параметров..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Управление профилями..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Показать онлайн документацию" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Отправить отчёт об ошибке" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Что нового" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "О Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" @@ -4372,7 +4418,7 @@ msgstr[0] "Удалить выбранную модель" msgstr[1] "Удалить выбранные модели" msgstr[2] "Удалить выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" @@ -4380,7 +4426,7 @@ msgstr[0] "Центрировать выбранную модель" msgstr[1] "Центрировать выбранные модели" msgstr[2] "Центрировать выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" @@ -4388,92 +4434,92 @@ msgstr[0] "Размножить выбранную модель" msgstr[1] "Размножить выбранные модели" msgstr[2] "Размножить выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Удалить модель" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Поместить модель по центру" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Сгруппировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Разгруппировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Объединить модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Дублировать модель..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Выбрать все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Очистить стол" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Перезагрузить все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Выровнять все модели по всем рабочим столам" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Выровнять все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Выровнять выбранные" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Сбросить позиции всех моделей" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Сбросить преобразования всех моделей" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Открыть файл(ы)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "Новый проект..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Показать конфигурационный каталог" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Магазин" @@ -4488,49 +4534,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Этот пакет будет установлен после перезапуска." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Параметры" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Закрытие Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Вы уверены, что хотите выйти из Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Открыть файл(ы)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Установить пакет" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Открыть файл(ы)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Среди выбранных файлов мы нашли несколько файлов с G-кодом. Вы можете открыть только один файл за раз. Измените свой выбор, пожалуйста." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Добавление принтера" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Что нового" @@ -4756,32 +4802,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Сохранить проект" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Рабочий стол" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Экструдер %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 и материал" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Материал" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Больше не показывать сводку по проекту" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Сохранить" @@ -4957,12 +5003,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Поиск и устранение неисправностей" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Имя принтера" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Присвойте имя принтеру" @@ -5021,21 +5067,6 @@ msgctxt "@button" msgid "Get started" msgstr "Приступить" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Показывать только текущий рабочий стол" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Выровнять для всех рабочих столов" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Выровнять текущий рабочий стол" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5126,6 +5157,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Нормализатор профиля" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "Обеспечивает поддержку чтения файлов AMF." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "Средство чтения AMF" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5136,16 +5177,6 @@ msgctxt "name" msgid "USB printing" msgstr "Печать через USB" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Разрешить сохранение результирующего слоя в формате X3G для поддержки принтеров, считывающих этот формат (Malyan, Makerbot и другие принтеры на базе Sailfish)." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5396,6 +5427,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "Обновление версии 3.0 до 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Обновляет конфигурации Cura 4.1 до Cura 4.2." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Обновление версии 4.1 до 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5466,16 +5507,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "Чтение 3MF" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Считывает файлы SVG как пути инструментов для отладки движений принтера." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "Средство считывания путей инструментов SVG" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5566,6 +5597,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Чтение профиля Cura" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Руководство по параметрам Cura" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Настройки изменены в соответствии с текущей доступностью экструдеров: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Описание пользователя" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Указанные опции недоступны, поскольку вы отслеживаете облачный принтер." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Перейти к Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Все задания печати выполнены." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Просмотреть архив печати" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Для печати на вашем принтере через сеть, пожалуйста, удостоверьтесь, что ваш принтер подключен к сети с помощью кабеля или через WiFi. Если вы не подключили Cura к вашему принтеру, вы по-прежнему можете использовать USB флешку для переноса G-Code файлов на ваш принтер.\n" +#~ "\n" +#~ "Укажите ваш принтер в списке ниже:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Проверьте наличие подключения к принтеру:\n" +#~ "- Убедитесь, что принтер включен.\n" +#~ "- Проверьте, подключен ли принтер к сети." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Показывать только текущий рабочий стол" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Выровнять для всех рабочих столов" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Выровнять текущий рабочий стол" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Разрешить сохранение результирующего слоя в формате X3G для поддержки принтеров, считывающих этот формат (Malyan, Makerbot и другие принтеры на базе Sailfish)." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Считывает файлы SVG как пути инструментов для отладки движений принтера." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "Средство считывания путей инструментов SVG" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Журнал изменений" diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index 23df03f728..89d234c483 100644 --- a/resources/i18n/ru_RU/fdmextruder.def.json.po +++ b/resources/i18n/ru_RU/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 510f400c86..eabadf6069 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Ruslan Popov , Russian \n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Russian , Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "Команды в G-коде, которые будут выполнены в самом начале, разделенные с помощью \n." +msgstr "" +"Команды в G-коде, которые будут выполнены в самом начале, разделенные с помощью \n" +"." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -70,7 +72,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "Команды в G-коде, которые будут выполнены в самом конце, разделенные с помощью \n." +msgstr "" +"Команды в G-коде, которые будут выполнены в самом конце, разделенные с помощью \n" +"." #: fdmprinter.def.json msgctxt "material_guid label" @@ -334,7 +338,7 @@ msgstr "Минимальное время, которое экструдер д #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "Вариант G-кода" #: fdmprinter.def.json @@ -1294,8 +1298,10 @@ msgstr "Настройки угла шва" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Управляет влиянием углов на контуре модели на позицию шва. Нет означает отсутствие влияния. Спрятать шов означает по возможности перенести шов внутрь угла. Показать шов означает по возможности перенести шов наружу. Спрятать или показать означает выбор по ситуации." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Управляет влиянием углов на контуре модели на позицию шва. «Нет» означает отсутствие влияния. «Спрятать шов» означает размещение шва с наибольшей вероятностью" +" внутри угла. «Показать шов» означает размещение шва с наибольшей вероятностью снаружи угла. «Спрятать или показать» означает выбор варианта в зависимости" +" от ситуации. Функция «Интеллектуальное скрытие» допускает размещение швов как внутри, так и снаружи углов, но чаще размещает их внутри." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1317,6 +1323,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Спрятать или показать" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Интеллектуальное скрытие" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1329,13 +1340,15 @@ msgstr "Когда включено, координаты Z шва привяз #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Игнорирование Z зазоров" +msgid "No Skin in Z Gaps" +msgstr "Нет оболочки в Z-зазорах" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Когда модель имеет небольшие вертикальные зазоры, около 5% дополнительного времени будет потрачено на вычисления верхних и нижних оболочек в этих узких пространствах. В этом случае, отключите данный параметр." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Если у модели имеются небольшие вертикальные зазоры, состоящие всего из нескольких слоев, вокруг этих слоев в узком пространстве, как правило, присутствует" +" оболочка. Выбор данного параметра предотвратит создание оболочки в ситуациях, когда вертикальные зазоры очень маленькие. Это позволит сократить время" +" печати и нарезки, но с технической точки зрения область заполнения останется открытой." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1632,7 +1645,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Добавление дополнительных стенок вокруг области заполнения. Эти стенки могут уменьшить провисание верхних/нижних линий оболочки, что уменьшает необходимое количество верхних/нижних слоев оболочки без ухудшения качества за счет небольшого увеличения количества материала.\nЭта функция может сочетаться с соединением полигонов заполнения для соединения всего участка заполнения в один путь экструзии без необходимости в движениях или откатах в случае правильной настройки." +msgstr "" +"Добавление дополнительных стенок вокруг области заполнения. Эти стенки могут уменьшить провисание верхних/нижних линий оболочки, что уменьшает необходимое количество верхних/нижних слоев оболочки без ухудшения качества за счет небольшого увеличения количества материала.\n" +"Эта функция может сочетаться с соединением полигонов заполнения для соединения всего участка заполнения в один путь экструзии без необходимости в движениях или откатах в случае правильной настройки." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1871,8 +1886,8 @@ msgstr "Температура для объема печати" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "Температура, используемая для объема печати. Если значение равно 0, температура для объема печати не будет регулироваться." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "Температура среды печати. Если это значение равно 0, температура для объема печати не будет регулироваться." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1984,6 +1999,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Коэффициент усадки в процентах." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Кристаллический материал" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Это материал, который при нагревании легко ломается по четким линиям (кристаллический) или образует длинные сплетающиеся полимерные цепочки (некристаллический)?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Положение отката для защиты от капель" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Насколько далеко необходимо убрать материал, чтобы он перестал капать." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Скорость отката для защиты от капель" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Насколько быстро необходимо убрать материал во время его замены, чтобы не допустить появления капель." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Положение отката для подготовки к отламыванию" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Насколько сильно можно растянуть материал при нагревании, до тех пор пока он не отломится." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Скорость отката для подготовки к отламыванию" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Насколько быстро следует убирать материал, чтобы он отломился." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Положение отката для отламывания" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Насколько далеко следует убрать материал, чтобы он отломился чисто." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Скорость отката для отламывания" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "Скорость, при которой убираемый материал отломится чисто." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Температура отламывания" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "Температура, при которой материал отломится чисто." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1994,6 +2089,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Компенсация потока: объём выдавленного материала умножается на этот коэффициент." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Поток для стенки" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Компенсация потока на линиях стенки." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Поток для внешней стенки" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "Компенсация потока на внешней линии стенки." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "Поток для внутренних стенок" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "Компенсация потока на линиях стенки для всех линий, за исключением внешней." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Поток для верхних/нижних линий" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Компенсация потока на верхних/нижних линиях." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Поток для верхней оболочки" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Компенсация потока на линиях наверху печатаемой детали." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Поток для заполнения" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Компенсация потока на линиях заполнения." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Поток для юбки/каймы" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Компенсация потока на линиях юбки или каймы." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Поток для поддержек" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Компенсация потока на линиях структуры поддержек." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Поток для связующего слоя поддержек" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Компенсация потока на линиях крыши или низа поддержек." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Поток для крыши поддержек" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Компенсация потока на линиях крыши поддержек." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Поток для низа поддержек" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Компенсация потока на линиях низа поддержек." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "Поток черновой башни" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Компенсация потока на линиях черновой башни." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2111,8 +2326,9 @@ msgstr "Ограничить откаты поддержки" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Избежание отката при перемещении от поддержки к поддержке по прямой. Активация этой настройки сокращает время печати, однако может привести к излишней строчности в поддерживающей структуре." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Пропустить откат при переходе от поддержки к поддержке по прямой линии. Включение этого параметра обеспечивает экономию времени печати, но может привести" +" к чрезмерной строчности структуры поддержек." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2164,6 +2380,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Скорость, с которой материал будет возвращён обратно при смене экструдера." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Дополнительно заполняемый объем при смене экструдера" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Дополнительный объем материала для заполнения после смены экструдера." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2355,14 +2581,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Скорость, на которой происходит печать юбки и каймы. Обычно, их печать происходит на скорости печати первого слоя, но иногда вам может потребоваться печатать юбку или кайму на другой скорости." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Максимальная скорость по оси Z" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Скорость поднятия оси Z" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Максимальная скорость, с которой движется ось Z. Установка нуля в качестве значения, приводит к использованию скорости прописанной в прошивке." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Скорость вертикального движения по оси Z. Обычно она ниже, чем скорость печати, поскольку рабочий стол или портал машины тяжелее сдвинуть." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3280,12 +3506,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Дистанция между напечатанными линиями структуры поддержек первого слоя. Этот параметр вычисляется по плотности поддержек." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Направление линии заполнения поддержек" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Ориентация шаблона заполнения для поддержек. Шаблон заполнения поддержек вращается в горизонтальной плоскости." @@ -3416,8 +3642,9 @@ msgstr "Расстояние объединения поддержки" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "Максимальное расстояние между структурами поддержки по осям X/Y. Если отдельные структуры находятся ближе, чем определено данным значением, то такие структуры объединяются в одну." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "Максимальное расстояние между структурами поддержек по осям X/Y. Если отдельные структуры находятся ближе, чем определено данным значением, они объединяются" +" в одну." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3795,14 +4022,14 @@ msgid "The diameter of a special tower." msgstr "Диаметр специальных башен." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Минимальный диаметр" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Максимальный диаметр, поддерживаемый башней" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Минимальный диаметр по осям X/Y небольшой области, которая будет поддерживаться с помощью специальных башен." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "Максимальный диаметр по осям X/Y небольшой области, который должен поддерживаться определенной башней." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3924,7 +4151,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Горизонтальное расстояние между юбкой и первым слоем печати.\nМинимальное расстояние. Несколько линий юбки будут расширяться от этого расстояния." +msgstr "" +"Горизонтальное расстояние между юбкой и первым слоем печати.\n" +"Минимальное расстояние. Несколько линий юбки будут расширяться от этого расстояния." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4296,16 +4525,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Печатает башню перед печатью модели, чем помогает выдавить старый материал после смены экструдера." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Цилиндрическая черновая башня" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "Делает черновую башню цилиндрической формы." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4346,16 +4565,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "Y координата позиции черновой башни." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "Поток черновой башни" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Компенсация потока: объём выдавленного материала умножается на этот коэффициент." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4658,8 +4867,9 @@ msgstr "Сглаживать спиральные контуры" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Сглаживает спиральные контуры для уменьшения видимости шва по оси Z (такой шов должен быть едва виден при печати, но по-прежнему виден при послойном просмотре). Следует отметить, что сглаживание ведёт к размыванию мелких деталей поверхности." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Сглаживает спиральные контуры для уменьшения видимости шва по оси Z (такой шов должен быть едва виден при печати, но виден при послойном просмотре). Следует" +" отметить, что сглаживание ведет к размыванию мелких деталей поверхности." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5158,8 +5368,8 @@ msgstr "Конические поддержки" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Экспериментальная возможность: Нижняя часть поддержек становится меньше, чем верхняя." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Нижняя часть поддержек становится меньше, чем верхняя." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5391,7 +5601,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "Расстояние движения вверх, при котором выдавливание идёт на половине скорости.\nЭто может улучшить прилипание к предыдущим слоям, не перегревая материал тех слоёв. Применяется только при каркасной печати." +msgstr "" +"Расстояние движения вверх, при котором выдавливание идёт на половине скорости.\n" +"Это может улучшить прилипание к предыдущим слоям, не перегревая материал тех слоёв. Применяется только при каркасной печати." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5958,6 +6170,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Матрица преобразования, применяемая к модели при её загрузке из файла." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "Вариант G-кода" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Управляет влиянием углов на контуре модели на позицию шва. Нет означает отсутствие влияния. Спрятать шов означает по возможности перенести шов внутрь угла. Показать шов означает по возможности перенести шов наружу. Спрятать или показать означает выбор по ситуации." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Игнорирование Z зазоров" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Когда модель имеет небольшие вертикальные зазоры, около 5% дополнительного времени будет потрачено на вычисления верхних и нижних оболочек в этих узких пространствах. В этом случае, отключите данный параметр." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "Температура, используемая для объема печати. Если значение равно 0, температура для объема печати не будет регулироваться." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Избежание отката при перемещении от поддержки к поддержке по прямой. Активация этой настройки сокращает время печати, однако может привести к излишней строчности в поддерживающей структуре." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Максимальная скорость по оси Z" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Максимальная скорость, с которой движется ось Z. Установка нуля в качестве значения, приводит к использованию скорости прописанной в прошивке." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "Максимальное расстояние между структурами поддержки по осям X/Y. Если отдельные структуры находятся ближе, чем определено данным значением, то такие структуры объединяются в одну." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Минимальный диаметр" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Минимальный диаметр по осям X/Y небольшой области, которая будет поддерживаться с помощью специальных башен." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Цилиндрическая черновая башня" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "Делает черновую башню цилиндрической формы." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Компенсация потока: объём выдавленного материала умножается на этот коэффициент." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Сглаживает спиральные контуры для уменьшения видимости шва по оси Z (такой шов должен быть едва виден при печати, но по-прежнему виден при послойном просмотре). Следует отметить, что сглаживание ведёт к размыванию мелких деталей поверхности." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Экспериментальная возможность: Нижняя часть поддержек становится меньше, чем верхняя." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Количество включенных экструдеров" @@ -6163,7 +6439,6 @@ msgstr "Матрица преобразования, применяемая к #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "Команды в G-коде, которые будут выполнены при старте печати, разделённые \n" #~ "." @@ -6176,7 +6451,6 @@ msgstr "Матрица преобразования, применяемая к #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "Команды в G-коде, которые будут выполнены в конце печати, разделённые \n" #~ "." @@ -6233,7 +6507,6 @@ msgstr "Матрица преобразования, применяемая к #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "Расстояние по горизонтали между юбкой и первым слоем печатаемого объекта.\n" #~ "Это минимальное расстояние, следующие линии юбки будут печататься наружу." diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 2e0eb16b0c..34b59860cb 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: Turkish\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Turkish , Turkish \n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,11 @@ msgid "" "

{model_names}

\n" "

Find out how to ensure the best possible print quality and reliability.

\n" "

View print quality guide

" -msgstr "

Model boyutu ve model yapılandırması nedeniyle bir veya daha fazla 3D model optimum yazdırılamayabilir:

\n

{model_names}

\n

En iyi kalite ve güvenilirliği nasıl elde edeceğinizi öğrenin.

\n

Yazdırma kalitesi kılavuzunu görüntüleyin

" +msgstr "" +"

Model boyutu ve model yapılandırması nedeniyle bir veya daha fazla 3D model optimum yazdırılamayabilir:

\n" +"

{model_names}

\n" +"

En iyi kalite ve güvenilirliği nasıl elde edeceğinizi öğrenin.

\n" +"

Yazdırma kalitesi kılavuzunu görüntüleyin

" #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 msgctxt "@action" @@ -81,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profil düzleştirilmiş ve aktifleştirilmiştir." +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF Dosyası" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -106,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USB’den yazdırma devam ediyor, Cura’yı kapatmanız bu yazdırma işlemini durduracak. Emin misiniz?" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G Dosyası" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -122,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g Dosyası" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G Dosyası" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -194,9 +202,9 @@ msgstr "Çıkarılabilir aygıta {0} kaydedilemedi: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "Hata" @@ -226,8 +234,8 @@ msgstr "Çıkarılabilir aygıtı çıkar {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "Uyarı" @@ -358,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "Yazıcı yapılandırması veya kalibrasyonu ile Cura arasında eşleşme sorunu var. En iyi sonucu almak istiyorsanız her zaman PrintCore ve yazıcıya eklenen malzemeler için dilimleme yapın." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "Yeni işlerin gönderilmesi (geçici olarak) engellenmiştir, hala bir önceki yazdırma işi gönderiliyor." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Veriler yazıcıya gönderiliyor" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "Veri gönderiliyor" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "İptal Et" @@ -439,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "Ağ üzerinden bağlandı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Yazdırma işi yazıcıya başarıyla gönderildi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "Veri Gönderildi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "Monitörde Görüntüle" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "{printer_name}, '{job_name}' yazdırmayı tamamladı." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "Yazdırma işi '{job_name}' tamamlandı." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "Baskı tamamlandı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "Boş" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "Bilinmiyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "Bulut üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "Bulut üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "Bulut üzerinden bağlı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "Bulut hatası" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "Yazdırma görevi dışa aktarılamadı." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "Veri yazıcıya yüklenemedi." @@ -544,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "Ultimaker Cloud İle Yükleniyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Ultimaker hesabınızı kullanarak yazdırma görevlerini dilediğiniz yerden gönderin ve görüntüleyin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "Ultimaker Cloud Platformuna Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "Bu yazıcı için bir daha sorma." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "Başlayın" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "Artık, Ultimaker hesabınızı kullanarak yazdırma görevlerini dilediğiniz yerden gönderebilir ve görüntüleyebilirsiniz." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "Bağlı!" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "Bağlantınızı inceleyin" @@ -584,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ağ ile Bağlan" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura Ayarlar Kılavuzu" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -762,18 +765,18 @@ msgid "3MF File" msgstr "3MF Dosyası" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "Nozül" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Proje dosyası {0} bilinmeyen bir makine tipi içeriyor: {1}. Makine alınamıyor. Bunun yerine modeller alınacak." -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "Proje Dosyası Aç" @@ -905,13 +908,13 @@ msgid "Not supported" msgstr "Desteklenmiyor" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "Dosya Zaten Mevcut" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -923,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Geçersiz dosya URL’si:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "Ayarlar, ekstruderlerin mevcut kullanılabilirliğine uyacak şekilde değiştirildi: [%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "Ayarlar, ekstrüderlerin mevcut kullanılabilirliğine uyacak şekilde değiştirildi:" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "Ayarlar güncellendi" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstrüder(ler) Devre Dışı Bırakıldı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "Profilin {0} dosyasına aktarımı başarısız oldu: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "Profilin {0} dosyasına aktarımı başarısız oldu: Yazıcı eklentisinde rapor edilen hata." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "Profil {0} dosyasına aktarıldı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "Dışa aktarma başarılı" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "Yazıcı eklenmeden önce profil, {0} dosyasından içe aktarılamaz." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "{0} dosyasında içe aktarılabilecek özel profil yok" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "Bu {0} profili yanlış veri içeriyor, içeri aktarılamadı." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "{0} ({1}) profilinde tanımlanan makine, mevcut makineniz ({2}) ile eşleşmiyor, içe aktarılamadı." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "{0} dosyasından profil içe aktarımı başarısız oldu:" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Profil başarıyla içe aktarıldı {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "Dosya {0} geçerli bir profil içermemekte." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} öğesinde bilinmeyen bir dosya türü var veya profil bozuk." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "Özel profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilde eksik bir kalite tipi var." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1111,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "Sonraki" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1122,7 +1124,7 @@ msgstr "Grup #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1130,7 +1132,7 @@ msgstr "Kapat" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Ekle" @@ -1151,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tüm Dosyalar (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "Bilinmiyor" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "Aşağıdaki yazıcı(lar) bir grubun parçası olmadıkları için bağlanamıyor" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "Mevcut ağ yazıcıları" @@ -1180,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "Özel" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "Portalın yazdırılan modeller ile çarpışmasını önlemek için yapı hacmi yüksekliği “Sıralamayı Yazdır” ayarı nedeniyle azaltıldı." -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "Yapı Disk Bölümü" @@ -1278,7 +1280,12 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "

Ultimaker Cura doğru görünmeyen bir şeyle karşılaştı.

\n

Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen bazı hatalı yapılandırma dosyalarından kaynaklanıyordu. Yapılandırmanızı yedekleyip sıfırlamanızı öneriyoruz.

\n

Yedekler yapılandırma klasöründe bulunabilir.

\n

Sorunu düzeltmek için lütfen bu Çökme Raporunu bize gönderin.

\n " +msgstr "" +"

Ultimaker Cura doğru görünmeyen bir şeyle karşılaştı.

\n" +"

Başlatma esnasında kurtarılamaz bir hata ile karşılaştık. Muhtemelen bazı hatalı yapılandırma dosyalarından kaynaklanıyordu. Yapılandırmanızı yedekleyip sıfırlamanızı öneriyoruz.

\n" +"

Yedekler yapılandırma klasöründe bulunabilir.

\n" +"

Sorunu düzeltmek için lütfen bu Çökme Raporunu bize gönderin.

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:98 msgctxt "@action:button" @@ -1311,7 +1318,10 @@ msgid "" "

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " -msgstr "

Cura’da onarılamaz bir hata oluştu. Lütfen sorunu çözmek için bize Çökme Raporunu gönderin

\n

Sunucularımıza otomatik olarak bir hata raporu yüklemek için lütfen \"Rapor gönder\" düğmesini kullanın

\n " +msgstr "" +"

Cura’da onarılamaz bir hata oluştu. Lütfen sorunu çözmek için bize Çökme Raporunu gönderin

\n" +"

Sunucularımıza otomatik olarak bir hata raporu yüklemek için lütfen \"Rapor gönder\" düğmesini kullanın

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:173 msgctxt "@title:groupbox" @@ -1383,48 +1393,48 @@ msgstr "Günlükler" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "Kullanıcı açıklaması" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "Kullanıcı açıklaması (Not: Geliştiriciler dilinizi konuşamıyor olabilir, lütfen mümkünse İngilizce kullanın)" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "Rapor gönder" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Makineler yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Görünüm ayarlanıyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Arayüz yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Aynı anda yalnızca bir G-code dosyası yüklenebilir. {0} içe aktarma atlandı" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-code yüklenirken başka bir dosya açılamaz. {0} içe aktarma atlandı" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Seçilen model yüklenemeyecek kadar küçüktü." @@ -1434,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "Yazıcı Ayarları" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (Genişlik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (Derinlik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (Yükseklik)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "Yapı levhası şekli" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "Merkez nokta" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "Isıtılmış yatak" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "G-code türü" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "Yazıcı Başlığı Ayarları" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y min" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X maks" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y maks" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "Portal Yüksekliği" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "Ekstrüder Sayısı" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code’u Başlat" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "G-code’u Sonlandır" @@ -1555,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "Nozül X ofseti" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Nozül Y ofseti" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "Soğutma Fanı Numarası" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Ekstruder G-Code'u Başlatma" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Ekstruder G-Code'u Sonlandırma" @@ -1581,7 +1591,7 @@ msgid "Install" msgstr "Yükle" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "Yüklü" @@ -1604,8 +1614,8 @@ msgstr "Eklentiler" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "Malzemeler" @@ -1615,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "Derecelendirmeniz" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "Sürüm" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "Son güncelleme" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "Yazar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "İndirmeler" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "Yükleme ve güncelleme yapabilmek için oturum açın" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Malzeme makarası satın al" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Güncelle" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Güncelleniyor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1769,7 +1779,10 @@ msgid "" "This plugin contains a license.\n" "You need to accept this license to install this plugin.\n" "Do you agree with the terms below?" -msgstr "Bu eklenti bir lisans içerir.\nBu eklentiyi yüklemek için bu lisansı kabul etmeniz gerekir.\nAşağıdaki koşulları kabul ediyor musunuz?" +msgstr "" +"Bu eklenti bir lisans içerir.\n" +"Bu eklentiyi yüklemek için bu lisansı kabul etmeniz gerekir.\n" +"Aşağıdaki koşulları kabul ediyor musunuz?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:55 msgctxt "@action:button" @@ -1907,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "Eksik aygıt yazılımı nedeniyle aygıt yazılımı güncellemesi başarısız oldu." #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "Cam" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "Görüntülediğiniz yazıcı bulut yazıcısı olduğundan bu seçenekleri kullanamazsınız." +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "Kuyruğu uzaktan yönetmek için lütfen yazıcının donanım yazılımını güncelleyin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "Görüntülediğiniz yazıcı bulut yazıcısı olduğundan web kamerasını kullanamazsınız." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "Yükleniyor..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "Mevcut değil" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "Ulaşılamıyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "Boşta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "Başlıksız" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "Anonim" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Yapılandırma değişiklikleri gerekiyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "Detaylar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "Kullanım dışı yazıcı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "İlk kullanılabilen" @@ -1979,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "Kuyrukta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "Cura Connect’e git" +msgid "Manage in browser" +msgstr "Tarayıcıda yönet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "Kuyrukta baskı işi yok. Bir iş eklemek için dilimleme yapın ve gönderin." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "Yazdırma görevleri" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "Toplam yazdırma süresi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "Bekleniyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "Tüm işler yazdırıldı." - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "Yazdırma geçmişini görüntüle" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2026,11 +2034,14 @@ msgstr "Ağ Yazıcısına Bağlan" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "Yazıcınıza ağ üzerinden doğrudan bağlamak için, lütfen yazıcınızın ağ kablosu kullanan bir ağa bağlı olduğundan emin olun veya yazıcınızı WiFi ağına bağlayın. Cura'ya yazıcınız ile bağlanamıyorsanız g-code dosyalarını yazıcınıza aktarmak için USB sürücüsü kullanabilirsiniz.\n\nAşağıdaki listeden yazıcınızı seçin:" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "Yazıcınıza ağ üzerinden doğrudan baskı göndermek için lütfen yazıcınızın ağ kablosuyla ağa bağlı olduğundan veya yazıcınızı WiFi ağınıza bağladığınızdan" +" emin olun. Yazıcınız ile Cura'ya bağlanamıyorsanız g-code dosyalarını yazıcınıza aktarmak için USB sürücüsü kullanabilirsiniz." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "Aşağıdaki listeden yazıcınızı seçin:" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2038,9 +2049,9 @@ msgid "Edit" msgstr "Düzenle" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "Kaldır" @@ -2123,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "Tamam" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Durduruldu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Tamamlandı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "Hazırlanıyor..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "İptal ediliyor..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "Duraklatılıyor..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "Duraklatıldı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "Devam ediliyor..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "Eylem gerekli" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "%1 bitiş tarihi: %2" @@ -2270,44 +2281,44 @@ msgctxt "@action:button" msgid "Override" msgstr "Geçersiz kıl" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "Atanan yazıcı %1, şu yapılandırma değişikliğini gerektiriyor:" msgstr[1] "Atanan yazıcı %1, şu yapılandırma değişikliklerini gerektiriyor:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "Yazıcı %1 atandı, fakat iş bilinmeyen bir malzeme yapılandırması içeriyor." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "%2 olan %1 malzemesini %3 yapın." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "%3 malzemesini %1 malzemesi olarak yükleyin (Bu işlem geçersiz kılınamaz)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "%2 olan %1 print core'u %3 yapın." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "Baskı tablasını %1 olarak değiştirin (Bu işlem geçersiz kılınamaz)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Geçersiz kıl seçeneği mevcut yazıcı yapılandırmasındaki ayarları kullanacaktır. Yazdırma işlemi başarısız olabilir." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "Alüminyum" @@ -2317,7 +2328,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Yazıcıya Bağlan" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura Ayarlar Kılavuzu" @@ -2327,8 +2338,10 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "Lütfen yazıcınızın bağlı olduğunu kontrol edin:\n- Yazıcının açık olduğunu kontrol edin.\n- Yazıcının ağa bağlı olduğunu kontrol edin." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "Lütfen yazıcınızda bağlantı olduğundan emin olun:\n- Yazıcının açık olup olmadığını kontrol edin.\n- Yazıcının ağa bağlı olup olmadığını kontrol edin.\n-" +" Buluta bağlı yazıcıları keşfetmek için giriş yapıp yapmadığınızı kontrol edin." #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2640,7 +2653,7 @@ msgid "Printer Group" msgstr "Yazıcı Grubu" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "Profil ayarları" @@ -2653,19 +2666,19 @@ msgstr "Profildeki çakışma nasıl çözülmelidir?" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "İsim" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "Profilde değil" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2837,18 +2850,24 @@ msgid "Previous" msgstr "Önceki" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "Dışa Aktar" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "İpucu" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "Genel" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "Yazdırma denemesi" @@ -2953,170 +2972,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Yazdırmayı iptal etmek istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "Bilgi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "Çap Değişikliğini Onayla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "Yeni filaman çapı %1 mm olarak ayarlandı ve bu değer, geçerli ekstrüder ile uyumlu değil. Devam etmek istiyor musunuz?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "Görünen Ad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "Marka" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "Malzeme Türü" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "Renk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "Özellikler" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "Yoğunluk" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "Çap" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "Filaman masrafı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "Filaman ağırlığı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "Filaman uzunluğu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "Metre başına maliyet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "Bu malzeme %1’e bağlıdır ve özelliklerinden bazılarını paylaşır." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "Malzemeyi Ayır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "Tanım" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "Yapışma Bilgileri" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Yazdırma ayarları" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "Etkinleştir" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "Yazıcı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Kaldırmayı Onayla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1’i kaldırmak istediğinizden emin misiniz? Bu eylem geri alınamaz!" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "Malzemeyi İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Malzeme %1 dosyasına içe aktarılamadı: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Malzeme %1 dosyasına başarıyla içe aktarıldı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "Malzemeyi Dışa Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Malzemenin %1 dosyasına dışa aktarımı başarısız oldu: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Malzeme %1 dosyasına başarıyla dışa aktarıldı" @@ -3157,383 +3176,406 @@ msgid "Unit" msgstr "Birim" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "Genel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "Arayüz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "Dil:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "Para Birimi:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Bu değişikliklerinin geçerli olması için uygulamayı yeniden başlatmanız gerekecektir." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Ayarlar değiştirilirken otomatik olarak dilimle." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "Otomatik olarak dilimle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "Görünüm şekli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Modelin desteklenmeyen alanlarını kırmızı ile gösterin. Destek alınmadan bu alanlar düzgün bir şekilde yazdırılmayacaktır." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "Dışarıda kalan alanı göster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bir model seçildiğinde bu model görüntünün ortasında kalacak şekilde kamera hareket eder" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Öğeyi seçince kamerayı ortalayın" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Cura’nın varsayılan yakınlaştırma davranışı tersine çevrilsin mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kamera yakınlaştırma yönünü ters çevir." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Yakınlaştırma farenin hareket yönüne uygun olsun mu?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "Fareye doğru yakınlaştırma yapılması ortografik perspektifte desteklenmez." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Farenin hareket yönüne göre yakınlaştır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Platformun üzerindeki öğeler kesişmemeleri için hareket ettirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellerin birbirinden ayrı olduğundan emin olduğundan emin olun" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Platformun üzerindeki modeller yapı levhasına değmeleri için indirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modelleri otomatik olarak yapı tahtasına indirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-code okuyucuda uyarı mesajı göster." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code okuyucuda uyarı mesajı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Katman, uyumluluk moduna zorlansın mı?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Katman görünümünü uyumluluk moduna zorla (yeniden başlatma gerekir)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "Ne tür bir kamera oluşturma işlemi kullanılmalıdır?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "Kamera oluşturma: " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "Perspektif" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "Ortografik" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "Dosyaların açılması ve kaydedilmesi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Modeller çok büyükse yapı hacmine göre ölçeklendirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "Büyük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Bir modelin birimi milimetre değil de metre ise oldukça küçük görünebilir. Bu modeller ölçeklendirilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Çok küçük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Yüklendikten sonra modeller seçilsin mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Yüklendiğinde modelleri seç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Yazıcı adına bağlı bir ön ek otomatik olarak yazdırma işinin adına eklenmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Makine ön ekini iş adına ekleyin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Bir proje dosyasını kaydederken özet gösterilmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Projeyi kaydederken özet iletişim kutusunu göster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Bir proje dosyası açıldığında varsayılan davranış" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Bir proje dosyası açıldığında varsayılan davranış: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Her zaman proje olarak aç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "Her zaman modelleri içe aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Bir profil üzerinde değişiklik yapıp farklı bir profile geçtiğinizde, değişikliklerin kaydedilmesini isteyip istemediğinizi soran bir iletişim kutusu açılır. Alternatif olarak bu işleve yönelik varsayılan bir davranış seçebilir ve bu iletişim kutusunun bir daha görüntülenmemesini tercih edebilirsiniz." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "Profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Farklı bir profile geçerken değişen ayar değerleriyle ilgili varsayılan davranış: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Değiştirilen ayarları her zaman at" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Değiştirilen ayarları her zaman yeni profile taşı" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "Gizlilik" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura, program başladığında güncellemeleri kontrol etmeli mi?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Başlangıçta güncellemeleri kontrol edin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Yazdırmanızdaki anonim veriler Ultimaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonim) yazdırma bilgisi gönder" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "Daha fazla bilgi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "Deneysel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Çok yapılı levha fonksiyonelliğini kullan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "Çok yapılı levha fonksiyonelliğini kullan (yeniden başlatma gerektirir)" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "Yazıcılar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "Yeniden adlandır" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "Profil Oluştur" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Bu profil için lütfen bir ad girin." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profili Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profili Yeniden Adlandır" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "Profili İçe Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "Profili Dışa Aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Yazıcı: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "Varsayılan profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "Özel profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profili geçerli ayarlar/geçersiz kılmalar ile güncelle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "Geçerli değişiklikleri iptal et" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Bu profil yazıcının belirlediği varsayılan ayarları kullanır; dolayısıyla aşağıdaki listede bulunan ayarları/geçersiz kılmaları içermez." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Geçerli ayarlarınız seçilen profille uyumlu." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "Küresel Ayarlar" @@ -3601,33 +3643,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "arama ayarları" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Değeri tüm ekstruderlere kopyala" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Tüm değiştirilmiş değerleri tüm ekstruderlere kopyala" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Bu ayarı gizle" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Bu ayarı gösterme" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Bu ayarı görünür yap" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Görünürlük ayarını yapılandır..." @@ -3638,55 +3680,64 @@ msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "Gizlenen bazı ayarlar normal hesaplanan değerden farklı değerler kullanır.\n\nBu ayarları görmek için tıklayın." +msgstr "" +"Gizlenen bazı ayarlar normal hesaplanan değerden farklı değerler kullanır.\n" +"\n" +"Bu ayarları görmek için tıklayın." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "Etkilediği tüm ayarlar geçersiz kılındığı için bu ayar kullanılmamaktadır." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "Etkileri" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr ".........den etkilenir" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "Bu ayar her zaman, tüm ekstrüderler arasında paylaşılır. Buradan değiştirildiğinde tüm ekstrüderler için değer değiştirir." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Değer, her bir ekstruder değerinden alınır. " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "Bu ayarın değeri profilden farklıdır.\n\nProfil değerini yenilemek için tıklayın." +msgstr "" +"Bu ayarın değeri profilden farklıdır.\n" +"\n" +"Profil değerini yenilemek için tıklayın." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" "\n" "Click to restore the calculated value." -msgstr "Bu ayar normal olarak yapılır ama şu anda mutlak değer ayarı var.\n\nHesaplanan değeri yenilemek için tıklayın." +msgstr "" +"Bu ayar normal olarak yapılır ama şu anda mutlak değer ayarı var.\n" +"\n" +"Hesaplanan değeri yenilemek için tıklayın." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" msgstr "Önerilen" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "Özel" @@ -3711,12 +3762,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Modellerin askıda kalan kısımlarını destekleyen yapılar oluşturun. Bu yapılar olmadan, yazdırma sırasında söz konusu kısımlar düşebilir." -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "Yapıştırma" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Bir kenar veya radye yazdırın. Bu nesnenizin etrafına veya altına daha sonra kesilmesi kolay olan düz bir alan sağlayacak." @@ -3762,7 +3813,10 @@ msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "Bazı ayar/geçersiz kılma değerleri profilinizde saklanan değerlerden farklıdır.\n\nProfil yöneticisini açmak için tıklayın." +msgstr "" +"Bazı ayar/geçersiz kılma değerleri profilinizde saklanan değerlerden farklıdır.\n" +"\n" +"Profil yöneticisini açmak için tıklayın." #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -3799,7 +3853,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "G-code Gönder" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "Bağlı yazıcıya özel bir G-code komutu gönderin. Komutu göndermek için 'enter' tuşuna basın." @@ -3896,11 +3950,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "Favoriler" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "Genel" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3951,7 +4000,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kamera konumu" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "Kamera görüşü" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "Perspektif" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "Ortografik" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Yapı levhası" @@ -4070,22 +4134,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "En Son Öğeyi Aç" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "Geçerli yazdırma" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "İşin Adı" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "Yazdırma süresi" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "Kalan tahmini süre" @@ -4095,6 +4159,11 @@ msgctxt "@label" msgid "View type" msgstr "Görüntüleme tipi" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "Nesne listesi" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4126,7 +4195,10 @@ msgid "" "- Send print jobs to Ultimaker printers outside your local network\n" "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" "- Get exclusive access to print profiles from leading brands" -msgstr "- Yerel ağınız dışındaki Ultimaker yazıcılarına yazdırma görevleri gönderin\n- Dilediğiniz yerde kullanmak üzere Ultimaker Cura ayarlarınızı bulutta depolayın\n- Lider markalardan yazdırma profillerine özel erişim sağlayın" +msgstr "" +"- Yerel ağınız dışındaki Ultimaker yazıcılarına yazdırma görevleri gönderin\n" +"- Dilediğiniz yerde kullanmak üzere Ultimaker Cura ayarlarınızı bulutta depolayın\n" +"- Lider markalardan yazdırma profillerine özel erişim sağlayın" #: /home/ruben/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 msgctxt "@button" @@ -4143,32 +4215,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "Maliyet tahmini yok" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "Önizleme" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "Dilimleniyor..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "Dilimlenemedi" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "İşleme" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "Dilimle" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "Dilimleme sürecini başlat" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "İptal" @@ -4203,233 +4280,238 @@ msgctxt "@label" msgid "Preset printers" msgstr "Önayarlı yazıcılar" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "Yazıcı ekle" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "Yazıcıları yönet" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Çevrimiçi Sorun Giderme Kılavuzunu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Tam Ekrana Geç" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "Tam Ekrandan Çık" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Geri Al" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Yinele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Çıkış" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3 Boyutlu Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Önden Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Yukarıdan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Sol Taraftan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Sağ Taraftan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura’yı yapılandır..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Yazıcı Ekle..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Yazıcıları Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Malzemeleri Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Profili geçerli ayarlar/geçersiz kılmalar ile güncelle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Geçerli değişiklikleri iptal et" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "G&eçerli ayarlardan/geçersiz kılmalardan profil oluştur..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profilleri Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Çevrimiçi Belgeleri Göster" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Hata Bildir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Yenilikler" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Hakkında..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "Seçili Modeli Sil" msgstr[1] "Seçili Modelleri Sil" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "Seçili Modeli Ortala" msgstr[1] "Seçili Modelleri Ortala" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "Seçili Modeli Çoğalt" msgstr[1] "Seçili Modelleri Çoğalt" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modeli Sil" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modeli Platformda Ortala" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelleri Gruplandır" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Model Grubunu Çöz" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Modelleri Birleştir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Modeli Çoğalt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Tüm modelleri Seç" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Yapı Levhasını Temizle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Tüm Modelleri Yeniden Yükle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Tüm Modelleri Tüm Yapı Levhalarına Yerleştir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Tüm Modelleri Düzenle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Seçimi Düzenle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Tüm Model Konumlarını Sıfırla" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Tüm Model ve Dönüşümleri Sıfırla" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Dosya Aç..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Yeni Proje..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Yapılandırma Klasörünü Göster" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mağazayı Göster" @@ -4444,49 +4526,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Bu paket yeniden başlatmanın ardından kurulacak." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "Ayarlar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura Kapatılıyor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura’dan çıkmak istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Dosya aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "Paketi Kur" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "Dosya Aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Seçtiğiniz dosyalar arasında bir veya daha fazla G-code dosyası bulduk. Tek seferde sadece bir G-code dosyası açabilirsiniz. Bir G-code dosyası açmak istiyorsanız, sadece birini seçiniz." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "Yazıcı Ekle" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "Yenilikler" @@ -4508,7 +4590,9 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "Bazı profil ayarlarını özelleştirdiniz.\nBu ayarları kaydetmek veya iptal etmek ister misiniz?" +msgstr "" +"Bazı profil ayarlarını özelleştirdiniz.\n" +"Bu ayarları kaydetmek veya iptal etmek ister misiniz?" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -4570,7 +4654,9 @@ msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura, topluluk iş birliği ile Ultimaker B.V. tarafından geliştirilmiştir.\nCura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:" +msgstr "" +"Cura, topluluk iş birliği ile Ultimaker B.V. tarafından geliştirilmiştir.\n" +"Cura aşağıdaki açık kaynak projelerini gururla kullanmaktadır:" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 msgctxt "@label" @@ -4707,32 +4793,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projeyi Kaydet" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "Baskı tepsisi" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "Ekstruder %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "Malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "Kaydederken proje özetini bir daha gösterme" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "Kaydet" @@ -4908,12 +4994,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "Sorun giderme" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "Yazıcı adı" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "Lütfen yazıcınıza bir isim verin" @@ -4963,28 +5049,15 @@ msgctxt "@text" msgid "" "Please follow these steps to set up\n" "Ultimaker Cura. This will only take a few moments." -msgstr "Ultimaker Cura'yı kurmak\n için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." +msgstr "" +"Ultimaker Cura'yı kurmak\n" +" için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 msgctxt "@button" msgid "Get started" msgstr "Başlayın" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "Sadece mevcut yapı levhasını görüntüle" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "Tüm yapı levhalarına yerleştir" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "Sadece mevcut yapı levhasına yerleştir" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5075,6 +5148,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "Profil Düzleştirici" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "AMF dosyalarının okunması için destek sağlar." + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF Okuyucu" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5085,16 +5168,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB yazdırma" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "Bu formatı okuyan yazıcıları (Malyan, Makerbot ve diğer Sailfish tabanlı yazıcılar) desteklemek için Ortaya çıkacak parçanın X3G dosyası olarak kaydedilmesine izin verir." - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3GWriter" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5345,6 +5418,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "3.0'dan 3.1'e Sürüm Yükseltme" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "Yapılandırmaları Cura 4.1'den Cura 4.2'ye yükseltir." + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "Sürüm 4.1'den 4.2'ye Yükseltme" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5415,16 +5498,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF Okuyucu" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "Yazıcı hareketlerinde hata ayıklaması yapmak için takım yolu olarak SVG dosyalarını okur." - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG Takım Yolu Okuyucu" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5515,6 +5588,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura Profil Okuyucu" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura Ayarlar Kılavuzu" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "Ayarlar, ekstruderlerin mevcut kullanılabilirliğine uyacak şekilde değiştirildi: [%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "Kullanıcı açıklaması" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "Görüntülediğiniz yazıcı bulut yazıcısı olduğundan bu seçenekleri kullanamazsınız." + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "Cura Connect’e git" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "Tüm işler yazdırıldı." + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "Yazdırma geçmişini görüntüle" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "Yazıcınıza ağ üzerinden doğrudan bağlamak için, lütfen yazıcınızın ağ kablosu kullanan bir ağa bağlı olduğundan emin olun veya yazıcınızı WiFi ağına bağlayın. Cura'ya yazıcınız ile bağlanamıyorsanız g-code dosyalarını yazıcınıza aktarmak için USB sürücüsü kullanabilirsiniz.\n" +#~ "\n" +#~ "Aşağıdaki listeden yazıcınızı seçin:" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "Lütfen yazıcınızın bağlı olduğunu kontrol edin:\n" +#~ "- Yazıcının açık olduğunu kontrol edin.\n" +#~ "- Yazıcının ağa bağlı olduğunu kontrol edin." + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "Sadece mevcut yapı levhasını görüntüle" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "Tüm yapı levhalarına yerleştir" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "Sadece mevcut yapı levhasına yerleştir" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "Bu formatı okuyan yazıcıları (Malyan, Makerbot ve diğer Sailfish tabanlı yazıcılar) desteklemek için Ortaya çıkacak parçanın X3G dosyası olarak kaydedilmesine izin verir." + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3GWriter" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "Yazıcı hareketlerinde hata ayıklaması yapmak için takım yolu olarak SVG dosyalarını okur." + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG Takım Yolu Okuyucu" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "Değişiklik Günlüğü" @@ -5721,7 +5870,6 @@ msgstr "Cura Profil Okuyucu" #~ "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" #~ "- Get exclusive access to material profiles from leading brands" #~ msgstr "" - #~ "- Yerel ağınız dışındaki Ultimaker yazıcılarına yazdırma görevleri gönderin\n" #~ "- Dilediğiniz yerde kullanmak üzere Ultimaker Cura ayarlarınızı bulutta depolayın\n" #~ "- Lider markalardan malzeme profillerine özel erişim sağlayın" @@ -5748,7 +5896,6 @@ msgstr "Cura Profil Okuyucu" #~ "\n" #~ "If your printer is not in the list, use the \"Custom FFF Printer\" from the \"Custom\" category and adjust the settings to match your printer in the next dialog." #~ msgstr "" - #~ "Aşağıdaki listeden kullanmak istediğiniz yazıcıyı seçin.\n" #~ "\n" #~ "Yazıcınız listede yoksa “Özel” kategorisinden “Özel FFF Yazıcı” seçeneğini kullanın ve sonraki iletişim kutusunda ayarları yazıcınıza göre düzenleyin." @@ -5961,7 +6108,6 @@ msgstr "Cura Profil Okuyucu" #~ "Print Setup disabled\n" #~ "G-code files cannot be modified" #~ msgstr "" - #~ "Yazdırma Ayarı devre dışı\n" #~ "G-code dosyaları üzerinde değişiklik yapılamaz" @@ -6214,7 +6360,6 @@ msgstr "Cura Profil Okuyucu" #~ "Could not export using \"{}\" quality!\n" #~ "Felt back to \"{}\"." #~ msgstr "" - #~ "\"{}\" quality!\n" #~ "Fell back to \"{}\" kullanarak dışarı aktarım yapılamadı." @@ -6390,7 +6535,6 @@ msgstr "Cura Profil Okuyucu" #~ "2) Turn the fan off (only if there are no tiny details on the model).\n" #~ "3) Use a different material." #~ msgstr "" - #~ "Bazı modeller, nesne boyutu ve modeller için seçilen materyal nedeniyle optimal biçimde yazdırılamayabilir: {model_names}.\n" #~ "Yazdırma kalitesini iyileştirmek için faydalı olabilecek ipuçları:\n" #~ "1) Yuvarlak köşeler kullanın.\n" @@ -6407,7 +6551,6 @@ msgstr "Cura Profil Okuyucu" #~ "\n" #~ "Thanks!" #~ msgstr "" - #~ "Çiziminizde model bulunamadı. İçeriğini tekrar kontrol edip bir parçanın veya düzeneğin içinde olduğunu teyit edebilir misiniz?\n" #~ "\n" #~ "Teşekkürler!" @@ -6418,7 +6561,6 @@ msgstr "Cura Profil Okuyucu" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "Çiziminizin içinde birden fazla parça veya düzenek bulundu. Şu anda sadece içerisinde bir parça veya düzenek olan çizimleri desteklemekteyiz.\n" #~ "\n" #~ "Üzgünüz!" @@ -6443,7 +6585,6 @@ msgstr "Cura Profil Okuyucu" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Sayın müşterimiz,\n" #~ "Sisteminizde SolidWorks’ün geçerli bir yüklemesini bulamadık. Ya sisteminizde SolidWorks yüklü değil ya da geçerli bir lisansa sahip değilsiniz. SolidWorks’ü tek başına sorunsuz bir biçimde çalıştırabildiğinizden emin olun ve/veya ICT’niz ile irtibata geçin.\n" #~ "\n" @@ -6458,7 +6599,6 @@ msgstr "Cura Profil Okuyucu" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "Sayın müşterimiz,\n" #~ "Şu anda bu eklentiyi Windows dışında farklı bir işletim sisteminde kullanmaktasınız. Bu eklenti sadece Windows işletim sisteminde, geçerli bir lisansa sahip, kurulu SolidWorks programıyla çalışır. Lütfen bu eklentiyi SolidWorks’ün kurulu olduğu Windows işletim sistemli bir bilgisayara yükleyin.\n" #~ "\n" @@ -6563,7 +6703,6 @@ msgstr "Cura Profil Okuyucu" #~ "Open the directory\n" #~ "with macro and icon" #~ msgstr "" - #~ "Makro ve simge ile\n" #~ "dizini açın" @@ -6862,7 +7001,6 @@ msgstr "Cura Profil Okuyucu" #~ "\n" #~ " Thanks!." #~ msgstr "" - #~ "Çiziminizde model bulunamadı. İçeriğini tekrar kontrol edip bir parçanın veya düzeneğin içinde olduğunu teyit edebilir misiniz?\n" #~ "\n" #~ " Teşekkürler!." @@ -6873,7 +7011,6 @@ msgstr "Cura Profil Okuyucu" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "Çiziminizin içinde birden fazla parça veya düzenek bulundu. Şu anda sadece içerisinde bir parça veya düzenek olan çizimleri desteklemekteyiz.\n" #~ "\n" #~ "Üzgünüz!" @@ -6908,7 +7045,6 @@ msgstr "Cura Profil Okuyucu" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Onarılamaz bir hata oluştu. Lütfen sorunu çözmek için bize Çökme Raporunu gönderin

\n" #~ "

Sunucularımıza otomatik olarak bir hata raporu yüklemek için lütfen \"Rapor gönder\" düğmesini kullanın

\n" #~ " " @@ -7075,7 +7211,6 @@ msgstr "Cura Profil Okuyucu" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

Çok ciddi bir istisna oluştu. Lütfen sorunu çözmek için bize Çökme Raporu'nu gönderin

\n" #~ "

Sunucularımıza otomatik olarak bir hata raporu yüklemek için lütfen \"Rapor gönder\" düğmesini kullanın

\n" #~ " " @@ -7222,7 +7357,6 @@ msgstr "Cura Profil Okuyucu" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Kurtulunamayan ciddi bir olağanüstü durum oluştu!

\n" #~ "

Yazılım hatası raporunu http://github.com/Ultimaker/Cura/issues adresine gönderirken aşağıdaki bilgileri kullanınız

\n" #~ " " @@ -7265,7 +7399,6 @@ msgstr "Cura Profil Okuyucu" #~ "You need to accept this license to install this plugin.\n" #~ "Do you agree with the terms below?" #~ msgstr "" - #~ " eklenti lisans içerir.\n" #~ "Bu eklentiyi kurmak için bu lisans kabul etmeniz gerekir.\n" #~ "Aşağıdaki koşulları kabul ediyor musunuz?" @@ -7793,7 +7926,6 @@ msgstr "Cura Profil Okuyucu" #~ msgid "Print Selected Model with %1" #~ msgid_plural "Print Selected Models With %1" #~ msgstr[0] "Seçili Modeli %1 ile Yazdır" - #~ msgstr[1] "Seçili Modelleri %1 ile Yazdır" #~ msgctxt "@info:status" @@ -7823,7 +7955,6 @@ msgstr "Cura Profil Okuyucu" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

Düzeltemediğimiz önemli bir özel durum oluştu!

\n" #~ "

Umarız bu yavru kedi resmi şoku atlatmanıza yardımcı olur.

\n" #~ "

Bir hata raporu göndermek için aşağıdaki bilgileri kullanın: http://github.com/Ultimaker/Cura/issues

\n" diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index fb4a041bd8..350e20bb6f 100644 --- a/resources/i18n/tr_TR/fdmextruder.def.json.po +++ b/resources/i18n/tr_TR/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 4ab6aef3d7..72abb07035 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-14 14:47+0100\n" -"Last-Translator: Bothof \n" -"Language-Team: Turkish\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0100\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Turkish , Turkish \n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr " \n ile ayrılan, başlangıçta yürütülecek G-code komutları" +msgstr "" +" \n" +" ile ayrılan, başlangıçta yürütülecek G-code komutları" #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -69,7 +71,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr " \n ile ayrılan, bitişte yürütülecek G-code komutları" +msgstr "" +" \n" +" ile ayrılan, bitişte yürütülecek G-code komutları" #: fdmprinter.def.json msgctxt "material_guid label" @@ -333,8 +337,8 @@ msgstr "Nozül soğumadan önce ekstruderin etkin olmaması gerektiği minimum s #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" -msgstr "G-code Türü" +msgid "G-code Flavor" +msgstr "G-code türü" #: fdmprinter.def.json msgctxt "machine_gcode_flavor description" @@ -1293,8 +1297,12 @@ msgstr "Dikiş Köşesi Tercihi" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "Modelin ana hatlarında yer alan köşelerin dikişin konumunu etkileyip etkilemediğini kontrol edin. Hiçbiri, köşelerin dikişin konumunu etkilemediği anlamına gelir. Dikişi Gizle, dikişin daha büyük olasılıkla bir iç köşe üzerinde oluşmasını sağlar. Dikişi Açığa Çıkar, dikişin daha büyük olasılıkla bir dış köşe üzerinde oluşmasını sağlar. Dikişi Gizle veya Açığa Çıkar, dikişin daha büyük olasılıkla bir iç veya dış köşe üzerinde oluşmasını sağlar." +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "Modelin ana hatlarında yer alan köşelerin dikişin konumunu etkileyip etkilemediğini kontrol edin. Hiçbiri, köşelerin dikişin konumunu" +" etkilemediği anlamına gelir. Dikişi Gizle, dikişin daha büyük olasılıkla bir iç köşe üzerinde oluşmasını sağlar. Dikişi Açığa" +" Çıkar, dikişin daha büyük olasılıkla bir dış köşe üzerinde oluşmasını sağlar. Dikişi Gizle veya Açığa Çıkar, dikişin daha büyük" +" olasılıkla bir iç veya dış köşe üzerinde oluşmasını sağlar. Akıllı Gizleme, hem iç hem de dış köşelere izin verir ancak uygun olduğu" +" durumlarda iç köşeleri daha sık seçer." #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1316,6 +1324,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "Dikişi Gizle veya Açığa Çıkar" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "Akıllı Gizleme" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1328,13 +1341,15 @@ msgstr "Etkin olduğunda, z dikişi koordinatları her parçanın merkezine gör #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "Küçük Z Açıklıklarını Yoksay" +msgid "No Skin in Z Gaps" +msgstr "Z Boşluklarında Dış Katman Oluşturma" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "Modelde küçük dikey açıklıklar varsa bu dar yerlerdeki üst ve alt yüzeyleri oluşturmak için %5 oranında ek hesaplama süresi verilebilir. Bu gibi bir durumda ayarı devre dışı bırakın." +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "Modelde yalnızca birkaç katmanda küçük dikey boşluklar varsa normal şartlarda dar alandaki bu katmanların etrafında dış bir katman olmalıdır. Dikey boşluğun" +" çok küçük olduğu durumlarda dış katman oluşturulmaması için bu ayarı etkinleştirin. Böylece baskı ve dilimleme süresi kısalır ancak teknik olarak bakıldığında" +" havayla temasa açık dolgular kalır." #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1631,7 +1646,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "Dolgu alanının etrafına ekstra duvar ekle. Bu duvarlar üst/alt yüzey hatlarının daha az aşağı düşmesini sağlar. Yani biraz fazla materyal kullanarak, daha az üst/alt yüzey katmanı ile aynı kaliteyi yakalayabilirsiniz.\nBu özellik, doğru konfigüre edildiğinde, harekete veya geri çekmeye gerek kalmadan Dolgu Poligonlarını Bağlama ile birlikte tüm dolguyu tek bir ekstrüzyon yoluna bağlayabilir." +msgstr "" +"Dolgu alanının etrafına ekstra duvar ekle. Bu duvarlar üst/alt yüzey hatlarının daha az aşağı düşmesini sağlar. Yani biraz fazla materyal kullanarak, daha az üst/alt yüzey katmanı ile aynı kaliteyi yakalayabilirsiniz.\n" +"Bu özellik, doğru konfigüre edildiğinde, harekete veya geri çekmeye gerek kalmadan Dolgu Poligonlarını Bağlama ile birlikte tüm dolguyu tek bir ekstrüzyon yoluna bağlayabilir." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1870,8 +1887,8 @@ msgstr "Yapı Disk Bölümü Sıcaklığı" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "Yapı disk bölümü için kullanılan sıcaklık. Bu 0 olursa yapı disk bölümü sıcaklığı ayarlanmaz." +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "Baskı yapılacak ortamın sıcaklığı. Bu değer 0 ise yapı hacminin sıcaklığı ayarlanmaz." #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1983,6 +2000,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "Yüzde cinsinden çekme oranı." +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "Kristalli Malzeme" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "Bu malzeme ısıtıldığında temiz bir şekilde parçalanan tür de mi (kristalli) yoksa uzun iç içe polimer zincirler (kristal olmayan) oluşturan türde mi?" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "Sızma Önleme Geri Çekme Mesafesi" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "Malzemenin sızma yapmaması için gereken geri çekilme mesafesidir." + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "Sızma Önleme Geri Çekme Hızı" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "Filament değişimi sırasında malzemenin sızma yapmaması için gereken geri çekilme hızıdır." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "Geri Çekme Pozisyonunda Durma Mesafesi" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "Filamentin ısıtıldığında kopmadan esneyebileceği mesafedir." + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "Durma Payına Uygun Geri Çekme Hızı" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "Filamentin kopmadan ne kadar hızlı geri çekilmesi gerektiğidir." + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "Kopma Geri Çekme Mesafesi" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "Sorunsuz kopması için filamentin geri çekilmesi gereken mesafedir." + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "Kopma Geri Çekme Hızı" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "Sorunsuz kopması için filamentin geri çekilmesi gereken hızdır." + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "Kopma Sıcaklığı" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "Sorunsuz kopması için filament koptuğundaki sıcaklık değeridir." + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1993,6 +2090,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "Akış dengeleme: sıkıştırılan malzeme miktarı bu değerle çoğaltılır." +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "Duvar Akışı" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "Duvar hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "Dış Duvar Akışı" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "En dıştaki duvar hattının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "İç Duvar Akışı" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "En dıştaki duvar hattı hariç diğer duvar hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "Üst/Alt Akış" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "Üst/alt hatların akış telafisidir." + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "Üst Yüzeyin Dış Katman Akışı" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "Baskının üst bölümlerindeki hatların akış telafisidir." + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "Dolgu Akışı" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "Dolgu hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "Etek/Kenar Akışı" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "Etek veya kenar hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "Destek Akışı" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "Destek yapı hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "Destek Ara Yüzeyi Akışı" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "Destek çatı ve zemin hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "Destek Çatı Akışı" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "Destek çatı hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "Destek Zemin Akışı" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "Destek zemin hatlarının akış telafisidir." + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "İlk Direk Akışı" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "Temel kule hatlarının akış telafisidir." + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2110,8 +2327,9 @@ msgstr "Destek Geri Çekmelerini Sınırlandır" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "Düz çizgi üzerinde destekler arasında hareket ederken geri çekmeyi atla. Bu ayarın etkinleştirilmesi yazdırma süresi tasarrufu sağlar ancak destek yapısı içinde aşırı dizilime yol açabilir." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "Düz hat üzerinde destekler arasında hareket ederken geri çekmeyi atlayın. Bu ayarın etkinleştirilmesi baskı süresini kısaltır ancak destek yapısında ölçüsüz" +" dizilime yol açabilir." #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2163,6 +2381,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "Nozül değişiminin çekmesi sonucunda filamanın geriye doğru itildiği hız." +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "Nozül Değişimiyle Çalışmaya Hazırlanacak Ek Miktar" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "Nozül değişiminin ardından çalışmaya hazırlanacak ek malzemedir." + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2354,14 +2582,15 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "Etek ve kenarın yazdırıldığı hız. Bu işlem normalde ilk katman hızında yapılır, ama etek ve kenarı farklı hızlarda yazdırmak isteyebilirsiniz." #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "Maksimum Z Hızı" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Z Atlama Hızı" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "Yapı levhasının hareket ettiği maksimum hız. Bu hızı 0’a ayarlamak yazdırmanın maksimum z hızı için aygıt yazılımı kullanmasına neden olur." +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Z Atlamaları için yapılan dikey Z hareketinin gerçekleştirileceği hızdır. Yapı plakasının veya makine tezgahının hareket etmesi daha zor olduğundan genelde" +" baskı hızından daha düşüktür." #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3279,12 +3508,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "Yazdırılan ilk katman destek yapı hatları arasındaki mesafedir. Bu ayar destek yoğunluğuna göre hesaplanır." #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "Destek Dolgu Hattı Yönü" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Destekler için dolgu şeklinin döndürülmesi. Destek dolgu şekli yatay düzlemde döndürülür." @@ -3415,8 +3644,9 @@ msgstr "Destek Birleşme Mesafesi" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "X/Y yönündeki destek yapıları arasındaki maksimum mesafe. Ayrı yapılar birbirlerine bu değerden daha yakınsa yapılar birleşip tek olur." +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "X/Y yönlerinde destek yapıları arasındaki maksimum mesafedir. Ayrı yapılar birbirlerine bu değerden daha yakınsa yapılar birleşerek tek bir yapı haline" +" gelir." #: fdmprinter.def.json msgctxt "support_offset label" @@ -3794,14 +4024,14 @@ msgid "The diameter of a special tower." msgstr "Özel bir direğin çapı." #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "Minimum Çap" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "Kule Destekli Maksimum Çap" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "Özel bir destek direği ile desteklenecek küçük bir alanın X/Y yönündeki minimum çapı." +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "Özel bir destek kulesiyle desteklenecek küçük bir alanın X/Y yönlerindeki maksimum çapıdır." #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3923,7 +4153,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "Baskının eteği ve ilk katmanı arasındaki yatay mesafe.\nMinimum mesafedir. Bu mesafeden çok sayıda etek hattı dışarı doğru uzanır." +msgstr "" +"Baskının eteği ve ilk katmanı arasındaki yatay mesafe.\n" +"Minimum mesafedir. Bu mesafeden çok sayıda etek hattı dışarı doğru uzanır." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4295,16 +4527,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "Malzemenin hazırlanmasına yardımcı olan yazıcının yanındaki direği her nozül değişiminden sonra yazdırın." -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "Dairesel İlk Direk" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "İlk direği dairesel bir şekil olarak yapın." - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4345,16 +4567,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "İlk direk konumunun y koordinatı." -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "İlk Direk Akışı" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "Akış dengeleme: sıkıştırılan malzeme miktarı bu değerle çoğaltılır." - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4657,8 +4869,9 @@ msgstr "Helezon Şeklinde Düzeltme" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "Z dikişinin görünürlüğünü azaltmak için helezon şeklinde konturları düzeltin (Z-dikişi yazdırma durumunda çok az görünür olmalı, ancak tabaka görünümünde halen görünür olmalıdır). Düzeltme işleminin ince yüzey detaylarında bulanıklığa neden olabileceğini unutmayınız." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "Z dikişinin görünürlüğünü azaltmak için helezon şeklindeki konturları düzeltin (Z dikişi baskıda zor görünmeli ancak katman görünümünde görünür olmalıdır)." +" Düzeltme işleminin ince yüzey detaylarında bulanıklığa neden olabileceğini göz önünde bulundurun." #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5157,8 +5370,8 @@ msgstr "Konik Desteği Etkinleştir" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "Deneysel Özellik: Destek alanlarını alt kısımlarda çıkıntılardakinden daha küçük yapar." +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "Alttaki destek alanlarını çıkıntıda olanlardan daha küçük yapın." #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5390,7 +5603,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "Yarı hızda sıkıştırılmış yukarı doğru hareket mesafesi.\nBu katmanlarda malzemeyi çok fazla ısıtmayarak önceki katmanlarda daha iyi yapışma sağlayabilir. Sadece kablo yazdırmaya uygulanır." +msgstr "" +"Yarı hızda sıkıştırılmış yukarı doğru hareket mesafesi.\n" +"Bu katmanlarda malzemeyi çok fazla ısıtmayarak önceki katmanlarda daha iyi yapışma sağlayabilir. Sadece kablo yazdırmaya uygulanır." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5957,6 +6172,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-code Türü" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "Modelin ana hatlarında yer alan köşelerin dikişin konumunu etkileyip etkilemediğini kontrol edin. Hiçbiri, köşelerin dikişin konumunu etkilemediği anlamına gelir. Dikişi Gizle, dikişin daha büyük olasılıkla bir iç köşe üzerinde oluşmasını sağlar. Dikişi Açığa Çıkar, dikişin daha büyük olasılıkla bir dış köşe üzerinde oluşmasını sağlar. Dikişi Gizle veya Açığa Çıkar, dikişin daha büyük olasılıkla bir iç veya dış köşe üzerinde oluşmasını sağlar." + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "Küçük Z Açıklıklarını Yoksay" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "Modelde küçük dikey açıklıklar varsa bu dar yerlerdeki üst ve alt yüzeyleri oluşturmak için %5 oranında ek hesaplama süresi verilebilir. Bu gibi bir durumda ayarı devre dışı bırakın." + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "Yapı disk bölümü için kullanılan sıcaklık. Bu 0 olursa yapı disk bölümü sıcaklığı ayarlanmaz." + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "Düz çizgi üzerinde destekler arasında hareket ederken geri çekmeyi atla. Bu ayarın etkinleştirilmesi yazdırma süresi tasarrufu sağlar ancak destek yapısı içinde aşırı dizilime yol açabilir." + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "Maksimum Z Hızı" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "Yapı levhasının hareket ettiği maksimum hız. Bu hızı 0’a ayarlamak yazdırmanın maksimum z hızı için aygıt yazılımı kullanmasına neden olur." + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "X/Y yönündeki destek yapıları arasındaki maksimum mesafe. Ayrı yapılar birbirlerine bu değerden daha yakınsa yapılar birleşip tek olur." + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "Minimum Çap" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "Özel bir destek direği ile desteklenecek küçük bir alanın X/Y yönündeki minimum çapı." + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "Dairesel İlk Direk" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "İlk direği dairesel bir şekil olarak yapın." + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "Akış dengeleme: sıkıştırılan malzeme miktarı bu değerle çoğaltılır." + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "Z dikişinin görünürlüğünü azaltmak için helezon şeklinde konturları düzeltin (Z-dikişi yazdırma durumunda çok az görünür olmalı, ancak tabaka görünümünde halen görünür olmalıdır). Düzeltme işleminin ince yüzey detaylarında bulanıklığa neden olabileceğini unutmayınız." + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "Deneysel Özellik: Destek alanlarını alt kısımlarda çıkıntılardakinden daha küçük yapar." + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "Etkinleştirilmiş Ekstruder sayısı" @@ -6162,7 +6441,6 @@ msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "​\n" #~ " ile ayrılan, başlangıçta yürütülecek G-code komutları." @@ -6175,7 +6453,6 @@ msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "​\n" #~ " ile ayrılan, bitişte yürütülecek Gcode komutları." @@ -6232,7 +6509,6 @@ msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "Etek ve baskının ilk katmanı arasındaki yatay mesafe.\n" #~ "Bu minimum mesafedir ve çoklu etek hatları bu mesafeden dışa doğru genişleyecektir." diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 733b994b1f..3d651185c8 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-03-14 14:49+0100\n" -"Last-Translator: Bothof \n" -"Language-Team: PCDotFan , Bothof \n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-29 15:51+0100\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Chinese , PCDotFan , Chinese \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,11 @@ msgid "" "

{model_names}

\n" "

Find out how to ensure the best possible print quality and reliability.

\n" "

View print quality guide

" -msgstr "

由于模型的大小和材质的配置，一个或多个3D模型可能无法最优地打印:

\n

{model_names}

\n

找出如何确保最好的打印质量和可靠性.

\n

查看打印质量指南

" +msgstr "" +"

由于模型的大小和材质的配置，一个或多个3D模型可能无法最优地打印:

\n" +"

{model_names}

\n" +"

找出如何确保最好的打印质量和可靠性.

\n" +"

查看打印质量指南

" #: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 msgctxt "@action" @@ -81,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "配置文件已被合并并激活。" +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF 文件" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -106,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "正在进行 USB 打印，关闭 Cura 将停止此打印。您确定吗？" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 文件" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -122,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g 文件" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G 文件" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -194,9 +202,9 @@ msgstr "无法保存到可移动磁盘 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "错误" @@ -226,8 +234,8 @@ msgstr "弹出可移动设备 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -358,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "打印机的配置或校准与 Cura 之间不匹配。为了获得最佳打印效果，请务必切换打印头和打印机中插入的材料。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "发送新作业（暂时）受阻，仍在发送前一份打印作业。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "向打印机发送数据" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "正在发送数据" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "取消" @@ -439,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "已通过网络连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "打印作业已成功发送到打印机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "数据已发送" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "在监控器中查看" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "打印机 '{printer_name}' 完成了打印任务 '{job_name}'。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "打印作业 '{job_name}' 已完成。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "打印完成" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "空" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "未知" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "通过云打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "通过云打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "通过云连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "云错误" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "无法导出打印作业。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "无法将数据上传到打印机。" @@ -544,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "通过 Ultimaker Cloud 上传" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "使用您的 Ultimaker account 帐户从任何地方发送和监控打印作业。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "连接到 Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "对此打印机不再询问。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "开始" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "您现在可以使用您的 Ultimaker account 帐户从任何地方发送和监控打印作业。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "已连接！" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "查看您的连接" @@ -584,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "通过网络连接" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura 设置向导" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -762,18 +765,18 @@ msgid "3MF File" msgstr "3MF 文件" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "喷嘴" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "项目文件 {0} 包含未知机器类型 {1}。无法导入机器。将改为导入模型。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "打开项目文件" @@ -905,13 +908,13 @@ msgid "Not supported" msgstr "不支持" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "文件已存在" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -923,117 +926,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "文件 URL 无效：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "已根据挤出机的当前可用性更改设置：[%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "已根据挤出机的当前可用性更改设置：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "设置已更新" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "挤出机已禁用" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "无法将配置文件导出至 {0} ： {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "无法将配置文件导出至 {0} ： 写入器插件报告故障。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "配置文件已导出至： {0} " -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "导出成功" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "无法从 {0} 导入配置文件：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "无法在添加打印机前从 {0} 导入配置文件。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "没有可导入文件 {0} 的自定义配置文件" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "无法从 {0} 导入配置文件：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "此配置文件 {0} 包含错误数据，无法导入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "配置文件 {0} ({1}) 中定义的机器与当前机器 ({2}) 不匹配，无法导入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "无法从 {0} 导入配置文件：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "已成功导入配置文件 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "文件 {0} 不包含任何有效的配置文件。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "配置 {0} 文件类型未知或已损坏。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "自定义配置文件" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "配置文件缺少打印质量类型定义。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1111,7 +1113,7 @@ msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1122,7 +1124,7 @@ msgstr "组 ＃{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1130,7 +1132,7 @@ msgstr "关闭" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "添加" @@ -1151,20 +1153,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有文件 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "未知" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "无法连接到下列打印机，因为这些打印机已在组中" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "可用的网络打印机" @@ -1180,12 +1182,12 @@ msgctxt "@label" msgid "Custom" msgstr "自定义" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "由于“打印序列”设置的值，成形空间体积高度已被减少，以防止十字轴与打印模型相冲突。" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "成形空间体积" @@ -1278,7 +1280,12 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "

糟糕，Ultimaker Cura 似乎遇到了问题。

\n

在启动时发生了不可修复的错误。这可能是因某些配置文件出错导致的。建议您备份并重置配置。

\n

您可在配置文件夹中找到备份。

\n

请向我们发送此错误报告，以便解决问题。

\n " +msgstr "" +"

糟糕，Ultimaker Cura 似乎遇到了问题。

\n" +"

在启动时发生了不可修复的错误。这可能是因某些配置文件出错导致的。建议您备份并重置配置。

\n" +"

您可在配置文件夹中找到备份。

\n" +"

请向我们发送此错误报告，以便解决问题。

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:98 msgctxt "@action:button" @@ -1311,7 +1318,10 @@ msgid "" "

A fatal error has occurred in Cura. Please send us this Crash Report to fix the problem

\n" "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" " " -msgstr "

Cura 发生了严重错误。请将这份错误报告发送给我们以便修复问题

\n

请使用“发送报告”按钮将错误报告自动发布到我们的服务器

\n " +msgstr "" +"

Cura 发生了严重错误。请将这份错误报告发送给我们以便修复问题

\n" +"

请使用“发送报告”按钮将错误报告自动发布到我们的服务器

\n" +" " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:173 msgctxt "@title:groupbox" @@ -1383,48 +1393,48 @@ msgstr "日志" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "用户说明" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "用户说明（注意：为避免开发人员可能不熟悉您的语言，请尽量使用英语）" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "发送报告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在载入打印机..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在设置场景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在载入界面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能加载一个 G-code 文件。{0} 已跳过导入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果加载 G-code，则无法打开其他任何文件。{0} 已跳过导入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "所选模型过小，无法加载。" @@ -1434,98 +1444,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "打印机设置" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (宽度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (深度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "打印平台形状" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "置中" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "加热床" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "G-code 风格" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "打印头设置" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "十字轴高度" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "挤出机数目" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "开始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "结束 G-code" @@ -1555,22 +1565,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "喷嘴偏移 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "喷嘴偏移 Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷却风扇数量" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "挤出机的开始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "挤出机的结束 G-code" @@ -1581,7 +1591,7 @@ msgid "Install" msgstr "安装" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "已安装" @@ -1604,8 +1614,8 @@ msgstr "插件" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "材料" @@ -1615,49 +1625,49 @@ msgctxt "@label" msgid "Your rating" msgstr "您的评分" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "版本" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "更新日期" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "作者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "下载项" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "安装或更新需要登录" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "购买材料线轴" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "更新" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "更新" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1769,7 +1779,10 @@ msgid "" "This plugin contains a license.\n" "You need to accept this license to install this plugin.\n" "Do you agree with the terms below?" -msgstr "该插件包含一个许可。\n您需要接受此许可才能安装此插件。\n是否同意下列条款？" +msgstr "" +"该插件包含一个许可。\n" +"您需要接受此许可才能安装此插件。\n" +"是否同意下列条款？" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:55 msgctxt "@action:button" @@ -1907,69 +1920,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "由于固件丢失，导致固件升级失败。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "玻璃" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "这些选项不可用，因为您正在监控云打印机。" +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "请及时更新打印机固件以远程管理打印队列。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "网络摄像头不可用，因为您正在监控云打印机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "正在加载..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "不可用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "无法连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "空闲" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "未命名" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "需要更改配置" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "详细信息" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "不可用的打印机" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "第一个可用" @@ -1979,36 +1992,31 @@ msgctxt "@label" msgid "Queued" msgstr "已排队" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "转到 Cura Connect" +msgid "Manage in browser" +msgstr "请于浏览器中进行管理" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "队列中无打印任务。可通过切片和发送添加任务。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "打印作业" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "总打印时间" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "等待" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "已完成所有打印工作。" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "查看打印历史" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2026,11 +2034,13 @@ msgstr "连接到网络打印机" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "要通过网络向打印机发送打印请求，请确保您的打印机已通过网线或 WIFI 连接到网络。若您不能连接 Cura 与打印机，您仍然可以使用 USB 设备将 G-code 文件传输到打印机。\n\n从以下列表中选择您的打印机：" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "欲通过网络向打印机发送打印请求，请确保您的打印机已通过网线或 WIFI 连接至网络。若不能连接 Cura 与打印机，亦可通过使用 USB 设备将 G-code 文件传输到打印机。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "请从以下列表中选择您的打印机：" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2038,9 +2048,9 @@ msgid "Edit" msgstr "编辑" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "删除" @@ -2123,50 +2133,50 @@ msgctxt "@action:button" msgid "OK" msgstr "确定" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "已中止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "已完成" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "正在准备..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "正在中止..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "正在暂停..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "已暂停" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "正在恢复..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "需要采取行动" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "完成 %1 于 %2" @@ -2270,43 +2280,43 @@ msgctxt "@action:button" msgid "Override" msgstr "覆盖" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "分配的打印机 %1 需要以下配置更改：" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "已向打印机 %1 分配作业，但作业包含未知的材料配置。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "将材料 %1 从 %2 更改为 %3。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "将 %3 作为材料 %1 进行加载（此操作无法覆盖）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "将 Print Core %1 从 %2 更改为 %3。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "将打印平台更改为 %1（此操作无法覆盖）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "覆盖将使用包含现有打印机配置的指定设置。这可能会导致打印失败。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "铝" @@ -2316,7 +2326,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "连接到打印机" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura 设置向导" @@ -2326,8 +2336,9 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." -msgstr "请确保您的打印机已连接：\n- 检查打印机是否已启动。\n- 检查打印机是否连接到网络。" +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." +msgstr "请确保您的打印机已连接：\n- 检查打印机是否已启动。\n- 检查打印机是否连接至网络。\n- 检查您是否已登录查找云连接的打印机。" #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2639,7 +2650,7 @@ msgid "Printer Group" msgstr "打印机组" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "配置文件设置" @@ -2652,19 +2663,19 @@ msgstr "配置文件中的冲突如何解决？" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "名字" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "不在配置文件中" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2834,18 +2845,24 @@ msgid "Previous" msgstr "上一步" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "导出" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "提示" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "通用" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "打印试验" @@ -2950,170 +2967,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "您确定要中止打印吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "确认直径更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新的灯丝直径被设置为%1毫米，这与当前的挤出机不兼容。你想继续吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "显示名称" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "品牌" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "材料类型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "颜色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "属性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "直径" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "耗材成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "耗材重量" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "耗材长度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "每米成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "此材料与 %1 相关联，并共享其某些属性。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "解绑材料" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "描述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "粘附信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "打印设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "激活" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "创建" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "复制" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "导入" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "打印机" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "确认删除" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "您确认要删除 %1？该操作无法恢复！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "导入配置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "无法导入材料 %1： %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功导入材料 %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "导出材料" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "无法导出材料至 %1： %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "成功导出材料至： %1" @@ -3154,383 +3171,406 @@ msgid "Unit" msgstr "单位" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "接口" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "语言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "币种：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "主题：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新启动 Cura，新的设置才能生效。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "当设置被更改时自动进行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "自动切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "视区行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "以红色突出显示模型需要增加支撑结构的区域。没有支撑，这些区域将无法正确打印。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "显示悬垂（Overhang）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "当模型被选中时，视角将自动调整到最合适的观察位置（模型处于正中央）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "当项目被选中时，自动对中视角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要令 Cura 的默认缩放操作反转吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反转视角变焦方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟随鼠标方向进行缩放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "正交透视中不支持通过鼠标缩放。" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟随鼠标方向缩放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移动平台上的模型，使它们不再相交吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "确保每个模型都保持分离" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "需要转动模型，使它们接触打印平台吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自动下降模型到打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 G-code 读取器中显示警告信息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 读取器中的警告信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "层视图要强制进入兼容模式吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "强制层视图兼容模式（需要重新启动）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "应使用哪种类型的摄像头进行渲染？" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "摄像头渲染： " + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "透视" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "正交" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "打开并保存文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "当模型的尺寸过大时，是否将模型自动缩小至成形空间体积？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "缩小过大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "当模型以米而不是毫米为单位时，模型可能会在打印平台中显得非常小。在此情况下是否进行放大？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大过小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型是否应该在加载后被选中？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "选择模型时加载" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "打印机名是否自动作为打印作业名称的前缀？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "将机器前缀添加到作业名称中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "保存项目文件时是否显示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "保存项目时显示摘要对话框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "打开项目文件时的默认行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "打开项目文件时的默认行为： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "总是询问" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "始终作为一个项目打开" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "始终导入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "当您对配置文件进行更改并切换到其他配置文件时将显示一个对话框，询问您是否要保留修改。您也可以选择一个默认行为并令其不再显示该对话框。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "切换到不同配置文件时对设置值更改的默认操作： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "总是询问" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "总是舍失更改的设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "总是将更改的设置传输至新配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "隐私" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "当 Cura 启动时，是否自动检查更新？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "启动时检查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "您愿意将关于您的打印数据以匿名形式发送到 Ultimaker 吗？注意：我们不会记录/发送任何模型、IP 地址或其他私人数据。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）发送打印信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "详细信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "实验性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "使用多打印平台功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "使用多打印平台功能（需要重启）" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "打印机" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "重命名" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "创建" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "复制" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "创建配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "请为此配置文件提供名称。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "复制配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "导入配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "导出配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "打印机：%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "默认配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "自定义配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "舍弃当前更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此配置文件使用打印机指定的默认值，因此在下面的列表中没有此设置项。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "您当前的设置与选定的配置文件相匹配。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局设置" @@ -3598,33 +3638,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "搜索设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "将值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "将所有修改值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隐藏此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再显示此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此设置可见" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "配置设定可见性..." @@ -3635,55 +3675,64 @@ msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "一些隐藏设置正在使用有别于一般设置的计算值。\n\n单击以使这些设置可见。" +msgstr "" +"一些隐藏设置正在使用有别于一般设置的计算值。\n" +"\n" +"单击以使这些设置可见。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "未使用此设置，因为受其影响的所有设置均已覆盖。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "影响" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "受影响项目" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "此设置始终在所有挤出机之间共享。在此处更改它将改变所有挤出机的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "该值将会根据每一个挤出机的设置而确定 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" "\n" "Click to restore the value of the profile." -msgstr "此设置的值与配置文件不同。\n\n单击以恢复配置文件的值。" +msgstr "" +"此设置的值与配置文件不同。\n" +"\n" +"单击以恢复配置文件的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" "\n" "Click to restore the calculated value." -msgstr "此设置通常可被自动计算，但其当前已被绝对定义。\n\n单击以恢复自动计算的值。" +msgstr "" +"此设置通常可被自动计算，但其当前已被绝对定义。\n" +"\n" +"单击以恢复自动计算的值。" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:144 msgctxt "@button" msgid "Recommended" msgstr "推荐" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "自定义" @@ -3708,12 +3757,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "在模型的悬垂（Overhangs）部分生成支撑结构。若不这样做，这些部分在打印时将倒塌。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "附着" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "允许打印 Brim 或 Raft。这将在您的对象周围或下方添加一个容易切断的平面区域。" @@ -3759,7 +3808,10 @@ msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "某些设置/重写值与存储在配置文件中的值不同。\n\n点击打开配置文件管理器。" +msgstr "" +"某些设置/重写值与存储在配置文件中的值不同。\n" +"\n" +"点击打开配置文件管理器。" #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" @@ -3796,7 +3848,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "发送 G-code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "向连接的打印机发送自定义 G-code 命令。按“Enter”发送命令。" @@ -3893,11 +3945,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "收藏" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "通用" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3948,7 +3995,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "摄像头位置(&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "摄像头视图" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "透视" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "正交" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "打印平台(&B)" @@ -4065,22 +4127,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "打开最近使用过的文件(&R)" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "正在打印" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "作业名" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "打印时间" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "预计剩余时间" @@ -4090,6 +4152,11 @@ msgctxt "@label" msgid "View type" msgstr "查看类型" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "对象列表" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4121,7 +4188,10 @@ msgid "" "- Send print jobs to Ultimaker printers outside your local network\n" "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" "- Get exclusive access to print profiles from leading brands" -msgstr "- 将打印作业发送到局域网外的 Ultimaker 打印机\n- 将 Ultimaker Cura 设置存储到云以便在任何地方使用\n- 获得来自领先品牌的打印配置文件的独家访问权限" +msgstr "" +"- 将打印作业发送到局域网外的 Ultimaker 打印机\n" +"- 将 Ultimaker Cura 设置存储到云以便在任何地方使用\n" +"- 获得来自领先品牌的打印配置文件的独家访问权限" #: /home/ruben/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 msgctxt "@button" @@ -4138,32 +4208,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "无可用成本估计" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "预览" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "正在切片..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "无法切片" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "正在处理中" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "切片" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "开始切片流程" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "取消" @@ -4198,230 +4273,235 @@ msgctxt "@label" msgid "Preset printers" msgstr "预设打印机" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "添加打印机" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "管理打印机" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "显示联机故障排除指南" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切换完整界面" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "退出完整界面" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "撤销(&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "重做(&R)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出(&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "正视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "顶视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "配置 Cura…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增打印机(&A)…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理打印机(&I)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "管理材料…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "舍弃当前更改（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "从当前设置 / 重写值创建配置文件（&C）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理配置文件.." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "显示在线文档(&D)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 反馈(&B)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新增功能" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "关于…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "删除所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "居中所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "复制所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "删除模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "使模型居于平台中央（&N）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "绑定模型（&G）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "拆分模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "合并模型（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "复制模型…（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "选择所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新载入所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "将所有模型编位到所有打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "编位所有的模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "为所选模型编位" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "复位所有模型的位置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "复位所有模型的变动" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "打开文件（&O）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建项目（&N）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "显示配置文件夹" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "市场(&M)" @@ -4436,49 +4516,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "这个包将在重新启动后安装。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "设置" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "关闭 Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "您确定要退出 Cura 吗？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "安装包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我们已经在您选择的文件中找到一个或多个 G-Code 文件。您一次只能打开一个 G-Code 文件。若需打开 G-Code 文件，请仅选择一个。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "新增打印机" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "新增功能" @@ -4499,7 +4579,9 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "您已自定义某些配置文件设置。\n您想保留或舍弃这些设置吗？" +msgstr "" +"您已自定义某些配置文件设置。\n" +"您想保留或舍弃这些设置吗？" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -4561,7 +4643,9 @@ msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" "Cura proudly uses the following open source projects:" -msgstr "Cura 由 Ultimaker B.V. 与社区合作开发。\nCura 使用以下开源项目：" +msgstr "" +"Cura 由 Ultimaker B.V. 与社区合作开发。\n" +"Cura 使用以下开源项目：" #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:134 msgctxt "@label" @@ -4698,32 +4782,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "保存项目" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "挤出机 %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "材料" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "保存时不再显示项目摘要" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "保存" @@ -4899,12 +4983,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "故障排除" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "打印机名称" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "请指定打印机名称" @@ -4954,28 +5038,15 @@ msgctxt "@text" msgid "" "Please follow these steps to set up\n" "Ultimaker Cura. This will only take a few moments." -msgstr "请按照以下步骤设置\nUltimaker Cura。此操作只需要几分钟时间。" +msgstr "" +"请按照以下步骤设置\n" +"Ultimaker Cura。此操作只需要几分钟时间。" #: /home/ruben/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 msgctxt "@button" msgid "Get started" msgstr "开始" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "只能看到当前的打印平台" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "编位到所有打印平台" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "编位当前打印平台" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5066,6 +5137,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "配置文件合并器" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "提供对读取 AMF 文件的支持。" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF 读取器" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5076,16 +5157,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB 联机打印" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "允许将产生的切片保存为X3G文件，以支持读取此格式的打印机（Malyan、Makerbot和其他基于sailfish打印机的打印机）。" - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3G写" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5336,6 +5407,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "版本自 3.0 升级到 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "请将配置从 Cura 4.1 升级至 Cura 4.2。" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "版本自 4.1 升级到 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5406,16 +5487,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF 读取器" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "读取 SVG 文件的刀具路径，调试打印机活动。" - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG 刀具路径读取器" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5506,6 +5577,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 配置文件读取器" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura 设置向导" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "已根据挤出机的当前可用性更改设置：[%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "用户说明" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "这些选项不可用，因为您正在监控云打印机。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "转到 Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "已完成所有打印工作。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "查看打印历史" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "要通过网络向打印机发送打印请求，请确保您的打印机已通过网线或 WIFI 连接到网络。若您不能连接 Cura 与打印机，您仍然可以使用 USB 设备将 G-code 文件传输到打印机。\n" +#~ "\n" +#~ "从以下列表中选择您的打印机：" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "请确保您的打印机已连接：\n" +#~ "- 检查打印机是否已启动。\n" +#~ "- 检查打印机是否连接到网络。" + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "只能看到当前的打印平台" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "编位到所有打印平台" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "编位当前打印平台" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "允许将产生的切片保存为X3G文件，以支持读取此格式的打印机（Malyan、Makerbot和其他基于sailfish打印机的打印机）。" + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3G写" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "读取 SVG 文件的刀具路径，调试打印机活动。" + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG 刀具路径读取器" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "更新日志" @@ -5712,7 +5859,6 @@ msgstr "Cura 配置文件读取器" #~ "- Store your Ultimaker Cura settings in the cloud for use anywhere\n" #~ "- Get exclusive access to material profiles from leading brands" #~ msgstr "" - #~ "- 发送打印作业到局域网外的 Ultimaker 打印机\n" #~ "- 将 Ultimaker Cura 设置存储到云以便在任何地方使用\n" #~ "- 获得来自领先品牌的材料配置文件的独家访问权限" @@ -5739,7 +5885,6 @@ msgstr "Cura 配置文件读取器" #~ "\n" #~ "If your printer is not in the list, use the \"Custom FFF Printer\" from the \"Custom\" category and adjust the settings to match your printer in the next dialog." #~ msgstr "" - #~ "从以下列表中选择您要使用的打印机。\n" #~ "\n" #~ "如果您的打印机不在列表中，使用“自定义”类别中的“自定义 FFF 打印机”，并在下一个对话框中调整设置以匹配您的打印机。" @@ -5952,7 +6097,6 @@ msgstr "Cura 配置文件读取器" #~ "Print Setup disabled\n" #~ "G-code files cannot be modified" #~ msgstr "" - #~ "打印设置已禁用\n" #~ "G-code 文件无法被修改" @@ -6205,7 +6349,6 @@ msgstr "Cura 配置文件读取器" #~ "Could not export using \"{}\" quality!\n" #~ "Felt back to \"{}\"." #~ msgstr "" - #~ "无法使用 \"{}\" 导出质量！\n" #~ "返回 \"{}\"。" @@ -6381,7 +6524,6 @@ msgstr "Cura 配置文件读取器" #~ "2) Turn the fan off (only if there are no tiny details on the model).\n" #~ "3) Use a different material." #~ msgstr "" - #~ "由于模型的对象大小和所选材质，某些模型可能无法打印出最佳效果：{Model_names}。\n" #~ "可以借鉴一些实用技巧来改善打印质量：\n" #~ "1) 使用圆角。\n" @@ -6398,7 +6540,6 @@ msgstr "Cura 配置文件读取器" #~ "\n" #~ "Thanks!" #~ msgstr "" - #~ "在图纸中找不到模型。请再次检查图纸内容，确保里面有一个零件或组件？\n" #~ "\n" #~ "谢谢！" @@ -6409,7 +6550,6 @@ msgstr "Cura 配置文件读取器" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "在图纸中找到一个以上的零件或组件。我们目前只支持里面正好有一个零件或组件的图纸。\n" #~ "\n" #~ "很抱歉！" @@ -6434,7 +6574,6 @@ msgstr "Cura 配置文件读取器" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "尊敬的客户：\n" #~ "我们无法在您的系统中找到有效的 SolidWorks 软件。这意味着您的系统中没有安装 SolidWorks，或者您没有获得有效的许可。请确保 SolidWorks 的运行没有任何问题并/或联系您的 ICT。\n" #~ "\n" @@ -6449,7 +6588,6 @@ msgstr "Cura 配置文件读取器" #~ "With kind regards\n" #~ " - Thomas Karl Pietrowski" #~ msgstr "" - #~ "尊敬的客户：\n" #~ "您当前正在非 Windows 操作系统上运行此插件。此插件只能在装有 SolidWorks 且拥有有效许可的 Windows 系统上运行。请在装有 SolidWorks 的 Windows 计算机上安装此插件。\n" #~ "\n" @@ -6554,7 +6692,6 @@ msgstr "Cura 配置文件读取器" #~ "Open the directory\n" #~ "with macro and icon" #~ msgstr "" - #~ "打开宏和图标\n" #~ "所在的目录" @@ -6853,7 +6990,6 @@ msgstr "Cura 配置文件读取器" #~ "\n" #~ " Thanks!." #~ msgstr "" - #~ "在您的图纸中找不到模型。请再次检查图纸内容，确保里面有一个零件或组件。\n" #~ "\n" #~ "谢谢！" @@ -6864,7 +7000,6 @@ msgstr "Cura 配置文件读取器" #~ "\n" #~ "Sorry!" #~ msgstr "" - #~ "在您的图纸中找到一个以上的零件或组件。我们目前只支持里面正好有一个零件或组件的图纸。\n" #~ "\n" #~ "很抱歉！" @@ -6899,7 +7034,6 @@ msgstr "Cura 配置文件读取器" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

发生了致命错误。请将这份错误报告发送给我们以便修复问题

\n" #~ "

请使用“发送报告”按钮将错误报告自动发布到我们的服务器

\n" #~ " " @@ -7066,7 +7200,6 @@ msgstr "Cura 配置文件读取器" #~ "

Please use the \"Send report\" button to post a bug report automatically to our servers

\n" #~ " " #~ msgstr "" - #~ "

发生了致命错误。 请将这份错误报告发送给我们以便修复问题

\n" #~ "

请使用“发送报告”按钮将错误报告自动发布到我们的服务器

\n" #~ " " @@ -7213,7 +7346,6 @@ msgstr "Cura 配置文件读取器" #~ "

Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues

\n" #~ " " #~ msgstr "" - #~ "

发生了致命错误，我们无法恢复！

\n" #~ "

请在以下网址中使用下方的信息提交错误报告：http://github.com/Ultimaker/Cura/issues

" @@ -7255,7 +7387,6 @@ msgstr "Cura 配置文件读取器" #~ "You need to accept this license to install this plugin.\n" #~ "Do you agree with the terms below?" #~ msgstr "" - #~ " 插件包含一个许可。\n" #~ "您需要接受此许可才能安装此插件。\n" #~ "是否同意下列条款？" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index 62bda7bf06..87a3ef4f8e 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index f6a213dc74..ff5fcdb819 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" -"Last-Translator: Bothof \n" -"Language-Team: PCDotFan , Bothof \n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-29 15:51+0200\n" +"Last-Translator: Lionbridge \n" +"Language-Team: Chinese , PCDotFan , Chinese \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,9 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "在开始时执行的 G-code 命令 - 以 \n 分行。" +msgstr "" +"在开始时执行的 G-code 命令 - 以 \n" +" 分行。" #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -70,7 +72,9 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "在结束前执行的 G-code 命令 - 以 \n 分行。" +msgstr "" +"在结束前执行的 G-code 命令 - 以 \n" +" 分行。" #: fdmprinter.def.json msgctxt "material_guid label" @@ -334,7 +338,7 @@ msgstr "挤出机必须保持不活动以便喷嘴冷却的最短时间。 挤 #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "G-code 风格" #: fdmprinter.def.json @@ -1294,8 +1298,8 @@ msgstr "缝隙角偏好设置" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "控制模型轮廓上的各个角是否影响缝隙的位置。 “无”意味着各个角不影响缝隙位置。 “隐藏缝隙”会使缝隙更可能出现在内侧角上。 “外露缝隙”会使缝隙更可能出现在外侧角上。 “隐藏或外露缝隙”会使缝隙更可能出现在内侧或外侧角上。" +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "控制模型轮廓上的角是否影响缝隙的位置。“无”表示各个角不影响缝隙位置。“隐藏缝隙”会使缝隙更可能出现在内侧角上。“外露缝隙”会使缝隙更可能出现在外侧角上。“隐藏或外露缝隙”会使缝隙更可能出现在内侧或外侧角上。“智能隐藏”允许缝隙出现在内侧和外侧角上，如适当，会更多地出现在内侧角上。" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1317,6 +1321,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "隐藏或外露缝隙" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "智能隐藏" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1329,13 +1338,13 @@ msgstr "启用时，Z 缝坐标为相对于各个部分中心的值。 禁用时 #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "忽略小 Z 间隙" +msgid "No Skin in Z Gaps" +msgstr "Z 间隙内无表层" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "当模型具有小的垂直间隙时，可能会花费大约 5％ 的额外计算时间来生成这些狭窄空间中的顶部和底部皮肤。 这种情况下，禁用该设置。" +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "当模型中只有几个分层有微小垂直间隙时，通常狭窄空间的分层周围应有表层。如果垂直间隙非常小，则启用此设置不生成表层。这缩短了打印时间和切片时间，但从技术方面看，会使填充物暴露在空气中。" #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1632,7 +1641,9 @@ msgctxt "infill_wall_line_count description" msgid "" "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\n" "This feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right." -msgstr "在填充区域周围添加额外壁。此类壁可减少顶部/底部皮肤走线，这意味着只要付出一些额外的材料就可以使用更少的顶部/底部皮肤层达到相同的质量。\n在适当配置的情况下，此功能可结合连接填充多边形以将所有填充物连接到单一挤出路径而无需空驶或回抽。" +msgstr "" +"在填充区域周围添加额外壁。此类壁可减少顶部/底部皮肤走线，这意味着只要付出一些额外的材料就可以使用更少的顶部/底部皮肤层达到相同的质量。\n" +"在适当配置的情况下，此功能可结合连接填充多边形以将所有填充物连接到单一挤出路径而无需空驶或回抽。" #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1871,8 +1882,8 @@ msgstr "打印体积温度" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "用于打印体积的温度。如果该值为 0，将不会调整打印体积温度。" +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "打印环境温度。若为 0，将不会调整构建体积温度。" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1984,6 +1995,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "百分比收缩率。" +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "晶体材料" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "该材料为受热后脱落干净的类型（晶体），还是会产生长交织状聚合物链的类型（非晶体）？" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "防渗出回抽位置" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "材料在停止渗出前所需的回抽长度。" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "防渗出回抽速度" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "在耗材用于防渗出过程中材料所需的回抽速率。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "断裂缓冲期回抽位置" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "耗材受热拉伸但不断裂的极限长度。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "断裂缓冲期回抽速度" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "耗材在回抽过程中恰好折断的回抽速率。" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "断裂回抽位置" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "为完全脱落耗材而抽回耗材的长度。" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "断裂回抽速度" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "为完全脱落耗材而抽回耗材的速度。" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "折断温度" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "耗材在完全脱落时的温度。" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1994,6 +2085,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "流量补偿：挤出的材料量乘以此值。" +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "壁流量" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "壁走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "外壁流量" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "最外壁走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "内壁流量" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "适用于所有壁走线（最外壁走线除外）的流量补偿。" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "顶部/底部流量" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "顶部/底部走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "顶部表层流量" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "打印顶部区域走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "填充流量" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "填充走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "裙边/边缘流量" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "裙边或边缘走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "支撑流量" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "支撑结构走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "支撑接触面流量" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "支撑顶板或底板走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "支撑顶板流量" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "支撑顶板走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "支撑底板流量" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "支撑底板走线的流量补偿。" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "装填塔流量" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "装填塔走线的流量补偿。" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2111,8 +2322,8 @@ msgstr "支撑限制被撤销" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." -msgstr "当从支撑移动到支撑直线时，省略撤回。启用这个设置可以节省打印时间，但是可以在支撑结构中产生出色的字符串。" +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." +msgstr "当在各个支撑间直线移动时，省略回抽。启用这个设置可以节省打印时间，但会在支撑结构中产生过多穿线。" #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2164,6 +2375,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "喷嘴切换回抽后耗材被推回的速度。" +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "喷嘴切换额外装填量" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "喷嘴切换后的额外装填材料。" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2355,14 +2576,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "打印 skirt 和 brim 的速度。 一般情况是以起始层速度打印这些部分，但有时候您可能想要以不同速度来打印 skirt 或 brim。" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "最大 Z 速度" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Z 抬升速度" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "打印平台移动的最大速度。 将该值设为零会使打印为最大 Z 速度采用固件默认值。" +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Z 垂直移动实现抬升的速度。一般小于打印速度，因为打印平台或打印机的十字轴较难移动。" #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3280,12 +3501,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "已打印起始层支撑结构走线之间的距离。该设置通过支撑密度计算。" #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "支撑填充走线方向" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "用于支撑的填充图案的方向。支撑填充图案在水平面中旋转。" @@ -3416,8 +3637,8 @@ msgstr "支撑结合部距离" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "支撑结构间在 X/Y 方向的最大距离。 当分离结构之间的距离小于此值时，这些结构将合并为一个。" +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "支撑结构间在 X/Y 方向的最大距离。当分离结构之间的距离小于此值时，这些结构将合并为一体。" #: fdmprinter.def.json msgctxt "support_offset label" @@ -3795,14 +4016,14 @@ msgid "The diameter of a special tower." msgstr "特殊塔的直径。" #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "最小直径" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "最大塔支撑直径" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "将由专门的支撑塔支撑的小区域 X/Y 轴方向的最小直径。" +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "将由专门的支撑塔支撑的小区域 X/Y 轴方向的最大直径。" #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -3924,7 +4145,9 @@ msgctxt "skirt_gap description" msgid "" "The horizontal distance between the skirt and the first layer of the print.\n" "This is the minimum distance. Multiple skirt lines will extend outwards from this distance." -msgstr "skirt 和打印第一层之间的水平距离。\n这是最小距离。多个 skirt 走线将从此距离向外延伸。" +msgstr "" +"skirt 和打印第一层之间的水平距离。\n" +"这是最小距离。多个 skirt 走线将从此距离向外延伸。" #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -4296,16 +4519,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在打印品相邻处打印一个塔，用于在每个喷嘴切换后装填材料。" -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "圆形装填塔" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "使装填塔成圆形。" - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4346,16 +4559,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "装填塔位置的 y 坐标。" -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "装填塔流量" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "流量补偿：挤出的材料量乘以此值。" - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4658,8 +4861,8 @@ msgstr "平滑螺旋轮廓" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." -msgstr "平滑螺旋轮廓以减少 Z 缝的可见性（Z 缝应在打印品上几乎看不到，但在层视图中仍然可见）。 请注意，平滑操作将倾向于模糊精细的表面细节。" +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgstr "平滑螺旋轮廓以减少 Z 缝的可见性（Z 缝于打印品上几乎不可见，但在层视图中仍然可见）。注意：平滑操作将模糊精细的表面细节。" #: fdmprinter.def.json msgctxt "relative_extrusion label" @@ -5158,8 +5361,8 @@ msgstr "启用锥形支撑" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "实验性功能： 让底部的支撑区域小于悬垂处的支撑区域。" +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "使底部的支撑区域小于悬垂处的支撑区域。" #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5391,7 +5594,9 @@ msgctxt "wireframe_up_half_speed description" msgid "" "Distance of an upward move which is extruded with half speed.\n" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." -msgstr "以半速挤出的上行移动的距离。\n这会与之前的层产生更好的附着，而不会将这些层中的材料过度加热。 仅应用于单线打印。" +msgstr "" +"以半速挤出的上行移动的距离。\n" +"这会与之前的层产生更好的附着，而不会将这些层中的材料过度加热。 仅应用于单线打印。" #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5958,6 +6163,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-code 风格" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "控制模型轮廓上的各个角是否影响缝隙的位置。 “无”意味着各个角不影响缝隙位置。 “隐藏缝隙”会使缝隙更可能出现在内侧角上。 “外露缝隙”会使缝隙更可能出现在外侧角上。 “隐藏或外露缝隙”会使缝隙更可能出现在内侧或外侧角上。" + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "忽略小 Z 间隙" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "当模型具有小的垂直间隙时，可能会花费大约 5％ 的额外计算时间来生成这些狭窄空间中的顶部和底部皮肤。 这种情况下，禁用该设置。" + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "用于打印体积的温度。如果该值为 0，将不会调整打印体积温度。" + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "当从支撑移动到支撑直线时，省略撤回。启用这个设置可以节省打印时间，但是可以在支撑结构中产生出色的字符串。" + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "最大 Z 速度" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "打印平台移动的最大速度。 将该值设为零会使打印为最大 Z 速度采用固件默认值。" + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "支撑结构间在 X/Y 方向的最大距离。 当分离结构之间的距离小于此值时，这些结构将合并为一个。" + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "最小直径" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "将由专门的支撑塔支撑的小区域 X/Y 轴方向的最小直径。" + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "圆形装填塔" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "使装填塔成圆形。" + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "流量补偿：挤出的材料量乘以此值。" + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "平滑螺旋轮廓以减少 Z 缝的可见性（Z 缝应在打印品上几乎看不到，但在层视图中仍然可见）。 请注意，平滑操作将倾向于模糊精细的表面细节。" + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "实验性功能： 让底部的支撑区域小于悬垂处的支撑区域。" + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "已启用的挤出机数目" @@ -6163,7 +6432,6 @@ msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" #~ "Gcode commands to be executed at the very start - separated by \n" #~ "." #~ msgstr "" - #~ "在开始后执行的 G-code 命令 - 以 \n" #~ " 分行" @@ -6176,7 +6444,6 @@ msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" #~ "Gcode commands to be executed at the very end - separated by \n" #~ "." #~ msgstr "" - #~ "在结束前执行的 G-code 命令 - 以 \n" #~ " 分行" @@ -6233,7 +6500,6 @@ msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" #~ "The horizontal distance between the skirt and the first layer of the print.\n" #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance." #~ msgstr "" - #~ "skirt 和打印第一层之间的水平距离。\n" #~ "这是最小距离，多个 skirt 走线将从此距离向外延伸。" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po old mode 100755 new mode 100644 index efd4202ffb..c311a2ab2c --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0200\n" -"PO-Revision-Date: 2019-05-24 21:46+0800\n" +"POT-Creation-Date: 2019-07-16 14:38+0200\n" +"PO-Revision-Date: 2019-07-20 20:39+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" @@ -85,6 +85,11 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "列印參數已被合併並啟用。" +#: /home/ruben/Projects/Cura/plugins/AMFReader/__init__.py:15 +msgctxt "@item:inlistbox" +msgid "AMF File" +msgstr "AMF 檔案" + #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:37 msgctxt "@item:inmenu" msgid "USB printing" @@ -110,12 +115,6 @@ msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USB 列印正在進行中，關閉 Cura 將停止此列印工作。你確定要繼續嗎？" -#: /home/ruben/Projects/Cura/plugins/X3GWriter/build/install/X3GWriter/__init__.py:15 -#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 -msgctxt "X3G Writer File Description" -msgid "X3G File" -msgstr "X3G 檔案" - #: /home/ruben/Projects/Cura/plugins/X3GWriter/build/GPX-prefix/src/GPX/slicerplugins/cura15.06/X3gWriter/__init__.py:16 msgctxt "X3g Writer Plugin Description" msgid "Writes X3g to files" @@ -126,6 +125,11 @@ msgctxt "X3g Writer File Description" msgid "X3g File" msgstr "X3g 檔案" +#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15 +msgctxt "X3G Writer File Description" +msgid "X3G File" +msgstr "X3G 檔案" + #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 msgctxt "@item:inlistbox" @@ -198,9 +202,9 @@ msgstr "無法儲存到行動裝置 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:188 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1620 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:134 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:141 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1622 msgctxt "@info:title" msgid "Error" msgstr "錯誤" @@ -230,8 +234,8 @@ msgstr "卸載行動裝置 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 #: /home/ruben/Projects/Cura/cura/OAuth2/AuthorizationService.py:197 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1610 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1710 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1612 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1712 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -362,39 +366,39 @@ msgid "There is a mismatch between the configuration or calibration of the print msgstr "印表機的設定或校正與 Cura 之間不匹配。為了獲得最佳列印效果，請使用印表機的 PrintCores 和耗材設定進行切片。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:171 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:181 msgctxt "@info:status" msgid "Sending new jobs (temporarily) blocked, still sending the previous print job." msgstr "前一列印作業傳送中，暫停傳送新列印作業。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:266 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:189 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:206 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:194 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:211 msgctxt "@info:status" msgid "Sending data to printer" msgstr "正在向印表機發送資料" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:267 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:191 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:196 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:213 msgctxt "@info:title" msgid "Sending Data" msgstr "發送資料中" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:268 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:209 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:214 #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:19 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:410 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:149 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:283 msgctxt "@action:button" msgid "Cancel" msgstr "取消" @@ -443,82 +447,82 @@ msgctxt "@info:status" msgid "Connected over the network" msgstr "透過網路連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:284 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:369 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:289 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "列印作業已成功傳送到印表機。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:286 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:370 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:291 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:371 msgctxt "@info:title" msgid "Data Sent" msgstr "資料傳送" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:287 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:292 msgctxt "@action:button" msgid "View in Monitor" msgstr "使用監控觀看" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:399 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:317 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:411 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:318 #, python-brace-format msgctxt "@info:status" msgid "Printer '{printer_name}' has finished printing '{job_name}'." msgstr "印表機 '{printer_name}' 已完成列印 '{job_name}'。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:401 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:321 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:413 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:322 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "列印作業 '{job_name}' 已完成。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:402 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:414 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:316 msgctxt "@info:status" msgid "Print finished" msgstr "列印已完成" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:583 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:617 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:595 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:629 msgctxt "@label:material" msgid "Empty" msgstr "空的" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:584 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:618 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:596 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:630 msgctxt "@label:material" msgid "Unknown" msgstr "未知" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:174 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:169 msgctxt "@action:button" msgid "Print via Cloud" msgstr "透過雲端服務列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:175 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:170 msgctxt "@properties:tooltip" msgid "Print via Cloud" msgstr "透過雲端服務列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:176 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:171 msgctxt "@info:status" msgid "Connected via Cloud" msgstr "透過雲端服務連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:186 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:182 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:359 msgctxt "@info:title" msgid "Cloud error" msgstr "雲端服務錯誤" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:203 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:199 msgctxt "@info:status" msgid "Could not export print job." msgstr "雲端服務未匯出列印作業。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:357 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:358 msgctxt "@info:text" msgid "Could not upload the data to the printer." msgstr "雲端服務未上傳資料到印表機。" @@ -548,37 +552,37 @@ msgctxt "@info:status" msgid "Uploading via Ultimaker Cloud" msgstr "透過 Ultimaker Cloud 上傳" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:624 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:621 msgctxt "@info:status" msgid "Send and monitor print jobs from anywhere using your Ultimaker account." msgstr "利用你的 Ultimaker 帳號在任何地方傳送和監控列印作業。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:630 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:627 msgctxt "@info:status Ultimaker Cloud is a brand name and shouldn't be translated." msgid "Connect to Ultimaker Cloud" msgstr "連接到 Ultimaker Cloud" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:628 msgctxt "@action" msgid "Don't ask me again for this printer." msgstr "對此印表機不要再次詢問。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:634 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:631 msgctxt "@action" msgid "Get started" msgstr "開始" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:640 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:637 msgctxt "@info:status" msgid "You can now send and monitor print jobs from anywhere using your Ultimaker account." msgstr "現在你可以利用你的 Ultimaker 帳號在任何地方傳送和監控列印作業。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:646 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:643 msgctxt "@info:status" msgid "Connected!" msgstr "已連線！" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:648 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py:645 msgctxt "@action" msgid "Review your connection" msgstr "檢查您的連線" @@ -588,11 +592,6 @@ msgctxt "@action" msgid "Connect via Network" msgstr "透過網路連接" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/__init__.py:16 -msgctxt "@item:inmenu" -msgid "Cura Settings Guide" -msgstr "Cura 設定指南" - #: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:14 msgctxt "@item:inmenu" msgid "Monitor" @@ -767,18 +766,18 @@ msgid "3MF File" msgstr "3MF 檔案" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:191 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:772 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:775 msgctxt "@label" msgid "Nozzle" msgstr "噴頭" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:470 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:474 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "專案檔案 {0} 包含未知的機器類型 {1}。機器無法被匯入，但模型將被匯入。" -#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:473 +#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:477 msgctxt "@info:title" msgid "Open Project File" msgstr "開啟專案檔案" @@ -910,13 +909,13 @@ msgid "Not supported" msgstr "不支援" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:203 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 msgctxt "@title:window" msgid "File Already Exists" msgstr "檔案已經存在" #: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:204 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:123 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" @@ -928,117 +927,116 @@ msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無效的檔案網址：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:924 -#, python-format -msgctxt "@info:generic" -msgid "Settings have been changed to match the current availability of extruders: [%s]" -msgstr "設定已改為與目前擠出機性能相匹配：[%s]" +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:925 +msgctxt "@info:message Followed by a list of settings." +msgid "Settings have been changed to match the current availability of extruders:" +msgstr "設定已被更改為符合目前擠出機：" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:926 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:927 msgctxt "@info:title" msgid "Settings updated" msgstr "設定更新" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1468 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1481 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "擠出機已停用" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:131 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to export profile to {0}: {1}" msgstr "無法將列印參數匯出至 {0}：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:138 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Failed to export profile to {0}: Writer plugin reported failure." msgstr "無法將列印參數匯出至 {0}：寫入器外掛報告故障。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 #, python-brace-format msgctxt "@info:status Don't translate the XML tag !" msgid "Exported profile to {0}" msgstr "列印參數已匯出至：{0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:144 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 msgctxt "@info:title" msgid "Export succeeded" msgstr "匯出成功" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:172 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}: {1}" msgstr "無法從 {0} 匯入列印參數：{1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:177 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:176 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Can't import profile from {0} before a printer is added." msgstr "在加入印表機前，無法從 {0} 匯入列印參數。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:192 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" msgstr "檔案 {0} 內沒有自訂列印參數可匯入" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:196 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "從 {0} 匯入列印參數失敗：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:218 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:228 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:220 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:230 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." msgstr "列印參數 {0} 含有不正確的資料，無法匯入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:243 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." msgstr "列印參數 {0} 內定義的機器（{1}）與你目前的機器（{2}）不匹配， 無法匯入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:315 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}:" msgstr "從 {0} 匯入列印參數失敗：" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:318 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "已成功匯入列印參數 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:319 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:321 #, python-brace-format msgctxt "@info:status" msgid "File {0} does not contain any valid profile." msgstr "檔案 {0} 內未含有效的列印參數。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:322 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:324 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "列印參數 {0} 檔案類型未知或已損壞。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:357 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:359 msgctxt "@label" msgid "Custom profile" msgstr "自訂列印參數" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:373 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:375 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "列印參數缺少列印品質類型定義。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:387 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:389 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." @@ -1116,7 +1114,7 @@ msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:73 +#: /home/ruben/Projects/Cura/cura/UI/ObjectsModel.py:61 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1127,7 +1125,7 @@ msgstr "群組 #{group_nr}" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:85 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:124 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:168 msgctxt "@action:button" msgid "Close" @@ -1135,7 +1133,7 @@ msgstr "關閉" #: /home/ruben/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:91 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:46 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "增加" @@ -1156,20 +1154,20 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有檔案 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:78 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:181 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:222 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:182 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:223 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:269 msgctxt "@label" msgid "Unknown" msgstr "未知" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:102 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:116 msgctxt "@label" msgid "The printer(s) below cannot be connected because they are part of a group" msgstr "下列印表機因為是群組的一部份導致無法連接" -#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:104 +#: /home/ruben/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:118 msgctxt "@label" msgid "Available networked printers" msgstr "可用的網路印表機" @@ -1185,12 +1183,12 @@ msgctxt "@label" msgid "Custom" msgstr "自訂" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:81 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:89 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." msgstr "由於「列印序列」設定的值，成形列印範圍高度已被減少，以防止龍門與列印模型相衝突。" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:83 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:91 msgctxt "@info:title" msgid "Build Volume" msgstr "列印範圍" @@ -1396,48 +1394,48 @@ msgstr "日誌" #: /home/ruben/Projects/Cura/cura/CrashHandler.py:322 msgctxt "@title:groupbox" -msgid "User description" -msgstr "使用者描述" +msgid "User description (Note: Developers may not speak your language, please use English if possible)" +msgstr "使用者描述（注意：開發人員可能不會說您的語言，請盡可能使用英語）" -#: /home/ruben/Projects/Cura/cura/CrashHandler.py:341 +#: /home/ruben/Projects/Cura/cura/CrashHandler.py:342 msgctxt "@action:button" msgid "Send report" msgstr "送出報告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:503 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:504 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在載入印表機..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:817 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:819 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在設定場景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:853 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:854 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在載入介面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1131 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1133 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1609 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1611 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能載入一個 G-code 檔案。{0} 已跳過匯入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1619 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1621 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果載入 G-code，則無法開啟其他任何檔案。{0} 已跳過匯入" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1709 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1711 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選擇的模型太小無法載入。" @@ -1447,98 +1445,98 @@ msgctxt "@title:label" msgid "Printer Settings" msgstr "印表機設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:70 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:72 msgctxt "@label" msgid "X (Width)" msgstr "X (寬度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:88 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:102 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:208 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:226 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:246 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:264 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:76 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:90 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:194 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:213 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:232 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:253 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:272 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:123 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 msgctxt "@label" msgid "mm" msgstr "mm" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:84 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:86 msgctxt "@label" msgid "Y (Depth)" msgstr "Y (深度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:98 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:100 msgctxt "@label" msgid "Z (Height)" msgstr "Z (高度)" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:112 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:114 msgctxt "@label" msgid "Build plate shape" msgstr "列印平台形狀" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:125 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:127 msgctxt "@label" msgid "Origin at center" msgstr "原點位於中心" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:137 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:139 msgctxt "@label" msgid "Heated bed" msgstr "熱床" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:149 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:151 msgctxt "@label" msgid "G-code flavor" msgstr "G-code 類型" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:176 msgctxt "@title:label" msgid "Printhead Settings" msgstr "列印頭設定" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:186 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:190 msgctxt "@label" msgid "X min" msgstr "X 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:204 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:209 msgctxt "@label" msgid "Y min" msgstr "Y 最小值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:222 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:228 msgctxt "@label" msgid "X max" msgstr "X 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:242 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:249 msgctxt "@label" msgid "Y max" msgstr "Y 最大值" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:260 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:268 msgctxt "@label" msgid "Gantry Height" msgstr "吊車高度" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:274 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:282 msgctxt "@label" msgid "Number of Extruders" msgstr "擠出機數目" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:333 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:341 msgctxt "@title:label" msgid "Start G-code" msgstr "起始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:347 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:355 msgctxt "@title:label" msgid "End G-code" msgstr "結束 G-code" @@ -1568,22 +1566,22 @@ msgctxt "@label" msgid "Nozzle offset X" msgstr "噴頭偏移 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:119 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:120 msgctxt "@label" msgid "Nozzle offset Y" msgstr "噴頭偏移 Y" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:133 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:135 msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷卻風扇數量" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:160 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "擠出機起始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:174 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "擠出機結束 G-code" @@ -1594,7 +1592,7 @@ msgid "Install" msgstr "安裝" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:20 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:45 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 msgctxt "@action:button" msgid "Installed" msgstr "已安裝" @@ -1617,8 +1615,8 @@ msgstr "外掛" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:70 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:44 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:417 msgctxt "@title:tab" msgid "Materials" msgstr "耗材" @@ -1628,49 +1626,49 @@ msgctxt "@label" msgid "Your rating" msgstr "你的評分" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:99 msgctxt "@label" msgid "Version" msgstr "版本" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:105 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:106 msgctxt "@label" msgid "Last updated" msgstr "最後更新時間" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:112 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:113 msgctxt "@label" msgid "Author" msgstr "作者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:119 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:120 msgctxt "@label" msgid "Downloads" msgstr "下載" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:55 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:56 msgctxt "@label:The string between and is the highlighted link" msgid "Log in is required to install or update" msgstr "需要登入才能進行安裝或升級" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:79 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "購買耗材線軸" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:95 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "更新" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:96 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "更新中" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:97 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:98 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" @@ -1923,69 +1921,69 @@ msgid "Firmware update failed due to missing firmware." msgstr "由於韌體遺失，導致韌體更新失敗。" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:144 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:185 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:181 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 msgctxt "@label" msgid "Glass" msgstr "玻璃" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:209 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:253 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:249 msgctxt "@info" -msgid "These options are not available because you are monitoring a cloud printer." -msgstr "由於你正在監控一台雲端印表機，因此無法使用這些選項。" +msgid "Please update your printer's firmware to manage the queue remotely." +msgstr "請更新你印表機的韌體以便遠端管理工作隊列。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:242 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:241 msgctxt "@info" msgid "The webcam is not available because you are monitoring a cloud printer." msgstr "由於你正在監控一台雲端印表機，因此無法使用網路攝影機。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:300 msgctxt "@label:status" msgid "Loading..." msgstr "正在載入..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:304 msgctxt "@label:status" msgid "Unavailable" msgstr "無法使用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:308 msgctxt "@label:status" msgid "Unreachable" msgstr "無法連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:314 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:312 msgctxt "@label:status" msgid "Idle" msgstr "閒置中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:355 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:353 msgctxt "@label" msgid "Untitled" msgstr "無標題" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:376 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:374 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:403 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:401 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "需要修改設定" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:441 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:439 msgctxt "@action:button" msgid "Details" msgstr "細項" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:134 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:130 msgctxt "@label" msgid "Unavailable printer" msgstr "無法使用的印表機" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:132 msgctxt "@label" msgid "First available" msgstr "可用的第一個" @@ -1995,36 +1993,31 @@ msgctxt "@label" msgid "Queued" msgstr "已排入隊列" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:68 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:67 msgctxt "@label link to connect manager" -msgid "Go to Cura Connect" -msgstr "前往 Cura Connect" +msgid "Manage in browser" +msgstr "使用瀏覽器管理" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:100 +msgctxt "@label" +msgid "There are no print jobs in the queue. Slice and send a job to add one." +msgstr "目前沒有列印作業在隊列中。可透過切片並傳送列印作來增加一個。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:116 msgctxt "@label" msgid "Print jobs" msgstr "列印作業" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:132 msgctxt "@label" msgid "Total print time" msgstr "總列印時間" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:133 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:148 msgctxt "@label" msgid "Waiting for" msgstr "等待" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:217 -msgctxt "@info" -msgid "All jobs are printed." -msgstr "所有列印作業已完成。" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml:252 -msgctxt "@label link to connect manager" -msgid "View print history" -msgstr "檢視列印歷史記錄" - #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:50 msgctxt "@window:title" msgid "Existing Connection" @@ -2042,14 +2035,13 @@ msgstr "連接到網路印表機" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 msgctxt "@label" -msgid "" -"To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" -"\n" -"Select your printer from the list below:" -msgstr "" -"要透過網路列印，請確認你的印表機已透過網路線或 WIFI 連接到網路。若你無法讓 Cura 與印表機連線，你仍然可以使用 USB 裝置將 G-code 檔案傳輸到印表機。\n" -"\n" -"從以下清單中選擇你的印表機：" +msgid "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer." +msgstr "要透過網路列印，請確認你的印表機已透過網路線或 WIFI 連接到網路。若你無法讓 Cura 與印表機連線，你仍然可以使用 USB 裝置將 G-code 檔案傳輸到印表機。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:81 +msgctxt "@label" +msgid "Select your printer from the list below:" +msgstr "從下列清單中選擇你的印表機：" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:101 msgctxt "@action:button" @@ -2057,9 +2049,9 @@ msgid "Edit" msgstr "編輯" #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:112 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:52 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 msgctxt "@action:button" msgid "Remove" msgstr "移除" @@ -2142,50 +2134,50 @@ msgctxt "@action:button" msgid "OK" msgstr "確定" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:73 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "已中斷" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:77 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "已完成" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:79 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:81 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." msgstr "正在準備..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:83 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." msgstr "正在中斷..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:92 msgctxt "@label:status" msgid "Pausing..." msgstr "正在暫停..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:94 msgctxt "@label:status" msgid "Paused" msgstr "已暫停" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:96 msgctxt "@label:status" msgid "Resuming..." msgstr "正在繼續..." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:98 msgctxt "@label:status" msgid "Action required" msgstr "需要採取的動作" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:100 msgctxt "@label:status" msgid "Finishes %1 at %2" msgstr "在 %2 完成 %1" @@ -2289,43 +2281,43 @@ msgctxt "@action:button" msgid "Override" msgstr "覆寫" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:65 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 msgctxt "@label" msgid "The assigned printer, %1, requires the following configuration change:" msgid_plural "The assigned printer, %1, requires the following configuration changes:" msgstr[0] "分配的印表機 %1 需要下列的設定更動：" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:69 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." msgstr "已分配到印表機 %1，但列印工作含有未知的耗材設定。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:79 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." msgstr "將耗材 %1 從 %2 改成 %3。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." msgstr "將 %3 做為耗材 %1 載入（無法覆寫）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:85 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" msgid "Change print core %1 from %2 to %3." msgstr "將 print core %1 從 %2 改成 %3。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:108 msgctxt "@label" msgid "Change build plate to %1 (This cannot be overridden)." msgstr "將列印平台改成 %1（無法覆寫）。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:95 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:115 msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "覆寫會將指定的設定套用在現有的印表機上。這可能導致列印失敗。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:136 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:156 msgctxt "@label" msgid "Aluminum" msgstr "鋁" @@ -2335,7 +2327,7 @@ msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "連接到印表機" -#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:17 +#: /home/ruben/Projects/Cura/plugins/SettingsGuide/resources/qml/SettingsGuide.qml:16 msgctxt "@title" msgid "Cura Settings Guide" msgstr "Cura 設定指南" @@ -2345,11 +2337,13 @@ msgctxt "@info" msgid "" "Please make sure your printer has a connection:\n" "- Check if the printer is turned on.\n" -"- Check if the printer is connected to the network." +"- Check if the printer is connected to the network.\n" +"- Check if you are signed in to discover cloud-connected printers." msgstr "" "請確認你的印表機有連接：\n" "- 檢查印表機是否已打開。\n" -"- 檢查印表機是否已連接到網路。" +"- 檢查印表機是否已連接到網路。\n" +"- 檢查是否已登入以尋找雲端連接的印表機。" #: /home/ruben/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:117 msgctxt "@info" @@ -2661,7 +2655,7 @@ msgid "Printer Group" msgstr "印表機群組" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Profile settings" msgstr "列印參數設定" @@ -2674,19 +2668,19 @@ msgstr "如何解决列印參數中的設定衝突？" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:216 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:250 msgctxt "@action:label" msgid "Name" msgstr "名稱" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:234 msgctxt "@action:label" msgid "Not in profile" msgstr "不在列印參數中" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236 -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:239 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -2856,18 +2850,24 @@ msgid "Previous" msgstr "前一個" #: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:60 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:159 msgctxt "@action:button" msgid "Export" msgstr "匯出" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:169 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:209 msgctxt "@label" msgid "Tip" msgstr "提示" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:156 +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorMaterialMenu.qml:20 +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 +msgctxt "@label:category menu label" +msgid "Generic" +msgstr "通用" + +#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:160 msgctxt "@label" msgid "Print experiment" msgstr "列印實驗" @@ -2972,170 +2972,170 @@ msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "你確定要中斷列印嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:73 msgctxt "@title" msgid "Information" msgstr "資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@title:window" msgid "Confirm Diameter Change" msgstr "直徑更改確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:103 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" msgstr "新的耗材直徑設定為 %1 mm，這與目前的擠出機不相容。你要繼續嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:127 msgctxt "@label" msgid "Display Name" msgstr "顯示名稱" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:137 msgctxt "@label" msgid "Brand" msgstr "品牌" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:147 msgctxt "@label" msgid "Material Type" msgstr "耗材類型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:163 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:157 msgctxt "@label" msgid "Color" msgstr "顏色" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:213 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:207 msgctxt "@label" msgid "Properties" msgstr "屬性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:215 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:209 msgctxt "@label" msgid "Density" msgstr "密度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:224 msgctxt "@label" msgid "Diameter" msgstr "直徑" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:258 msgctxt "@label" msgid "Filament Cost" msgstr "耗材成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:275 msgctxt "@label" msgid "Filament weight" msgstr "耗材重量" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:299 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:293 msgctxt "@label" msgid "Filament length" msgstr "耗材長度" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:302 msgctxt "@label" msgid "Cost per Meter" msgstr "每公尺成本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:322 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:316 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." msgstr "此耗材與 %1 相關聯，並共享其部份屬性。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:323 msgctxt "@label" msgid "Unlink Material" msgstr "解除聯結耗材" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:340 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:334 msgctxt "@label" msgid "Description" msgstr "描述" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:353 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:347 msgctxt "@label" msgid "Adhesion Information" msgstr "附著資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:373 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "列印設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:84 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:39 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:73 msgctxt "@action:button" msgid "Activate" msgstr "啟用" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:117 msgctxt "@action:button" msgid "Create" msgstr "建立" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:131 msgctxt "@action:button" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:141 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:160 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:148 msgctxt "@action:button" msgid "Import" msgstr "匯入" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:223 msgctxt "@action:label" msgid "Printer" msgstr "印表機" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:262 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:253 msgctxt "@title:window" msgid "Confirm Remove" msgstr "移除確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:263 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:254 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "你確定要移除 %1 嗎？這動作無法復原！" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:277 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 msgctxt "@title:window" msgid "Import Material" msgstr "匯入耗材設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:313 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "無法匯入耗材 %1：%2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:317 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功匯入耗材 %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:308 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:316 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:335 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:343 msgctxt "@title:window" msgid "Export Material" msgstr "匯出耗材設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:347 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "無法匯出耗材至 %1：%2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:326 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:353 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "成功匯出耗材至：%1" @@ -3176,383 +3176,406 @@ msgid "Unit" msgstr "單位" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:406 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:410 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:130 msgctxt "@label" msgid "Interface" msgstr "介面" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 msgctxt "@label" msgid "Language:" msgstr "語言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 msgctxt "@label" msgid "Currency:" msgstr "貨幣：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Theme:" msgstr "主題：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:273 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:277 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新啟動 Cura，新的設定才能生效。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:290 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "當設定變更時自動進行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:298 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:312 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:316 msgctxt "@label" msgid "Viewport behavior" msgstr "顯示區設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:320 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "以紅色凸顯模型缺少支撐的區域。如果沒有支撐這些區域將無法正常列印。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@option:check" msgid "Display overhang" msgstr "顯示突出部分" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:336 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "當模型被選中時，視角將自動調整到最合適的觀察位置（模型處於正中央）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "當專案被選中時，自動置中視角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:356 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要讓 Cura 的預設縮放操作反轉嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:361 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反轉視角縮放方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟隨滑鼠方向進行縮放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +msgctxt "@info:tooltip" +msgid "Zooming towards the mouse is not supported in the orthogonal perspective." +msgstr "正交透視不支援游標縮放功能。" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟隨滑鼠方向縮放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:380 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:402 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移動平台上的模型，使它們不再交錯嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "確保每個模型都保持分離" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "要將模型下降到碰觸列印平台嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:421 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動下降模型到列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 g-code 讀取器中顯示警告訊息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 讀取器中的警告訊息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "分層檢視要強制進入相容模式嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "強制分層檢視相容模式（需要重新啟動）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 +msgctxt "@info:tooltip" +msgid "What type of camera rendering should be used?" +msgstr "使用哪種類型的攝影機渲染？" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:472 +msgctxt "@window:text" +msgid "Camera rendering: " +msgstr "攝影機渲染：" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +msgid "Perspective" +msgstr "透視" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:484 +msgid "Orthogonal" +msgstr "正交" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:515 msgctxt "@label" msgid "Opening and saving files" msgstr "開啟並儲存檔案" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "當模型的尺寸過大時，是否將模型自動縮小至列印範圍嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527 msgctxt "@option:check" msgid "Scale large models" msgstr "縮小過大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:471 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "部份模型採用較大的單位(例如：公尺)，導致模型變得非常小，要將這些模型放大嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:476 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大過小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:486 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型載入後要設為被選擇的狀態嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@option:check" msgid "Select models when loaded" msgstr "模型載入後選擇模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:501 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:567 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "是否自動將印表機名稱作為列印作業名稱的前綴？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "將印表機名稱前綴添加到列印作業名稱中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:516 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:582 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "儲存專案檔案時是否顯示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "儲存專案時顯示摘要對話框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:530 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:596 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "開啟專案檔案時的預設行為" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:538 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "開啟專案檔案時的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:552 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "每次都向我確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "總是作為一個專案開啟" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:554 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:openProject" msgid "Always import models" msgstr "總是匯入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:656 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "當你對列印參數進行更改然後切換到其他列印參數時，將顯示一個對話框詢問你是否要保留修改。你也可以選擇預設不顯示該對話框。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:599 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:665 msgctxt "@label" msgid "Profiles" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:604 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:670 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "當切換到另一組列印參數時，對於被修改過的設定的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:684 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:157 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "總是詢問" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:619 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:685 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "總是放棄修改過的設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "總是將修改過的設定轉移至新的列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:654 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 msgctxt "@label" msgid "Privacy" msgstr "隱私權" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:661 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:727 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "當 Cura 啟動時，是否自動檢查更新？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:732 msgctxt "@option:check" msgid "Check for updates on start" msgstr "啟動時檢查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:676 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:742 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "你願意將關於你的列印資料以匿名形式發送到 Ultimaker 嗎？注意：我們不會記錄或發送任何模型、IP 地址或其他私人資料。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）發送列印資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:690 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:756 msgctxt "@action:button" msgid "More information" msgstr "更多資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:708 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:774 #: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml:27 #: /home/ruben/Projects/Cura/resources/qml/Menus/ProfileMenu.qml:23 msgctxt "@label" msgid "Experimental" msgstr "實驗功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:781 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "使用多列印平台功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:720 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:786 msgctxt "@option:check" msgid "Use multi build plate functionality (restart required)" msgstr "使用多列印平台功能（需重啟軟體）" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 msgctxt "@title:tab" msgid "Printers" msgstr "印表機" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:59 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:134 msgctxt "@action:button" msgid "Rename" msgstr "重命名" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:419 msgctxt "@title:tab" msgid "Profiles" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:89 msgctxt "@label" msgid "Create" msgstr "建立" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:105 msgctxt "@label" msgid "Duplicate" msgstr "複製" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@title:window" msgid "Create Profile" msgstr "建立列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:183 msgctxt "@info" msgid "Please provide a name for this profile." msgstr "請為此參數提供一個名字。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:239 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "複製列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:270 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:276 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:283 msgctxt "@title:window" msgid "Import Profile" msgstr "匯入列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:302 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:309 msgctxt "@title:window" msgid "Export Profile" msgstr "匯出列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:364 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "印表機：%1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Default profiles" msgstr "預設參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:413 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:420 msgctxt "@label" msgid "Custom profiles" msgstr "自訂列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:490 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:500 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫值更新列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:507 msgctxt "@action:button" msgid "Discard current changes" msgstr "捨棄目前更改" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:514 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:524 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此列印參數使用印表機指定的預設值，因此在下面的清單中沒有此設定項。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:521 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:531 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "你目前的設定與選定的列印參數相匹配。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:550 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局設定" @@ -3620,33 +3643,33 @@ msgctxt "@label:textbox" msgid "search settings" msgstr "搜尋設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:466 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "將設定值複製到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:474 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:475 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "複製所有改變的設定值到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:511 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:512 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隱藏此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:525 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再顯示此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:533 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:529 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此設定顯示" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:557 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:425 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:434 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "參數顯示設定..." @@ -3662,32 +3685,32 @@ msgstr "" "\n" "點擊以顯這些設定。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:81 msgctxt "@label" msgid "This setting is not used because all the settings that it influences are overridden." msgstr "此設定未被使用，因為受它影響的設定都被覆寫了。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:86 msgctxt "@label Header for list of settings." msgid "Affects" msgstr "影響" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:91 msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "影響因素" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186 msgctxt "@label" msgid "This setting is always shared between all extruders. Changing it here will change the value for all extruders." msgstr "這個設定是所有擠出機共用的。修改它會同時更動到所有擠出機的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:190 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "這個數值是由每個擠出機的設定值解析出來的 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:214 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:228 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3698,7 +3721,7 @@ msgstr "" "\n" "單擊以復原列印參數的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:308 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:322 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3714,7 +3737,7 @@ msgctxt "@button" msgid "Recommended" msgstr "推薦" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml:158 msgctxt "@button" msgid "Custom" msgstr "自訂選項" @@ -3739,12 +3762,12 @@ msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "在模型的突出部分產生支撐結構。若不這樣做，這些部分在列印時將倒塌。" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:28 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:29 msgctxt "@label" msgid "Adhesion" msgstr "附著" -#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml:74 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "允許列印邊緣或木筏。這將在你的物件周圍或下方添加一個容易切斷的平面區域。" @@ -3830,7 +3853,7 @@ msgctxt "@label" msgid "Send G-code" msgstr "傳送 G-code" -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:364 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:365 msgctxt "@tooltip of G-code command input" msgid "Send a custom G-code command to the connected printer. Press 'enter' to send the command." msgstr "傳送一個自訂的 G-code 命令到連接中的印表機。按下 Enter 鍵傳送命令。" @@ -3927,11 +3950,6 @@ msgctxt "@label:category menu label" msgid "Favorites" msgstr "常用" -#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:66 -msgctxt "@label:category menu label" -msgid "Generic" -msgstr "通用" - #: /home/ruben/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3982,7 +4000,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "視角位置（&C）" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:35 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +msgctxt "@action:inmenu menubar:view" +msgid "Camera view" +msgstr "攝影機檢視" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +msgctxt "@action:inmenu menubar:view" +msgid "Perspective" +msgstr "透視" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +msgctxt "@action:inmenu menubar:view" +msgid "Orthographic" +msgstr "正交" + +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "列印平台（&B）" @@ -4099,22 +4132,22 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "最近開啟的檔案（&R）" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:145 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:140 msgctxt "@label" msgid "Active print" msgstr "正在列印" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:148 msgctxt "@label" msgid "Job Name" msgstr "作業名稱" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:156 msgctxt "@label" msgid "Printing Time" msgstr "列印時間" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:164 msgctxt "@label" msgid "Estimated time left" msgstr "預計剩餘時間" @@ -4124,6 +4157,11 @@ msgctxt "@label" msgid "View type" msgstr "檢示類型" +#: /home/ruben/Projects/Cura/resources/qml/ObjectSelector.qml:59 +msgctxt "@label" +msgid "Object list" +msgstr "物件清單" + #: /home/ruben/Projects/Cura/resources/qml/Account/UserOperations.qml:22 msgctxt "@label The argument is a username." msgid "Hi %1" @@ -4175,32 +4213,37 @@ msgctxt "@label" msgid "No cost estimation available" msgstr "沒有成本估算" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/OutputProcessWidget.qml:127 msgctxt "@button" msgid "Preview" msgstr "預覽" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:49 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:55 msgctxt "@label:PrintjobStatus" msgid "Slicing..." msgstr "正在切片..." -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:67 msgctxt "@label:PrintjobStatus" msgid "Unable to slice" msgstr "無法切片" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 +msgctxt "@button" +msgid "Processing" +msgstr "處理中" + +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:103 msgctxt "@button" msgid "Slice" msgstr "切片" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:98 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:104 msgctxt "@label" msgid "Start the slicing process" msgstr "開始切片程序" -#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/ActionPanel/SliceProcessWidget.qml:118 msgctxt "@button" msgid "Cancel" msgstr "取消" @@ -4235,230 +4278,235 @@ msgctxt "@label" msgid "Preset printers" msgstr "預設印表機" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:166 msgctxt "@button" msgid "Add printer" msgstr "新增印表機" -#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/PrinterSelector/MachineSelector.qml:182 msgctxt "@button" msgid "Manage printers" msgstr "管理印表機" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:80 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:81 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "顯示線上故障排除指南" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切換全螢幕" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +msgctxt "@action:inmenu" +msgid "Exit Full Screen" +msgstr "離開全螢幕" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "復原（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "取消復原（&R）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:123 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出（&Q）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:122 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:131 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "立體圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:138 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "前視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:136 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:145 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "上視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:152 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:159 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:157 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:166 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "設定 Cura…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:164 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:173 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增印表機（&A）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:179 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理印表機（&I）..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "管理耗材…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫更新列印參數（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "捨棄目前更改（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:206 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:215 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "從目前設定 / 覆寫值建立列印參數（&C）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:212 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理列印參數.." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:229 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "顯示線上說明文件（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 回報（&B）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:245 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新功能" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "關於…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "刪除所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:259 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "置中所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "複製所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:277 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:286 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "刪除模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:285 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "將模型置中（&N）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:291 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:300 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "群組模型（&G）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:311 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:320 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "取消模型群組" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:330 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "結合模型（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:340 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "複製模型…（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:347 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "選擇所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:348 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新載入所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:367 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:376 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "將所有模型排列到所有列印平台上" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:383 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "排列所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:382 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "排列所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:389 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "重置所有模型位置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:396 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:405 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "重置所有模型旋轉" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:403 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:412 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "開啟檔案（&O）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:411 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建專案（&N）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:418 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:427 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "顯示設定資料夾" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:441 msgctxt "@action:menu" msgid "&Marketplace" msgstr "市集（&M）" @@ -4473,49 +4521,49 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "此軟體包將在重新啟動後安裝。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:413 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:535 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:539 msgctxt "@title:window" msgid "Closing Cura" msgstr "關閉 Cura 中" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:536 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:548 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:552 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "你確定要結束 Cura 嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:580 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:590 #: /home/ruben/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:681 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 msgctxt "@window:title" msgid "Install Package" msgstr "安裝軟體包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:689 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:699 msgctxt "@title:window" msgid "Open File(s)" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:692 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:702 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我們已經在你選擇的檔案中找到一個或多個 G-Code 檔案。你一次只能開啟一個 G-Code 檔案。若需開啟 G-Code 檔案，請僅選擇一個。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:795 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:805 msgctxt "@title:window" msgid "Add Printer" msgstr "新增印表機" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:803 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:813 msgctxt "@title:window" msgid "What's New" msgstr "新功能" @@ -4739,32 +4787,32 @@ msgctxt "@title:window" msgid "Save Project" msgstr "儲存專案" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:149 msgctxt "@action:label" msgid "Build plate" msgstr "列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:172 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:183 msgctxt "@action:label" msgid "Extruder %1" msgstr "擠出機 %1" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:187 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:198 msgctxt "@action:label" msgid "%1 & material" msgstr "%1 & 耗材" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:200 msgctxt "@action:label" msgid "Material" msgstr "耗材" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:261 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:272 msgctxt "@action:label" msgid "Don't show project summary on save again" msgstr "儲存時不再顯示專案摘要" -#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:291 msgctxt "@action:button" msgid "Save" msgstr "儲存" @@ -4940,12 +4988,12 @@ msgctxt "@label" msgid "Troubleshooting" msgstr "故障排除" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:204 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:207 msgctxt "@label" msgid "Printer name" msgstr "印表機名稱" -#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:220 msgctxt "@text" msgid "Please give your printer a name" msgstr "請為你的印表機取一個名稱" @@ -5004,21 +5052,6 @@ msgctxt "@button" msgid "Get started" msgstr "開始" -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:210 -msgctxt "@option:check" -msgid "See only current build plate" -msgstr "只顯示目前的列印平台" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:226 -msgctxt "@action:button" -msgid "Arrange to all build plates" -msgstr "擺放到所有的列印平台" - -#: /home/ruben/Projects/Cura/resources/qml/ObjectsList.qml:246 -msgctxt "@action:button" -msgid "Arrange current build plate" -msgstr "擺放到目前的列印平台" - #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." @@ -5109,6 +5142,16 @@ msgctxt "name" msgid "Profile Flattener" msgstr "參數撫平器" +#: AMFReader/plugin.json +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "提供對讀取 AMF 格式檔案的支援。" + +#: AMFReader/plugin.json +msgctxt "name" +msgid "AMF Reader" +msgstr "AMF 讀取器" + #: USBPrinting/plugin.json msgctxt "description" msgid "Accepts G-Code and sends them to a printer. Plugin can also update firmware." @@ -5119,16 +5162,6 @@ msgctxt "name" msgid "USB printing" msgstr "USB 連線列印" -#: X3GWriter/build/plugin.json -msgctxt "description" -msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." -msgstr "允許將切片結果儲存為 X3G 檔案，以支援讀取此格式的印表機（Malyan，Makerbot 和其他以 Sailfish 為原型的印表機）。" - -#: X3GWriter/build/plugin.json -msgctxt "name" -msgid "X3GWriter" -msgstr "X3G 寫入器" - #: GCodeGzWriter/plugin.json msgctxt "description" msgid "Writes g-code to a compressed archive." @@ -5379,6 +5412,16 @@ msgctxt "name" msgid "Version Upgrade 3.0 to 3.1" msgstr "升級版本 3.0 到 3.1" +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." +msgstr "將設定從 Cura 4.1 版本升級至 4.2 版本。" + +#: VersionUpgrade/VersionUpgrade41to42/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.1 to 4.2" +msgstr "升級版本 4.1 到 4.2" + #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." @@ -5449,16 +5492,6 @@ msgctxt "name" msgid "3MF Reader" msgstr "3MF 讀取器" -#: SVGToolpathReader/build/plugin.json -msgctxt "description" -msgid "Reads SVG files as toolpaths, for debugging printer movements." -msgstr "讀取 SVG 檔案做為工具路徑，用於印表機移動的除錯。" - -#: SVGToolpathReader/build/plugin.json -msgctxt "name" -msgid "SVG Toolpath Reader" -msgstr "SVG 工具路徑讀取器" - #: SolidView/plugin.json msgctxt "description" msgid "Provides a normal solid mesh view." @@ -5549,6 +5582,82 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 列印參數讀取器" +#~ msgctxt "@item:inmenu" +#~ msgid "Cura Settings Guide" +#~ msgstr "Cura 設定指南" + +#~ msgctxt "@info:generic" +#~ msgid "Settings have been changed to match the current availability of extruders: [%s]" +#~ msgstr "設定已改為與目前擠出機性能相匹配：[%s]" + +#~ msgctxt "@title:groupbox" +#~ msgid "User description" +#~ msgstr "使用者描述" + +#~ msgctxt "@info" +#~ msgid "These options are not available because you are monitoring a cloud printer." +#~ msgstr "由於你正在監控一台雲端印表機，因此無法使用這些選項。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "Go to Cura Connect" +#~ msgstr "前往 Cura Connect" + +#~ msgctxt "@info" +#~ msgid "All jobs are printed." +#~ msgstr "所有列印作業已完成。" + +#~ msgctxt "@label link to connect manager" +#~ msgid "View print history" +#~ msgstr "檢視列印歷史記錄" + +#~ msgctxt "@label" +#~ msgid "" +#~ "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n" +#~ "\n" +#~ "Select your printer from the list below:" +#~ msgstr "" +#~ "要透過網路列印，請確認你的印表機已透過網路線或 WIFI 連接到網路。若你無法讓 Cura 與印表機連線，你仍然可以使用 USB 裝置將 G-code 檔案傳輸到印表機。\n" +#~ "\n" +#~ "從以下清單中選擇你的印表機：" + +#~ msgctxt "@info" +#~ msgid "" +#~ "Please make sure your printer has a connection:\n" +#~ "- Check if the printer is turned on.\n" +#~ "- Check if the printer is connected to the network." +#~ msgstr "" +#~ "請確認你的印表機有連接：\n" +#~ "- 檢查印表機是否已打開。\n" +#~ "- 檢查印表機是否已連接到網路。" + +#~ msgctxt "@option:check" +#~ msgid "See only current build plate" +#~ msgstr "只顯示目前的列印平台" + +#~ msgctxt "@action:button" +#~ msgid "Arrange to all build plates" +#~ msgstr "擺放到所有的列印平台" + +#~ msgctxt "@action:button" +#~ msgid "Arrange current build plate" +#~ msgstr "擺放到目前的列印平台" + +#~ msgctxt "description" +#~ msgid "Allows saving the resulting slice as an X3G file, to support printers that read this format (Malyan, Makerbot and other Sailfish-based printers)." +#~ msgstr "允許將切片結果儲存為 X3G 檔案，以支援讀取此格式的印表機（Malyan，Makerbot 和其他以 Sailfish 為原型的印表機）。" + +#~ msgctxt "name" +#~ msgid "X3GWriter" +#~ msgstr "X3G 寫入器" + +#~ msgctxt "description" +#~ msgid "Reads SVG files as toolpaths, for debugging printer movements." +#~ msgstr "讀取 SVG 檔案做為工具路徑，用於印表機移動的除錯。" + +#~ msgctxt "name" +#~ msgid "SVG Toolpath Reader" +#~ msgstr "SVG 工具路徑讀取器" + #~ msgctxt "@item:inmenu" #~ msgid "Changelog" #~ msgstr "更新日誌" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index f13a220a91..ea48cff29d 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" "PO-Revision-Date: 2019-03-03 14:09+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po old mode 100755 new mode 100644 index 67d72621be..bd36f9cb2a --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.1\n" +"Project-Id-Version: Cura 4.2\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2019-05-14 12:48+0000\n" -"PO-Revision-Date: 2019-05-28 10:26+0200\n" +"POT-Creation-Date: 2019-07-16 14:38+0000\n" +"PO-Revision-Date: 2019-07-23 21:08+0800\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" @@ -337,7 +337,7 @@ msgstr "擠出機必須保持不活動以便噴頭冷卻的最短時間。擠出 #: fdmprinter.def.json msgctxt "machine_gcode_flavor label" -msgid "G-code Flavour" +msgid "G-code Flavor" msgstr "G-code 類型" #: fdmprinter.def.json @@ -1297,8 +1297,8 @@ msgstr "接縫偏好設定" #: fdmprinter.def.json msgctxt "z_seam_corner description" -msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." -msgstr "控制接縫是否受模型輪廓上的角影響。'無'表示轉角不影響接縫位置。'隱藏接縫'表示使用盡可能使用凹角做為接縫位置。'暴露接縫'表示盡可能使用凸角做為接縫位置。'隱藏或暴露接縫'則同時使用凹角和凸角做為接縫位置。" +msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner. Smart Hiding allows both inside and outside corners, but chooses inside corners more frequently, if appropriate." +msgstr "控制模型輪廓上的轉角是否影響接縫的位置。「無」表示轉角不影響接縫位置。「隱藏接縫」讓接縫盡量出現在凹角。「暴露接縫」讓接縫盡量出現在凸角。「隱藏或暴露接縫」讓接縫盡量出現在凹角或凸角。「智慧隱藏」允許使用凹角或凸角，但如果狀況合適，會盡可能地選擇凹角。" #: fdmprinter.def.json msgctxt "z_seam_corner option z_seam_corner_none" @@ -1320,6 +1320,11 @@ msgctxt "z_seam_corner option z_seam_corner_any" msgid "Hide or Expose Seam" msgstr "隱藏或暴露接縫" +#: fdmprinter.def.json +msgctxt "z_seam_corner option z_seam_corner_weighted" +msgid "Smart Hiding" +msgstr "智慧隱藏" + #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" @@ -1332,13 +1337,13 @@ msgstr "啟用時，Z 接縫座標為相對於各個部分中心的值。關閉 #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" -msgid "Ignore Small Z Gaps" -msgstr "忽略 Z 方向的小間隙" +msgid "No Skin in Z Gaps" +msgstr "Z 間隙無表層" #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic description" -msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." -msgstr "當模型具有微小的垂直間隙時，為了在這些間隙上產生頂部、底部等表面，會花費大約5％的額外的計算時間。勾選這個項目可以節省時間，但是間隙會消失，若要保留這些間隙，不要勾選這個項目。" +msgid "When the model has small vertical gaps of only a few layers, there should normally be skin around those layers in the narrow space. Enable this setting to not generate skin if the vertical gap is very small. This improves printing time and slicing time, but technically leaves infill exposed to the air." +msgstr "當模型具有僅幾層的小垂直間隙時，通常在那些層周圍的狹窄空間中應該存在表層。如果垂直間隙非常小，啟用此設定會停止自動產生表層。這樣可以縮短列印時間和切片時間，但技術上會使填充暴露出來。" #: fdmprinter.def.json msgctxt "skin_outline_count label" @@ -1876,8 +1881,8 @@ msgstr "列印空間溫度" #: fdmprinter.def.json msgctxt "build_volume_temperature description" -msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." -msgstr "設定列印空間的溫度。如果設定為 0，就不會加熱列印空間。" +msgid "The temperature of the environment to print in. If this is 0, the build volume temperature will not be adjusted." +msgstr "列印的環境溫度。如果設為 0，則不會調整列印空間溫度。" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1989,6 +1994,86 @@ msgctxt "material_shrinkage_percentage description" msgid "Shrinkage ratio in percentage." msgstr "收縮率百分比。" +#: fdmprinter.def.json +msgctxt "material_crystallinity label" +msgid "Crystalline Material" +msgstr "晶狀耗材" + +#: fdmprinter.def.json +msgctxt "material_crystallinity description" +msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" +msgstr "這種耗材高溫時是脆斷的類型（晶狀），還是拉絲的類型（非晶狀）？" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position label" +msgid "Anti-ooze Retracted Position" +msgstr "防滲漏回抽位置" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retracted_position description" +msgid "How far the material needs to be retracted before it stops oozing." +msgstr "停止滲漏要回抽耗材多長的距離。" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed label" +msgid "Anti-ooze Retraction Speed" +msgstr "防滲漏回抽速度" + +#: fdmprinter.def.json +msgctxt "material_anti_ooze_retraction_speed description" +msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." +msgstr "在耗材切換回抽時，需要多快的速度來防止滲漏。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position label" +msgid "Break Preparation Retracted Position" +msgstr "回抽切斷前位置" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_retracted_position description" +msgid "How far the filament can be stretched before it breaks, while heated." +msgstr "在加熱時，耗材在脆斷前可以拉伸多長的距離。" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed label" +msgid "Break Preparation Retraction Speed" +msgstr "回抽切斷前速度" + +#: fdmprinter.def.json +msgctxt "material_break_preparation_speed description" +msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." +msgstr "回抽切斷前，耗材回抽的速度" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position label" +msgid "Break Retracted Position" +msgstr "回抽切斷位置" + +#: fdmprinter.def.json +msgctxt "material_break_retracted_position description" +msgid "How far to retract the filament in order to break it cleanly." +msgstr "要讓耗材脆斷需要回抽長的距離。" + +#: fdmprinter.def.json +msgctxt "material_break_speed label" +msgid "Break Retraction Speed" +msgstr "回抽切斷速度" + +#: fdmprinter.def.json +msgctxt "material_break_speed description" +msgid "The speed at which to retract the filament in order to break it cleanly." +msgstr "要讓耗材脆斷要回抽多快。" + +#: fdmprinter.def.json +msgctxt "material_break_temperature label" +msgid "Break Temperature" +msgstr "切斷溫度" + +#: fdmprinter.def.json +msgctxt "material_break_temperature description" +msgid "The temperature at which the filament is broken for a clean break." +msgstr "要讓耗材脆斷所需的溫度。" + #: fdmprinter.def.json msgctxt "material_flow label" msgid "Flow" @@ -1999,6 +2084,126 @@ msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." msgstr "流量補償：擠出的耗材量乘以此值。" +#: fdmprinter.def.json +msgctxt "wall_material_flow label" +msgid "Wall Flow" +msgstr "牆壁流量" + +#: fdmprinter.def.json +msgctxt "wall_material_flow description" +msgid "Flow compensation on wall lines." +msgstr "牆壁線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow label" +msgid "Outer Wall Flow" +msgstr "外壁流量" + +#: fdmprinter.def.json +msgctxt "wall_0_material_flow description" +msgid "Flow compensation on the outermost wall line." +msgstr "外壁線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow label" +msgid "Inner Wall(s) Flow" +msgstr "內壁流量" + +#: fdmprinter.def.json +msgctxt "wall_x_material_flow description" +msgid "Flow compensation on wall lines for all wall lines except the outermost one." +msgstr "最外層牆壁以外的牆壁線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "skin_material_flow label" +msgid "Top/Bottom Flow" +msgstr "頂部/底部流量" + +#: fdmprinter.def.json +msgctxt "skin_material_flow description" +msgid "Flow compensation on top/bottom lines." +msgstr "頂部/底部線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow label" +msgid "Top Surface Skin Flow" +msgstr "頂部表層流量" + +#: fdmprinter.def.json +msgctxt "roofing_material_flow description" +msgid "Flow compensation on lines of the areas at the top of the print." +msgstr "頂部區域線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "infill_material_flow label" +msgid "Infill Flow" +msgstr "填充流量" + +#: fdmprinter.def.json +msgctxt "infill_material_flow description" +msgid "Flow compensation on infill lines." +msgstr "填充線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow label" +msgid "Skirt/Brim Flow" +msgstr "外圍/邊緣流量" + +#: fdmprinter.def.json +msgctxt "skirt_brim_material_flow description" +msgid "Flow compensation on skirt or brim lines." +msgstr "外圍/邊緣線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "support_material_flow label" +msgid "Support Flow" +msgstr "支撐流量" + +#: fdmprinter.def.json +msgctxt "support_material_flow description" +msgid "Flow compensation on support structure lines." +msgstr "支撐結構線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow label" +msgid "Support Interface Flow" +msgstr "支撐介面流量" + +#: fdmprinter.def.json +msgctxt "support_interface_material_flow description" +msgid "Flow compensation on lines of support roof or floor." +msgstr "支撐頂板或底板線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow label" +msgid "Support Roof Flow" +msgstr "支撐頂板流量" + +#: fdmprinter.def.json +msgctxt "support_roof_material_flow description" +msgid "Flow compensation on support roof lines." +msgstr "支撐頂板線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow label" +msgid "Support Floor Flow" +msgstr "支撐底板流量" + +#: fdmprinter.def.json +msgctxt "support_bottom_material_flow description" +msgid "Flow compensation on support floor lines." +msgstr "支撐底板線條的流量補償。" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow label" +msgid "Prime Tower Flow" +msgstr "換料塔流量" + +#: fdmprinter.def.json +msgctxt "prime_tower_flow description" +msgid "Flow compensation on prime tower lines." +msgstr "換料塔線條的流量補償。" + #: fdmprinter.def.json msgctxt "material_flow_layer_0 label" msgid "Initial Layer Flow" @@ -2116,7 +2321,7 @@ msgstr "限制支撐回抽" #: fdmprinter.def.json msgctxt "limit_support_retractions description" -msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure." msgstr "當從支撐直線移動到另一支撐時，省略回抽。啟用此功能可節省列印時間，但會導致支撐內部有較多的牽絲。" #: fdmprinter.def.json @@ -2169,6 +2374,16 @@ msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." msgstr "噴頭切換回抽後耗材被推回的速度。" +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount label" +msgid "Nozzle Switch Extra Prime Amount" +msgstr "噴頭切換額外裝填量" + +#: fdmprinter.def.json +msgctxt "switch_extruder_extra_prime_amount description" +msgid "Extra material to prime after nozzle switching." +msgstr "噴頭切換後額外裝填的耗材量。" + #: fdmprinter.def.json msgctxt "speed label" msgid "Speed" @@ -2360,14 +2575,14 @@ msgid "The speed at which the skirt and brim are printed. Normally this is done msgstr "列印外圍和邊緣的速度。一般情况是以起始層速度列印這些部分，但有時候你可能想要以不同速度來列印外圍或邊緣。" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override label" -msgid "Maximum Z Speed" -msgstr "最大 Z 軸速度" +msgctxt "speed_z_hop label" +msgid "Z Hop Speed" +msgstr "Z 抬升速度" #: fdmprinter.def.json -msgctxt "max_feedrate_z_override description" -msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." -msgstr "列印平台移動的最大速度。將該值設為零會使列印為最大 Z 速度採用韌體預設值。" +msgctxt "speed_z_hop description" +msgid "The speed at which the vertical Z movement is made for Z Hops. This is typically lower than the print speed since the build plate or machine's gantry is harder to move." +msgstr "Z 抬升時 Z 軸垂直移動的速度。這通常低於列印速度，因為列印平台或機器的吊車較難移動。" #: fdmprinter.def.json msgctxt "speed_slowdown_layers label" @@ -3285,12 +3500,12 @@ msgid "Distance between the printed initial layer support structure lines. This msgstr "支撐結構起始層線條之間的距離。該設定通過支撐密度計算。" #: fdmprinter.def.json -msgctxt "support_infill_angle label" -msgid "Support Infill Line Direction" +msgctxt "support_infill_angles label" +msgid "Support Infill Line Directions" msgstr "支撐填充線條方向" #: fdmprinter.def.json -msgctxt "support_infill_angle description" +msgctxt "support_infill_angles description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "支撐填充樣式的方向。 支撐填充樣式的旋轉方向是在水平面上旋轉。" @@ -3421,8 +3636,8 @@ msgstr "支撐結合距離" #: fdmprinter.def.json msgctxt "support_join_distance description" -msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." -msgstr "支撐結構間在 X/Y 方向的最大距離。當分離結構之間的距離小於此值時，這些結構將合併為一個。" +msgid "The maximum distance between support structures in the X/Y directions. When separate structures are closer together than this value, the structures merge into one." +msgstr "支撐結構間在 X/Y 方向的最大距離。當結構與結構靠近到小於此值時，這些結構將合併為一個。" #: fdmprinter.def.json msgctxt "support_offset label" @@ -3800,14 +4015,14 @@ msgid "The diameter of a special tower." msgstr "特殊塔的直徑。" #: fdmprinter.def.json -msgctxt "support_minimal_diameter label" -msgid "Minimum Diameter" -msgstr "最小直徑" +msgctxt "support_tower_maximum_supported_diameter label" +msgid "Maximum Tower-Supported Diameter" +msgstr "最大塔型支撐直徑" #: fdmprinter.def.json -msgctxt "support_minimal_diameter description" -msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." -msgstr "小區域中支撐塔的 X/Y 軸方向最小直徑。" +msgctxt "support_tower_maximum_supported_diameter description" +msgid "Maximum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +msgstr "塔型支撐使用的區域在 X/Y 方向的最大直徑。" #: fdmprinter.def.json msgctxt "support_tower_roof_angle label" @@ -4303,16 +4518,6 @@ msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充耗材。" -#: fdmprinter.def.json -msgctxt "prime_tower_circular label" -msgid "Circular Prime Tower" -msgstr "圓型換料塔" - -#: fdmprinter.def.json -msgctxt "prime_tower_circular description" -msgid "Make the prime tower as a circular shape." -msgstr "將換料塔印成圓型。" - #: fdmprinter.def.json msgctxt "prime_tower_size label" msgid "Prime Tower Size" @@ -4353,16 +4558,6 @@ msgctxt "prime_tower_position_y description" msgid "The y coordinate of the position of the prime tower." msgstr "換料塔位置的 Y 座標。" -#: fdmprinter.def.json -msgctxt "prime_tower_flow label" -msgid "Prime Tower Flow" -msgstr "換料塔流量" - -#: fdmprinter.def.json -msgctxt "prime_tower_flow description" -msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "流量補償：擠出的耗材量乘以此值。" - #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled label" msgid "Wipe Inactive Nozzle on Prime Tower" @@ -4665,7 +4860,7 @@ msgstr "平滑螺旋輪廓" #: fdmprinter.def.json msgctxt "smooth_spiralized_contours description" -msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." msgstr "平滑螺旋輪廓可以減少 Z 縫的出現（Z 縫應在列印品上幾乎看不到，但在分層檢視中仍然可見）。請注意，平滑操作將傾向於模糊精細的表面細節。" #: fdmprinter.def.json @@ -5165,8 +5360,8 @@ msgstr "啟用錐形支撐" #: fdmprinter.def.json msgctxt "support_conical_enabled description" -msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." -msgstr "實驗性功能： 讓底部的支撐區域小於突出部分的支撐區域。" +msgid "Make support areas smaller at the bottom than at the overhang." +msgstr "讓底部的支撐區域小於突出部分的支撐區域。" #: fdmprinter.def.json msgctxt "support_conical_angle label" @@ -5967,6 +6162,70 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在將模型從檔案中載入時套用在模型上的轉換矩陣。" +#~ msgctxt "machine_gcode_flavor label" +#~ msgid "G-code Flavour" +#~ msgstr "G-code 類型" + +#~ msgctxt "z_seam_corner description" +#~ msgid "Control whether corners on the model outline influence the position of the seam. None means that corners have no influence on the seam position. Hide Seam makes the seam more likely to occur on an inside corner. Expose Seam makes the seam more likely to occur on an outside corner. Hide or Expose Seam makes the seam more likely to occur at an inside or outside corner." +#~ msgstr "控制接縫是否受模型輪廓上的角影響。'無'表示轉角不影響接縫位置。'隱藏接縫'表示使用盡可能使用凹角做為接縫位置。'暴露接縫'表示盡可能使用凸角做為接縫位置。'隱藏或暴露接縫'則同時使用凹角和凸角做為接縫位置。" + +#~ msgctxt "skin_no_small_gaps_heuristic label" +#~ msgid "Ignore Small Z Gaps" +#~ msgstr "忽略 Z 方向的小間隙" + +#~ msgctxt "skin_no_small_gaps_heuristic description" +#~ msgid "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting." +#~ msgstr "當模型具有微小的垂直間隙時，為了在這些間隙上產生頂部、底部等表面，會花費大約5％的額外的計算時間。勾選這個項目可以節省時間，但是間隙會消失，若要保留這些間隙，不要勾選這個項目。" + +#~ msgctxt "build_volume_temperature description" +#~ msgid "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted." +#~ msgstr "設定列印空間的溫度。如果設定為 0，就不會加熱列印空間。" + +#~ msgctxt "limit_support_retractions description" +#~ msgid "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excesive stringing within the support structure." +#~ msgstr "當從支撐直線移動到另一支撐時，省略回抽。啟用此功能可節省列印時間，但會導致支撐內部有較多的牽絲。" + +#~ msgctxt "max_feedrate_z_override label" +#~ msgid "Maximum Z Speed" +#~ msgstr "最大 Z 軸速度" + +#~ msgctxt "max_feedrate_z_override description" +#~ msgid "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed." +#~ msgstr "列印平台移動的最大速度。將該值設為零會使列印為最大 Z 速度採用韌體預設值。" + +#~ msgctxt "support_join_distance description" +#~ msgid "The maximum distance between support structures in the X/Y directions. When seperate structures are closer together than this value, the structures merge into one." +#~ msgstr "支撐結構間在 X/Y 方向的最大距離。當分離結構之間的距離小於此值時，這些結構將合併為一個。" + +#~ msgctxt "support_minimal_diameter label" +#~ msgid "Minimum Diameter" +#~ msgstr "最小直徑" + +#~ msgctxt "support_minimal_diameter description" +#~ msgid "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower." +#~ msgstr "小區域中支撐塔的 X/Y 軸方向最小直徑。" + +#~ msgctxt "prime_tower_circular label" +#~ msgid "Circular Prime Tower" +#~ msgstr "圓型換料塔" + +#~ msgctxt "prime_tower_circular description" +#~ msgid "Make the prime tower as a circular shape." +#~ msgstr "將換料塔印成圓型。" + +#~ msgctxt "prime_tower_flow description" +#~ msgid "Flow compensation: the amount of material extruded is multiplied by this value." +#~ msgstr "流量補償：擠出的耗材量乘以此值。" + +#~ msgctxt "smooth_spiralized_contours description" +#~ msgid "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details." +#~ msgstr "平滑螺旋輪廓可以減少 Z 縫的出現（Z 縫應在列印品上幾乎看不到，但在分層檢視中仍然可見）。請注意，平滑操作將傾向於模糊精細的表面細節。" + +#~ msgctxt "support_conical_enabled description" +#~ msgid "Experimental feature: Make support areas smaller at the bottom than at the overhang." +#~ msgstr "實驗性功能： 讓底部的支撐區域小於突出部分的支撐區域。" + #~ msgctxt "extruders_enabled_count label" #~ msgid "Number of Extruders that are enabled" #~ msgstr "已啟用擠出機的數量" diff --git a/resources/meshes/FelixPro2_platform.obj b/resources/meshes/FelixPro2_platform.obj new file mode 100644 index 0000000000..1d13cdd904 --- /dev/null +++ b/resources/meshes/FelixPro2_platform.obj @@ -0,0 +1,4485 @@ +# Blender v2.79 (sub 0) OBJ File: 'FelixPro2_platform.blend' +# www.blender.org +o Body1 +v 177.244446 31.941147 -22.999994 +v 177.244446 31.941143 -4.999995 +v 177.500000 30.000004 -22.999994 +v 177.500000 30.000000 -4.999995 +v 177.244446 28.058861 -22.999996 +v 177.244446 28.058857 -4.999995 +v 176.495193 26.250004 -22.999996 +v 176.495193 26.250000 -4.999996 +v 175.303299 24.696703 -22.999996 +v 175.303299 24.696699 -4.999996 +v 173.750000 23.504812 -22.999996 +v 173.750000 23.504808 -4.999996 +v 171.941147 22.755560 -22.999996 +v 171.941147 22.755556 -4.999996 +v 170.000000 22.500004 -22.999996 +v 170.000000 22.500000 -4.999996 +v 168.058853 22.755560 -22.999996 +v 168.058853 22.755556 -4.999996 +v 166.250000 23.504812 -22.999996 +v 166.250000 23.504808 -4.999996 +v 164.696701 24.696703 -22.999996 +v 164.696701 24.696699 -4.999996 +v 163.504807 26.250004 -22.999996 +v 163.504807 26.250000 -4.999996 +v 162.755554 28.058861 -22.999996 +v 162.755554 28.058857 -4.999995 +v 162.500000 30.000004 -22.999994 +v 162.500000 30.000000 -4.999995 +v 162.755554 31.941147 -22.999994 +v 162.755554 31.941143 -4.999995 +v 163.504807 33.750004 -22.999994 +v 163.504807 33.750000 -4.999994 +v 164.696701 35.303307 -22.999994 +v 164.696701 35.303303 -4.999994 +v 166.250000 36.495193 -22.999994 +v 166.250000 36.495190 -4.999994 +v 168.058853 37.244450 -22.999994 +v 168.058853 37.244446 -4.999994 +v 170.000000 37.500004 -22.999994 +v 170.000000 37.500000 -4.999994 +v 171.941147 37.244450 -22.999994 +v 171.941147 37.244446 -4.999994 +v 173.750000 36.495193 -22.999994 +v 173.750000 36.495190 -4.999994 +v 175.303299 35.303307 -22.999994 +v 175.303299 35.303303 -4.999994 +v 176.495193 33.750004 -22.999994 +v 176.495193 33.750000 -4.999994 +v 97.424881 121.941139 -22.999981 +v 97.424881 121.941139 -4.999980 +v 97.680435 120.000000 -22.999981 +v 97.680435 120.000000 -4.999980 +v 97.424881 118.058861 -22.999981 +v 97.424881 118.058861 -4.999981 +v 96.675629 116.250000 -22.999981 +v 96.675629 116.250000 -4.999981 +v 95.483734 114.696701 -22.999981 +v 95.483734 114.696701 -4.999981 +v 93.930435 113.504807 -22.999981 +v 93.930435 113.504807 -4.999981 +v 92.121582 112.755554 -22.999981 +v 92.121582 112.755554 -4.999981 +v 90.180435 112.500000 -22.999981 +v 90.180435 112.500000 -4.999982 +v 88.239296 112.755554 -22.999981 +v 88.239296 112.755554 -4.999981 +v 86.430435 113.504807 -22.999981 +v 86.430435 113.504807 -4.999981 +v 84.877136 114.696701 -22.999981 +v 84.877136 114.696701 -4.999981 +v 83.685249 116.250000 -22.999981 +v 83.685249 116.250000 -4.999981 +v 82.935989 118.058861 -22.999981 +v 82.935989 118.058861 -4.999981 +v 82.680435 120.000000 -22.999981 +v 82.680435 120.000000 -4.999980 +v 82.935989 121.941139 -22.999981 +v 82.935989 121.941139 -4.999980 +v 83.685249 123.750000 -22.999979 +v 83.685249 123.750000 -4.999980 +v 84.877136 125.303299 -22.999979 +v 84.877136 125.303299 -4.999979 +v 86.430435 126.495193 -22.999979 +v 86.430435 126.495193 -4.999979 +v 88.239296 127.244446 -22.999979 +v 88.239296 127.244446 -4.999979 +v 90.180435 127.500000 -22.999979 +v 90.180435 127.500000 -4.999979 +v 92.121582 127.244446 -22.999979 +v 92.121582 127.244446 -4.999979 +v 93.930435 126.495193 -22.999979 +v 93.930435 126.495193 -4.999979 +v 95.483734 125.303299 -22.999979 +v 95.483734 125.303299 -4.999979 +v 96.675629 123.750000 -22.999979 +v 96.675629 123.750000 -4.999980 +v 180.000000 20.000004 -22.999996 +v 160.000000 20.000004 -22.999996 +v 160.000000 49.896946 -22.999992 +v 105.938271 109.965530 -22.999983 +v 160.000000 190.103058 -22.999969 +v 173.750000 203.504807 -22.999968 +v 171.941147 202.755554 -22.999968 +v 175.303299 204.696701 -22.999968 +v 176.495193 206.250000 -22.999966 +v 177.244446 208.058853 -22.999966 +v 180.000000 220.000000 -22.999964 +v 102.087685 120.000000 -22.999981 +v 102.532974 116.372253 -22.999981 +v 103.842422 112.959900 -22.999981 +v 79.031021 109.965530 -22.999983 +v 76.935173 112.959900 -22.999981 +v 75.625732 116.372253 -22.999981 +v 75.180435 120.000000 -22.999981 +v 75.625732 123.627747 -22.999979 +v 76.935173 127.040100 -22.999979 +v 79.031021 130.034470 -22.999979 +v 105.938271 130.034470 -22.999979 +v 160.000000 220.000000 -22.999964 +v 103.842422 127.040100 -22.999979 +v 102.532974 123.627747 -22.999979 +v 162.500000 210.000000 -22.999966 +v 162.755554 211.941147 -22.999966 +v 170.000000 217.500000 -22.999964 +v 171.941147 217.244446 -22.999964 +v 173.750000 216.495193 -22.999966 +v 177.244446 211.941147 -22.999966 +v 177.500000 210.000000 -22.999966 +v 170.000000 202.500000 -22.999968 +v 168.058853 202.755554 -22.999968 +v 166.250000 203.504807 -22.999968 +v 164.696701 204.696701 -22.999968 +v 163.504807 206.250000 -22.999966 +v 162.755554 208.058853 -22.999966 +v 163.504807 213.750000 -22.999966 +v 164.696701 215.303299 -22.999966 +v 166.250000 216.495193 -22.999966 +v 168.058853 217.244446 -22.999964 +v 175.303299 215.303299 -22.999966 +v 176.495193 213.750000 -22.999966 +v 160.000000 220.000000 -29.999964 +v 134.000000 220.000000 -29.999964 +v 160.017288 220.019211 -30.195053 +v 134.000000 220.034073 -30.258783 +v 160.068512 220.076126 -30.382647 +v 134.000000 220.133972 -30.499964 +v 160.151672 220.168533 -30.555534 +v 134.000000 220.292892 -30.707071 +v 160.263611 220.292892 -30.707071 +v 160.399994 220.444427 -30.831434 +v 134.000000 220.500000 -30.865990 +v 160.555588 220.617310 -30.923843 +v 134.000000 220.741180 -30.965889 +v 160.724426 220.804916 -30.980749 +v 134.000000 221.000000 -30.999964 +v 160.899994 221.000000 -30.999964 +v 125.000000 229.000000 -29.999962 +v 125.034073 229.000000 -30.258781 +v 125.306671 226.670624 -29.999964 +v 125.339584 226.679443 -30.258783 +v 126.205772 224.500000 -29.999964 +v 126.235283 224.517044 -30.258783 +v 127.636040 222.636032 -29.999964 +v 127.660133 222.660126 -30.258783 +v 129.500000 221.205765 -29.999964 +v 129.517044 221.235275 -30.258783 +v 131.670624 220.306671 -29.999964 +v 131.679443 220.339584 -30.258783 +v 131.705307 220.436081 -30.499964 +v 131.746429 220.589584 -30.707071 +v 131.800034 220.789627 -30.865990 +v 131.862457 221.022598 -30.965889 +v 131.929443 221.272598 -30.999964 +v 125.133972 229.000000 -30.499962 +v 125.436073 226.705307 -30.499964 +v 126.321800 224.566986 -30.499964 +v 127.730774 222.730774 -30.499964 +v 129.566986 221.321793 -30.499964 +v 125.292892 229.000000 -30.707069 +v 125.589584 226.746429 -30.707071 +v 126.459427 224.646454 -30.707071 +v 127.843147 222.843140 -30.707071 +v 129.646454 221.459427 -30.707071 +v 125.500000 229.000000 -30.865988 +v 125.789627 226.800034 -30.865990 +v 126.638786 224.750000 -30.865990 +v 127.989594 222.989594 -30.865990 +v 129.750000 221.638779 -30.865990 +v 125.741180 229.000000 -30.965887 +v 126.022591 226.862457 -30.965889 +v 126.847656 224.870590 -30.965889 +v 128.160126 223.160126 -30.965889 +v 129.870590 221.847656 -30.965889 +v 126.000000 229.000000 -30.999962 +v 126.272591 226.929443 -30.999964 +v 127.071800 225.000000 -30.999964 +v 128.343140 223.343140 -30.999964 +v 130.000000 222.071793 -30.999964 +v 125.000000 251.000000 -29.999960 +v 125.034073 251.000000 -30.258780 +v 125.133972 251.000000 -30.499960 +v 125.292892 251.000000 -30.707067 +v 125.500000 251.000000 -30.865986 +v 125.741180 251.000000 -30.965885 +v 126.000000 251.000000 -30.999960 +v 134.000000 260.000000 -29.999958 +v 134.000000 259.965912 -30.258778 +v 131.670624 259.693329 -29.999958 +v 131.679443 259.660431 -30.258778 +v 129.500000 258.794220 -29.999958 +v 129.517044 258.764709 -30.258778 +v 127.636040 257.363953 -29.999958 +v 127.660133 257.339874 -30.258778 +v 126.205772 255.500000 -29.999958 +v 126.235283 255.482956 -30.258778 +v 125.306671 253.329376 -29.999958 +v 125.339584 253.320557 -30.258778 +v 125.436073 253.294693 -30.499958 +v 125.589584 253.253571 -30.707066 +v 125.789627 253.199966 -30.865984 +v 126.022591 253.137543 -30.965883 +v 126.272591 253.070557 -30.999958 +v 134.000000 259.866028 -30.499958 +v 131.705307 259.563934 -30.499958 +v 129.566986 258.678192 -30.499958 +v 127.730774 257.269226 -30.499958 +v 126.321800 255.433014 -30.499958 +v 134.000000 259.707092 -30.707066 +v 131.746429 259.410431 -30.707066 +v 129.646454 258.540588 -30.707066 +v 127.843147 257.156860 -30.707066 +v 126.459427 255.353546 -30.707066 +v 134.000000 259.500000 -30.865984 +v 131.800034 259.210358 -30.865984 +v 129.750000 258.361206 -30.865984 +v 127.989594 257.010406 -30.865984 +v 126.638786 255.250000 -30.865984 +v 134.000000 259.258820 -30.965883 +v 131.862457 258.977417 -30.965883 +v 129.870590 258.152344 -30.965883 +v 128.160126 256.839874 -30.965883 +v 126.847656 255.129410 -30.965883 +v 134.000000 259.000000 -30.999958 +v 131.929443 258.727417 -30.999958 +v 130.000000 257.928192 -30.999958 +v 128.343140 256.656860 -30.999958 +v 127.071800 255.000000 -30.999958 +v 186.000000 260.000000 -29.999958 +v 186.000000 259.965912 -30.258778 +v 186.000000 259.866028 -30.499958 +v 186.000000 259.707092 -30.707066 +v 186.000000 259.500000 -30.865984 +v 186.000000 259.258820 -30.965883 +v 186.000000 259.000000 -30.999958 +v 195.000000 251.000000 -29.999960 +v 194.965927 251.000000 -30.258780 +v 194.693329 253.329376 -29.999958 +v 194.660416 253.320557 -30.258778 +v 193.794235 255.500000 -29.999958 +v 193.764725 255.482956 -30.258778 +v 192.363968 257.363953 -29.999958 +v 192.339874 257.339874 -30.258778 +v 190.500000 258.794220 -29.999958 +v 190.482956 258.764709 -30.258778 +v 188.329376 259.693329 -29.999958 +v 188.320557 259.660431 -30.258778 +v 188.294693 259.563934 -30.499958 +v 188.253571 259.410431 -30.707066 +v 188.199966 259.210358 -30.865984 +v 188.137543 258.977417 -30.965883 +v 188.070557 258.727417 -30.999958 +v 194.866028 251.000000 -30.499960 +v 194.563919 253.294693 -30.499958 +v 193.678207 255.433014 -30.499958 +v 192.269226 257.269226 -30.499958 +v 190.433014 258.678192 -30.499958 +v 194.707108 251.000000 -30.707067 +v 194.410416 253.253571 -30.707066 +v 193.540573 255.353546 -30.707066 +v 192.156860 257.156860 -30.707066 +v 190.353546 258.540588 -30.707066 +v 194.500000 251.000000 -30.865986 +v 194.210373 253.199966 -30.865984 +v 193.361221 255.250000 -30.865984 +v 192.010406 257.010406 -30.865984 +v 190.250000 258.361206 -30.865984 +v 194.258820 251.000000 -30.965885 +v 193.977402 253.137543 -30.965883 +v 193.152344 255.129410 -30.965883 +v 191.839874 256.839874 -30.965883 +v 190.129410 258.152344 -30.965883 +v 194.000000 251.000000 -30.999960 +v 193.727402 253.070557 -30.999958 +v 192.928207 255.000000 -30.999958 +v 191.656860 256.656860 -30.999958 +v 190.000000 257.928192 -30.999958 +v 195.000000 229.000000 -29.999962 +v 194.965927 229.000000 -30.258781 +v 194.866028 229.000000 -30.499962 +v 194.707108 229.000000 -30.707069 +v 194.500000 229.000000 -30.865988 +v 194.258820 229.000000 -30.965887 +v 194.000000 229.000000 -30.999962 +v 186.000000 220.000000 -29.999964 +v 186.000000 220.034073 -30.258783 +v 188.329376 220.306671 -29.999964 +v 188.320557 220.339584 -30.258783 +v 190.500000 221.205765 -29.999964 +v 190.482956 221.235275 -30.258783 +v 192.363968 222.636032 -29.999964 +v 192.339874 222.660126 -30.258783 +v 193.794235 224.500000 -29.999964 +v 193.764725 224.517044 -30.258783 +v 194.693329 226.670624 -29.999964 +v 194.660416 226.679443 -30.258783 +v 194.563919 226.705307 -30.499964 +v 194.410416 226.746429 -30.707071 +v 194.210373 226.800034 -30.865990 +v 193.977402 226.862457 -30.965889 +v 193.727402 226.929443 -30.999964 +v 186.000000 220.133972 -30.499964 +v 188.294693 220.436081 -30.499964 +v 190.433014 221.321793 -30.499964 +v 192.269226 222.730774 -30.499964 +v 193.678207 224.566986 -30.499964 +v 186.000000 220.292892 -30.707071 +v 188.253571 220.589584 -30.707071 +v 190.353546 221.459427 -30.707071 +v 192.156860 222.843140 -30.707071 +v 193.540573 224.646454 -30.707071 +v 186.000000 220.500000 -30.865990 +v 188.199966 220.789627 -30.865990 +v 190.250000 221.638779 -30.865990 +v 192.010406 222.989594 -30.865990 +v 193.361221 224.750000 -30.865990 +v 186.000000 220.741180 -30.965889 +v 188.137543 221.022598 -30.965889 +v 190.129410 221.847656 -30.965889 +v 191.839874 223.160126 -30.965889 +v 193.152344 224.870590 -30.965889 +v 186.000000 221.000000 -30.999964 +v 188.070557 221.272598 -30.999964 +v 190.000000 222.071793 -30.999964 +v 191.656860 223.343140 -30.999964 +v 192.928207 225.000000 -30.999964 +v 180.000000 220.000000 -29.999964 +v 180.000000 220.034073 -30.258783 +v 180.000000 220.133972 -30.499964 +v 180.000000 220.292892 -30.707071 +v 180.000000 220.500000 -30.865990 +v 180.000000 220.741180 -30.965889 +v 180.000000 221.000000 -30.999964 +v 186.000000 220.000000 -13.999964 +v 188.329376 220.306671 -13.999964 +v 190.500000 221.205765 -13.999964 +v 192.363968 222.636032 -13.999964 +v 193.794235 224.500000 -13.999964 +v 194.693329 226.670624 -13.999963 +v 195.000000 229.000000 -13.999963 +v 195.000000 251.000000 -13.999959 +v 194.693329 253.329376 -13.999959 +v 193.794235 255.500000 -13.999958 +v 192.363968 257.363953 -13.999958 +v 190.500000 258.794220 -13.999958 +v 188.329376 259.693329 -13.999958 +v 186.000000 260.000000 -13.999958 +v 134.000000 260.000000 -13.999958 +v 131.670624 259.693329 -13.999958 +v 129.500000 258.794220 -13.999958 +v 127.636040 257.363953 -13.999958 +v 126.205772 255.500000 -13.999958 +v 125.306671 253.329376 -13.999959 +v 125.000000 251.000000 -13.999959 +v 125.000000 229.000000 -13.999963 +v 125.306671 226.670624 -13.999963 +v 126.205772 224.500000 -13.999964 +v 127.636040 222.636032 -13.999964 +v 129.500000 221.205765 -13.999964 +v 131.670624 220.306671 -13.999964 +v 134.000000 220.000000 -13.999964 +v 194.000000 251.000000 -12.999959 +v 194.000000 229.000000 -12.999963 +v 194.258820 251.000000 -13.034033 +v 194.258820 229.000000 -13.034037 +v 194.500000 251.000000 -13.133934 +v 194.500000 229.000000 -13.133938 +v 194.707108 251.000000 -13.292852 +v 194.707108 229.000000 -13.292856 +v 194.866028 251.000000 -13.499959 +v 194.866028 229.000000 -13.499963 +v 194.965927 251.000000 -13.741140 +v 194.965927 229.000000 -13.741144 +v 186.000000 259.965912 -13.741139 +v 188.320557 259.660431 -13.741139 +v 190.482956 258.764709 -13.741139 +v 192.339874 257.339874 -13.741139 +v 193.764725 255.482956 -13.741139 +v 194.660416 253.320557 -13.741140 +v 194.563919 253.294693 -13.499959 +v 194.410416 253.253571 -13.292852 +v 194.210373 253.199966 -13.133934 +v 193.977402 253.137543 -13.034033 +v 193.727402 253.070557 -12.999959 +v 186.000000 259.866028 -13.499958 +v 188.294693 259.563934 -13.499958 +v 190.433014 258.678192 -13.499958 +v 192.269226 257.269226 -13.499958 +v 193.678207 255.433014 -13.499958 +v 186.000000 259.707092 -13.292851 +v 188.253571 259.410431 -13.292851 +v 190.353546 258.540588 -13.292851 +v 192.156860 257.156860 -13.292851 +v 193.540573 255.353546 -13.292851 +v 186.000000 259.500000 -13.133933 +v 188.199966 259.210358 -13.133933 +v 190.250000 258.361206 -13.133933 +v 192.010406 257.010406 -13.133933 +v 193.361221 255.250000 -13.133933 +v 186.000000 259.258820 -13.034032 +v 188.137543 258.977417 -13.034032 +v 190.129410 258.152344 -13.034032 +v 191.839874 256.839874 -13.034032 +v 193.152344 255.129410 -13.034032 +v 186.000000 259.000000 -12.999958 +v 188.070557 258.727417 -12.999958 +v 190.000000 257.928192 -12.999958 +v 191.656860 256.656860 -12.999958 +v 192.928207 255.000000 -12.999958 +v 134.000000 259.965912 -13.741139 +v 134.000000 259.866028 -13.499958 +v 134.000000 259.707092 -13.292851 +v 134.000000 259.500000 -13.133933 +v 134.000000 259.258820 -13.034032 +v 134.000000 259.000000 -12.999958 +v 125.034073 251.000000 -13.741140 +v 125.339584 253.320557 -13.741140 +v 126.235283 255.482956 -13.741139 +v 127.660133 257.339874 -13.741139 +v 129.517044 258.764709 -13.741139 +v 131.679443 259.660431 -13.741139 +v 131.705307 259.563934 -13.499958 +v 131.746429 259.410431 -13.292851 +v 131.800034 259.210358 -13.133933 +v 131.862457 258.977417 -13.034032 +v 131.929443 258.727417 -12.999958 +v 125.133972 251.000000 -13.499959 +v 125.436073 253.294693 -13.499959 +v 126.321800 255.433014 -13.499958 +v 127.730774 257.269226 -13.499958 +v 129.566986 258.678192 -13.499958 +v 125.292892 251.000000 -13.292852 +v 125.589584 253.253571 -13.292852 +v 126.459427 255.353546 -13.292851 +v 127.843147 257.156860 -13.292851 +v 129.646454 258.540588 -13.292851 +v 125.500000 251.000000 -13.133934 +v 125.789627 253.199966 -13.133934 +v 126.638786 255.250000 -13.133933 +v 127.989594 257.010406 -13.133933 +v 129.750000 258.361206 -13.133933 +v 125.741180 251.000000 -13.034033 +v 126.022591 253.137543 -13.034033 +v 126.847656 255.129410 -13.034032 +v 128.160126 256.839874 -13.034032 +v 129.870590 258.152344 -13.034032 +v 126.000000 251.000000 -12.999959 +v 126.272591 253.070557 -12.999959 +v 127.071800 255.000000 -12.999958 +v 128.343140 256.656860 -12.999958 +v 130.000000 257.928192 -12.999958 +v 125.034073 229.000000 -13.741144 +v 125.133972 229.000000 -13.499963 +v 125.292892 229.000000 -13.292856 +v 125.500000 229.000000 -13.133938 +v 125.741180 229.000000 -13.034037 +v 126.000000 229.000000 -12.999963 +v 134.000000 220.034073 -13.741145 +v 131.679443 220.339584 -13.741145 +v 129.517044 221.235275 -13.741145 +v 127.660133 222.660126 -13.741145 +v 126.235283 224.517044 -13.741145 +v 125.339584 226.679443 -13.741144 +v 125.436073 226.705307 -13.499963 +v 125.589584 226.746429 -13.292856 +v 125.789627 226.800034 -13.133938 +v 126.022591 226.862457 -13.034037 +v 126.272591 226.929443 -12.999963 +v 134.000000 220.133972 -13.499964 +v 131.705307 220.436081 -13.499964 +v 129.566986 221.321793 -13.499964 +v 127.730774 222.730774 -13.499964 +v 126.321800 224.566986 -13.499964 +v 134.000000 220.292892 -13.292857 +v 131.746429 220.589584 -13.292857 +v 129.646454 221.459427 -13.292857 +v 127.843147 222.843140 -13.292857 +v 126.459427 224.646454 -13.292857 +v 134.000000 220.500000 -13.133939 +v 131.800034 220.789627 -13.133939 +v 129.750000 221.638779 -13.133939 +v 127.989594 222.989594 -13.133939 +v 126.638786 224.750000 -13.133939 +v 134.000000 220.741180 -13.034038 +v 131.862457 221.022598 -13.034038 +v 129.870590 221.847656 -13.034038 +v 128.160126 223.160126 -13.034038 +v 126.847656 224.870590 -13.034038 +v 134.000000 221.000000 -12.999964 +v 131.929443 221.272598 -12.999964 +v 130.000000 222.071793 -12.999964 +v 128.343140 223.343140 -12.999964 +v 127.071800 225.000000 -12.999964 +v 186.000000 220.034073 -13.741145 +v 186.000000 220.133972 -13.499964 +v 186.000000 220.292892 -13.292857 +v 186.000000 220.500000 -13.133939 +v 186.000000 220.741180 -13.034038 +v 186.000000 221.000000 -12.999964 +v 188.070557 221.272598 -12.999964 +v 188.137543 221.022598 -13.034038 +v 190.000000 222.071793 -12.999964 +v 190.129410 221.847656 -13.034038 +v 191.656860 223.343140 -12.999964 +v 191.839874 223.160126 -13.034038 +v 192.928207 225.000000 -12.999964 +v 193.152344 224.870590 -13.034038 +v 193.727402 226.929443 -12.999963 +v 193.977402 226.862457 -13.034037 +v 194.210373 226.800034 -13.133938 +v 194.410416 226.746429 -13.292856 +v 194.563919 226.705307 -13.499963 +v 194.660416 226.679443 -13.741144 +v 188.199966 220.789627 -13.133939 +v 190.250000 221.638779 -13.133939 +v 192.010406 222.989594 -13.133939 +v 193.361221 224.750000 -13.133939 +v 188.253571 220.589584 -13.292857 +v 190.353546 221.459427 -13.292857 +v 192.156860 222.843140 -13.292857 +v 193.540573 224.646454 -13.292857 +v 188.294693 220.436081 -13.499964 +v 190.433014 221.321793 -13.499964 +v 192.269226 222.730774 -13.499964 +v 193.678207 224.566986 -13.499964 +v 188.320557 220.339584 -13.741145 +v 190.482956 221.235275 -13.741145 +v 192.339874 222.660126 -13.741145 +v 193.764725 224.517044 -13.741145 +v 194.000000 3.974728 -31.000000 +v 194.000000 20.000006 -30.999996 +v 194.258820 3.974728 -30.965925 +v 194.258820 20.000006 -30.965921 +v 194.500000 3.974728 -30.866026 +v 194.500000 20.000006 -30.866022 +v 194.707108 3.974728 -30.707108 +v 194.707108 20.000006 -30.707104 +v 194.866028 3.974728 -30.500000 +v 194.866028 20.000006 -30.499996 +v 194.965927 3.974728 -30.258820 +v 194.965927 20.000006 -30.258816 +v 195.000000 3.974728 -30.000000 +v 195.000000 20.000006 -29.999996 +v 194.720581 -1.303926 -30.000000 +v 194.372025 -3.924798 -30.000000 +v 194.571930 -2.287664 -30.258820 +v 194.338379 -3.919414 -30.258820 +v 194.239746 -3.903631 -30.500000 +v 194.472824 -2.275143 -30.500000 +v 194.082809 -3.878523 -30.707108 +v 194.315155 -2.255225 -30.707108 +v 193.878311 -3.845802 -30.866026 +v 194.109680 -2.229268 -30.866026 +v 193.640152 -3.807698 -30.965925 +v 193.870392 -2.199040 -30.965925 +v 193.384598 -3.766807 -31.000000 +v 193.726166 -1.198353 -31.000000 +v 193.931488 1.384566 -31.000000 +v 194.930099 1.331706 -30.000000 +v 191.943054 -19.105928 -30.000004 +v 191.909409 -19.100544 -30.258823 +v 191.810760 -19.084761 -30.500004 +v 191.653839 -19.059652 -30.707111 +v 191.449326 -19.026932 -30.866030 +v 191.211182 -18.988829 -30.965929 +v 190.955612 -18.947937 -31.000004 +v 185.030960 -24.999994 -30.000004 +v 185.030960 -24.965919 -30.258823 +v 186.663300 -24.807013 -30.000004 +v 186.833878 -24.728561 -30.258823 +v 188.205627 -24.238708 -30.000004 +v 188.513931 -24.032663 -30.258823 +v 189.572906 -23.326416 -30.000004 +v 189.956619 -22.925648 -30.258823 +v 190.689758 -22.120438 -30.000004 +v 191.063629 -21.482958 -30.258823 +v 191.494598 -20.687267 -30.000004 +v 191.759537 -19.802908 -30.258823 +v 191.663040 -19.777052 -30.500004 +v 191.509537 -19.735922 -30.707111 +v 191.309479 -19.682318 -30.866030 +v 191.076523 -19.619896 -30.965929 +v 190.571228 -20.303371 -31.000004 +v 190.451263 -21.129404 -30.965929 +v 189.881363 -21.531803 -31.000004 +v 189.456619 -22.425648 -30.965929 +v 188.924057 -22.565498 -31.000004 +v 188.160370 -23.420290 -30.965929 +v 187.752106 -23.347464 -31.000004 +v 186.650864 -24.045549 -30.965929 +v 186.430099 -23.834581 -31.000004 +v 185.030960 -24.258814 -30.965929 +v 185.030960 -23.999994 -31.000004 +v 185.030960 -24.866020 -30.500004 +v 186.808029 -24.632065 -30.500004 +v 188.463974 -23.946146 -30.500004 +v 189.885986 -22.855007 -30.500004 +v 190.977112 -21.433008 -30.500004 +v 185.030960 -24.707102 -30.707111 +v 186.766891 -24.478561 -30.707111 +v 188.384521 -23.808519 -30.707111 +v 189.773605 -22.742636 -30.707111 +v 190.839493 -21.353548 -30.707111 +v 185.030960 -24.499994 -30.866030 +v 186.713287 -24.278513 -30.866030 +v 188.280960 -23.629160 -30.866030 +v 189.627167 -22.596188 -30.866030 +v 190.660126 -21.249994 -30.866030 +v 136.518784 -24.999994 -30.000004 +v 136.518784 -24.965919 -30.258823 +v 136.518784 -24.866020 -30.500004 +v 136.518784 -24.707102 -30.707111 +v 136.518784 -24.499994 -30.866030 +v 136.518784 -24.258814 -30.965929 +v 136.518784 -23.999994 -31.000004 +v 130.240479 -21.095625 -30.000004 +v 129.712067 -19.633606 -30.000004 +v 129.790207 -19.802908 -30.258823 +v 129.745193 -19.625654 -30.258823 +v 129.842346 -19.602339 -30.500004 +v 129.886703 -19.777052 -30.500004 +v 129.996872 -19.565250 -30.707111 +v 130.040207 -19.735922 -30.707111 +v 130.198257 -19.516918 -30.866030 +v 130.240265 -19.682318 -30.866030 +v 130.432785 -19.460634 -30.965929 +v 130.473221 -19.619896 -30.965929 +v 130.684448 -19.400232 -31.000004 +v 131.137375 -20.653393 -31.000004 +v 131.098480 -21.129404 -30.965929 +v 131.855713 -21.775684 -31.000004 +v 132.093124 -22.425648 -30.965929 +v 132.804031 -22.711758 -31.000004 +v 133.389374 -23.420290 -30.965929 +v 133.935577 -23.415442 -31.000004 +v 134.898880 -24.045549 -30.965929 +v 135.194519 -23.852032 -31.000004 +v 134.836456 -24.278513 -30.866030 +v 133.268784 -23.629160 -30.866030 +v 131.922577 -22.596188 -30.866030 +v 130.889618 -21.249994 -30.866030 +v 134.782852 -24.478561 -30.707111 +v 133.165222 -23.808519 -30.707111 +v 131.776138 -22.742636 -30.707111 +v 130.710251 -21.353548 -30.707111 +v 134.741714 -24.632065 -30.500004 +v 133.085770 -23.946146 -30.500004 +v 131.663773 -22.855007 -30.500004 +v 130.572632 -21.433008 -30.500004 +v 134.715866 -24.728561 -30.258823 +v 133.035812 -24.032663 -30.258823 +v 131.593124 -22.925648 -30.258823 +v 130.486115 -21.482958 -30.258823 +v 134.973816 -24.827372 -30.000004 +v 133.505035 -24.318016 -30.000004 +v 132.184921 -23.497051 -30.000004 +v 131.078537 -22.404966 -30.000004 +v 126.380638 -5.752640 -30.000000 +v 126.413765 -5.744688 -30.258820 +v 126.510910 -5.721374 -30.500000 +v 126.665443 -5.684287 -30.707108 +v 126.866829 -5.635954 -30.866026 +v 127.101349 -5.579669 -30.965925 +v 127.353020 -5.519267 -31.000000 +v 125.000000 5.916007 -29.999998 +v 125.034073 5.916007 -30.258818 +v 125.154037 1.994290 -30.000000 +v 125.615196 -1.903264 -30.000000 +v 125.133972 5.916007 -30.499998 +v 125.292892 5.916007 -30.707106 +v 125.500000 5.916007 -30.866024 +v 125.741180 5.916007 -30.965923 +v 126.602890 -1.746879 -31.000000 +v 126.000000 5.916007 -30.999998 +v 126.150955 2.072724 -31.000000 +v 125.000000 20.000006 -29.999996 +v 125.034073 20.000006 -30.258816 +v 125.133972 20.000006 -30.499996 +v 125.292892 20.000006 -30.707104 +v 125.500000 20.000006 -30.866022 +v 125.741180 20.000006 -30.965921 +v 126.000000 20.000006 -30.999996 +v 125.000000 5.916004 -13.999999 +v 125.154037 1.994287 -14.000000 +v 125.615196 -1.903267 -14.000000 +v 126.380638 -5.752643 -14.000001 +v 129.712067 -19.633610 -14.000003 +v 130.240479 -21.095629 -14.000004 +v 131.078537 -22.404970 -14.000004 +v 132.184921 -23.497055 -14.000004 +v 133.505035 -24.318020 -14.000004 +v 134.973816 -24.827375 -14.000004 +v 136.518784 -24.999998 -14.000004 +v 185.030960 -24.999998 -14.000004 +v 186.663300 -24.807016 -14.000004 +v 188.205627 -24.238712 -14.000004 +v 189.572906 -23.326420 -14.000004 +v 190.689758 -22.120441 -14.000004 +v 191.494598 -20.687271 -14.000004 +v 191.943054 -19.105932 -14.000003 +v 194.372025 -3.924801 -14.000001 +v 194.720581 -1.303929 -14.000000 +v 194.930099 1.331703 -14.000000 +v 195.000000 3.974725 -13.999999 +v 195.000000 20.000002 -13.999997 +v 194.965927 3.974725 -13.741180 +v 194.965927 20.000002 -13.741179 +v 194.866028 3.974725 -13.499999 +v 194.866028 20.000002 -13.499997 +v 194.707108 3.974725 -13.292892 +v 194.707108 20.000002 -13.292891 +v 194.500000 3.974725 -13.133974 +v 194.500000 20.000002 -13.133972 +v 194.258820 3.974725 -13.034073 +v 194.258820 20.000002 -13.034071 +v 194.000000 3.974725 -12.999999 +v 194.000000 20.000002 -12.999997 +v 193.384598 -3.766810 -13.000001 +v 193.640152 -3.807701 -13.034075 +v 193.726166 -1.198356 -13.000000 +v 193.931488 1.384563 -13.000000 +v 193.878311 -3.845805 -13.133976 +v 194.082809 -3.878526 -13.292894 +v 194.239746 -3.903634 -13.500001 +v 194.338379 -3.919417 -13.741182 +v 190.955612 -18.947941 -13.000003 +v 191.211182 -18.988832 -13.034077 +v 191.449326 -19.026936 -13.133978 +v 191.653839 -19.059656 -13.292896 +v 191.810760 -19.084764 -13.500003 +v 191.909409 -19.100548 -13.741184 +v 185.030960 -23.999998 -13.000004 +v 185.030960 -24.258818 -13.034078 +v 186.430099 -23.834585 -13.000004 +v 186.650864 -24.045553 -13.034078 +v 187.752106 -23.347467 -13.000004 +v 188.160370 -23.420294 -13.034078 +v 188.924057 -22.565502 -13.000004 +v 189.456619 -22.425652 -13.034078 +v 189.881363 -21.531807 -13.000004 +v 190.451263 -21.129408 -13.034078 +v 190.571228 -20.303375 -13.000003 +v 191.076523 -19.619900 -13.034077 +v 191.309479 -19.682322 -13.133978 +v 191.509537 -19.735926 -13.292896 +v 191.663040 -19.777056 -13.500003 +v 191.759537 -19.802912 -13.741184 +v 191.063629 -21.482962 -13.741185 +v 189.956619 -22.925652 -13.741185 +v 188.513931 -24.032667 -13.741185 +v 186.833878 -24.728565 -13.741185 +v 185.030960 -24.965923 -13.741185 +v 185.030960 -24.499998 -13.133979 +v 186.713287 -24.278517 -13.133979 +v 188.280960 -23.629164 -13.133979 +v 189.627167 -22.596191 -13.133979 +v 190.660126 -21.249998 -13.133979 +v 185.030960 -24.707106 -13.292897 +v 186.766891 -24.478565 -13.292897 +v 188.384521 -23.808523 -13.292897 +v 189.773605 -22.742640 -13.292897 +v 190.839493 -21.353552 -13.292897 +v 185.030960 -24.866024 -13.500004 +v 186.808029 -24.632069 -13.500004 +v 188.463974 -23.946150 -13.500004 +v 189.885986 -22.855011 -13.500004 +v 190.977112 -21.433012 -13.500004 +v 136.518784 -23.999998 -13.000004 +v 136.518784 -24.258818 -13.034078 +v 136.518784 -24.499998 -13.133979 +v 136.518784 -24.707106 -13.292897 +v 136.518784 -24.866024 -13.500004 +v 136.518784 -24.965923 -13.741185 +v 131.137375 -20.653397 -13.000004 +v 130.684448 -19.400236 -13.000003 +v 130.473221 -19.619900 -13.034077 +v 130.432785 -19.460638 -13.034077 +v 130.198257 -19.516922 -13.133978 +v 130.240265 -19.682322 -13.133978 +v 129.996872 -19.565254 -13.292896 +v 130.040207 -19.735926 -13.292896 +v 129.842346 -19.602343 -13.500003 +v 129.886703 -19.777056 -13.500003 +v 129.745193 -19.625658 -13.741184 +v 129.790207 -19.802912 -13.741184 +v 130.486115 -21.482962 -13.741185 +v 131.593124 -22.925652 -13.741185 +v 133.035812 -24.032667 -13.741185 +v 134.715866 -24.728565 -13.741185 +v 134.741714 -24.632069 -13.500004 +v 133.085770 -23.946150 -13.500004 +v 131.663773 -22.855011 -13.500004 +v 130.572632 -21.433012 -13.500004 +v 134.782852 -24.478565 -13.292897 +v 133.165222 -23.808523 -13.292897 +v 131.776138 -22.742640 -13.292897 +v 130.710251 -21.353552 -13.292897 +v 134.836456 -24.278517 -13.133979 +v 133.268784 -23.629164 -13.133979 +v 131.922577 -22.596191 -13.133979 +v 130.889618 -21.249998 -13.133979 +v 134.898880 -24.045553 -13.034078 +v 133.389374 -23.420294 -13.034078 +v 132.093124 -22.425652 -13.034078 +v 131.098480 -21.129408 -13.034078 +v 135.194519 -23.852036 -13.000004 +v 133.935577 -23.415445 -13.000004 +v 132.804031 -22.711761 -13.000004 +v 131.855713 -21.775688 -13.000004 +v 127.353020 -5.519270 -13.000001 +v 127.101349 -5.579672 -13.034075 +v 126.866829 -5.635957 -13.133976 +v 126.665443 -5.684289 -13.292894 +v 126.510910 -5.721376 -13.500001 +v 126.413765 -5.744690 -13.741182 +v 126.000000 5.916004 -12.999999 +v 125.741180 5.916004 -13.034073 +v 126.150955 2.072721 -13.000000 +v 126.129601 -0.257763 -13.034074 +v 126.602890 -1.746882 -13.000000 +v 125.500000 5.916004 -13.133974 +v 125.890320 -0.287991 -13.133975 +v 125.684853 -0.313948 -13.292893 +v 125.527184 -0.333866 -13.500000 +v 125.428070 -0.346387 -13.741181 +v 125.292892 5.916004 -13.292892 +v 125.133972 5.916004 -13.499999 +v 125.034073 5.916004 -13.741180 +v 126.000000 20.000002 -12.999997 +v 125.741180 20.000002 -13.034071 +v 125.500000 20.000002 -13.133972 +v 125.292892 20.000002 -13.292891 +v 125.133972 20.000002 -13.499997 +v 125.034073 20.000002 -13.741179 +v 125.000000 20.000002 -13.999997 +v 105.938271 109.965538 -30.999983 +v 103.842422 112.959908 -30.999981 +v 102.532974 116.372261 -30.999981 +v 102.087685 120.000008 -30.999981 +v 102.532974 123.627754 -30.999979 +v 103.842422 127.040108 -30.999979 +v 105.938271 130.034470 -30.999979 +v 160.000000 190.103058 -30.999969 +v 79.031021 109.965538 -30.999983 +v 76.935173 112.959908 -30.999981 +v 75.625732 116.372261 -30.999981 +v 75.180435 120.000008 -30.999981 +v 75.625732 123.627754 -30.999979 +v 76.935173 127.040108 -30.999979 +v 79.031021 130.034470 -30.999979 +v 180.000000 20.000006 -30.999996 +v 160.000000 20.000006 -30.999996 +v 160.000000 49.896946 -30.999992 +v 177.244446 211.941147 -4.999966 +v 177.500000 210.000000 -4.999966 +v 177.244446 208.058853 -4.999966 +v 176.495193 206.250000 -4.999967 +v 175.303299 204.696701 -4.999967 +v 173.750000 203.504807 -4.999967 +v 171.941147 202.755554 -4.999967 +v 170.000000 202.500000 -4.999967 +v 168.058853 202.755554 -4.999967 +v 166.250000 203.504807 -4.999967 +v 164.696701 204.696701 -4.999967 +v 163.504807 206.250000 -4.999967 +v 162.755554 208.058853 -4.999966 +v 162.500000 210.000000 -4.999966 +v 162.755554 211.941147 -4.999966 +v 163.504807 213.750000 -4.999965 +v 164.696701 215.303299 -4.999965 +v 166.250000 216.495193 -4.999965 +v 168.058853 217.244446 -4.999965 +v 170.000000 217.500000 -4.999965 +v 171.941147 217.244446 -4.999965 +v 173.750000 216.495193 -4.999965 +v 175.303299 215.303299 -4.999965 +v 176.495193 213.750000 -4.999965 +v 9.000000 260.000000 0.000042 +v 9.000000 260.000000 -4.999958 +v 6.670629 259.693329 0.000042 +v 6.670629 259.693329 -4.999958 +v 4.500000 258.794220 0.000042 +v 4.500000 258.794220 -4.999958 +v 2.636039 257.363953 0.000042 +v 2.636039 257.363953 -4.999958 +v 1.205771 255.500000 0.000042 +v 1.205771 255.500000 -4.999959 +v 0.306668 253.329376 0.000041 +v 0.306668 253.329376 -4.999959 +v 0.000000 251.000000 0.000041 +v 0.000000 251.000000 -4.999959 +v 0.000000 9.000001 -4.999999 +v 0.000000 9.000000 0.000001 +v 261.000000 0.000001 -5.000000 +v 270.000000 9.000001 -4.999999 +v 9.000000 0.000001 -5.000000 +v 270.000000 251.000000 -4.999959 +v 261.000000 260.000000 -4.999958 +v 263.329376 259.693329 -4.999958 +v 265.500000 258.794220 -4.999958 +v 267.363953 257.363953 -4.999958 +v 268.794220 255.500000 -4.999959 +v 269.693329 253.329376 -4.999959 +v 269.693329 6.670630 -4.999999 +v 268.794220 4.500001 -4.999999 +v 267.363953 2.636040 -5.000000 +v 265.500000 1.205772 -5.000000 +v 263.329376 0.306669 -5.000000 +v 6.670629 0.306669 -5.000000 +v 4.500000 1.205772 -5.000000 +v 2.636039 2.636040 -5.000000 +v 1.205771 4.500001 -4.999999 +v 0.306668 6.670630 -4.999999 +v 270.000000 251.000000 0.000041 +v 269.693329 253.329376 0.000041 +v 268.794220 255.500000 0.000042 +v 267.363953 257.363953 0.000042 +v 265.500000 258.794220 0.000042 +v 263.329376 259.693329 0.000042 +v 261.000000 260.000000 0.000042 +v 270.000000 9.000000 0.000001 +v 261.000000 0.000000 0.000000 +v 263.329376 0.306668 0.000000 +v 265.500000 1.205771 0.000000 +v 267.363953 2.636039 0.000000 +v 268.794220 4.500000 0.000001 +v 269.693329 6.670629 0.000001 +v 0.306668 6.670629 0.000001 +v 1.205771 4.500000 0.000001 +v 2.636039 2.636039 0.000000 +v 4.500000 1.205771 0.000000 +v 6.670629 0.306668 0.000000 +v 9.000000 0.000000 0.000000 +vt 0.217339 0.786783 +vt 0.192612 0.786783 +vt 0.217339 0.781403 +vt 0.192612 0.781403 +vt 0.217339 0.776024 +vt 0.192612 0.776024 +vt 0.217339 0.770644 +vt 0.192612 0.770644 +vt 0.217339 0.765265 +vt 0.192612 0.765265 +vt 0.217340 0.759886 +vt 0.192612 0.759886 +vt 0.217340 0.754507 +vt 0.192612 0.754507 +vt 0.217340 0.749127 +vt 0.192612 0.749127 +vt 0.217340 0.743748 +vt 0.192612 0.743748 +vt 0.217340 0.738368 +vt 0.192612 0.738368 +vt 0.217340 0.732989 +vt 0.192612 0.732989 +vt 0.217340 0.727610 +vt 0.192612 0.727610 +vt 0.217340 0.722231 +vt 0.192612 0.722231 +vt 0.217340 0.716851 +vt 0.192612 0.716851 +vt 0.217340 0.711472 +vt 0.192612 0.711472 +vt 0.217339 0.840576 +vt 0.192612 0.840576 +vt 0.217339 0.835197 +vt 0.192612 0.835197 +vt 0.217339 0.829817 +vt 0.192612 0.829817 +vt 0.217339 0.824438 +vt 0.192612 0.824438 +vt 0.217339 0.819059 +vt 0.192612 0.819059 +vt 0.217339 0.813680 +vt 0.192612 0.813680 +vt 0.217339 0.808300 +vt 0.192612 0.808300 +vt 0.217339 0.802921 +vt 0.192612 0.802921 +vt 0.217339 0.797541 +vt 0.192612 0.797541 +vt 0.217339 0.792162 +vt 0.192612 0.792162 +vt 0.217340 0.651321 +vt 0.192612 0.651321 +vt 0.217340 0.645942 +vt 0.192612 0.645942 +vt 0.217340 0.640562 +vt 0.192612 0.640562 +vt 0.217340 0.635183 +vt 0.192612 0.635183 +vt 0.217340 0.629804 +vt 0.192612 0.629804 +vt 0.217340 0.624424 +vt 0.192612 0.624424 +vt 0.217340 0.619045 +vt 0.192612 0.619045 +vt 0.217340 0.613666 +vt 0.192612 0.613666 +vt 0.217340 0.608286 +vt 0.192612 0.608286 +vt 0.217340 0.602907 +vt 0.192612 0.602907 +vt 0.217340 0.597528 +vt 0.192612 0.597528 +vt 0.217340 0.592148 +vt 0.192612 0.592148 +vt 0.217340 0.586769 +vt 0.192612 0.586769 +vt 0.217340 0.581390 +vt 0.192612 0.581390 +vt 0.217340 0.710494 +vt 0.192612 0.710494 +vt 0.217340 0.705115 +vt 0.192612 0.705115 +vt 0.217340 0.699735 +vt 0.192612 0.699735 +vt 0.217340 0.694356 +vt 0.192612 0.694356 +vt 0.217340 0.688976 +vt 0.192612 0.688976 +vt 0.217340 0.683597 +vt 0.192612 0.683597 +vt 0.217340 0.678218 +vt 0.192612 0.678218 +vt 0.217340 0.672839 +vt 0.192612 0.672839 +vt 0.217340 0.667459 +vt 0.192612 0.667459 +vt 0.217340 0.662080 +vt 0.192612 0.662080 +vt 0.217340 0.656700 +vt 0.192612 0.656700 +vt 0.310442 0.065987 +vt 0.310752 0.060445 +vt 0.314203 0.028452 +vt 0.310267 0.054869 +vt 0.308997 0.049687 +vt 0.306986 0.045373 +vt 0.304377 0.042377 +vt 0.301405 0.040977 +vt 0.298319 0.041245 +vt 0.282384 0.038962 +vt 0.295107 0.042958 +vt 0.292223 0.046072 +vt 0.289826 0.050257 +vt 0.287988 0.055189 +vt 0.286762 0.060657 +vt 0.286225 0.066429 +vt 0.282821 0.121322 +vt 0.211025 0.281065 +vt 0.286525 0.072171 +vt 0.287521 0.077556 +vt 0.289128 0.082241 +vt 0.291223 0.085947 +vt 0.293653 0.088477 +vt 0.296259 0.089725 +vt 0.298869 0.089639 +vt 0.301334 0.088262 +vt 0.283108 0.493049 +vt 0.301326 0.527104 +vt 0.298968 0.525452 +vt 0.304768 0.084951 +vt 0.304459 0.530106 +vt 0.307736 0.078943 +vt 0.307427 0.535493 +vt 0.310186 0.544468 +vt 0.314203 0.580411 +vt 0.199690 0.312837 +vt 0.200026 0.307700 +vt 0.205875 0.307678 +vt 0.199681 0.302565 +vt 0.206469 0.298068 +vt 0.198674 0.297786 +vt 0.208221 0.289015 +vt 0.197076 0.293693 +vt 0.194997 0.290567 +vt 0.192577 0.288625 +vt 0.189985 0.288003 +vt 0.175077 0.281428 +vt 0.187392 0.288684 +vt 0.184981 0.290679 +vt 0.182916 0.293849 +vt 0.181340 0.297968 +vt 0.180356 0.302748 +vt 0.172359 0.289391 +vt 0.180025 0.307871 +vt 0.170675 0.298405 +vt 0.170119 0.307958 +vt 0.170720 0.317498 +vt 0.172445 0.326473 +vt 0.180374 0.312988 +vt 0.175198 0.334374 +vt 0.181375 0.317749 +vt 0.182963 0.321839 +vt 0.185035 0.324973 +vt 0.187447 0.326929 +vt 0.190035 0.327570 +vt 0.192625 0.326897 +vt 0.211020 0.334174 +vt 0.283180 0.574246 +vt 0.195037 0.324911 +vt 0.197106 0.321751 +vt 0.208223 0.326280 +vt 0.198694 0.317630 +vt 0.206471 0.317271 +vt 0.286760 0.547097 +vt 0.287296 0.552594 +vt 0.298640 0.570034 +vt 0.301646 0.569879 +vt 0.304497 0.568138 +vt 0.310028 0.555298 +vt 0.310454 0.549755 +vt 0.296438 0.525141 +vt 0.293901 0.526169 +vt 0.291534 0.528492 +vt 0.289505 0.531992 +vt 0.287961 0.536460 +vt 0.287021 0.541609 +vt 0.288510 0.557767 +vt 0.290333 0.562366 +vt 0.292706 0.566149 +vt 0.295534 0.568798 +vt 0.306967 0.564918 +vt 0.308852 0.560501 +vt 0.175292 0.043640 +vt 0.173407 0.040307 +vt 0.174440 0.044040 +vt 0.172989 0.039817 +vt 0.173592 0.044475 +vt 0.172549 0.039414 +vt 0.172747 0.044945 +vt 0.172088 0.039101 +vt 0.171907 0.045452 +vt 0.171070 0.045990 +vt 0.171605 0.038886 +vt 0.170238 0.046564 +vt 0.171102 0.038770 +vt 0.169412 0.047170 +vt 0.170581 0.038762 +vt 0.168592 0.047806 +vt 0.174435 0.038840 +vt 0.174284 0.038936 +vt 0.173976 0.039115 +vt 0.173907 0.039122 +vt 0.173613 0.039341 +vt 0.173565 0.039339 +vt 0.173298 0.039531 +vt 0.173249 0.039525 +vt 0.173104 0.039767 +vt 0.173013 0.039739 +vt 0.173059 0.039970 +vt 0.172846 0.039862 +vt 0.172630 0.039755 +vt 0.172411 0.039653 +vt 0.172189 0.039558 +vt 0.171967 0.039472 +vt 0.171746 0.039400 +vt 0.174133 0.039001 +vt 0.173837 0.039129 +vt 0.173518 0.039339 +vt 0.173199 0.039520 +vt 0.172921 0.039713 +vt 0.173983 0.039034 +vt 0.173767 0.039136 +vt 0.173470 0.039339 +vt 0.173149 0.039516 +vt 0.172829 0.039689 +vt 0.173833 0.039037 +vt 0.173697 0.039143 +vt 0.173423 0.039341 +vt 0.173098 0.039513 +vt 0.172738 0.039669 +vt 0.173686 0.039008 +vt 0.173630 0.039150 +vt 0.173377 0.039345 +vt 0.173048 0.039511 +vt 0.172649 0.039655 +vt 0.173542 0.038946 +vt 0.173566 0.039157 +vt 0.173332 0.039351 +vt 0.172999 0.039513 +vt 0.172563 0.039649 +vt 0.175083 0.038334 +vt 0.175113 0.038199 +vt 0.175134 0.038064 +vt 0.175147 0.037928 +vt 0.175152 0.037794 +vt 0.175149 0.037662 +vt 0.175137 0.037533 +vt 0.175904 0.036019 +vt 0.175867 0.036155 +vt 0.175858 0.036378 +vt 0.175829 0.036442 +vt 0.175764 0.036670 +vt 0.175751 0.036728 +vt 0.175603 0.036913 +vt 0.175599 0.036954 +vt 0.175457 0.037347 +vt 0.175454 0.037344 +vt 0.175282 0.037800 +vt 0.175284 0.037754 +vt 0.175285 0.037708 +vt 0.175287 0.037663 +vt 0.175288 0.037619 +vt 0.175290 0.037577 +vt 0.175291 0.037537 +vt 0.175825 0.036280 +vt 0.175801 0.036506 +vt 0.175739 0.036788 +vt 0.175594 0.036993 +vt 0.175450 0.037342 +vt 0.175776 0.036391 +vt 0.175773 0.036570 +vt 0.175728 0.036848 +vt 0.175590 0.037031 +vt 0.175447 0.037339 +vt 0.175721 0.036490 +vt 0.175746 0.036633 +vt 0.175719 0.036910 +vt 0.175585 0.037069 +vt 0.175444 0.037337 +vt 0.175662 0.036573 +vt 0.175720 0.036694 +vt 0.175710 0.036975 +vt 0.175581 0.037105 +vt 0.175442 0.037336 +vt 0.175597 0.036640 +vt 0.175695 0.036754 +vt 0.175704 0.037042 +vt 0.175578 0.037142 +vt 0.175441 0.037335 +vt 0.175631 0.052174 +vt 0.175940 0.052558 +vt 0.176265 0.052875 +vt 0.176603 0.053124 +vt 0.176954 0.053302 +vt 0.177316 0.053406 +vt 0.177687 0.053433 +vt 0.176337 0.053465 +vt 0.176392 0.053463 +vt 0.176420 0.053309 +vt 0.176443 0.053323 +vt 0.176451 0.053149 +vt 0.176470 0.053157 +vt 0.176442 0.052986 +vt 0.176470 0.052993 +vt 0.176363 0.052804 +vt 0.176423 0.052820 +vt 0.176154 0.052586 +vt 0.176303 0.052664 +vt 0.176455 0.052742 +vt 0.176609 0.052818 +vt 0.176765 0.052890 +vt 0.176921 0.052956 +vt 0.177076 0.053015 +vt 0.176446 0.053474 +vt 0.176467 0.053337 +vt 0.176489 0.053166 +vt 0.176499 0.053001 +vt 0.176485 0.052836 +vt 0.176499 0.053496 +vt 0.176490 0.053352 +vt 0.176508 0.053175 +vt 0.176528 0.053008 +vt 0.176546 0.052851 +vt 0.176551 0.053531 +vt 0.176513 0.053367 +vt 0.176527 0.053183 +vt 0.176556 0.053016 +vt 0.176607 0.052864 +vt 0.176601 0.053577 +vt 0.176535 0.053383 +vt 0.176546 0.053191 +vt 0.176585 0.053023 +vt 0.176667 0.052875 +vt 0.176649 0.053637 +vt 0.176556 0.053398 +vt 0.176563 0.053199 +vt 0.176613 0.053029 +vt 0.176724 0.052881 +vt 0.176480 0.055043 +vt 0.176461 0.055290 +vt 0.176455 0.055536 +vt 0.176459 0.055777 +vt 0.176475 0.056014 +vt 0.176504 0.056245 +vt 0.176544 0.056467 +vt 0.177046 0.057279 +vt 0.177028 0.058060 +vt 0.176798 0.057464 +vt 0.176752 0.057846 +vt 0.176636 0.057165 +vt 0.176605 0.057352 +vt 0.176539 0.056739 +vt 0.176529 0.056854 +vt 0.176510 0.056251 +vt 0.176506 0.056348 +vt 0.176493 0.055716 +vt 0.176494 0.055837 +vt 0.176495 0.055959 +vt 0.176497 0.056081 +vt 0.176498 0.056201 +vt 0.176500 0.056319 +vt 0.176502 0.056432 +vt 0.176984 0.058837 +vt 0.176704 0.058231 +vt 0.176573 0.057539 +vt 0.176518 0.056970 +vt 0.176503 0.056445 +vt 0.176915 0.059612 +vt 0.176655 0.058618 +vt 0.176539 0.057725 +vt 0.176506 0.057085 +vt 0.176499 0.056541 +vt 0.176820 0.060384 +vt 0.176603 0.059007 +vt 0.176504 0.057910 +vt 0.176494 0.057200 +vt 0.176494 0.056637 +vt 0.176699 0.061154 +vt 0.176547 0.059393 +vt 0.176467 0.058090 +vt 0.176480 0.057313 +vt 0.176489 0.056732 +vt 0.176550 0.061923 +vt 0.176489 0.059775 +vt 0.176427 0.058263 +vt 0.176466 0.057423 +vt 0.176482 0.056825 +vt 0.178681 0.057080 +vt 0.178334 0.058660 +vt 0.177925 0.060177 +vt 0.177454 0.061623 +vt 0.176925 0.062989 +vt 0.176339 0.064268 +vt 0.175698 0.065452 +vt 0.177137 0.049396 +vt 0.176974 0.050249 +vt 0.176848 0.050984 +vt 0.176755 0.051615 +vt 0.176858 0.052209 +vt 0.176809 0.052743 +vt 0.176795 0.053207 +vt 0.176816 0.053614 +vt 0.176638 0.053012 +vt 0.176651 0.052923 +vt 0.176668 0.052824 +vt 0.176686 0.052712 +vt 0.176730 0.052612 +vt 0.176752 0.052462 +vt 0.176776 0.052299 +vt 0.176806 0.052126 +vt 0.178518 0.034772 +vt 0.178089 0.034727 +vt 0.177712 0.034685 +vt 0.177389 0.034659 +vt 0.176633 0.035719 +vt 0.175970 0.036494 +vt 0.175390 0.037434 +vt 0.174886 0.038527 +vt 0.175195 0.038182 +vt 0.174817 0.038616 +vt 0.174498 0.039157 +vt 0.174239 0.039800 +vt 0.173892 0.040663 +vt 0.173719 0.041452 +vt 0.173607 0.042355 +vt 0.173563 0.043373 +vt 0.178028 0.051056 +vt 0.175766 0.044710 +vt 0.269988 0.972405 +vt 0.298859 0.972541 +vt 0.270011 0.973256 +vt 0.298824 0.973474 +vt 0.270023 0.974113 +vt 0.298806 0.974415 +vt 0.270022 0.974977 +vt 0.298803 0.975364 +vt 0.270008 0.975847 +vt 0.298818 0.976322 +vt 0.269976 0.976724 +vt 0.298845 0.977288 +vt 0.269933 0.977610 +vt 0.298893 0.978260 +vt 0.254640 0.950521 +vt 0.255470 0.950291 +vt 0.257205 0.959361 +vt 0.257602 0.958884 +vt 0.259129 0.964581 +vt 0.259407 0.964150 +vt 0.261118 0.969246 +vt 0.261357 0.968753 +vt 0.263611 0.973131 +vt 0.263797 0.972535 +vt 0.266526 0.975864 +vt 0.266652 0.975164 +vt 0.266775 0.974473 +vt 0.266892 0.973783 +vt 0.267004 0.973095 +vt 0.267114 0.972409 +vt 0.267222 0.971724 +vt 0.256292 0.950169 +vt 0.258007 0.958445 +vt 0.259687 0.963728 +vt 0.261594 0.968267 +vt 0.263982 0.971949 +vt 0.257100 0.950145 +vt 0.258415 0.958026 +vt 0.259966 0.963301 +vt 0.261826 0.967778 +vt 0.264160 0.971363 +vt 0.257896 0.950207 +vt 0.258827 0.957628 +vt 0.260245 0.962876 +vt 0.262055 0.967291 +vt 0.264336 0.970781 +vt 0.258680 0.950372 +vt 0.259241 0.957250 +vt 0.260525 0.962452 +vt 0.262284 0.966805 +vt 0.264511 0.970200 +vt 0.259450 0.950643 +vt 0.259654 0.956888 +vt 0.260806 0.962030 +vt 0.262511 0.966319 +vt 0.264685 0.969620 +vt 0.254640 0.815252 +vt 0.255472 0.815496 +vt 0.256291 0.815635 +vt 0.257098 0.815668 +vt 0.257891 0.815585 +vt 0.258671 0.815399 +vt 0.259436 0.815110 +vt 0.269912 0.788684 +vt 0.269955 0.789560 +vt 0.266555 0.790389 +vt 0.266671 0.791083 +vt 0.263659 0.793034 +vt 0.263835 0.793633 +vt 0.261171 0.796827 +vt 0.261400 0.797329 +vt 0.259179 0.801394 +vt 0.259447 0.801835 +vt 0.257242 0.806497 +vt 0.257630 0.806993 +vt 0.258024 0.807461 +vt 0.258427 0.807890 +vt 0.258833 0.808292 +vt 0.259242 0.808673 +vt 0.259649 0.809037 +vt 0.269981 0.790434 +vt 0.266781 0.791775 +vt 0.264005 0.794228 +vt 0.261624 0.797829 +vt 0.259715 0.802277 +vt 0.269997 0.791302 +vt 0.266892 0.792461 +vt 0.264177 0.794813 +vt 0.261849 0.798320 +vt 0.259987 0.802711 +vt 0.270000 0.792165 +vt 0.267001 0.793143 +vt 0.264349 0.795393 +vt 0.262073 0.798808 +vt 0.260261 0.803139 +vt 0.269989 0.793022 +vt 0.267109 0.793824 +vt 0.264519 0.795971 +vt 0.262296 0.799294 +vt 0.260536 0.803565 +vt 0.269966 0.793873 +vt 0.267215 0.794504 +vt 0.264689 0.796547 +vt 0.262519 0.799779 +vt 0.260812 0.803989 +vt 0.298872 0.788102 +vt 0.298824 0.789084 +vt 0.298791 0.790053 +vt 0.298778 0.791014 +vt 0.298782 0.791964 +vt 0.298802 0.792906 +vt 0.298837 0.793838 +vt 0.314203 0.815751 +vt 0.313372 0.815981 +vt 0.311639 0.806911 +vt 0.311243 0.807387 +vt 0.309719 0.801694 +vt 0.309442 0.802122 +vt 0.307738 0.797035 +vt 0.307499 0.797525 +vt 0.305272 0.793144 +vt 0.305082 0.793732 +vt 0.302398 0.790274 +vt 0.302258 0.790984 +vt 0.302120 0.791688 +vt 0.301992 0.792393 +vt 0.301868 0.793097 +vt 0.301748 0.793800 +vt 0.301630 0.794502 +vt 0.312550 0.816103 +vt 0.310838 0.807826 +vt 0.309162 0.802544 +vt 0.307262 0.798007 +vt 0.304893 0.794313 +vt 0.311741 0.816127 +vt 0.310429 0.808245 +vt 0.308883 0.802969 +vt 0.307030 0.798492 +vt 0.304710 0.794894 +vt 0.310944 0.816064 +vt 0.310017 0.808641 +vt 0.308604 0.803392 +vt 0.306800 0.798975 +vt 0.304530 0.795473 +vt 0.310160 0.815898 +vt 0.309604 0.809018 +vt 0.308324 0.803815 +vt 0.306571 0.799459 +vt 0.304351 0.796050 +vt 0.309390 0.815627 +vt 0.309190 0.809379 +vt 0.308043 0.804236 +vt 0.306343 0.799941 +vt 0.304173 0.796626 +vt 0.314203 0.951134 +vt 0.313370 0.950890 +vt 0.312551 0.950751 +vt 0.311743 0.950718 +vt 0.310949 0.950802 +vt 0.310169 0.950989 +vt 0.309404 0.951279 +vt 0.309195 0.957353 +vt 0.309603 0.957717 +vt 0.308037 0.962403 +vt 0.308313 0.962825 +vt 0.306334 0.966618 +vt 0.306558 0.967101 +vt 0.304169 0.969863 +vt 0.304343 0.970437 +vt 0.301637 0.971928 +vt 0.301753 0.972625 +vt 0.301871 0.973322 +vt 0.301992 0.974020 +vt 0.302115 0.974720 +vt 0.302239 0.975425 +vt 0.302370 0.976130 +vt 0.310011 0.958096 +vt 0.308588 0.963250 +vt 0.306782 0.967583 +vt 0.304518 0.971011 +vt 0.310417 0.958498 +vt 0.308861 0.963677 +vt 0.307006 0.968067 +vt 0.304693 0.971587 +vt 0.310820 0.958926 +vt 0.309133 0.964109 +vt 0.307232 0.968555 +vt 0.304869 0.972167 +vt 0.311214 0.959393 +vt 0.309401 0.964549 +vt 0.307456 0.969051 +vt 0.305044 0.972756 +vt 0.311602 0.959889 +vt 0.309669 0.964989 +vt 0.307686 0.969549 +vt 0.305224 0.973349 +vt 0.026456 0.339805 +vt 0.027842 0.341046 +vt 0.026381 0.339822 +vt 0.027777 0.340745 +vt 0.026276 0.339803 +vt 0.027703 0.340452 +vt 0.026173 0.339775 +vt 0.027617 0.340174 +vt 0.026072 0.339739 +vt 0.027517 0.339913 +vt 0.025973 0.339695 +vt 0.027396 0.339667 +vt 0.025902 0.339704 +vt 0.027214 0.339403 +vt 0.024967 0.340828 +vt 0.024501 0.341159 +vt 0.024829 0.341238 +vt 0.024644 0.341353 +vt 0.024768 0.341586 +vt 0.024889 0.341446 +vt 0.024873 0.341854 +vt 0.024962 0.341638 +vt 0.024955 0.342154 +vt 0.025046 0.341808 +vt 0.025014 0.342482 +vt 0.025139 0.341953 +vt 0.025047 0.342836 +vt 0.025414 0.341689 +vt 0.025934 0.340752 +vt 0.025432 0.340238 +vt 0.022668 0.342089 +vt 0.022581 0.342214 +vt 0.022519 0.342357 +vt 0.022479 0.342510 +vt 0.022460 0.342668 +vt 0.022464 0.342826 +vt 0.022494 0.342975 +vt 0.020877 0.345119 +vt 0.020900 0.344600 +vt 0.021248 0.344299 +vt 0.021322 0.343997 +vt 0.021564 0.343801 +vt 0.021645 0.343593 +vt 0.021853 0.343426 +vt 0.021948 0.343251 +vt 0.022130 0.343071 +vt 0.022244 0.342888 +vt 0.022404 0.342665 +vt 0.022550 0.342469 +vt 0.022529 0.342545 +vt 0.022507 0.342630 +vt 0.022486 0.342716 +vt 0.022466 0.342795 +vt 0.022335 0.342836 +vt 0.022219 0.342887 +vt 0.022111 0.342918 +vt 0.021962 0.343035 +vt 0.021892 0.342996 +vt 0.021716 0.343108 +vt 0.021689 0.342971 +vt 0.021491 0.342993 +vt 0.021517 0.342715 +vt 0.021274 0.342754 +vt 0.021432 0.342378 +vt 0.020955 0.344098 +vt 0.021362 0.343750 +vt 0.021663 0.343474 +vt 0.021952 0.343199 +vt 0.022239 0.342890 +vt 0.021036 0.343621 +vt 0.021404 0.343500 +vt 0.021681 0.343353 +vt 0.021956 0.343145 +vt 0.022232 0.342891 +vt 0.021142 0.343172 +vt 0.021447 0.343247 +vt 0.021699 0.343230 +vt 0.021959 0.343091 +vt 0.022226 0.342890 +vt 0.018793 0.331271 +vt 0.018547 0.331242 +vt 0.018298 0.331288 +vt 0.018052 0.331399 +vt 0.017813 0.331576 +vt 0.017581 0.331821 +vt 0.017364 0.332144 +vt 0.018614 0.330744 +vt 0.018790 0.330532 +vt 0.018694 0.330613 +vt 0.018722 0.330665 +vt 0.018645 0.330753 +vt 0.018624 0.330677 +vt 0.018563 0.330812 +vt 0.018550 0.330730 +vt 0.018479 0.330844 +vt 0.018474 0.330767 +vt 0.018394 0.330846 +vt 0.018398 0.330788 +vt 0.018310 0.330799 +vt 0.018404 0.330909 +vt 0.018427 0.330938 +vt 0.018378 0.331106 +vt 0.018362 0.331179 +vt 0.018296 0.331329 +vt 0.018243 0.331440 +vt 0.018154 0.331576 +vt 0.018046 0.331723 +vt 0.017913 0.331861 +vt 0.018136 0.331631 +vt 0.018282 0.331395 +vt 0.018384 0.331149 +vt 0.018457 0.330913 +vt 0.018230 0.331548 +vt 0.018323 0.331351 +vt 0.018408 0.331119 +vt 0.018488 0.330886 +vt 0.018325 0.331474 +vt 0.018363 0.331309 +vt 0.018432 0.331091 +vt 0.018520 0.330859 +vt 0.018420 0.331406 +vt 0.018404 0.331269 +vt 0.018456 0.331063 +vt 0.018552 0.330831 +vt 0.018528 0.331344 +vt 0.018444 0.331277 +vt 0.018449 0.331131 +vt 0.018508 0.330946 +vt 0.019349 0.329300 +vt 0.019279 0.329219 +vt 0.019169 0.329097 +vt 0.019058 0.328975 +vt 0.018946 0.328853 +vt 0.018835 0.328733 +vt 0.018744 0.328639 +vt 0.019877 0.327636 +vt 0.019800 0.327481 +vt 0.019729 0.328168 +vt 0.019544 0.328733 +vt 0.019685 0.327282 +vt 0.019570 0.327082 +vt 0.019456 0.326881 +vt 0.019342 0.326678 +vt 0.018946 0.327978 +vt 0.019247 0.326500 +vt 0.019117 0.327272 +vt 0.020360 0.327136 +vt 0.020313 0.326856 +vt 0.020274 0.326611 +vt 0.020226 0.326377 +vt 0.020167 0.326155 +vt 0.020099 0.325943 +vt 0.020026 0.325739 +vt 0.019841 0.326729 +vt 0.019535 0.327301 +vt 0.019244 0.327915 +vt 0.018987 0.328525 +vt 0.018600 0.329583 +vt 0.018641 0.329712 +vt 0.018590 0.330012 +vt 0.018479 0.330350 +vt 0.018324 0.330703 +vt 0.018108 0.331062 +vt 0.017781 0.331427 +vt 0.017233 0.331831 +vt 0.018053 0.348729 +vt 0.019271 0.347684 +vt 0.020227 0.346853 +vt 0.021030 0.346108 +vt 0.021724 0.345403 +vt 0.022325 0.344756 +vt 0.022785 0.344333 +vt 0.022929 0.344353 +vt 0.024541 0.343541 +vt 0.025036 0.342868 +vt 0.025544 0.342145 +vt 0.025986 0.341420 +vt 0.027103 0.340513 +vt 0.025977 0.341144 +vt 0.026926 0.340129 +vt 0.025933 0.340772 +vt 0.026713 0.339902 +vt 0.025893 0.340397 +vt 0.026483 0.339742 +vt 0.025858 0.340019 +vt 0.026237 0.339638 +vt 0.025828 0.339637 +vt 0.025954 0.339602 +vt 0.025828 0.339329 +vt 0.025532 0.339720 +vt 0.023548 0.342878 +vt 0.023697 0.342927 +vt 0.024327 0.341707 +vt 0.025067 0.340526 +vt 0.023880 0.343052 +vt 0.024060 0.343186 +vt 0.024238 0.343329 +vt 0.024414 0.343479 +vt 0.023690 0.342360 +vt 0.023349 0.343003 +vt 0.023139 0.343311 +vt 0.022995 0.343573 +vt 0.022905 0.343831 +vt 0.022872 0.344088 +vt 0.019712 0.347915 +vt 0.019510 0.348188 +vt 0.020179 0.347775 +vt 0.020106 0.347687 +vt 0.020805 0.347336 +vt 0.020863 0.347091 +vt 0.021481 0.346679 +vt 0.021631 0.346293 +vt 0.022154 0.345819 +vt 0.022364 0.345285 +vt 0.022799 0.344719 +vt 0.023069 0.343984 +vt 0.023373 0.343311 +vt 0.023280 0.343161 +vt 0.022988 0.344032 +vt 0.022903 0.344121 +vt 0.022817 0.344227 +vt 0.022728 0.344331 +vt 0.022825 0.344084 +vt 0.022071 0.345151 +vt 0.021342 0.345958 +vt 0.020501 0.346768 +vt 0.019523 0.347616 +vt 0.018388 0.348761 +vt 0.019269 0.348417 +vt 0.019959 0.347666 +vt 0.020768 0.346998 +vt 0.021554 0.346197 +vt 0.022287 0.345237 +vt 0.019000 0.348591 +vt 0.019813 0.347649 +vt 0.020677 0.346916 +vt 0.021481 0.346111 +vt 0.022212 0.345202 +vt 0.018706 0.348707 +vt 0.019667 0.347633 +vt 0.020587 0.346840 +vt 0.021410 0.346032 +vt 0.022141 0.345174 +vt 0.018801 0.331201 +vt 0.018534 0.331105 +vt 0.018263 0.331099 +vt 0.017994 0.331170 +vt 0.017731 0.331315 +vt 0.017473 0.331533 +vt 0.018721 0.329759 +vt 0.018949 0.329339 +vt 0.018982 0.329456 +vt 0.019083 0.329409 +vt 0.019003 0.329585 +vt 0.018945 0.329537 +vt 0.018901 0.329679 +vt 0.018872 0.329602 +vt 0.018801 0.329722 +vt 0.018789 0.329646 +vt 0.018709 0.329723 +vt 0.018711 0.329681 +vt 0.018577 0.330074 +vt 0.018426 0.330484 +vt 0.018229 0.330898 +vt 0.017948 0.331302 +vt 0.018057 0.331239 +vt 0.018273 0.330865 +vt 0.018446 0.330455 +vt 0.018600 0.330038 +vt 0.018168 0.331181 +vt 0.018317 0.330831 +vt 0.018465 0.330426 +vt 0.018621 0.330001 +vt 0.018280 0.331129 +vt 0.018361 0.330797 +vt 0.018485 0.330395 +vt 0.018640 0.329962 +vt 0.018390 0.331083 +vt 0.018404 0.330764 +vt 0.018502 0.330364 +vt 0.018655 0.329920 +vt 0.018509 0.331076 +vt 0.018434 0.330838 +vt 0.018468 0.330522 +vt 0.018565 0.330157 +vt 0.019454 0.329185 +vt 0.018934 0.329352 +vt 0.019158 0.329384 +vt 0.018954 0.329220 +vt 0.019017 0.329548 +vt 0.018966 0.329075 +vt 0.018905 0.329647 +vt 0.018974 0.328932 +vt 0.018978 0.328789 +vt 0.018980 0.328649 +vt 0.020504 0.326826 +vt 0.020399 0.326838 +vt 0.019937 0.327626 +vt 0.019577 0.328038 +vt 0.019416 0.328433 +vt 0.020282 0.326826 +vt 0.019529 0.327961 +vt 0.019482 0.327884 +vt 0.019435 0.327805 +vt 0.019388 0.327725 +vt 0.020166 0.326807 +vt 0.020052 0.326781 +vt 0.019938 0.326749 +vt 0.020175 0.327047 +vt 0.020344 0.326695 +vt 0.020421 0.326544 +vt 0.020474 0.326435 +vt 0.020516 0.326332 +vt 0.020542 0.326233 +vt 0.020512 0.326171 +vt 0.217584 0.631713 +vt 0.233678 0.610235 +vt 0.269432 0.787124 +vt 0.287745 0.762686 +vt 0.238185 0.604720 +vt 0.290653 0.758580 +vt 0.242894 0.599928 +vt 0.293448 0.754172 +vt 0.296122 0.749474 +vt 0.247777 0.595889 +vt 0.311618 0.720772 +vt 0.312874 0.699527 +vt 0.312874 0.717826 +vt 0.313752 0.714376 +vt 0.314203 0.710612 +vt 0.314203 0.706741 +vt 0.313752 0.702977 +vt 0.275884 0.588655 +vt 0.266180 0.582335 +vt 0.267957 0.581459 +vt 0.269787 0.581390 +vt 0.271580 0.582129 +vt 0.273247 0.583642 +vt 0.274706 0.585854 +vt 0.041866 0.115036 +vt 0.043020 0.107791 +vt 0.048589 0.118325 +vt 0.049198 0.113228 +vt 0.044947 0.100979 +vt 0.050386 0.108695 +vt 0.052107 0.104882 +vt 0.047620 0.095047 +vt 0.054286 0.101950 +vt 0.050801 0.090152 +vt 0.054425 0.086726 +vt 0.056858 0.100058 +vt 0.058253 0.084831 +vt 0.059760 0.099306 +vt 0.142316 0.083872 +vt 0.139419 0.087089 +vt 0.014170 0.072258 +vt 0.015397 0.061413 +vt 0.022599 0.075285 +vt 0.023867 0.068264 +vt 0.017916 0.051130 +vt 0.025787 0.061644 +vt 0.028322 0.055753 +vt 0.021563 0.042091 +vt 0.031321 0.050777 +vt 0.026110 0.034835 +vt 0.031286 0.029810 +vt 0.034667 0.046999 +vt 0.036764 0.027343 +vt 0.038213 0.044551 +vt 0.029719 0.340077 +vt 0.022548 0.325778 +vt 0.040190 0.278081 +vt 0.166696 0.043968 +vt 0.166717 0.044600 +vt 0.166791 0.045205 +vt 0.166742 0.028933 +vt 0.166915 0.045771 +vt 0.167083 0.046291 +vt 0.167304 0.046774 +vt 0.167543 0.047172 +vt 0.167733 0.047462 +vt 0.041838 0.272141 +vt 0.014170 0.325778 +vt 0.180231 0.078961 +vt 0.035174 0.351683 +vt 0.175458 0.068806 +vt 0.175307 0.068385 +vt 0.175216 0.067903 +vt 0.175190 0.067386 +vt 0.175234 0.066840 +vt 0.175363 0.066272 +vt 0.020174 0.326147 +vt 0.020312 0.326838 +vt 0.020309 0.327038 +vt 0.022740 0.330459 +vt 0.020666 0.326018 +vt 0.020562 0.326316 +vt 0.020572 0.326213 +vt 0.020393 0.326598 +vt 0.026039 0.339139 +vt 0.027196 0.340158 +vt 0.027006 0.339657 +vt 0.027377 0.339494 +vt 0.026023 0.339515 +vt 0.026255 0.339595 +vt 0.026947 0.340044 +vt 0.027712 0.340443 +vt 0.198512 0.891009 +vt 0.198512 0.841554 +vt 0.201201 0.891009 +vt 0.201201 0.841554 +vt 0.203891 0.891009 +vt 0.203891 0.841554 +vt 0.206581 0.891009 +vt 0.206581 0.841554 +vt 0.209270 0.891009 +vt 0.209270 0.841554 +vt 0.211960 0.891009 +vt 0.211960 0.841554 +vt 0.214650 0.891009 +vt 0.214650 0.841554 +vt 0.217339 0.891009 +vt 0.217339 0.841554 +vt 0.254395 0.825757 +vt 0.229668 0.825757 +vt 0.254395 0.820378 +vt 0.229668 0.820378 +vt 0.254395 0.814999 +vt 0.229668 0.814999 +vt 0.254395 0.809619 +vt 0.229668 0.809619 +vt 0.254395 0.804240 +vt 0.229668 0.804240 +vt 0.254395 0.798861 +vt 0.229668 0.798861 +vt 0.254395 0.793481 +vt 0.229668 0.793481 +vt 0.254395 0.788102 +vt 0.229668 0.788102 +vt 0.171615 0.891009 +vt 0.171615 0.841554 +vt 0.174305 0.891009 +vt 0.174305 0.841554 +vt 0.176994 0.891009 +vt 0.176994 0.841554 +vt 0.179684 0.891009 +vt 0.179684 0.841554 +vt 0.182374 0.891009 +vt 0.182374 0.841554 +vt 0.185063 0.891009 +vt 0.185063 0.841554 +vt 0.187753 0.891009 +vt 0.187753 0.841554 +vt 0.190443 0.891009 +vt 0.190443 0.841554 +vt 0.193132 0.891009 +vt 0.193132 0.841554 +vt 0.195822 0.891009 +vt 0.195822 0.841554 +vt 0.496770 0.360900 +vt 0.494253 0.362711 +vt 0.496344 0.358534 +vt 0.494119 0.360392 +vt 0.495791 0.356126 +vt 0.493746 0.358519 +vt 0.495034 0.353878 +vt 0.493181 0.356986 +vt 0.494068 0.351903 +vt 0.492436 0.355749 +vt 0.492936 0.350248 +vt 0.491505 0.354803 +vt 0.491699 0.348859 +vt 0.490343 0.354114 +vt 0.375646 0.344190 +vt 0.490445 0.349374 +vt 0.375749 0.339450 +vt 0.377394 0.515644 +vt 0.378611 0.516112 +vt 0.357290 0.610646 +vt 0.379850 0.515952 +vt 0.362229 0.621886 +vt 0.381074 0.515145 +vt 0.382333 0.513486 +vt 0.470186 0.519810 +vt 0.383373 0.510938 +vt 0.469267 0.517200 +vt 0.383999 0.508203 +vt 0.468755 0.514421 +vt 0.428861 0.433622 +vt 0.468634 0.511614 +vt 0.430084 0.433434 +vt 0.468845 0.509246 +vt 0.431119 0.432698 +vt 0.469312 0.507246 +vt 0.431993 0.431501 +vt 0.470014 0.505563 +vt 0.432685 0.429903 +vt 0.470902 0.504307 +vt 0.433148 0.428013 +vt 0.471946 0.503517 +vt 0.433393 0.425798 +vt 0.473166 0.503208 +vt 0.433377 0.423282 +vt 0.384242 0.505321 +vt 0.427645 0.433165 +vt 0.384149 0.502829 +vt 0.426624 0.432259 +vt 0.383772 0.500666 +vt 0.425784 0.430905 +vt 0.383135 0.498782 +vt 0.425152 0.429177 +vt 0.382286 0.497301 +vt 0.424768 0.427198 +vt 0.381251 0.496267 +vt 0.424626 0.424929 +vt 0.380008 0.495691 +vt 0.371466 0.353005 +vt 0.378721 0.495724 +vt 0.377482 0.496417 +vt 0.376315 0.497744 +vt 0.375263 0.499714 +vt 0.374417 0.502331 +vt 0.373971 0.505379 +vt 0.374173 0.508446 +vt 0.374672 0.510996 +vt 0.375354 0.512991 +vt 0.376283 0.514578 +vt 0.433029 0.421049 +vt 0.432413 0.419104 +vt 0.431553 0.417492 +vt 0.430464 0.416272 +vt 0.429173 0.415545 +vt 0.427873 0.416118 +vt 0.426767 0.417159 +vt 0.425870 0.418598 +vt 0.425193 0.420395 +vt 0.424763 0.422519 +vt 0.472673 0.522685 +vt 0.473838 0.522978 +vt 0.494816 0.622129 +vt 0.474966 0.522686 +vt 0.499793 0.612545 +vt 0.476030 0.521845 +vt 0.476954 0.520495 +vt 0.477672 0.518727 +vt 0.478198 0.516501 +vt 0.478495 0.513775 +vt 0.478431 0.510693 +vt 0.477687 0.507988 +vt 0.476741 0.505878 +vt 0.475653 0.504364 +vt 0.474454 0.503460 +vt 0.471429 0.521684 +vt 0.499531 0.615319 +vt 0.498997 0.617527 +vt 0.498251 0.619267 +vt 0.497319 0.620592 +vt 0.496196 0.621528 +vt 0.360740 0.620948 +vt 0.359552 0.619689 +vt 0.358607 0.618064 +vt 0.357896 0.616064 +vt 0.357437 0.613638 +vt 0.371640 0.350548 +vt 0.372066 0.348566 +vt 0.372686 0.346978 +vt 0.373478 0.345740 +vt 0.374446 0.344828 +vt 0.496050 0.627989 +vt 0.497427 0.626828 +vt 0.498821 0.625423 +vt 0.500137 0.623588 +vt 0.501303 0.621257 +vt 0.502262 0.618493 +vt 0.503027 0.615451 +vt 0.494813 0.627609 +vt 0.362227 0.627365 +vt 0.354029 0.612867 +vt 0.354551 0.615931 +vt 0.355237 0.619056 +vt 0.356187 0.621983 +vt 0.357409 0.624569 +vt 0.358848 0.626749 +vt 0.360425 0.628591 +vt 0.374445 0.339142 +vt 0.373259 0.340271 +vt 0.372063 0.341617 +vt 0.370943 0.343334 +vt 0.369966 0.345474 +vt 0.369178 0.347978 +vt 0.368568 0.350711 +vt 0.354734 0.610083 +vt 0.368910 0.352442 +vt 0.496731 0.362491 +vt 0.502272 0.612325 +vt 0.549955 0.936679 +vt 0.546329 0.933675 +vt 0.553846 0.937703 +vt 0.543215 0.928896 +vt 0.540826 0.922668 +vt 0.539324 0.915416 +vt 0.538811 0.907633 +vt 0.989866 0.907633 +vt 0.989866 0.099076 +vt 0.538811 0.099076 +vt 0.974831 0.069007 +vt 0.553846 0.069007 +vt 0.539324 0.091294 +vt 0.540826 0.084041 +vt 0.543215 0.077814 +vt 0.546329 0.073035 +vt 0.549955 0.070031 +vt 0.978722 0.070032 +vt 0.982348 0.073035 +vt 0.985462 0.077814 +vt 0.987851 0.084041 +vt 0.989354 0.091294 +vt 0.974831 0.937702 +vt 0.989354 0.915416 +vt 0.987852 0.922668 +vt 0.985462 0.928895 +vt 0.982349 0.933674 +vt 0.978723 0.936678 +vn 0.9659 0.2588 0.0000 +vn 1.0000 -0.0000 0.0000 +vn 0.9659 -0.2588 -0.0000 +vn 0.8660 -0.5000 -0.0000 +vn 0.7071 -0.7071 -0.0000 +vn 0.5000 -0.8660 -0.0000 +vn 0.2588 -0.9659 -0.0000 +vn 0.0000 -1.0000 -0.0000 +vn -0.2588 -0.9659 -0.0000 +vn -0.5000 -0.8660 -0.0000 +vn -0.7071 -0.7071 -0.0000 +vn -0.8660 -0.5000 -0.0000 +vn -0.9659 -0.2588 -0.0000 +vn -1.0000 0.0000 -0.0000 +vn -0.9659 0.2588 0.0000 +vn -0.8660 0.5000 0.0000 +vn -0.7071 0.7071 0.0000 +vn -0.5000 0.8660 0.0000 +vn -0.2588 0.9659 0.0000 +vn -0.0000 1.0000 0.0000 +vn 0.2588 0.9659 0.0000 +vn 0.5000 0.8660 0.0000 +vn 0.7071 0.7071 0.0000 +vn 0.8660 0.5000 0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -0.9808 -0.1951 +vn 0.0000 -0.9659 -0.2588 +vn 0.0000 -0.9239 -0.3827 +vn -0.0000 -0.8660 -0.5000 +vn -0.0000 -0.8315 -0.5556 +vn -0.0000 -0.7071 -0.7071 +vn 0.0000 -0.5556 -0.8315 +vn -0.0000 -0.5000 -0.8660 +vn -0.0000 -0.3827 -0.9239 +vn -0.0000 -0.2588 -0.9659 +vn -0.0000 -0.1951 -0.9808 +vn -0.0000 0.0000 -1.0000 +vn -0.9659 0.0000 -0.2588 +vn -0.9330 -0.2500 -0.2589 +vn -0.8365 -0.4830 -0.2588 +vn -0.6830 -0.6830 -0.2588 +vn -0.4830 -0.8365 -0.2588 +vn -0.2500 -0.9330 -0.2588 +vn -0.2241 -0.8365 -0.5000 +vn -0.1830 -0.6830 -0.7071 +vn -0.1294 -0.4830 -0.8660 +vn -0.0670 -0.2500 -0.9659 +vn -0.8660 -0.0000 -0.5000 +vn -0.8365 -0.2241 -0.5000 +vn -0.7500 -0.4330 -0.5000 +vn -0.6124 -0.6124 -0.5000 +vn -0.4330 -0.7500 -0.5000 +vn -0.7071 -0.0000 -0.7071 +vn -0.6830 -0.1830 -0.7071 +vn -0.6124 -0.3536 -0.7071 +vn -0.5000 -0.5000 -0.7071 +vn -0.3536 -0.6124 -0.7071 +vn -0.5000 -0.0000 -0.8660 +vn -0.4830 -0.1294 -0.8660 +vn -0.4330 -0.2500 -0.8660 +vn -0.3536 -0.3536 -0.8660 +vn -0.2500 -0.4330 -0.8660 +vn -0.2588 0.0000 -0.9659 +vn -0.2500 -0.0670 -0.9659 +vn -0.2241 -0.1294 -0.9659 +vn -0.1830 -0.1830 -0.9659 +vn -0.1294 -0.2241 -0.9659 +vn 0.0000 0.9659 -0.2588 +vn -0.2500 0.9330 -0.2588 +vn -0.4830 0.8365 -0.2588 +vn -0.6830 0.6830 -0.2588 +vn -0.8365 0.4830 -0.2588 +vn -0.9330 0.2500 -0.2588 +vn -0.8365 0.2241 -0.5000 +vn -0.6830 0.1830 -0.7071 +vn -0.4830 0.1294 -0.8660 +vn -0.2500 0.0670 -0.9659 +vn -0.0000 0.8660 -0.5000 +vn -0.2241 0.8365 -0.5000 +vn -0.4330 0.7500 -0.5000 +vn -0.6124 0.6124 -0.5000 +vn -0.7500 0.4330 -0.5000 +vn -0.0000 0.7071 -0.7071 +vn -0.1830 0.6830 -0.7071 +vn -0.3536 0.6124 -0.7071 +vn -0.5000 0.5000 -0.7071 +vn -0.6124 0.3536 -0.7071 +vn -0.0000 0.5000 -0.8660 +vn -0.1294 0.4830 -0.8660 +vn -0.2500 0.4330 -0.8660 +vn -0.3535 0.3535 -0.8660 +vn -0.4330 0.2500 -0.8660 +vn 0.0000 0.2588 -0.9659 +vn -0.0670 0.2500 -0.9659 +vn -0.1294 0.2242 -0.9659 +vn -0.1830 0.1830 -0.9659 +vn -0.2241 0.1294 -0.9659 +vn 0.9659 -0.0000 -0.2588 +vn 0.9330 0.2500 -0.2588 +vn 0.8365 0.4830 -0.2588 +vn 0.6830 0.6830 -0.2588 +vn 0.4830 0.8365 -0.2588 +vn 0.2500 0.9330 -0.2588 +vn 0.2241 0.8365 -0.5000 +vn 0.1830 0.6830 -0.7071 +vn 0.1294 0.4830 -0.8660 +vn 0.0670 0.2500 -0.9659 +vn 0.8660 0.0000 -0.5000 +vn 0.8365 0.2241 -0.5000 +vn 0.7500 0.4330 -0.5000 +vn 0.6124 0.6124 -0.5000 +vn 0.4330 0.7500 -0.5000 +vn 0.7071 0.0000 -0.7071 +vn 0.6830 0.1830 -0.7071 +vn 0.6124 0.3536 -0.7071 +vn 0.5000 0.5000 -0.7071 +vn 0.3536 0.6124 -0.7071 +vn 0.5000 0.0000 -0.8660 +vn 0.4830 0.1294 -0.8660 +vn 0.4330 0.2500 -0.8660 +vn 0.3536 0.3536 -0.8660 +vn 0.2500 0.4330 -0.8660 +vn 0.2588 -0.0000 -0.9659 +vn 0.2500 0.0670 -0.9659 +vn 0.2241 0.1294 -0.9659 +vn 0.1830 0.1830 -0.9659 +vn 0.1294 0.2241 -0.9659 +vn 0.2500 -0.9330 -0.2588 +vn 0.4830 -0.8365 -0.2588 +vn 0.6830 -0.6830 -0.2588 +vn 0.8365 -0.4830 -0.2588 +vn 0.9330 -0.2500 -0.2588 +vn 0.8365 -0.2241 -0.5000 +vn 0.6830 -0.1830 -0.7071 +vn 0.4830 -0.1294 -0.8660 +vn 0.2500 -0.0670 -0.9659 +vn 0.2241 -0.8365 -0.5000 +vn 0.4330 -0.7500 -0.5000 +vn 0.6124 -0.6124 -0.5000 +vn 0.7500 -0.4330 -0.5000 +vn 0.1830 -0.6830 -0.7071 +vn 0.3536 -0.6124 -0.7071 +vn 0.5000 -0.5000 -0.7071 +vn 0.6124 -0.3536 -0.7071 +vn 0.1294 -0.4830 -0.8660 +vn 0.2500 -0.4330 -0.8660 +vn 0.3536 -0.3536 -0.8660 +vn 0.4330 -0.2500 -0.8660 +vn 0.0670 -0.2500 -0.9659 +vn 0.1294 -0.2242 -0.9659 +vn 0.1830 -0.1830 -0.9659 +vn 0.2242 -0.1294 -0.9659 +vn 0.0000 -0.9659 -0.2589 +vn 0.2588 -0.0000 0.9659 +vn 0.5000 0.0000 0.8660 +vn 0.7071 0.0000 0.7071 +vn 0.8660 0.0000 0.5000 +vn 0.9659 -0.0000 0.2588 +vn -0.0000 0.9659 0.2588 +vn 0.2500 0.9330 0.2588 +vn 0.4830 0.8365 0.2588 +vn 0.6830 0.6830 0.2588 +vn 0.8365 0.4830 0.2588 +vn 0.9330 0.2500 0.2589 +vn 0.8365 0.2241 0.5000 +vn 0.6830 0.1830 0.7071 +vn 0.4830 0.1294 0.8660 +vn 0.2500 0.0670 0.9659 +vn 0.0000 0.8660 0.5000 +vn 0.2241 0.8365 0.5000 +vn 0.4330 0.7500 0.5000 +vn 0.6124 0.6124 0.5000 +vn 0.7500 0.4330 0.5000 +vn 0.0000 0.7071 0.7071 +vn 0.1830 0.6830 0.7071 +vn 0.3535 0.6124 0.7071 +vn 0.5000 0.5000 0.7071 +vn 0.6124 0.3536 0.7071 +vn 0.0000 0.5000 0.8660 +vn 0.1294 0.4830 0.8660 +vn 0.2500 0.4330 0.8660 +vn 0.3535 0.3535 0.8660 +vn 0.4330 0.2500 0.8660 +vn -0.0000 0.2588 0.9659 +vn 0.0670 0.2500 0.9659 +vn 0.1294 0.2241 0.9659 +vn 0.1830 0.1830 0.9659 +vn 0.2241 0.1294 0.9659 +vn -0.9659 -0.0000 0.2588 +vn -0.9330 0.2500 0.2588 +vn -0.8365 0.4830 0.2588 +vn -0.6830 0.6830 0.2588 +vn -0.4830 0.8365 0.2588 +vn -0.2500 0.9330 0.2588 +vn -0.2241 0.8365 0.5000 +vn -0.1830 0.6830 0.7071 +vn -0.1294 0.4830 0.8660 +vn -0.0670 0.2500 0.9659 +vn -0.8660 0.0000 0.5000 +vn -0.8365 0.2241 0.5000 +vn -0.7500 0.4330 0.5000 +vn -0.6124 0.6124 0.5000 +vn -0.4330 0.7500 0.5000 +vn -0.7071 0.0000 0.7071 +vn -0.6830 0.1830 0.7071 +vn -0.6124 0.3535 0.7071 +vn -0.5000 0.5000 0.7071 +vn -0.3536 0.6124 0.7071 +vn -0.5000 0.0000 0.8660 +vn -0.4830 0.1294 0.8660 +vn -0.4330 0.2500 0.8660 +vn -0.3536 0.3536 0.8660 +vn -0.2500 0.4330 0.8660 +vn -0.2588 -0.0000 0.9659 +vn -0.2500 0.0670 0.9659 +vn -0.2241 0.1294 0.9659 +vn -0.1830 0.1830 0.9659 +vn -0.1294 0.2242 0.9659 +vn 0.0000 -0.9659 0.2588 +vn -0.2500 -0.9330 0.2588 +vn -0.4830 -0.8365 0.2588 +vn -0.6830 -0.6830 0.2588 +vn -0.8365 -0.4830 0.2588 +vn -0.9330 -0.2500 0.2588 +vn -0.8365 -0.2241 0.5000 +vn -0.6830 -0.1830 0.7071 +vn -0.4830 -0.1294 0.8660 +vn -0.2500 -0.0670 0.9659 +vn -0.0000 -0.8660 0.5000 +vn -0.2241 -0.8365 0.5000 +vn -0.4330 -0.7500 0.5000 +vn -0.6124 -0.6124 0.5000 +vn -0.7500 -0.4330 0.5000 +vn -0.0000 -0.7071 0.7071 +vn -0.1830 -0.6830 0.7071 +vn -0.3535 -0.6124 0.7071 +vn -0.5000 -0.5000 0.7071 +vn -0.6124 -0.3535 0.7071 +vn -0.0000 -0.5000 0.8660 +vn -0.1294 -0.4830 0.8660 +vn -0.2500 -0.4330 0.8660 +vn -0.3535 -0.3535 0.8660 +vn -0.4330 -0.2500 0.8660 +vn 0.0000 -0.2588 0.9659 +vn -0.0670 -0.2500 0.9659 +vn -0.1294 -0.2242 0.9659 +vn -0.1830 -0.1830 0.9659 +vn -0.2241 -0.1294 0.9659 +vn 0.0670 -0.2500 0.9659 +vn 0.1294 -0.2241 0.9659 +vn 0.1830 -0.1830 0.9659 +vn 0.2241 -0.1294 0.9659 +vn 0.2500 -0.0670 0.9659 +vn 0.4830 -0.1294 0.8660 +vn 0.6830 -0.1830 0.7071 +vn 0.8365 -0.2241 0.5000 +vn 0.9330 -0.2500 0.2588 +vn 0.1294 -0.4830 0.8660 +vn 0.2500 -0.4330 0.8660 +vn 0.3536 -0.3536 0.8660 +vn 0.4330 -0.2500 0.8660 +vn 0.1830 -0.6830 0.7071 +vn 0.3536 -0.6124 0.7071 +vn 0.5000 -0.5000 0.7071 +vn 0.6124 -0.3536 0.7071 +vn 0.2241 -0.8365 0.5000 +vn 0.4330 -0.7500 0.5000 +vn 0.6124 -0.6124 0.5000 +vn 0.7500 -0.4330 0.5000 +vn 0.2500 -0.9330 0.2588 +vn 0.4830 -0.8365 0.2588 +vn 0.6830 -0.6830 0.2588 +vn 0.8365 -0.4830 0.2588 +vn 0.9944 -0.1056 -0.0000 +vn 0.9874 -0.1580 0.0000 +vn 0.9583 -0.1211 -0.2588 +vn 0.9538 -0.1526 -0.2588 +vn 0.8552 -0.1368 -0.5000 +vn 0.8592 -0.1086 -0.5000 +vn 0.6982 -0.1117 -0.7071 +vn 0.7015 -0.0886 -0.7071 +vn 0.4937 -0.0790 -0.8660 +vn 0.4961 -0.0627 -0.8660 +vn 0.2556 -0.0409 -0.9659 +vn 0.2568 -0.0324 -0.9659 +vn 0.9986 -0.0528 -0.0000 +vn 0.8551 -0.1368 -0.5000 +vn 0.2332 -0.9724 0.0000 +vn 0.4535 -0.8912 -0.0000 +vn 0.4829 -0.8365 -0.2588 +vn 0.6489 -0.7609 0.0000 +vn 0.8084 -0.5886 0.0000 +vn 0.9234 -0.3839 -0.0000 +vn 0.8365 -0.2242 -0.5000 +vn 0.3535 -0.6124 -0.7071 +vn 0.3536 -0.3535 -0.8660 +vn -0.8969 -0.4422 0.0000 +vn -0.9724 -0.2334 -0.0000 +vn -0.9330 -0.2500 -0.2588 +vn -0.9393 -0.2254 -0.2588 +vn -0.8421 -0.2021 -0.5000 +vn -0.8365 -0.2242 -0.5000 +vn -0.6876 -0.1650 -0.7071 +vn -0.4862 -0.1167 -0.8660 +vn -0.2517 -0.0604 -0.9659 +vn -0.1294 -0.2242 -0.9659 +vn -0.3536 -0.3535 -0.8660 +vn -0.2207 -0.9753 0.0000 +vn -0.4305 -0.9026 -0.0000 +vn -0.6191 -0.7853 -0.0000 +vn -0.7772 -0.6293 0.0000 +vn -0.9392 -0.2254 -0.2588 +vn -0.9969 -0.0784 0.0000 +vn -0.9877 -0.1564 0.0000 +vn 0.0000 0.0001 -1.0000 +vn 0.0000 -0.0001 -1.0000 +vn 0.2556 -0.0409 0.9659 +vn 0.4937 -0.0790 0.8660 +vn 0.6982 -0.1117 0.7071 +vn 0.8552 -0.1368 0.5000 +vn 0.9538 -0.1526 0.2588 +vn 0.8551 -0.1368 0.5000 +vn 0.1294 -0.2242 0.9659 +vn 0.8365 -0.2242 0.5000 +vn 0.4829 -0.8365 0.2588 +vn 0.3536 -0.3535 0.8660 +vn -0.2517 -0.0604 0.9659 +vn -0.4862 -0.1167 0.8660 +vn -0.6876 -0.1650 0.7071 +vn -0.8421 -0.2021 0.5000 +vn -0.9392 -0.2254 0.2588 +vn -0.3536 -0.6124 0.7071 +vn -0.3536 -0.3535 0.8660 +vn -0.1294 -0.2241 0.9659 +vn -0.9393 -0.2254 0.2588 +vn -0.2568 -0.0324 0.9659 +vn -0.4960 -0.0627 0.8660 +vn -0.7015 -0.0886 0.7071 +vn -0.8592 -0.1085 0.5000 +vn -0.9583 -0.1211 0.2588 +vn 0.7433 0.6690 0.0000 +vn 0.8830 0.4693 0.0000 +vn 0.7433 0.6689 0.0000 +vn 0.9703 0.2419 0.0000 +vn 0.9703 0.2418 0.0000 +vn 0.9703 -0.2419 -0.0000 +vn 0.9703 -0.2418 -0.0000 +vn 0.8830 -0.4693 -0.0000 +vn 0.7433 -0.6690 0.0000 +vn -0.7433 -0.6690 -0.0000 +vn -0.8830 -0.4693 -0.0000 +vn -0.9703 -0.2418 -0.0000 +vn -0.9703 -0.2419 -0.0000 +vn -0.9703 0.2418 0.0000 +vn -0.9703 0.2419 0.0000 +vn -0.8830 0.4693 0.0000 +vn -0.7433 0.6690 0.0000 +vn -0.7433 0.6690 -0.0001 +vn -0.7433 0.6690 0.0001 +vn -0.7433 0.6689 -0.0002 +s 1 +f 1/1/1 2/2/1 3/3/2 +f 3/3/2 2/2/1 4/4/2 +f 3/3/2 4/4/2 5/5/3 +f 5/5/3 4/4/2 6/6/3 +f 5/5/3 6/6/3 7/7/4 +f 7/7/4 6/6/3 8/8/4 +f 7/7/4 8/8/4 9/9/5 +f 9/9/5 8/8/4 10/10/5 +f 9/9/5 10/10/5 11/11/6 +f 11/11/6 10/10/5 12/12/6 +f 11/11/6 12/12/6 13/13/7 +f 13/13/7 12/12/6 14/14/7 +f 13/13/7 14/14/7 15/15/8 +f 15/15/8 14/14/7 16/16/8 +f 15/15/8 16/16/8 17/17/9 +f 17/17/9 16/16/8 18/18/9 +f 17/17/9 18/18/9 19/19/10 +f 19/19/10 18/18/9 20/20/10 +f 19/19/10 20/20/10 21/21/11 +f 21/21/11 20/20/10 22/22/11 +f 21/21/11 22/22/11 23/23/12 +f 23/23/12 22/22/11 24/24/12 +f 23/23/12 24/24/12 25/25/13 +f 25/25/13 24/24/12 26/26/13 +f 25/25/13 26/26/13 27/27/14 +f 27/27/14 26/26/13 28/28/14 +f 27/27/14 28/28/14 29/29/15 +f 29/29/15 28/28/14 30/30/15 +f 29/31/15 30/32/15 31/33/16 +f 31/33/16 30/32/15 32/34/16 +f 31/33/16 32/34/16 33/35/17 +f 33/35/17 32/34/16 34/36/17 +f 33/35/17 34/36/17 35/37/18 +f 35/37/18 34/36/17 36/38/18 +f 35/37/18 36/38/18 37/39/19 +f 37/39/19 36/38/18 38/40/19 +f 37/39/19 38/40/19 39/41/20 +f 39/41/20 38/40/19 40/42/20 +f 39/41/20 40/42/20 41/43/21 +f 41/43/21 40/42/20 42/44/21 +f 41/43/21 42/44/21 43/45/22 +f 43/45/22 42/44/21 44/46/22 +f 43/45/22 44/46/22 45/47/23 +f 45/47/23 44/46/22 46/48/23 +f 45/47/23 46/48/23 47/49/24 +f 47/49/24 46/48/23 48/50/24 +f 47/49/24 48/50/24 1/1/1 +f 1/1/1 48/50/24 2/2/1 +f 49/51/1 50/52/1 51/53/2 +f 51/53/2 50/52/1 52/54/2 +f 51/53/2 52/54/2 53/55/3 +f 53/55/3 52/54/2 54/56/3 +f 53/55/3 54/56/3 55/57/4 +f 55/57/4 54/56/3 56/58/4 +f 55/57/4 56/58/4 57/59/5 +f 57/59/5 56/58/4 58/60/5 +f 57/59/5 58/60/5 59/61/6 +f 59/61/6 58/60/5 60/62/6 +f 59/61/6 60/62/6 61/63/7 +f 61/63/7 60/62/6 62/64/7 +f 61/63/7 62/64/7 63/65/8 +f 63/65/8 62/64/7 64/66/8 +f 63/65/8 64/66/8 65/67/9 +f 65/67/9 64/66/8 66/68/9 +f 65/67/9 66/68/9 67/69/10 +f 67/69/10 66/68/9 68/70/10 +f 67/69/10 68/70/10 69/71/11 +f 69/71/11 68/70/10 70/72/11 +f 69/71/11 70/72/11 71/73/12 +f 71/73/12 70/72/11 72/74/12 +f 71/73/12 72/74/12 73/75/13 +f 73/75/13 72/74/12 74/76/13 +f 73/75/13 74/76/13 75/77/14 +f 75/77/14 74/76/13 76/78/14 +f 75/79/14 76/80/14 77/81/15 +f 77/81/15 76/80/14 78/82/15 +f 77/81/15 78/82/15 79/83/16 +f 79/83/16 78/82/15 80/84/16 +f 79/83/16 80/84/16 81/85/17 +f 81/85/17 80/84/16 82/86/17 +f 81/85/17 82/86/17 83/87/18 +f 83/87/18 82/86/17 84/88/18 +f 83/87/18 84/88/18 85/89/19 +f 85/89/19 84/88/18 86/90/19 +f 85/89/19 86/90/19 87/91/20 +f 87/91/20 86/90/19 88/92/20 +f 87/91/20 88/92/20 89/93/21 +f 89/93/21 88/92/20 90/94/21 +f 89/93/21 90/94/21 91/95/22 +f 91/95/22 90/94/21 92/96/22 +f 91/95/22 92/96/22 93/97/23 +f 93/97/23 92/96/22 94/98/23 +f 93/97/23 94/98/23 95/99/24 +f 95/99/24 94/98/23 96/100/24 +f 95/99/24 96/100/24 49/51/1 +f 49/51/1 96/100/24 50/52/1 +f 1/101/25 3/102/25 97/103/25 +f 97/103/25 3/102/25 5/104/25 +f 97/103/25 5/104/25 7/105/25 +f 7/105/25 9/106/25 97/103/25 +f 97/103/25 9/106/25 11/107/25 +f 97/103/25 11/107/25 13/108/25 +f 13/108/25 15/109/25 97/103/25 +f 97/103/25 15/109/25 98/110/25 +f 98/110/25 15/109/25 17/111/25 +f 98/110/25 17/111/25 19/112/25 +f 19/112/25 21/113/25 98/110/25 +f 98/110/25 21/113/25 23/114/25 +f 98/110/25 23/114/25 25/115/25 +f 25/115/25 27/116/25 98/110/25 +f 98/110/25 27/116/25 99/117/25 +f 98/110/25 99/117/25 100/118/25 +f 27/116/25 29/119/25 99/117/25 +f 99/117/25 29/119/25 31/120/25 +f 99/117/25 31/120/25 33/121/25 +f 33/121/25 35/122/25 99/117/25 +f 99/117/25 35/122/25 37/123/25 +f 99/117/25 37/123/25 39/124/25 +f 39/124/25 41/125/25 99/117/25 +f 99/117/25 41/125/25 43/126/25 +f 99/117/25 43/126/25 101/127/25 +f 101/127/25 43/126/25 102/128/25 +f 101/127/25 102/128/25 103/129/25 +f 43/126/25 45/130/25 102/128/25 +f 102/128/25 45/130/25 104/131/25 +f 104/131/25 45/130/25 47/132/25 +f 104/131/25 47/132/25 105/133/25 +f 105/133/25 47/132/25 1/101/25 +f 105/133/25 1/101/25 106/134/25 +f 106/134/25 1/101/25 97/103/25 +f 106/134/25 97/103/25 107/135/25 +f 49/136/25 51/137/25 108/138/25 +f 108/138/25 51/137/25 53/139/25 +f 108/138/25 53/139/25 109/140/25 +f 109/140/25 53/139/25 55/141/25 +f 109/140/25 55/141/25 110/142/25 +f 110/142/25 55/141/25 57/143/25 +f 110/142/25 57/143/25 100/118/25 +f 100/118/25 57/143/25 59/144/25 +f 100/118/25 59/144/25 61/145/25 +f 61/145/25 63/146/25 100/118/25 +f 100/118/25 63/146/25 98/110/25 +f 98/110/25 63/146/25 111/147/25 +f 111/147/25 63/146/25 65/148/25 +f 111/147/25 65/148/25 67/149/25 +f 67/149/25 69/150/25 111/147/25 +f 111/147/25 69/150/25 71/151/25 +f 111/147/25 71/151/25 73/152/25 +f 111/147/25 73/152/25 112/153/25 +f 112/153/25 73/152/25 75/154/25 +f 112/153/25 75/154/25 113/155/25 +f 113/155/25 75/154/25 114/156/25 +f 114/156/25 75/154/25 115/157/25 +f 115/157/25 75/154/25 116/158/25 +f 116/158/25 75/154/25 77/159/25 +f 116/158/25 77/159/25 117/160/25 +f 117/160/25 77/159/25 79/161/25 +f 117/160/25 79/161/25 81/162/25 +f 81/162/25 83/163/25 117/160/25 +f 117/160/25 83/163/25 85/164/25 +f 117/160/25 85/164/25 87/165/25 +f 89/166/25 118/167/25 87/165/25 +f 87/165/25 118/167/25 119/168/25 +f 87/165/25 119/168/25 117/160/25 +f 89/166/25 91/169/25 118/167/25 +f 118/167/25 91/169/25 93/170/25 +f 118/167/25 93/170/25 120/171/25 +f 120/171/25 93/170/25 95/172/25 +f 120/171/25 95/172/25 121/173/25 +f 121/173/25 95/172/25 49/136/25 +f 121/173/25 49/136/25 108/138/25 +f 118/167/25 101/127/25 119/168/25 +f 119/168/25 101/127/25 122/174/25 +f 119/168/25 122/174/25 123/175/25 +f 119/168/25 124/176/25 107/135/25 +f 107/135/25 124/176/25 125/177/25 +f 107/135/25 125/177/25 126/178/25 +f 127/179/25 128/180/25 107/135/25 +f 107/135/25 128/180/25 106/134/25 +f 103/129/25 129/181/25 101/127/25 +f 101/127/25 129/181/25 130/182/25 +f 101/127/25 130/182/25 131/183/25 +f 131/183/25 132/184/25 101/127/25 +f 101/127/25 132/184/25 133/185/25 +f 101/127/25 133/185/25 134/186/25 +f 134/186/25 122/174/25 101/127/25 +f 123/175/25 135/187/25 119/168/25 +f 119/168/25 135/187/25 136/188/25 +f 119/168/25 136/188/25 137/189/25 +f 137/189/25 138/190/25 119/168/25 +f 119/168/25 138/190/25 124/176/25 +f 126/178/25 139/191/25 107/135/25 +f 107/135/25 139/191/25 140/192/25 +f 107/135/25 140/192/25 127/179/25 +f 141/193/8 142/194/8 143/195/26 +f 143/195/26 142/194/8 144/196/27 +f 143/195/26 144/196/27 145/197/28 +f 145/197/28 144/196/27 146/198/29 +f 145/197/28 146/198/29 147/199/30 +f 147/199/30 146/198/29 148/200/31 +f 147/199/30 148/200/31 149/201/31 +f 149/201/31 148/200/31 150/202/32 +f 150/202/32 148/200/31 151/203/33 +f 150/202/32 151/203/33 152/204/34 +f 152/204/34 151/203/33 153/205/35 +f 152/204/34 153/205/35 154/206/36 +f 154/206/36 153/205/35 155/207/37 +f 154/206/36 155/207/37 156/208/37 +f 157/209/14 158/210/38 159/211/13 +f 159/211/13 158/210/38 160/212/39 +f 159/211/13 160/212/39 161/213/12 +f 161/213/12 160/212/39 162/214/40 +f 161/213/12 162/214/40 163/215/11 +f 163/215/11 162/214/40 164/216/41 +f 163/215/11 164/216/41 165/217/10 +f 165/217/10 164/216/41 166/218/42 +f 165/217/10 166/218/42 167/219/9 +f 167/219/9 166/218/42 168/220/43 +f 167/219/9 168/220/43 142/194/8 +f 142/194/8 168/220/43 144/196/27 +f 144/196/27 168/220/43 169/221/44 +f 144/196/27 169/221/44 146/198/29 +f 146/198/29 169/221/44 170/222/45 +f 146/198/29 170/222/45 148/200/31 +f 148/200/31 170/222/45 171/223/46 +f 148/200/31 171/223/46 151/203/33 +f 151/203/33 171/223/46 172/224/47 +f 151/203/33 172/224/47 153/205/35 +f 153/205/35 172/224/47 173/225/37 +f 153/205/35 173/225/37 155/207/37 +f 158/210/38 174/226/48 160/212/39 +f 160/212/39 174/226/48 175/227/49 +f 160/212/39 175/227/49 162/214/40 +f 162/214/40 175/227/49 176/228/50 +f 162/214/40 176/228/50 164/216/41 +f 164/216/41 176/228/50 177/229/51 +f 164/216/41 177/229/51 166/218/42 +f 166/218/42 177/229/51 178/230/52 +f 166/218/42 178/230/52 168/220/43 +f 168/220/43 178/230/52 169/221/44 +f 174/226/48 179/231/53 175/227/49 +f 175/227/49 179/231/53 180/232/54 +f 175/227/49 180/232/54 176/228/50 +f 176/228/50 180/232/54 181/233/55 +f 176/228/50 181/233/55 177/229/51 +f 177/229/51 181/233/55 182/234/56 +f 177/229/51 182/234/56 178/230/52 +f 178/230/52 182/234/56 183/235/57 +f 178/230/52 183/235/57 169/221/44 +f 169/221/44 183/235/57 170/222/45 +f 179/231/53 184/236/58 180/232/54 +f 180/232/54 184/236/58 185/237/59 +f 180/232/54 185/237/59 181/233/55 +f 181/233/55 185/237/59 186/238/60 +f 181/233/55 186/238/60 182/234/56 +f 182/234/56 186/238/60 187/239/61 +f 182/234/56 187/239/61 183/235/57 +f 183/235/57 187/239/61 188/240/62 +f 183/235/57 188/240/62 170/222/45 +f 170/222/45 188/240/62 171/223/46 +f 184/236/58 189/241/63 185/237/59 +f 185/237/59 189/241/63 190/242/64 +f 185/237/59 190/242/64 186/238/60 +f 186/238/60 190/242/64 191/243/65 +f 186/238/60 191/243/65 187/239/61 +f 187/239/61 191/243/65 192/244/66 +f 187/239/61 192/244/66 188/240/62 +f 188/240/62 192/244/66 193/245/67 +f 188/240/62 193/245/67 171/223/46 +f 171/223/46 193/245/67 172/224/47 +f 189/241/63 194/246/37 190/242/64 +f 190/242/64 194/246/37 195/247/37 +f 190/242/64 195/247/37 191/243/65 +f 191/243/65 195/247/37 196/248/37 +f 191/243/65 196/248/37 192/244/66 +f 192/244/66 196/248/37 197/249/37 +f 192/244/66 197/249/37 193/245/67 +f 193/245/67 197/249/37 198/250/37 +f 193/245/67 198/250/37 172/224/47 +f 172/224/47 198/250/37 173/225/37 +f 157/209/14 199/251/14 158/210/38 +f 158/210/38 199/251/14 200/252/38 +f 158/210/38 200/252/38 174/226/48 +f 174/226/48 200/252/38 201/253/48 +f 174/226/48 201/253/48 179/231/53 +f 179/231/53 201/253/48 202/254/53 +f 179/231/53 202/254/53 184/236/58 +f 184/236/58 202/254/53 203/255/58 +f 184/236/58 203/255/58 189/241/63 +f 189/241/63 203/255/58 204/256/63 +f 189/241/63 204/256/63 194/246/37 +f 194/246/37 204/256/63 205/257/37 +f 206/258/20 207/259/68 208/260/19 +f 208/260/19 207/259/68 209/261/69 +f 208/260/19 209/261/69 210/262/18 +f 210/262/18 209/261/69 211/263/70 +f 210/262/18 211/263/70 212/264/17 +f 212/264/17 211/263/70 213/265/71 +f 212/264/17 213/265/71 214/266/16 +f 214/266/16 213/265/71 215/267/72 +f 214/266/16 215/267/72 216/268/15 +f 216/268/15 215/267/72 217/269/73 +f 216/268/15 217/269/73 199/251/14 +f 199/251/14 217/269/73 200/252/38 +f 200/252/38 217/269/73 218/270/74 +f 200/252/38 218/270/74 201/253/48 +f 201/253/48 218/270/74 219/271/75 +f 201/253/48 219/271/75 202/254/53 +f 202/254/53 219/271/75 220/272/76 +f 202/254/53 220/272/76 203/255/58 +f 203/255/58 220/272/76 221/273/77 +f 203/255/58 221/273/77 204/256/63 +f 204/256/63 221/273/77 222/274/37 +f 204/256/63 222/274/37 205/257/37 +f 207/259/68 223/275/78 209/261/69 +f 209/261/69 223/275/78 224/276/79 +f 209/261/69 224/276/79 211/263/70 +f 211/263/70 224/276/79 225/277/80 +f 211/263/70 225/277/80 213/265/71 +f 213/265/71 225/277/80 226/278/81 +f 213/265/71 226/278/81 215/267/72 +f 215/267/72 226/278/81 227/279/82 +f 215/267/72 227/279/82 217/269/73 +f 217/269/73 227/279/82 218/270/74 +f 223/275/78 228/280/83 224/276/79 +f 224/276/79 228/280/83 229/281/84 +f 224/276/79 229/281/84 225/277/80 +f 225/277/80 229/281/84 230/282/85 +f 225/277/80 230/282/85 226/278/81 +f 226/278/81 230/282/85 231/283/86 +f 226/278/81 231/283/86 227/279/82 +f 227/279/82 231/283/86 232/284/87 +f 227/279/82 232/284/87 218/270/74 +f 218/270/74 232/284/87 219/271/75 +f 228/280/83 233/285/88 229/281/84 +f 229/281/84 233/285/88 234/286/89 +f 229/281/84 234/286/89 230/282/85 +f 230/282/85 234/286/89 235/287/90 +f 230/282/85 235/287/90 231/283/86 +f 231/283/86 235/287/90 236/288/91 +f 231/283/86 236/288/91 232/284/87 +f 232/284/87 236/288/91 237/289/92 +f 232/284/87 237/289/92 219/271/75 +f 219/271/75 237/289/92 220/272/76 +f 233/285/88 238/290/93 234/286/89 +f 234/286/89 238/290/93 239/291/94 +f 234/286/89 239/291/94 235/287/90 +f 235/287/90 239/291/94 240/292/95 +f 235/287/90 240/292/95 236/288/91 +f 236/288/91 240/292/95 241/293/96 +f 236/288/91 241/293/96 237/289/92 +f 237/289/92 241/293/96 242/294/97 +f 237/289/92 242/294/97 220/272/76 +f 220/272/76 242/294/97 221/273/77 +f 238/290/93 243/295/37 239/291/94 +f 239/291/94 243/295/37 244/296/37 +f 239/291/94 244/296/37 240/292/95 +f 240/292/95 244/296/37 245/297/37 +f 240/292/95 245/297/37 241/293/96 +f 241/293/96 245/297/37 246/298/37 +f 241/293/96 246/298/37 242/294/97 +f 242/294/97 246/298/37 247/299/37 +f 242/294/97 247/299/37 221/273/77 +f 221/273/77 247/299/37 222/274/37 +f 206/258/20 248/300/20 207/259/68 +f 207/259/68 248/300/20 249/301/68 +f 207/259/68 249/301/68 223/275/78 +f 223/275/78 249/301/68 250/302/78 +f 223/275/78 250/302/78 228/280/83 +f 228/280/83 250/302/78 251/303/83 +f 228/280/83 251/303/83 233/285/88 +f 233/285/88 251/303/83 252/304/88 +f 233/285/88 252/304/88 238/290/93 +f 238/290/93 252/304/88 253/305/93 +f 238/290/93 253/305/93 243/295/37 +f 243/295/37 253/305/93 254/306/37 +f 255/307/2 256/308/98 257/309/1 +f 257/309/1 256/308/98 258/310/99 +f 257/309/1 258/310/99 259/311/24 +f 259/311/24 258/310/99 260/312/100 +f 259/311/24 260/312/100 261/313/23 +f 261/313/23 260/312/100 262/314/101 +f 261/313/23 262/314/101 263/315/22 +f 263/315/22 262/314/101 264/316/102 +f 263/315/22 264/316/102 265/317/21 +f 265/317/21 264/316/102 266/318/103 +f 265/317/21 266/318/103 248/300/20 +f 248/300/20 266/318/103 249/301/68 +f 249/301/68 266/318/103 267/319/104 +f 249/301/68 267/319/104 250/302/78 +f 250/302/78 267/319/104 268/320/105 +f 250/302/78 268/320/105 251/303/83 +f 251/303/83 268/320/105 269/321/106 +f 251/303/83 269/321/106 252/304/88 +f 252/304/88 269/321/106 270/322/107 +f 252/304/88 270/322/107 253/305/93 +f 253/305/93 270/322/107 271/323/37 +f 253/305/93 271/323/37 254/306/37 +f 256/308/98 272/324/108 258/310/99 +f 258/310/99 272/324/108 273/325/109 +f 258/310/99 273/325/109 260/312/100 +f 260/312/100 273/325/109 274/326/110 +f 260/312/100 274/326/110 262/314/101 +f 262/314/101 274/326/110 275/327/111 +f 262/314/101 275/327/111 264/316/102 +f 264/316/102 275/327/111 276/328/112 +f 264/316/102 276/328/112 266/318/103 +f 266/318/103 276/328/112 267/319/104 +f 272/324/108 277/329/113 273/325/109 +f 273/325/109 277/329/113 278/330/114 +f 273/325/109 278/330/114 274/326/110 +f 274/326/110 278/330/114 279/331/115 +f 274/326/110 279/331/115 275/327/111 +f 275/327/111 279/331/115 280/332/116 +f 275/327/111 280/332/116 276/328/112 +f 276/328/112 280/332/116 281/333/117 +f 276/328/112 281/333/117 267/319/104 +f 267/319/104 281/333/117 268/320/105 +f 277/329/113 282/334/118 278/330/114 +f 278/330/114 282/334/118 283/335/119 +f 278/330/114 283/335/119 279/331/115 +f 279/331/115 283/335/119 284/336/120 +f 279/331/115 284/336/120 280/332/116 +f 280/332/116 284/336/120 285/337/121 +f 280/332/116 285/337/121 281/333/117 +f 281/333/117 285/337/121 286/338/122 +f 281/333/117 286/338/122 268/320/105 +f 268/320/105 286/338/122 269/321/106 +f 282/334/118 287/339/123 283/335/119 +f 283/335/119 287/339/123 288/340/124 +f 283/335/119 288/340/124 284/336/120 +f 284/336/120 288/340/124 289/341/125 +f 284/336/120 289/341/125 285/337/121 +f 285/337/121 289/341/125 290/342/126 +f 285/337/121 290/342/126 286/338/122 +f 286/338/122 290/342/126 291/343/127 +f 286/338/122 291/343/127 269/321/106 +f 269/321/106 291/343/127 270/322/107 +f 287/339/123 292/344/37 288/340/124 +f 288/340/124 292/344/37 293/345/37 +f 288/340/124 293/345/37 289/341/125 +f 289/341/125 293/345/37 294/346/37 +f 289/341/125 294/346/37 290/342/126 +f 290/342/126 294/346/37 295/347/37 +f 290/342/126 295/347/37 291/343/127 +f 291/343/127 295/347/37 296/348/37 +f 291/343/127 296/348/37 270/322/107 +f 270/322/107 296/348/37 271/323/37 +f 255/307/2 297/349/2 256/308/98 +f 256/308/98 297/349/2 298/350/98 +f 256/308/98 298/350/98 272/324/108 +f 272/324/108 298/350/98 299/351/108 +f 272/324/108 299/351/108 277/329/113 +f 277/329/113 299/351/108 300/352/113 +f 277/329/113 300/352/113 282/334/118 +f 282/334/118 300/352/113 301/353/118 +f 282/334/118 301/353/118 287/339/123 +f 287/339/123 301/353/118 302/354/123 +f 287/339/123 302/354/123 292/344/37 +f 292/344/37 302/354/123 303/355/37 +f 304/356/8 305/357/27 306/358/7 +f 306/358/7 305/357/27 307/359/128 +f 306/358/7 307/359/128 308/360/6 +f 308/360/6 307/359/128 309/361/129 +f 308/360/6 309/361/129 310/362/5 +f 310/362/5 309/361/129 311/363/130 +f 310/362/5 311/363/130 312/364/4 +f 312/364/4 311/363/130 313/365/131 +f 312/364/4 313/365/131 314/366/3 +f 314/366/3 313/365/131 315/367/132 +f 314/366/3 315/367/132 297/349/2 +f 297/349/2 315/367/132 298/350/98 +f 298/350/98 315/367/132 316/368/133 +f 298/350/98 316/368/133 299/351/108 +f 299/351/108 316/368/133 317/369/134 +f 299/351/108 317/369/134 300/352/113 +f 300/352/113 317/369/134 318/370/135 +f 300/352/113 318/370/135 301/353/118 +f 301/353/118 318/370/135 319/371/136 +f 301/353/118 319/371/136 302/354/123 +f 302/354/123 319/371/136 320/372/37 +f 302/354/123 320/372/37 303/355/37 +f 305/357/27 321/373/29 307/359/128 +f 307/359/128 321/373/29 322/374/137 +f 307/359/128 322/374/137 309/361/129 +f 309/361/129 322/374/137 323/375/138 +f 309/361/129 323/375/138 311/363/130 +f 311/363/130 323/375/138 324/376/139 +f 311/363/130 324/376/139 313/365/131 +f 313/365/131 324/376/139 325/377/140 +f 313/365/131 325/377/140 315/367/132 +f 315/367/132 325/377/140 316/368/133 +f 321/373/29 326/378/31 322/374/137 +f 322/374/137 326/378/31 327/379/141 +f 322/374/137 327/379/141 323/375/138 +f 323/375/138 327/379/141 328/380/142 +f 323/375/138 328/380/142 324/376/139 +f 324/376/139 328/380/142 329/381/143 +f 324/376/139 329/381/143 325/377/140 +f 325/377/140 329/381/143 330/382/144 +f 325/377/140 330/382/144 316/368/133 +f 316/368/133 330/382/144 317/369/134 +f 326/378/31 331/383/33 327/379/141 +f 327/379/141 331/383/33 332/384/145 +f 327/379/141 332/384/145 328/380/142 +f 328/380/142 332/384/145 333/385/146 +f 328/380/142 333/385/146 329/381/143 +f 329/381/143 333/385/146 334/386/147 +f 329/381/143 334/386/147 330/382/144 +f 330/382/144 334/386/147 335/387/148 +f 330/382/144 335/387/148 317/369/134 +f 317/369/134 335/387/148 318/370/135 +f 331/383/33 336/388/35 332/384/145 +f 332/384/145 336/388/35 337/389/149 +f 332/384/145 337/389/149 333/385/146 +f 333/385/146 337/389/149 338/390/150 +f 333/385/146 338/390/150 334/386/147 +f 334/386/147 338/390/150 339/391/151 +f 334/386/147 339/391/151 335/387/148 +f 335/387/148 339/391/151 340/392/152 +f 335/387/148 340/392/152 318/370/135 +f 318/370/135 340/392/152 319/371/136 +f 336/388/35 341/393/37 337/389/149 +f 337/389/149 341/393/37 342/394/37 +f 337/389/149 342/394/37 338/390/150 +f 338/390/150 342/394/37 343/395/37 +f 338/390/150 343/395/37 339/391/151 +f 339/391/151 343/395/37 344/396/37 +f 339/391/151 344/396/37 340/392/152 +f 340/392/152 344/396/37 345/397/37 +f 340/392/152 345/397/37 319/371/136 +f 319/371/136 345/397/37 320/372/37 +f 304/356/8 346/398/8 305/357/27 +f 305/357/27 346/398/8 347/399/153 +f 305/357/27 347/399/153 321/373/29 +f 321/373/29 347/399/153 348/400/29 +f 321/373/29 348/400/29 326/378/31 +f 326/378/31 348/400/29 349/401/31 +f 326/378/31 349/401/31 331/383/33 +f 331/383/33 349/401/31 350/402/33 +f 331/383/33 350/402/33 336/388/35 +f 336/388/35 350/402/33 351/403/35 +f 336/388/35 351/403/35 341/393/37 +f 341/393/37 351/403/35 352/404/37 +f 353/405/8 304/356/8 354/406/7 +f 354/406/7 304/356/8 306/358/7 +f 354/406/7 306/358/7 355/407/6 +f 355/407/6 306/358/7 308/360/6 +f 355/407/6 308/360/6 356/408/5 +f 356/408/5 308/360/6 310/362/5 +f 356/409/5 310/362/5 357/410/4 +f 357/410/4 310/362/5 312/364/4 +f 357/410/4 312/364/4 358/411/3 +f 358/411/3 312/364/4 314/366/3 +f 358/411/3 314/366/3 359/412/2 +f 359/412/2 314/366/3 297/349/2 +f 255/307/2 360/413/2 297/349/2 +f 297/349/2 360/413/2 359/412/2 +f 360/413/2 255/307/2 361/414/1 +f 361/414/1 255/307/2 257/309/1 +f 361/414/1 257/309/1 362/415/24 +f 362/415/24 257/309/1 259/311/24 +f 362/415/24 259/311/24 363/416/23 +f 363/416/23 259/311/24 261/313/23 +f 363/417/23 261/313/23 364/418/22 +f 364/418/22 261/313/23 263/315/22 +f 364/418/22 263/315/22 365/419/21 +f 365/419/21 263/315/22 265/317/21 +f 365/419/21 265/317/21 366/420/20 +f 366/420/20 265/317/21 248/300/20 +f 206/258/20 367/421/20 248/300/20 +f 248/300/20 367/421/20 366/420/20 +f 367/421/20 206/258/20 368/422/19 +f 368/422/19 206/258/20 208/260/19 +f 368/422/19 208/260/19 369/423/18 +f 369/423/18 208/260/19 210/262/18 +f 369/423/18 210/262/18 370/424/17 +f 370/424/17 210/262/18 212/264/17 +f 370/425/17 212/264/17 371/426/16 +f 371/426/16 212/264/17 214/266/16 +f 371/426/16 214/266/16 372/427/15 +f 372/427/15 214/266/16 216/268/15 +f 372/427/15 216/268/15 373/428/14 +f 373/428/14 216/268/15 199/251/14 +f 157/209/14 374/429/14 199/251/14 +f 199/251/14 374/429/14 373/428/14 +f 374/429/14 157/209/14 375/430/13 +f 375/430/13 157/209/14 159/211/13 +f 375/430/13 159/211/13 376/431/12 +f 376/431/12 159/211/13 161/213/12 +f 376/431/12 161/213/12 377/432/11 +f 377/432/11 161/213/12 163/215/11 +f 377/433/11 163/215/11 378/434/10 +f 378/434/10 163/215/11 165/217/10 +f 378/434/10 165/217/10 379/435/9 +f 379/435/9 165/217/10 167/219/9 +f 379/435/9 167/219/9 380/436/8 +f 380/436/8 167/219/9 142/194/8 +f 346/398/8 304/356/8 107/437/8 +f 107/437/8 304/356/8 353/405/8 +f 107/437/8 353/405/8 119/438/8 +f 119/438/8 353/405/8 380/436/8 +f 119/438/8 380/436/8 142/194/8 +f 142/194/8 141/193/8 119/438/8 +f 381/439/25 382/440/25 383/441/154 +f 383/441/154 382/440/25 384/442/154 +f 383/441/154 384/442/154 385/443/155 +f 385/443/155 384/442/154 386/444/155 +f 385/443/155 386/444/155 387/445/156 +f 387/445/156 386/444/155 388/446/156 +f 387/445/156 388/446/156 389/447/157 +f 389/447/157 388/446/156 390/448/157 +f 389/447/157 390/448/157 391/449/158 +f 391/449/158 390/448/157 392/450/158 +f 391/449/158 392/450/158 360/451/2 +f 360/451/2 392/450/158 359/452/2 +f 366/453/20 393/454/159 365/455/21 +f 365/455/21 393/454/159 394/456/160 +f 365/455/21 394/456/160 364/457/22 +f 364/457/22 394/456/160 395/458/161 +f 364/457/22 395/458/161 363/459/23 +f 363/459/23 395/458/161 396/460/162 +f 363/459/23 396/460/162 362/461/24 +f 362/461/24 396/460/162 397/462/163 +f 362/461/24 397/462/163 361/463/1 +f 361/463/1 397/462/163 398/464/164 +f 361/463/1 398/464/164 360/451/2 +f 360/451/2 398/464/164 391/449/158 +f 391/449/158 398/464/164 399/465/165 +f 391/449/158 399/465/165 389/447/157 +f 389/447/157 399/465/165 400/466/166 +f 389/447/157 400/466/166 387/445/156 +f 387/445/156 400/466/166 401/467/167 +f 387/445/156 401/467/167 385/443/155 +f 385/443/155 401/467/167 402/468/168 +f 385/443/155 402/468/168 383/441/154 +f 383/441/154 402/468/168 403/469/25 +f 383/441/154 403/469/25 381/439/25 +f 393/454/159 404/470/169 394/456/160 +f 394/456/160 404/470/169 405/471/170 +f 394/456/160 405/471/170 395/458/161 +f 395/458/161 405/471/170 406/472/171 +f 395/458/161 406/472/171 396/460/162 +f 396/460/162 406/472/171 407/473/172 +f 396/460/162 407/473/172 397/462/163 +f 397/462/163 407/473/172 408/474/173 +f 397/462/163 408/474/173 398/464/164 +f 398/464/164 408/474/173 399/465/165 +f 404/470/169 409/475/174 405/471/170 +f 405/471/170 409/475/174 410/476/175 +f 405/471/170 410/476/175 406/472/171 +f 406/472/171 410/476/175 411/477/176 +f 406/472/171 411/477/176 407/473/172 +f 407/473/172 411/477/176 412/478/177 +f 407/473/172 412/478/177 408/474/173 +f 408/474/173 412/478/177 413/479/178 +f 408/474/173 413/479/178 399/465/165 +f 399/465/165 413/479/178 400/466/166 +f 409/475/174 414/480/179 410/476/175 +f 410/476/175 414/480/179 415/481/180 +f 410/476/175 415/481/180 411/477/176 +f 411/477/176 415/481/180 416/482/181 +f 411/477/176 416/482/181 412/478/177 +f 412/478/177 416/482/181 417/483/182 +f 412/478/177 417/483/182 413/479/178 +f 413/479/178 417/483/182 418/484/183 +f 413/479/178 418/484/183 400/466/166 +f 400/466/166 418/484/183 401/467/167 +f 414/480/179 419/485/184 415/481/180 +f 415/481/180 419/485/184 420/486/185 +f 415/481/180 420/486/185 416/482/181 +f 416/482/181 420/486/185 421/487/186 +f 416/482/181 421/487/186 417/483/182 +f 417/483/182 421/487/186 422/488/187 +f 417/483/182 422/488/187 418/484/183 +f 418/484/183 422/488/187 423/489/188 +f 418/484/183 423/489/188 401/467/167 +f 401/467/167 423/489/188 402/468/168 +f 419/485/184 424/490/25 420/486/185 +f 420/486/185 424/490/25 425/491/25 +f 420/486/185 425/491/25 421/487/186 +f 421/487/186 425/491/25 426/492/25 +f 421/487/186 426/492/25 422/488/187 +f 422/488/187 426/492/25 427/493/25 +f 422/488/187 427/493/25 423/489/188 +f 423/489/188 427/493/25 428/494/25 +f 423/489/188 428/494/25 402/468/168 +f 402/468/168 428/494/25 403/469/25 +f 366/453/20 367/495/20 393/454/159 +f 393/454/159 367/495/20 429/496/159 +f 393/454/159 429/496/159 404/470/169 +f 404/470/169 429/496/159 430/497/169 +f 404/470/169 430/497/169 409/475/174 +f 409/475/174 430/497/169 431/498/174 +f 409/475/174 431/498/174 414/480/179 +f 414/480/179 431/498/174 432/499/179 +f 414/480/179 432/499/179 419/485/184 +f 419/485/184 432/499/179 433/500/184 +f 419/485/184 433/500/184 424/490/25 +f 424/490/25 433/500/184 434/501/25 +f 373/502/14 435/503/189 372/504/15 +f 372/504/15 435/503/189 436/505/190 +f 372/504/15 436/505/190 371/506/16 +f 371/506/16 436/505/190 437/507/191 +f 371/506/16 437/507/191 370/508/17 +f 370/508/17 437/507/191 438/509/192 +f 370/508/17 438/509/192 369/510/18 +f 369/510/18 438/509/192 439/511/193 +f 369/510/18 439/511/193 368/512/19 +f 368/512/19 439/511/193 440/513/194 +f 368/512/19 440/513/194 367/495/20 +f 367/495/20 440/513/194 429/496/159 +f 429/496/159 440/513/194 441/514/195 +f 429/496/159 441/514/195 430/497/169 +f 430/497/169 441/514/195 442/515/196 +f 430/497/169 442/515/196 431/498/174 +f 431/498/174 442/515/196 443/516/197 +f 431/498/174 443/516/197 432/499/179 +f 432/499/179 443/516/197 444/517/198 +f 432/499/179 444/517/198 433/500/184 +f 433/500/184 444/517/198 445/518/25 +f 433/500/184 445/518/25 434/501/25 +f 435/503/189 446/519/199 436/505/190 +f 436/505/190 446/519/199 447/520/200 +f 436/505/190 447/520/200 437/507/191 +f 437/507/191 447/520/200 448/521/201 +f 437/507/191 448/521/201 438/509/192 +f 438/509/192 448/521/201 449/522/202 +f 438/509/192 449/522/202 439/511/193 +f 439/511/193 449/522/202 450/523/203 +f 439/511/193 450/523/203 440/513/194 +f 440/513/194 450/523/203 441/514/195 +f 446/519/199 451/524/204 447/520/200 +f 447/520/200 451/524/204 452/525/205 +f 447/520/200 452/525/205 448/521/201 +f 448/521/201 452/525/205 453/526/206 +f 448/521/201 453/526/206 449/522/202 +f 449/522/202 453/526/206 454/527/207 +f 449/522/202 454/527/207 450/523/203 +f 450/523/203 454/527/207 455/528/208 +f 450/523/203 455/528/208 441/514/195 +f 441/514/195 455/528/208 442/515/196 +f 451/524/204 456/529/209 452/525/205 +f 452/525/205 456/529/209 457/530/210 +f 452/525/205 457/530/210 453/526/206 +f 453/526/206 457/530/210 458/531/211 +f 453/526/206 458/531/211 454/527/207 +f 454/527/207 458/531/211 459/532/212 +f 454/527/207 459/532/212 455/528/208 +f 455/528/208 459/532/212 460/533/213 +f 455/528/208 460/533/213 442/515/196 +f 442/515/196 460/533/213 443/516/197 +f 456/529/209 461/534/214 457/530/210 +f 457/530/210 461/534/214 462/535/215 +f 457/530/210 462/535/215 458/531/211 +f 458/531/211 462/535/215 463/536/216 +f 458/531/211 463/536/216 459/532/212 +f 459/532/212 463/536/216 464/537/217 +f 459/532/212 464/537/217 460/533/213 +f 460/533/213 464/537/217 465/538/218 +f 460/533/213 465/538/218 443/516/197 +f 443/516/197 465/538/218 444/517/198 +f 461/534/214 466/539/25 462/535/215 +f 462/535/215 466/539/25 467/540/25 +f 462/535/215 467/540/25 463/536/216 +f 463/536/216 467/540/25 468/541/25 +f 463/536/216 468/541/25 464/537/217 +f 464/537/217 468/541/25 469/542/25 +f 464/537/217 469/542/25 465/538/218 +f 465/538/218 469/542/25 470/543/25 +f 465/538/218 470/543/25 444/517/198 +f 444/517/198 470/543/25 445/518/25 +f 373/502/14 374/544/14 435/503/189 +f 435/503/189 374/544/14 471/545/189 +f 435/503/189 471/545/189 446/519/199 +f 446/519/199 471/545/189 472/546/199 +f 446/519/199 472/546/199 451/524/204 +f 451/524/204 472/546/199 473/547/204 +f 451/524/204 473/547/204 456/529/209 +f 456/529/209 473/547/204 474/548/209 +f 456/529/209 474/548/209 461/534/214 +f 461/534/214 474/548/209 475/549/214 +f 461/534/214 475/549/214 466/539/25 +f 466/539/25 475/549/214 476/550/25 +f 380/551/8 477/552/219 379/553/9 +f 379/553/9 477/552/219 478/554/220 +f 379/553/9 478/554/220 378/555/10 +f 378/555/10 478/554/220 479/556/221 +f 378/555/10 479/556/221 377/557/11 +f 377/557/11 479/556/221 480/558/222 +f 377/557/11 480/558/222 376/559/12 +f 376/559/12 480/558/222 481/560/223 +f 376/559/12 481/560/223 375/561/13 +f 375/561/13 481/560/223 482/562/224 +f 375/561/13 482/562/224 374/544/14 +f 374/544/14 482/562/224 471/545/189 +f 471/545/189 482/562/224 483/563/225 +f 471/545/189 483/563/225 472/546/199 +f 472/546/199 483/563/225 484/564/226 +f 472/546/199 484/564/226 473/547/204 +f 473/547/204 484/564/226 485/565/227 +f 473/547/204 485/565/227 474/548/209 +f 474/548/209 485/565/227 486/566/228 +f 474/548/209 486/566/228 475/549/214 +f 475/549/214 486/566/228 487/567/25 +f 475/549/214 487/567/25 476/550/25 +f 477/552/219 488/568/229 478/554/220 +f 478/554/220 488/568/229 489/569/230 +f 478/554/220 489/569/230 479/556/221 +f 479/556/221 489/569/230 490/570/231 +f 479/556/221 490/570/231 480/558/222 +f 480/558/222 490/570/231 491/571/232 +f 480/558/222 491/571/232 481/560/223 +f 481/560/223 491/571/232 492/572/233 +f 481/560/223 492/572/233 482/562/224 +f 482/562/224 492/572/233 483/563/225 +f 488/568/229 493/573/234 489/569/230 +f 489/569/230 493/573/234 494/574/235 +f 489/569/230 494/574/235 490/570/231 +f 490/570/231 494/574/235 495/575/236 +f 490/570/231 495/575/236 491/571/232 +f 491/571/232 495/575/236 496/576/237 +f 491/571/232 496/576/237 492/572/233 +f 492/572/233 496/576/237 497/577/238 +f 492/572/233 497/577/238 483/563/225 +f 483/563/225 497/577/238 484/564/226 +f 493/573/234 498/578/239 494/574/235 +f 494/574/235 498/578/239 499/579/240 +f 494/574/235 499/579/240 495/575/236 +f 495/575/236 499/579/240 500/580/241 +f 495/575/236 500/580/241 496/576/237 +f 496/576/237 500/580/241 501/581/242 +f 496/576/237 501/581/242 497/577/238 +f 497/577/238 501/581/242 502/582/243 +f 497/577/238 502/582/243 484/564/226 +f 484/564/226 502/582/243 485/565/227 +f 498/578/239 503/583/244 499/579/240 +f 499/579/240 503/583/244 504/584/245 +f 499/579/240 504/584/245 500/580/241 +f 500/580/241 504/584/245 505/585/246 +f 500/580/241 505/585/246 501/581/242 +f 501/581/242 505/585/246 506/586/247 +f 501/581/242 506/586/247 502/582/243 +f 502/582/243 506/586/247 507/587/248 +f 502/582/243 507/587/248 485/565/227 +f 485/565/227 507/587/248 486/566/228 +f 503/583/244 508/588/25 504/584/245 +f 504/584/245 508/588/25 509/589/25 +f 504/584/245 509/589/25 505/585/246 +f 505/585/246 509/589/25 510/590/25 +f 505/585/246 510/590/25 506/586/247 +f 506/586/247 510/590/25 511/591/25 +f 506/586/247 511/591/25 507/587/248 +f 507/587/248 511/591/25 512/592/25 +f 507/587/248 512/592/25 486/566/228 +f 486/566/228 512/592/25 487/567/25 +f 380/551/8 353/593/8 477/552/219 +f 477/552/219 353/593/8 513/594/219 +f 477/552/219 513/594/219 488/568/229 +f 488/568/229 513/594/219 514/595/229 +f 488/568/229 514/595/229 493/573/234 +f 493/573/234 514/595/229 515/596/234 +f 493/573/234 515/596/234 498/578/239 +f 498/578/239 515/596/234 516/597/239 +f 498/578/239 516/597/239 503/583/244 +f 503/583/244 516/597/239 517/598/244 +f 503/583/244 517/598/244 508/588/25 +f 508/588/25 517/598/244 518/599/25 +f 518/599/25 517/598/244 519/600/25 +f 519/600/25 517/598/244 520/601/249 +f 519/600/25 520/601/249 521/602/25 +f 521/602/25 520/601/249 522/603/250 +f 521/602/25 522/603/250 523/604/25 +f 523/604/25 522/603/250 524/605/251 +f 523/604/25 524/605/251 525/606/25 +f 525/606/25 524/605/251 526/607/252 +f 525/606/25 526/607/252 527/608/25 +f 527/608/25 526/607/252 528/609/253 +f 527/608/25 528/609/253 382/440/25 +f 382/440/25 528/609/253 384/442/154 +f 384/442/154 528/609/253 529/610/254 +f 384/442/154 529/610/254 386/444/155 +f 386/444/155 529/610/254 530/611/255 +f 386/444/155 530/611/255 388/446/156 +f 388/446/156 530/611/255 531/612/256 +f 388/446/156 531/612/256 390/448/157 +f 390/448/157 531/612/256 532/613/257 +f 390/448/157 532/613/257 392/450/158 +f 392/450/158 532/613/257 358/614/3 +f 392/450/158 358/614/3 359/452/2 +f 517/598/244 516/597/239 520/601/249 +f 520/601/249 516/597/239 533/615/258 +f 520/601/249 533/615/258 522/603/250 +f 522/603/250 533/615/258 534/616/259 +f 522/603/250 534/616/259 524/605/251 +f 524/605/251 534/616/259 535/617/260 +f 524/605/251 535/617/260 526/607/252 +f 526/607/252 535/617/260 536/618/261 +f 526/607/252 536/618/261 528/609/253 +f 528/609/253 536/618/261 529/610/254 +f 516/597/239 515/596/234 533/615/258 +f 533/615/258 515/596/234 537/619/262 +f 533/615/258 537/619/262 534/616/259 +f 534/616/259 537/619/262 538/620/263 +f 534/616/259 538/620/263 535/617/260 +f 535/617/260 538/620/263 539/621/264 +f 535/617/260 539/621/264 536/618/261 +f 536/618/261 539/621/264 540/622/265 +f 536/618/261 540/622/265 529/610/254 +f 529/610/254 540/622/265 530/611/255 +f 515/596/234 514/595/229 537/619/262 +f 537/619/262 514/595/229 541/623/266 +f 537/619/262 541/623/266 538/620/263 +f 538/620/263 541/623/266 542/624/267 +f 538/620/263 542/624/267 539/621/264 +f 539/621/264 542/624/267 543/625/268 +f 539/621/264 543/625/268 540/622/265 +f 540/622/265 543/625/268 544/626/269 +f 540/622/265 544/626/269 530/611/255 +f 530/611/255 544/626/269 531/612/256 +f 514/595/229 513/594/219 541/623/266 +f 541/623/266 513/594/219 545/627/270 +f 541/623/266 545/627/270 542/624/267 +f 542/624/267 545/627/270 546/628/271 +f 542/624/267 546/628/271 543/625/268 +f 543/625/268 546/628/271 547/629/272 +f 543/625/268 547/629/272 544/626/269 +f 544/626/269 547/629/272 548/630/273 +f 544/626/269 548/630/273 531/612/256 +f 531/612/256 548/630/273 532/613/257 +f 513/594/219 353/593/8 545/627/270 +f 545/627/270 353/593/8 354/631/7 +f 545/627/270 354/631/7 546/628/271 +f 546/628/271 354/631/7 355/632/6 +f 546/628/271 355/632/6 547/629/272 +f 547/629/272 355/632/6 356/633/5 +f 547/629/272 356/633/5 548/630/273 +f 548/630/273 356/633/5 357/634/4 +f 548/630/273 357/634/4 532/613/257 +f 532/613/257 357/634/4 358/614/3 +f 381/439/25 466/539/25 382/440/25 +f 382/440/25 466/539/25 476/550/25 +f 382/440/25 476/550/25 518/599/25 +f 518/599/25 476/550/25 508/588/25 +f 508/588/25 476/550/25 487/567/25 +f 508/588/25 487/567/25 512/592/25 +f 403/469/25 424/490/25 381/439/25 +f 381/439/25 424/490/25 434/501/25 +f 381/439/25 434/501/25 466/539/25 +f 466/539/25 434/501/25 467/540/25 +f 467/540/25 434/501/25 468/541/25 +f 468/541/25 434/501/25 469/542/25 +f 469/542/25 434/501/25 470/543/25 +f 470/543/25 434/501/25 445/518/25 +f 403/469/25 428/494/25 424/490/25 +f 424/490/25 428/494/25 427/493/25 +f 424/490/25 427/493/25 426/492/25 +f 426/492/25 425/491/25 424/490/25 +f 512/592/25 511/591/25 508/588/25 +f 508/588/25 511/591/25 510/590/25 +f 508/588/25 510/590/25 509/589/25 +f 519/600/25 521/602/25 518/599/25 +f 518/599/25 521/602/25 523/604/25 +f 518/599/25 523/604/25 525/606/25 +f 525/606/25 527/608/25 518/599/25 +f 518/599/25 527/608/25 382/440/25 +f 549/635/37 550/636/37 551/637/123 +f 551/637/123 550/636/37 552/638/123 +f 551/637/123 552/638/123 553/639/118 +f 553/639/118 552/638/123 554/640/118 +f 553/639/118 554/640/118 555/641/113 +f 555/641/113 554/640/118 556/642/113 +f 555/641/113 556/642/113 557/643/108 +f 557/643/108 556/642/113 558/644/108 +f 557/643/108 558/644/108 559/645/98 +f 559/645/98 558/644/108 560/646/98 +f 559/645/98 560/646/98 561/647/2 +f 561/647/2 560/646/98 562/648/2 +f 563/649/274 564/650/275 565/651/276 +f 565/651/276 564/650/275 566/652/277 +f 565/651/276 566/652/277 567/653/278 +f 565/651/276 567/653/278 568/654/279 +f 568/654/279 567/653/278 569/655/280 +f 568/654/279 569/655/280 570/656/281 +f 570/656/281 569/655/280 571/657/282 +f 570/656/281 571/657/282 572/658/283 +f 572/658/283 571/657/282 573/659/284 +f 572/658/283 573/659/284 574/660/285 +f 574/660/285 573/659/284 575/661/37 +f 574/660/285 575/661/37 576/662/37 +f 576/662/37 577/663/37 574/660/285 +f 574/660/285 577/663/37 551/637/123 +f 574/660/285 551/637/123 553/639/118 +f 577/663/37 549/635/37 551/637/123 +f 574/660/285 553/639/118 572/658/283 +f 572/658/283 553/639/118 555/641/113 +f 572/658/283 555/641/113 570/656/281 +f 570/656/281 555/641/113 557/643/108 +f 570/656/281 557/643/108 568/654/279 +f 568/654/279 557/643/108 559/645/98 +f 568/654/279 559/645/98 565/651/276 +f 565/651/276 559/645/98 578/664/286 +f 565/651/276 578/664/286 563/649/274 +f 559/645/98 561/647/2 578/664/286 +f 564/650/275 579/665/275 566/652/277 +f 566/652/277 579/665/275 580/666/277 +f 566/652/277 580/666/277 567/653/278 +f 567/653/278 580/666/277 581/667/287 +f 567/653/278 581/667/287 569/655/280 +f 569/655/280 581/667/287 582/668/280 +f 569/655/280 582/668/280 571/657/282 +f 571/657/282 582/668/280 583/669/282 +f 571/657/282 583/669/282 573/659/284 +f 573/659/284 583/669/282 584/670/284 +f 573/659/284 584/670/284 575/661/37 +f 575/661/37 584/670/284 585/671/37 +f 586/672/8 587/673/27 588/674/288 +f 588/674/288 587/673/27 589/675/128 +f 588/674/288 589/675/128 590/676/289 +f 590/676/289 589/675/128 591/677/290 +f 590/676/289 591/677/290 592/678/291 +f 592/678/291 591/677/290 593/679/130 +f 592/678/291 593/679/130 594/680/292 +f 594/680/292 593/679/130 595/681/131 +f 594/680/292 595/681/131 596/682/293 +f 596/682/293 595/681/131 597/683/132 +f 596/682/293 597/683/132 579/665/275 +f 579/665/275 597/683/132 580/666/277 +f 580/666/277 597/683/132 598/684/294 +f 580/666/277 598/684/294 581/667/287 +f 581/667/287 598/684/294 599/685/134 +f 581/667/287 599/685/134 582/668/280 +f 582/668/280 599/685/134 600/686/135 +f 582/668/280 600/686/135 583/669/282 +f 583/669/282 600/686/135 601/687/136 +f 583/669/282 601/687/136 584/670/284 +f 584/670/284 601/687/136 585/671/37 +f 585/671/37 601/687/136 602/688/37 +f 602/688/37 601/687/136 603/689/152 +f 602/688/37 603/689/152 604/690/37 +f 604/690/37 603/689/152 605/691/151 +f 604/690/37 605/691/151 606/692/37 +f 606/692/37 605/691/151 607/693/150 +f 606/692/37 607/693/150 608/694/37 +f 608/694/37 607/693/150 609/695/149 +f 608/694/37 609/695/149 610/696/37 +f 610/696/37 609/695/149 611/697/35 +f 610/696/37 611/697/35 612/698/37 +f 587/673/27 613/699/29 589/675/128 +f 589/675/128 613/699/29 614/700/137 +f 589/675/128 614/700/137 591/677/290 +f 591/677/290 614/700/137 615/701/138 +f 591/677/290 615/701/138 593/679/130 +f 593/679/130 615/701/138 616/702/139 +f 593/679/130 616/702/139 595/681/131 +f 595/681/131 616/702/139 617/703/140 +f 595/681/131 617/703/140 597/683/132 +f 597/683/132 617/703/140 598/684/294 +f 613/699/29 618/704/31 614/700/137 +f 614/700/137 618/704/31 619/705/141 +f 614/700/137 619/705/141 615/701/138 +f 615/701/138 619/705/141 620/706/295 +f 615/701/138 620/706/295 616/702/139 +f 616/702/139 620/706/295 621/707/143 +f 616/702/139 621/707/143 617/703/140 +f 617/703/140 621/707/143 622/708/144 +f 617/703/140 622/708/144 598/684/294 +f 598/684/294 622/708/144 599/685/134 +f 618/704/31 623/709/33 619/705/141 +f 619/705/141 623/709/33 624/710/145 +f 619/705/141 624/710/145 620/706/295 +f 620/706/295 624/710/145 625/711/146 +f 620/706/295 625/711/146 621/707/143 +f 621/707/143 625/711/146 626/712/296 +f 621/707/143 626/712/296 622/708/144 +f 622/708/144 626/712/296 627/713/148 +f 622/708/144 627/713/148 599/685/134 +f 599/685/134 627/713/148 600/686/135 +f 623/709/33 611/697/35 624/710/145 +f 624/710/145 611/697/35 609/695/149 +f 624/710/145 609/695/149 625/711/146 +f 625/711/146 609/695/149 607/693/150 +f 625/711/146 607/693/150 626/712/296 +f 626/712/296 607/693/150 605/691/151 +f 626/712/296 605/691/151 627/713/148 +f 627/713/148 605/691/151 603/689/152 +f 627/713/148 603/689/152 600/686/135 +f 600/686/135 603/689/152 601/687/136 +f 586/672/8 628/714/8 587/673/27 +f 587/673/27 628/714/8 629/715/27 +f 587/673/27 629/715/27 613/699/29 +f 613/699/29 629/715/27 630/716/29 +f 613/699/29 630/716/29 618/704/31 +f 618/704/31 630/716/29 631/717/31 +f 618/704/31 631/717/31 623/709/33 +f 623/709/33 631/717/31 632/718/33 +f 623/709/33 632/718/33 611/697/35 +f 611/697/35 632/718/33 633/719/35 +f 611/697/35 633/719/35 612/698/37 +f 612/698/37 633/719/35 634/720/37 +f 635/721/297 636/722/298 637/723/299 +f 637/723/299 636/722/298 638/724/300 +f 637/723/299 638/724/300 639/725/301 +f 637/723/299 639/725/301 640/726/302 +f 640/726/302 639/725/301 641/727/303 +f 640/726/302 641/727/303 642/728/54 +f 642/728/54 641/727/303 643/729/304 +f 642/728/54 643/729/304 644/730/59 +f 644/730/59 643/729/304 645/731/305 +f 644/730/59 645/731/305 646/732/64 +f 646/732/64 645/731/305 647/733/37 +f 646/732/64 647/733/37 648/734/37 +f 646/732/64 648/734/37 649/735/65 +f 649/735/65 648/734/37 650/736/37 +f 649/735/65 650/736/37 651/737/66 +f 651/737/66 650/736/37 652/738/37 +f 651/737/66 652/738/37 653/739/306 +f 653/739/306 652/738/37 654/740/37 +f 653/739/306 654/740/37 655/741/47 +f 655/741/47 654/740/37 656/742/37 +f 655/741/47 656/742/37 633/719/35 +f 633/719/35 656/742/37 634/720/37 +f 633/719/35 632/718/33 655/741/47 +f 655/741/47 632/718/33 657/743/46 +f 655/741/47 657/743/46 653/739/306 +f 653/739/306 657/743/46 658/744/62 +f 653/739/306 658/744/62 651/737/66 +f 651/737/66 658/744/62 659/745/307 +f 651/737/66 659/745/307 649/735/65 +f 649/735/65 659/745/307 660/746/60 +f 649/735/65 660/746/60 646/732/64 +f 646/732/64 660/746/60 644/730/59 +f 632/718/33 631/717/31 657/743/46 +f 657/743/46 631/717/31 661/747/45 +f 657/743/46 661/747/45 658/744/62 +f 658/744/62 661/747/45 662/748/57 +f 658/744/62 662/748/57 659/745/307 +f 659/745/307 662/748/57 663/749/56 +f 659/745/307 663/749/56 660/746/60 +f 660/746/60 663/749/56 664/750/55 +f 660/746/60 664/750/55 644/730/59 +f 644/730/59 664/750/55 642/728/54 +f 631/717/31 630/716/29 661/747/45 +f 661/747/45 630/716/29 665/751/44 +f 661/747/45 665/751/44 662/748/57 +f 662/748/57 665/751/44 666/752/52 +f 662/748/57 666/752/52 663/749/56 +f 663/749/56 666/752/52 667/753/51 +f 663/749/56 667/753/51 664/750/55 +f 664/750/55 667/753/51 668/754/50 +f 664/750/55 668/754/50 642/728/54 +f 642/728/54 668/754/50 640/726/302 +f 630/716/29 629/715/27 665/751/44 +f 665/751/44 629/715/27 669/755/43 +f 665/751/44 669/755/43 666/752/52 +f 666/752/52 669/755/43 670/756/42 +f 666/752/52 670/756/42 667/753/51 +f 667/753/51 670/756/42 671/757/41 +f 667/753/51 671/757/41 668/754/50 +f 668/754/50 671/757/41 672/758/40 +f 668/754/50 672/758/40 640/726/302 +f 640/726/302 672/758/40 637/723/299 +f 628/714/8 673/759/308 629/715/27 +f 629/715/27 673/759/308 669/755/43 +f 673/759/308 674/760/309 669/755/43 +f 669/755/43 674/760/309 670/756/42 +f 674/760/309 675/761/310 670/756/42 +f 670/756/42 675/761/310 671/757/41 +f 675/761/310 676/762/311 671/757/41 +f 671/757/41 676/762/311 672/758/40 +f 676/762/311 635/721/297 672/758/40 +f 672/758/40 635/721/297 637/723/299 +f 636/722/298 677/763/298 638/724/300 +f 638/724/300 677/763/298 678/764/312 +f 638/724/300 678/764/312 639/725/301 +f 639/725/301 678/764/312 679/765/301 +f 639/725/301 679/765/301 641/727/303 +f 641/727/303 679/765/301 680/766/303 +f 641/727/303 680/766/303 643/729/304 +f 643/729/304 680/766/303 681/767/304 +f 643/729/304 681/767/304 645/731/305 +f 645/731/305 681/767/304 682/768/305 +f 645/731/305 682/768/305 647/733/37 +f 647/733/37 682/768/305 683/769/37 +f 684/770/14 685/771/38 686/772/313 +f 686/772/313 685/771/38 687/773/314 +f 687/773/314 685/771/38 678/764/312 +f 687/773/314 678/764/312 677/763/298 +f 685/771/38 688/774/48 678/764/312 +f 678/764/312 688/774/48 679/765/301 +f 679/765/301 688/774/48 689/775/53 +f 679/765/301 689/775/53 680/766/303 +f 680/766/303 689/775/53 690/776/58 +f 680/766/303 690/776/58 681/767/304 +f 681/767/304 690/776/58 691/777/63 +f 681/767/304 691/777/63 682/768/305 +f 682/768/305 691/777/63 692/778/315 +f 682/768/305 692/778/315 683/769/37 +f 693/779/37 694/780/316 691/777/63 +f 691/777/63 694/780/316 692/778/315 +f 684/770/14 695/781/14 685/771/38 +f 685/771/38 695/781/14 696/782/38 +f 685/771/38 696/782/38 688/774/48 +f 688/774/48 696/782/38 697/783/48 +f 688/774/48 697/783/48 689/775/53 +f 689/775/53 697/783/48 698/784/53 +f 689/775/53 698/784/53 690/776/58 +f 690/776/58 698/784/53 699/785/58 +f 690/776/58 699/785/58 691/777/63 +f 691/777/63 699/785/58 700/786/63 +f 691/777/63 700/786/63 693/779/37 +f 693/779/37 700/786/63 701/787/37 +f 702/788/14 684/770/14 703/789/313 +f 703/789/313 684/770/14 686/772/313 +f 703/789/313 686/772/313 704/790/314 +f 704/790/314 686/772/313 687/773/314 +f 704/790/314 687/773/314 705/791/298 +f 705/791/298 687/773/314 677/763/298 +f 677/763/298 636/722/298 705/791/298 +f 705/791/298 636/722/298 706/792/298 +f 636/722/298 635/721/297 706/793/298 +f 706/793/298 635/721/297 707/794/297 +f 707/794/297 635/721/297 676/762/311 +f 707/794/297 676/762/311 708/795/311 +f 708/795/311 676/762/311 709/796/310 +f 709/796/310 676/762/311 675/761/310 +f 709/796/310 675/761/310 710/797/309 +f 710/797/309 675/761/310 674/760/309 +f 710/797/309 674/760/309 673/759/308 +f 710/797/309 673/759/308 711/798/308 +f 711/798/308 673/759/308 628/714/8 +f 711/798/308 628/714/8 712/799/8 +f 628/714/8 586/672/8 712/799/8 +f 712/799/8 586/672/8 713/800/8 +f 586/672/8 588/674/288 713/800/8 +f 713/800/8 588/674/288 714/801/288 +f 714/801/288 588/674/288 590/676/289 +f 714/801/288 590/676/289 715/802/289 +f 715/802/289 590/676/289 716/803/291 +f 716/803/291 590/676/289 592/678/291 +f 716/803/291 592/678/291 717/804/292 +f 717/804/292 592/678/291 594/680/292 +f 717/804/292 594/680/292 596/682/293 +f 717/804/292 596/682/293 718/805/293 +f 718/805/293 596/682/293 579/665/275 +f 718/805/293 579/665/275 719/806/275 +f 579/665/275 564/650/275 719/807/275 +f 719/807/275 564/650/275 720/808/275 +f 720/808/275 564/650/275 721/809/274 +f 721/809/274 564/650/275 563/649/274 +f 721/809/274 563/649/274 722/810/286 +f 722/810/286 563/649/274 578/664/286 +f 722/810/286 578/664/286 723/811/2 +f 723/811/2 578/664/286 561/647/2 +f 561/647/2 562/648/2 723/811/2 +f 723/811/2 562/648/2 724/812/2 +f 723/811/2 724/812/2 725/813/158 +f 725/813/158 724/812/2 726/814/158 +f 725/813/158 726/814/158 727/815/157 +f 727/815/157 726/814/158 728/816/157 +f 727/815/157 728/816/157 729/817/156 +f 729/817/156 728/816/157 730/818/156 +f 729/817/156 730/818/156 731/819/155 +f 731/819/155 730/818/156 732/820/155 +f 731/819/155 732/820/155 733/821/154 +f 733/821/154 732/820/155 734/822/154 +f 733/821/154 734/822/154 735/823/25 +f 735/823/25 734/822/154 736/824/25 +f 737/825/25 738/826/317 739/827/25 +f 739/827/25 738/826/317 733/821/154 +f 739/827/25 733/821/154 740/828/25 +f 740/828/25 733/821/154 735/823/25 +f 738/826/317 741/829/318 733/821/154 +f 733/821/154 741/829/318 731/819/155 +f 731/819/155 741/829/318 742/830/319 +f 731/819/155 742/830/319 729/817/156 +f 729/817/156 742/830/319 743/831/320 +f 729/817/156 743/831/320 727/815/157 +f 727/815/157 743/831/320 744/832/321 +f 727/815/157 744/832/321 725/813/158 +f 725/813/158 744/832/321 721/809/274 +f 725/813/158 721/809/274 722/810/286 +f 744/832/321 720/808/275 721/809/274 +f 722/810/286 723/811/2 725/813/158 +f 737/825/25 745/833/25 738/826/317 +f 738/826/317 745/833/25 746/834/317 +f 738/826/317 746/834/317 741/829/318 +f 741/829/318 746/834/317 747/835/318 +f 741/829/318 747/835/318 742/830/319 +f 742/830/319 747/835/318 748/836/319 +f 742/830/319 748/836/319 743/831/320 +f 743/831/320 748/836/319 749/837/322 +f 743/831/320 749/837/322 744/832/321 +f 744/832/321 749/837/322 750/838/321 +f 744/832/321 750/838/321 720/808/275 +f 720/808/275 750/838/321 719/807/275 +f 751/839/25 752/840/244 753/841/25 +f 753/841/25 752/840/244 754/842/249 +f 753/841/25 754/842/249 755/843/25 +f 755/843/25 754/842/249 756/844/323 +f 755/843/25 756/844/323 757/845/25 +f 757/845/25 756/844/323 758/846/251 +f 757/845/25 758/846/251 759/847/25 +f 759/847/25 758/846/251 760/848/252 +f 759/847/25 760/848/252 761/849/25 +f 761/849/25 760/848/252 762/850/253 +f 761/849/25 762/850/253 745/851/25 +f 745/851/25 762/850/253 746/852/317 +f 746/852/317 762/850/253 763/853/254 +f 746/852/317 763/853/254 747/835/318 +f 747/835/318 763/853/254 764/854/255 +f 747/835/318 764/854/255 748/836/319 +f 748/836/319 764/854/255 765/855/324 +f 748/836/319 765/855/324 749/837/322 +f 749/837/322 765/855/324 766/856/257 +f 749/837/322 766/856/257 750/857/321 +f 750/857/321 766/856/257 719/806/275 +f 719/806/275 766/856/257 718/805/293 +f 718/805/293 766/856/257 767/858/273 +f 718/805/293 767/858/273 717/804/292 +f 717/804/292 767/858/273 768/859/272 +f 717/804/292 768/859/272 716/803/291 +f 716/803/291 768/859/272 769/860/325 +f 716/803/291 769/860/325 715/802/289 +f 715/802/289 769/860/325 770/861/270 +f 715/802/289 770/861/270 714/801/288 +f 714/801/288 770/861/270 771/862/219 +f 714/801/288 771/862/219 713/800/8 +f 752/840/244 772/863/239 754/842/249 +f 754/842/249 772/863/239 773/864/258 +f 754/842/249 773/864/258 756/844/323 +f 756/844/323 773/864/258 774/865/259 +f 756/844/323 774/865/259 758/846/251 +f 758/846/251 774/865/259 775/866/326 +f 758/846/251 775/866/326 760/848/252 +f 760/848/252 775/866/326 776/867/261 +f 760/848/252 776/867/261 762/850/253 +f 762/850/253 776/867/261 763/853/254 +f 772/863/239 777/868/234 773/864/258 +f 773/864/258 777/868/234 778/869/262 +f 773/864/258 778/869/262 774/865/259 +f 774/865/259 778/869/262 779/870/263 +f 774/865/259 779/870/263 775/866/326 +f 775/866/326 779/870/263 780/871/264 +f 775/866/326 780/871/264 776/867/261 +f 776/867/261 780/871/264 781/872/265 +f 776/867/261 781/872/265 763/853/254 +f 763/853/254 781/872/265 764/854/255 +f 777/868/234 782/873/229 778/869/262 +f 778/869/262 782/873/229 783/874/266 +f 778/869/262 783/874/266 779/870/263 +f 779/870/263 783/874/266 784/875/267 +f 779/870/263 784/875/267 780/871/264 +f 780/871/264 784/875/267 785/876/268 +f 780/871/264 785/876/268 781/872/265 +f 781/872/265 785/876/268 786/877/269 +f 781/872/265 786/877/269 764/854/255 +f 764/854/255 786/877/269 765/855/324 +f 782/873/229 771/862/219 783/874/266 +f 783/874/266 771/862/219 770/861/270 +f 783/874/266 770/861/270 784/875/267 +f 784/875/267 770/861/270 769/860/325 +f 784/875/267 769/860/325 785/876/268 +f 785/876/268 769/860/325 768/859/272 +f 785/876/268 768/859/272 786/877/269 +f 786/877/269 768/859/272 767/858/273 +f 786/877/269 767/858/273 765/855/324 +f 765/855/324 767/858/273 766/856/257 +f 751/839/25 787/878/25 752/840/244 +f 752/840/244 787/878/25 788/879/244 +f 752/840/244 788/879/244 772/863/239 +f 772/863/239 788/879/244 789/880/239 +f 772/863/239 789/880/239 777/868/234 +f 777/868/234 789/880/239 790/881/234 +f 777/868/234 790/881/234 782/873/229 +f 782/873/229 790/881/234 791/882/229 +f 782/873/229 791/882/229 771/862/219 +f 771/862/219 791/882/229 792/883/219 +f 771/862/219 792/883/219 713/800/8 +f 713/800/8 792/883/219 712/799/8 +f 793/884/25 794/885/25 795/886/228 +f 795/886/228 794/885/25 796/887/327 +f 795/886/228 796/887/327 797/888/328 +f 795/886/228 797/888/328 798/889/227 +f 798/889/227 797/888/328 799/890/329 +f 798/889/227 799/890/329 800/891/226 +f 800/891/226 799/890/329 801/892/330 +f 800/891/226 801/892/330 802/893/225 +f 802/893/225 801/892/330 803/894/331 +f 802/893/225 803/894/331 804/895/224 +f 804/895/224 803/894/331 706/793/298 +f 804/895/224 706/793/298 707/794/297 +f 804/895/224 707/794/297 805/896/223 +f 805/896/223 707/794/297 708/795/311 +f 805/896/223 708/795/311 806/897/222 +f 806/897/222 708/795/311 709/796/310 +f 806/897/222 709/796/310 807/898/221 +f 807/898/221 709/796/310 710/797/309 +f 807/898/221 710/797/309 808/899/220 +f 808/899/220 710/797/309 711/798/308 +f 808/899/220 711/798/308 792/883/219 +f 792/883/219 711/798/308 712/799/8 +f 792/883/219 791/882/229 808/899/220 +f 808/899/220 791/882/229 809/900/230 +f 808/899/220 809/900/230 807/898/221 +f 807/898/221 809/900/230 810/901/231 +f 807/898/221 810/901/231 806/897/222 +f 806/897/222 810/901/231 811/902/232 +f 806/897/222 811/902/232 805/896/223 +f 805/896/223 811/902/232 812/903/233 +f 805/896/223 812/903/233 804/895/224 +f 804/895/224 812/903/233 802/893/225 +f 791/882/229 790/881/234 809/900/230 +f 809/900/230 790/881/234 813/904/235 +f 809/900/230 813/904/235 810/901/231 +f 810/901/231 813/904/235 814/905/332 +f 810/901/231 814/905/332 811/902/232 +f 811/902/232 814/905/332 815/906/237 +f 811/902/232 815/906/237 812/903/233 +f 812/903/233 815/906/237 816/907/238 +f 812/903/233 816/907/238 802/893/225 +f 802/893/225 816/907/238 800/891/226 +f 790/881/234 789/880/239 813/904/235 +f 813/904/235 789/880/239 817/908/240 +f 813/904/235 817/908/240 814/905/332 +f 814/905/332 817/908/240 818/909/241 +f 814/905/332 818/909/241 815/906/237 +f 815/906/237 818/909/241 819/910/333 +f 815/906/237 819/910/333 816/907/238 +f 816/907/238 819/910/333 820/911/243 +f 816/907/238 820/911/243 800/891/226 +f 800/891/226 820/911/243 798/889/227 +f 789/880/239 788/879/244 817/908/240 +f 817/908/240 788/879/244 821/912/245 +f 817/908/240 821/912/245 818/909/241 +f 818/909/241 821/912/245 822/913/334 +f 818/909/241 822/913/334 819/910/333 +f 819/910/333 822/913/334 823/914/247 +f 819/910/333 823/914/247 820/911/243 +f 820/911/243 823/914/247 824/915/248 +f 820/911/243 824/915/248 798/889/227 +f 798/889/227 824/915/248 795/886/228 +f 787/878/25 825/916/25 788/879/244 +f 788/879/244 825/916/25 821/912/245 +f 825/916/25 826/917/25 821/912/245 +f 821/912/245 826/917/25 822/913/334 +f 826/917/25 827/918/25 822/913/334 +f 822/913/334 827/918/25 823/914/247 +f 827/918/25 828/919/25 823/914/247 +f 823/914/247 828/919/25 824/915/248 +f 828/919/25 793/884/25 824/915/248 +f 824/915/248 793/884/25 795/886/228 +f 794/920/25 829/921/25 796/922/327 +f 796/922/327 829/921/25 830/923/327 +f 796/922/327 830/923/327 797/924/328 +f 797/924/328 830/923/327 831/925/328 +f 797/924/328 831/925/328 799/926/329 +f 799/926/329 831/925/328 832/927/329 +f 799/926/329 832/927/329 801/892/330 +f 801/892/330 832/927/329 833/928/330 +f 801/892/330 833/928/330 803/894/331 +f 803/894/331 833/928/330 834/929/335 +f 803/894/331 834/929/335 706/792/298 +f 706/792/298 834/929/335 705/791/298 +f 835/930/25 836/931/214 837/932/25 +f 837/932/25 836/931/214 838/933/336 +f 837/932/25 838/933/336 839/934/25 +f 839/934/25 838/933/336 830/923/327 +f 839/934/25 830/923/327 829/921/25 +f 836/931/214 840/935/209 838/933/336 +f 838/933/336 840/935/209 841/936/337 +f 838/933/336 841/936/337 830/923/327 +f 830/923/327 841/936/337 831/925/328 +f 831/925/328 841/936/337 842/937/338 +f 831/925/328 842/937/338 832/927/329 +f 832/927/329 842/937/338 843/938/339 +f 832/927/329 843/938/339 833/928/330 +f 833/928/330 843/938/339 844/939/340 +f 833/928/330 844/939/340 834/929/335 +f 834/929/335 844/939/340 704/790/314 +f 834/929/335 704/790/314 705/791/298 +f 840/935/209 845/940/204 841/936/337 +f 841/936/337 845/940/204 842/937/338 +f 845/940/204 846/941/199 842/937/338 +f 842/937/338 846/941/199 843/938/339 +f 846/941/199 847/942/189 843/938/339 +f 843/938/339 847/942/189 844/939/340 +f 702/788/14 703/789/313 847/942/189 +f 847/942/189 703/789/313 844/939/340 +f 703/789/313 704/790/314 844/939/340 +f 835/930/25 848/943/25 836/931/214 +f 836/931/214 848/943/25 849/944/214 +f 836/931/214 849/944/214 840/935/209 +f 840/935/209 849/944/214 850/945/209 +f 840/935/209 850/945/209 845/940/204 +f 845/940/204 850/945/209 851/946/204 +f 845/940/204 851/946/204 846/941/199 +f 846/941/199 851/946/204 852/947/199 +f 846/941/199 852/947/199 847/942/189 +f 847/942/189 852/947/199 853/948/189 +f 847/942/189 853/948/189 702/788/14 +f 702/788/14 853/948/189 854/949/14 +f 848/950/25 835/951/25 736/952/25 +f 736/952/25 835/951/25 735/953/25 +f 735/953/25 835/951/25 837/954/25 +f 735/953/25 837/954/25 740/955/25 +f 740/955/25 837/954/25 839/956/25 +f 740/955/25 839/956/25 739/957/25 +f 739/957/25 839/956/25 737/958/25 +f 737/958/25 839/956/25 829/959/25 +f 737/958/25 829/959/25 745/960/25 +f 745/960/25 829/959/25 751/961/25 +f 745/960/25 751/961/25 761/962/25 +f 761/962/25 751/961/25 759/963/25 +f 759/963/25 751/961/25 757/964/25 +f 757/964/25 751/961/25 755/965/25 +f 755/965/25 751/961/25 753/966/25 +f 751/961/25 829/959/25 787/967/25 +f 787/967/25 829/959/25 794/968/25 +f 787/967/25 794/968/25 793/969/25 +f 793/969/25 828/970/25 787/967/25 +f 787/967/25 828/970/25 827/971/25 +f 787/967/25 827/971/25 826/972/25 +f 826/972/25 825/973/25 787/967/25 +f 855/974/341 856/975/342 100/976/343 +f 100/976/343 856/975/342 110/977/342 +f 110/977/342 856/975/342 857/978/344 +f 110/977/342 857/978/344 109/979/345 +f 109/979/345 857/978/344 108/980/2 +f 108/980/2 857/978/344 858/981/2 +f 108/980/2 858/981/2 121/982/346 +f 121/982/346 858/981/2 859/983/347 +f 121/982/346 859/983/347 860/984/348 +f 121/982/346 860/984/348 120/985/348 +f 120/985/348 860/984/348 861/986/349 +f 120/985/348 861/986/349 118/987/349 +f 861/986/349 862/988/349 118/987/349 +f 118/987/349 862/988/349 101/989/349 +f 111/990/350 112/991/351 863/992/350 +f 863/992/350 112/991/351 864/993/351 +f 864/993/351 112/991/351 113/994/352 +f 864/993/351 113/994/352 865/995/353 +f 865/995/353 113/994/352 866/996/14 +f 866/996/14 113/994/352 114/997/14 +f 866/996/14 114/997/14 867/998/354 +f 867/998/354 114/997/14 115/999/355 +f 867/998/354 115/999/355 116/1000/356 +f 867/998/354 116/1000/356 868/1001/356 +f 868/1001/356 116/1000/356 117/1002/357 +f 868/1001/356 117/1002/357 869/1003/357 +f 870/1004/37 862/988/37 352/404/37 +f 352/404/37 862/988/37 156/208/37 +f 352/404/37 156/208/37 254/306/37 +f 254/306/37 156/208/37 243/295/37 +f 243/295/37 156/208/37 155/207/37 +f 243/295/37 155/207/37 173/225/37 +f 550/636/37 549/635/37 870/1004/37 +f 870/1004/37 549/635/37 577/663/37 +f 870/1004/37 577/663/37 576/662/37 +f 576/662/37 575/661/37 870/1004/37 +f 870/1004/37 575/661/37 612/698/37 +f 870/1004/37 612/698/37 871/1005/37 +f 871/1005/37 612/698/37 634/720/37 +f 871/1005/37 634/720/37 693/779/37 +f 693/779/37 634/720/37 683/769/37 +f 693/779/37 683/769/37 692/778/315 +f 612/698/37 575/661/37 610/696/37 +f 610/696/37 575/661/37 585/671/37 +f 610/696/37 585/671/37 608/694/37 +f 608/694/37 585/671/37 606/692/37 +f 606/692/37 585/671/37 604/690/37 +f 604/690/37 585/671/37 602/688/37 +f 634/720/37 656/742/37 683/769/37 +f 683/769/37 656/742/37 647/733/37 +f 647/733/37 656/742/37 654/740/37 +f 647/733/37 654/740/37 652/738/37 +f 652/738/37 650/736/37 647/733/37 +f 647/733/37 650/736/37 648/734/37 +f 692/778/315 694/780/316 693/779/37 +f 693/779/37 701/787/37 871/1005/37 +f 863/992/37 855/974/37 871/1005/37 +f 871/1005/37 855/974/37 872/1006/37 +f 871/1005/37 872/1006/37 870/1004/37 +f 870/1004/37 872/1006/37 862/988/37 +f 864/993/37 869/1003/37 863/992/37 +f 863/992/37 869/1003/37 858/981/37 +f 863/992/37 858/981/37 857/978/37 +f 869/1003/37 864/993/37 868/1001/37 +f 868/1001/37 864/993/37 865/995/37 +f 868/1001/37 865/995/37 867/998/37 +f 867/998/37 865/995/37 866/996/37 +f 156/208/37 861/986/37 869/1003/37 +f 869/1003/37 861/986/37 860/984/37 +f 869/1003/37 860/984/37 859/983/37 +f 243/295/37 173/225/37 244/296/37 +f 244/296/37 173/225/37 198/250/37 +f 244/296/37 198/250/37 245/297/37 +f 245/297/37 198/250/37 194/246/37 +f 245/297/37 194/246/37 205/257/37 +f 198/250/37 197/249/37 194/246/37 +f 194/246/37 197/249/37 196/248/37 +f 194/246/37 196/248/37 195/247/37 +f 222/274/37 247/299/37 205/257/37 +f 205/257/37 247/299/37 246/298/37 +f 205/257/37 246/298/37 245/297/37 +f 271/323/37 342/394/37 254/306/37 +f 254/306/37 342/394/37 341/393/37 +f 254/306/37 341/393/37 352/404/37 +f 342/394/37 271/323/37 343/395/37 +f 343/395/37 271/323/37 296/348/37 +f 343/395/37 296/348/37 303/355/37 +f 303/355/37 296/348/37 292/344/37 +f 292/344/37 296/348/37 295/347/37 +f 292/344/37 295/347/37 294/346/37 +f 294/346/37 293/345/37 292/344/37 +f 320/372/37 345/397/37 303/355/37 +f 303/355/37 345/397/37 344/396/37 +f 303/355/37 344/396/37 343/395/37 +f 862/988/37 861/986/37 156/208/37 +f 859/983/37 858/981/37 869/1003/37 +f 857/978/37 856/975/37 863/992/37 +f 863/992/37 856/975/37 855/974/37 +f 117/1002/357 141/1007/357 869/1003/357 +f 869/1003/357 141/1007/357 143/1008/357 +f 869/1003/357 143/1008/357 145/1009/357 +f 117/1002/357 119/1010/357 141/1007/357 +f 145/1009/357 147/1011/358 869/1003/357 +f 869/1003/357 147/1011/358 149/1012/357 +f 869/1003/357 149/1012/357 150/1013/359 +f 150/1013/359 152/1014/360 869/1003/357 +f 869/1003/357 152/1014/360 154/1015/357 +f 869/1003/357 154/1015/357 156/208/358 +f 100/976/343 99/1016/341 855/974/341 +f 855/974/341 99/1016/341 872/1006/341 +f 863/992/350 871/1005/350 111/990/350 +f 111/990/350 871/1005/350 98/1017/350 +f 101/989/14 862/988/14 99/1016/14 +f 99/1016/14 862/988/14 872/1006/14 +f 107/1018/2 97/1019/2 346/1020/2 +f 346/1020/2 97/1019/2 870/1004/2 +f 346/1020/2 870/1004/2 347/1021/2 +f 347/1021/2 870/1004/2 348/1022/2 +f 348/1022/2 870/1004/2 349/1023/2 +f 349/1023/2 870/1004/2 350/1024/2 +f 350/1024/2 870/1004/2 351/1025/2 +f 351/1025/2 870/1004/2 352/404/2 +f 695/781/14 684/770/14 854/949/14 +f 854/949/14 684/770/14 702/788/14 +f 700/786/20 699/1026/20 701/787/20 +f 701/787/20 699/1026/20 698/784/20 +f 701/787/20 698/784/20 697/783/20 +f 697/783/20 696/1027/20 701/787/20 +f 701/787/20 696/1027/20 695/1028/20 +f 701/787/20 695/1028/20 871/1005/20 +f 871/1005/20 695/1028/20 98/1029/20 +f 98/1029/20 695/1028/20 854/1030/20 +f 98/1029/20 854/1030/20 848/1031/20 +f 848/1031/20 854/1030/20 853/1032/20 +f 848/1031/20 853/1032/20 852/947/20 +f 852/947/20 851/946/20 848/1031/20 +f 848/1031/20 851/946/20 850/945/20 +f 848/1031/20 850/945/20 849/1033/20 +f 848/1031/20 736/1034/20 98/1029/20 +f 98/1029/20 736/1034/20 724/1035/20 +f 98/1029/20 724/1035/20 97/1036/20 +f 97/1036/20 724/1035/20 562/1037/20 +f 97/1036/20 562/1037/20 870/1004/20 +f 870/1004/20 562/1037/20 550/636/20 +f 550/636/20 562/1037/20 560/646/20 +f 550/636/20 560/646/20 558/644/20 +f 734/1038/20 732/1039/20 736/1034/20 +f 736/1034/20 732/1039/20 730/818/20 +f 736/1034/20 730/818/20 728/816/20 +f 728/816/20 726/1040/20 736/1034/20 +f 736/1034/20 726/1040/20 724/1035/20 +f 558/644/20 556/642/20 550/636/20 +f 550/636/20 556/642/20 554/1041/20 +f 550/636/20 554/1041/20 552/638/20 +f 127/1042/1 873/1043/1 128/1044/2 +f 128/1044/2 873/1043/1 874/1045/2 +f 128/1044/2 874/1045/2 106/1046/3 +f 106/1046/3 874/1045/2 875/1047/3 +f 106/1046/3 875/1047/3 105/1048/4 +f 105/1048/4 875/1047/3 876/1049/4 +f 105/1048/4 876/1049/4 104/1050/5 +f 104/1050/5 876/1049/4 877/1051/5 +f 104/1050/5 877/1051/5 102/1052/6 +f 102/1052/6 877/1051/5 878/1053/6 +f 102/1052/6 878/1053/6 103/1054/7 +f 103/1054/7 878/1053/6 879/1055/7 +f 103/1054/7 879/1055/7 129/1056/8 +f 129/1056/8 879/1055/7 880/1057/8 +f 129/1058/8 880/1059/8 130/1060/9 +f 130/1060/9 880/1059/8 881/1061/9 +f 130/1060/9 881/1061/9 131/1062/10 +f 131/1062/10 881/1061/9 882/1063/10 +f 131/1062/10 882/1063/10 132/1064/11 +f 132/1064/11 882/1063/10 883/1065/11 +f 132/1064/11 883/1065/11 133/1066/12 +f 133/1066/12 883/1065/11 884/1067/12 +f 133/1066/12 884/1067/12 134/1068/13 +f 134/1068/13 884/1067/12 885/1069/13 +f 134/1068/13 885/1069/13 122/1070/14 +f 122/1070/14 885/1069/13 886/1071/14 +f 122/1070/14 886/1071/14 123/1072/15 +f 123/1072/15 886/1071/14 887/1073/15 +f 123/1074/15 887/1075/15 135/1076/16 +f 135/1076/16 887/1075/15 888/1077/16 +f 135/1076/16 888/1077/16 136/1078/17 +f 136/1078/17 888/1077/16 889/1079/17 +f 136/1078/17 889/1079/17 137/1080/18 +f 137/1080/18 889/1079/17 890/1081/18 +f 137/1080/18 890/1081/18 138/1082/19 +f 138/1082/19 890/1081/18 891/1083/19 +f 138/1082/19 891/1083/19 124/1084/20 +f 124/1084/20 891/1083/19 892/1085/20 +f 124/1084/20 892/1085/20 125/1086/21 +f 125/1086/21 892/1085/20 893/1087/21 +f 125/1086/21 893/1087/21 126/1088/22 +f 126/1088/22 893/1087/21 894/1089/22 +f 126/1088/22 894/1089/22 139/1090/23 +f 139/1090/23 894/1089/22 895/1091/23 +f 139/1090/23 895/1091/23 140/1092/24 +f 140/1092/24 895/1091/23 896/1093/24 +f 140/1092/24 896/1093/24 127/1042/1 +f 127/1042/1 896/1093/24 873/1043/1 +f 897/1094/20 898/1095/20 899/1096/19 +f 899/1096/19 898/1095/20 900/1097/19 +f 899/1096/19 900/1097/19 901/1098/18 +f 901/1098/18 900/1097/19 902/1099/18 +f 901/1098/18 902/1099/18 903/1100/17 +f 903/1100/17 902/1099/18 904/1101/17 +f 903/1100/17 904/1101/17 905/1102/16 +f 905/1102/16 904/1101/17 906/1103/16 +f 905/1102/16 906/1103/16 907/1104/15 +f 907/1104/15 906/1103/16 908/1105/15 +f 907/1104/15 908/1105/15 909/1106/14 +f 909/1106/14 908/1105/15 910/1107/14 +f 910/1107/14 911/1108/14 909/1109/14 +f 909/1109/14 911/1108/14 912/1110/14 +f 6/1111/37 4/1112/37 913/1113/37 +f 913/1113/37 4/1112/37 2/1114/37 +f 913/1113/37 2/1114/37 914/1115/37 +f 914/1115/37 2/1114/37 48/1116/37 +f 914/1115/37 48/1116/37 46/1117/37 +f 914/1115/37 46/1117/37 877/1118/37 +f 877/1118/37 46/1117/37 44/1119/37 +f 877/1118/37 44/1119/37 878/1120/37 +f 878/1120/37 44/1119/37 42/1121/37 +f 878/1120/37 42/1121/37 879/1122/37 +f 879/1122/37 42/1121/37 52/1123/37 +f 879/1122/37 52/1123/37 880/1124/37 +f 880/1124/37 52/1123/37 50/1125/37 +f 880/1124/37 50/1125/37 881/1126/37 +f 881/1126/37 50/1125/37 96/1127/37 +f 881/1126/37 96/1127/37 882/1128/37 +f 882/1128/37 96/1127/37 94/1129/37 +f 882/1128/37 94/1129/37 883/1130/37 +f 883/1130/37 94/1129/37 92/1131/37 +f 883/1130/37 92/1131/37 884/1132/37 +f 884/1132/37 92/1131/37 90/1133/37 +f 884/1132/37 90/1133/37 885/1134/37 +f 885/1134/37 90/1133/37 88/1135/37 +f 885/1134/37 88/1135/37 886/1136/37 +f 886/1136/37 88/1135/37 86/1137/37 +f 886/1136/37 86/1137/37 898/1095/37 +f 898/1095/37 86/1137/37 910/1107/37 +f 898/1095/37 910/1107/37 908/1105/37 +f 42/1121/37 40/1138/37 52/1123/37 +f 52/1123/37 40/1138/37 54/1139/37 +f 54/1139/37 40/1138/37 38/1140/37 +f 54/1139/37 38/1140/37 56/1141/37 +f 56/1141/37 38/1140/37 36/1142/37 +f 56/1141/37 36/1142/37 58/1143/37 +f 58/1143/37 36/1142/37 34/1144/37 +f 58/1143/37 34/1144/37 60/1145/37 +f 60/1145/37 34/1144/37 32/1146/37 +f 60/1145/37 32/1146/37 62/1147/37 +f 62/1147/37 32/1146/37 30/1148/37 +f 62/1147/37 30/1148/37 64/1149/37 +f 64/1149/37 30/1148/37 28/1150/37 +f 64/1149/37 28/1150/37 915/1151/37 +f 915/1151/37 28/1150/37 26/1152/37 +f 915/1151/37 26/1152/37 24/1153/37 +f 24/1153/37 22/1154/37 915/1151/37 +f 915/1151/37 22/1154/37 20/1155/37 +f 915/1151/37 20/1155/37 18/1156/37 +f 18/1156/37 16/1157/37 915/1151/37 +f 915/1151/37 16/1157/37 913/1113/37 +f 913/1113/37 16/1157/37 14/1158/37 +f 913/1113/37 14/1158/37 12/1159/37 +f 12/1159/37 10/1160/37 913/1113/37 +f 913/1113/37 10/1160/37 8/1161/37 +f 913/1113/37 8/1161/37 6/1111/37 +f 86/1137/37 84/1162/37 910/1107/37 +f 910/1107/37 84/1162/37 82/1163/37 +f 910/1107/37 82/1163/37 80/1164/37 +f 80/1164/37 78/1165/37 910/1107/37 +f 910/1107/37 78/1165/37 76/1166/37 +f 910/1107/37 76/1166/37 911/1108/37 +f 911/1108/37 76/1166/37 74/1167/37 +f 911/1108/37 74/1167/37 72/1168/37 +f 72/1168/37 70/1169/37 911/1108/37 +f 911/1108/37 70/1169/37 68/1170/37 +f 911/1108/37 68/1170/37 915/1151/37 +f 915/1151/37 68/1170/37 66/1171/37 +f 915/1151/37 66/1171/37 64/1149/37 +f 875/1172/37 874/1173/37 916/1174/37 +f 916/1174/37 874/1173/37 873/1175/37 +f 916/1174/37 873/1175/37 917/1176/37 +f 917/1176/37 873/1175/37 896/1177/37 +f 917/1176/37 896/1177/37 895/1178/37 +f 895/1178/37 894/1179/37 917/1176/37 +f 917/1176/37 894/1179/37 893/1180/37 +f 917/1176/37 893/1180/37 892/1181/37 +f 892/1181/37 891/1182/37 917/1176/37 +f 917/1176/37 891/1182/37 898/1095/37 +f 898/1095/37 891/1182/37 890/1183/37 +f 898/1095/37 890/1183/37 889/1184/37 +f 889/1184/37 888/1185/37 898/1095/37 +f 898/1095/37 888/1185/37 887/1186/37 +f 898/1095/37 887/1186/37 886/1136/37 +f 914/1115/37 877/1118/37 916/1174/37 +f 916/1174/37 877/1118/37 876/1187/37 +f 916/1174/37 876/1187/37 875/1172/37 +f 908/1105/37 906/1103/37 898/1095/37 +f 898/1095/37 906/1103/37 904/1101/37 +f 898/1095/37 904/1101/37 902/1099/37 +f 902/1099/37 900/1097/37 898/1095/37 +f 918/1188/37 919/1189/37 917/1176/37 +f 917/1176/37 919/1189/37 920/1190/37 +f 917/1176/37 920/1190/37 921/1191/37 +f 921/1191/37 922/1192/37 917/1176/37 +f 917/1176/37 922/1192/37 916/1174/37 +f 914/1115/37 923/1193/37 913/1113/37 +f 913/1113/37 923/1193/37 924/1194/37 +f 913/1113/37 924/1194/37 925/1195/37 +f 925/1195/37 926/1196/37 913/1113/37 +f 913/1113/37 926/1196/37 927/1197/37 +f 928/1198/37 929/1199/37 915/1151/37 +f 915/1151/37 929/1199/37 930/1200/37 +f 915/1151/37 930/1200/37 931/1201/37 +f 931/1201/37 932/1202/37 915/1151/37 +f 915/1151/37 932/1202/37 911/1108/37 +f 933/1203/2 916/1174/2 934/1204/1 +f 934/1204/1 916/1174/2 922/1192/1 +f 934/1204/1 922/1192/1 935/1205/24 +f 935/1205/24 922/1192/1 921/1191/24 +f 935/1205/24 921/1191/24 936/1206/23 +f 936/1206/23 921/1191/24 920/1190/23 +f 936/1206/23 920/1190/23 937/1207/22 +f 937/1207/22 920/1190/23 919/1189/22 +f 937/1207/22 919/1189/22 938/1208/21 +f 938/1208/21 919/1189/22 918/1188/21 +f 938/1208/21 918/1188/21 939/1209/20 +f 939/1209/20 918/1188/21 917/1176/20 +f 933/1210/2 940/1211/2 916/1174/2 +f 916/1174/2 940/1211/2 914/1115/2 +f 941/1212/8 913/1113/8 942/1213/7 +f 942/1213/7 913/1113/8 927/1197/7 +f 942/1213/7 927/1197/7 943/1214/6 +f 943/1214/6 927/1197/7 926/1196/6 +f 943/1214/6 926/1196/6 944/1215/5 +f 944/1215/5 926/1196/6 925/1195/5 +f 944/1215/5 925/1195/5 945/1216/4 +f 945/1216/4 925/1195/5 924/1194/4 +f 945/1216/4 924/1194/4 946/1217/3 +f 946/1217/3 924/1194/4 923/1193/3 +f 946/1217/3 923/1193/3 940/1218/2 +f 940/1218/2 923/1193/3 914/1115/2 +f 912/1219/14 911/1108/14 947/1220/13 +f 947/1220/13 911/1108/14 932/1202/13 +f 947/1220/13 932/1202/13 948/1221/12 +f 948/1221/12 932/1202/13 931/1201/12 +f 948/1221/12 931/1201/12 949/1222/11 +f 949/1222/11 931/1201/12 930/1200/11 +f 949/1222/11 930/1200/11 950/1223/10 +f 950/1223/10 930/1200/11 929/1199/10 +f 950/1223/10 929/1199/10 951/1224/9 +f 951/1224/9 929/1199/10 928/1198/9 +f 951/1224/9 928/1198/9 952/1225/8 +f 952/1225/8 928/1198/9 915/1151/8 +f 941/1226/8 952/1227/8 913/1113/8 +f 913/1113/8 952/1227/8 915/1151/8 +f 897/1228/20 939/1229/20 898/1095/20 +f 898/1095/20 939/1229/20 917/1176/20 +f 899/1230/25 901/1231/25 897/1232/25 +f 897/1232/25 901/1231/25 903/1233/25 +f 897/1232/25 903/1233/25 905/1234/25 +f 905/1234/25 907/1235/25 897/1232/25 +f 897/1232/25 907/1235/25 909/1236/25 +f 897/1232/25 909/1236/25 933/1237/25 +f 933/1237/25 909/1236/25 940/1238/25 +f 940/1238/25 909/1236/25 912/1239/25 +f 940/1238/25 912/1239/25 941/1240/25 +f 941/1240/25 912/1239/25 952/1241/25 +f 952/1241/25 912/1239/25 947/1242/25 +f 952/1241/25 947/1242/25 948/1243/25 +f 948/1243/25 949/1244/25 952/1241/25 +f 952/1241/25 949/1244/25 950/1245/25 +f 952/1241/25 950/1245/25 951/1246/25 +f 942/1247/25 943/1248/25 941/1240/25 +f 941/1240/25 943/1248/25 944/1249/25 +f 941/1240/25 944/1249/25 945/1250/25 +f 945/1250/25 946/1251/25 941/1240/25 +f 941/1240/25 946/1251/25 940/1238/25 +f 897/1232/25 933/1237/25 939/1252/25 +f 939/1252/25 933/1237/25 934/1253/25 +f 939/1252/25 934/1253/25 935/1254/25 +f 935/1254/25 936/1255/25 939/1252/25 +f 939/1252/25 936/1255/25 937/1256/25 +f 939/1252/25 937/1256/25 938/1257/25 diff --git a/resources/meshes/creality_cr10spro.stl b/resources/meshes/creality_cr10spro.stl new file mode 100644 index 0000000000..df2167d1eb Binary files /dev/null and b/resources/meshes/creality_cr10spro.stl differ diff --git a/resources/meshes/creality_ender3_platform.stl b/resources/meshes/creality_ender3_platform.stl deleted file mode 100644 index 4c3699a530..0000000000 --- a/resources/meshes/creality_ender3_platform.stl +++ /dev/null @@ -1,19854 +0,0 @@ -solid OpenSCAD_Model - facet normal 0 0 -1 - outer loop - vertex -36.5262 -13.4531 -3 - vertex -35.4871 -14.1281 -3 - vertex -35.6081 -14.799 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.4871 -14.1281 -3 - vertex -35.9073 -13.512 -3 - vertex -35.5739 -13.718 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.4871 -14.1281 -3 - vertex -36.5262 -13.4531 -3 - vertex -35.9073 -13.512 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.2393 -13.2576 -3 - vertex -35.6081 -14.799 -3 - vertex -37.0548 -18.7102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.6081 -14.799 -3 - vertex -37.2393 -13.2576 -3 - vertex -36.5262 -13.4531 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.0548 -18.7102 -3 - vertex -37.5366 -12.7854 -3 - vertex -37.2393 -13.2576 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.3951 -12.1929 -3 - vertex -38.3729 23.836 -3 - vertex -37.6991 23.0789 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.3951 -12.1929 -3 - vertex -38.8382 24.6102 -3 - vertex -38.3729 23.836 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.3951 -12.1929 -3 - vertex -39.1303 25.4589 -3 - vertex -38.8382 24.6102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -47.2102 -36.2359 -3 - vertex -37.5366 -12.7854 -3 - vertex -39.9072 -25.4747 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -39.9072 -25.4747 -3 - vertex -37.5366 -12.7854 -3 - vertex -37.0548 -18.7102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.0976 22.0525 -3 - vertex -29.0303 22.3563 -3 - vertex -28.3511 21.9725 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.0976 22.0525 -3 - vertex -30.3878 23.2826 -3 - vertex -29.0303 22.3563 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -32.1178 22.3529 -3 - vertex -30.3878 23.2826 -3 - vertex -30.0976 22.0525 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -31.0943 24.213 -3 - vertex -34.2108 23.023 -3 - vertex -31.2773 24.779 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -34.2108 23.023 -3 - vertex -31.0943 24.213 -3 - vertex -32.1178 22.3529 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -30.3878 23.2826 -3 - vertex -32.1178 22.3529 -3 - vertex -31.0943 24.213 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.0647 23.8437 -3 - vertex -26.0224 24.2804 -3 - vertex -24.664 24.0122 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.3687 23.7586 -3 - vertex -26.0224 24.2804 -3 - vertex -26.0647 23.8437 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.3687 23.7586 -3 - vertex -28.1365 24.9019 -3 - vertex -26.0224 24.2804 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.4642 23.8513 -3 - vertex -28.1365 24.9019 -3 - vertex -27.3687 23.7586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.3958 24.13 -3 - vertex -28.1365 24.9019 -3 - vertex -28.4642 23.8513 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.3958 24.13 -3 - vertex -29.9035 25.8898 -3 - vertex -28.1365 24.9019 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.2081 24.6027 -3 - vertex -29.9035 25.8898 -3 - vertex -29.3958 24.13 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.8173 24.9813 -3 - vertex -29.9035 25.8898 -3 - vertex -30.2081 24.6027 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -31.1793 25.0376 -3 - vertex -29.9035 25.8898 -3 - vertex -30.8173 24.9813 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -29.9035 25.8898 -3 - vertex -31.1793 25.0376 -3 - vertex -31.116 26.9038 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -31.2912 27.2229 -3 - vertex -31.1793 25.0376 -3 - vertex -31.2773 24.779 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -31.1793 25.0376 -3 - vertex -31.2912 27.2229 -3 - vertex -31.116 26.9038 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.4212 26.8695 -3 - vertex -21.4485 26.3569 -3 - vertex -22.0473 26.2369 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.4485 26.3569 -3 - vertex -22.4212 26.8695 -3 - vertex -21.2681 26.5576 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.8433 26.205 -3 - vertex -22.4212 26.8695 -3 - vertex -22.0473 26.2369 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.4214 26.3653 -3 - vertex -24.3225 27.6757 -3 - vertex -24.8433 26.205 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -23.8902 27.3484 -3 - vertex -24.8433 26.205 -3 - vertex -24.3225 27.6757 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -22.4212 26.8695 -3 - vertex -24.8433 26.205 -3 - vertex -23.8902 27.3484 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.168338 -24.355 -3 - vertex -3.89417 -22.8317 -3 - vertex -3.85646 -21.6547 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -6.41168 -29.738 -3 - vertex -3.7659 -32.0301 -3 - vertex -3.99709 -33.5697 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.14673 -30.0798 -3 - vertex -4.26405 -24.3543 -3 - vertex -3.89417 -22.8317 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.2867 -16.8469 -3 - vertex 12.858 -14.1239 -3 - vertex 14.1246 -14.3424 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.2867 -16.8469 -3 - vertex 12.417 -13.7469 -3 - vertex 12.858 -14.1239 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.3474 -19.1774 -3 - vertex 13.2867 -16.8469 -3 - vertex 11.2177 -19.5302 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.2177 -19.5302 -3 - vertex 13.2867 -16.8469 -3 - vertex 12.058 -19.7199 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.0544 30.7144 -3 - vertex 5.19939 38.083 -3 - vertex 5.25321 38.4452 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.5971 30.3591 -3 - vertex 4.72188 37.0399 -3 - vertex 5.19939 38.083 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.2319 29.4873 -3 - vertex 3.57109 31.3388 -3 - vertex 11.5971 30.3591 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 4.30515 36.0346 -3 - vertex 11.5971 30.3591 -3 - vertex 3.93589 34.5584 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.5971 30.3591 -3 - vertex 4.30515 36.0346 -3 - vertex 4.72188 37.0399 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.57109 31.3388 -3 - vertex 4.3138 28.4461 -3 - vertex 3.67763 29.7129 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.5971 30.3591 -3 - vertex 3.57109 31.3388 -3 - vertex 3.93589 34.5584 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.21237 -5.88439 -3 - vertex 7.03104 -4.97268 -3 - vertex 7.79727 -5.75259 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.81183 -5.98051 -3 - vertex 7.03104 -4.97268 -3 - vertex 7.21237 -5.88439 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 7.03104 -4.97268 -3 - vertex 5.81183 -5.98051 -3 - vertex 5.97791 -3.63939 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.9592 -5.58648 -3 - vertex 5.97791 -3.63939 -3 - vertex 5.81183 -5.98051 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 5.97791 -3.63939 -3 - vertex 3.9592 -5.58648 -3 - vertex 5.02006 -2.01238 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 5.02006 -2.01238 -3 - vertex 1.09298 -4.60426 -3 - vertex 4.37015 -0.506109 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.09298 -4.60426 -3 - vertex 5.02006 -2.01238 -3 - vertex 3.9592 -5.58648 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.7931 16.6725 -3 - vertex 24.1542 17.4223 -3 - vertex 24.7174 17.1695 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.3802 15.8262 -3 - vertex 24.1542 17.4223 -3 - vertex 24.7931 16.6725 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.3802 15.8262 -3 - vertex 22.547 17.5015 -3 - vertex 24.1542 17.4223 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.1653 14.8489 -3 - vertex 22.547 17.5015 -3 - vertex 23.3802 15.8262 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.1653 14.8489 -3 - vertex 20.2159 17.5562 -3 - vertex 22.547 17.5015 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.0668 14.6265 -3 - vertex 20.2159 17.5562 -3 - vertex 21.1653 14.8489 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 18.4164 15.1559 -3 - vertex 20.2159 17.5562 -3 - vertex 20.0668 14.6265 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 20.2159 17.5562 -3 - vertex 18.4164 15.1559 -3 - vertex 19.8437 17.7553 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 16.5954 15.8977 -3 - vertex 19.8437 17.7553 -3 - vertex 18.4164 15.1559 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 19.8437 17.7553 -3 - vertex 16.5954 15.8977 -3 - vertex 19.5351 18.2611 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.2045 16.623 -3 - vertex 19.5351 18.2611 -3 - vertex 16.5954 15.8977 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 19.5351 18.2611 -3 - vertex 15.2045 16.623 -3 - vertex 19.0948 20.2262 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.99 17.4864 -3 - vertex 19.0948 20.2262 -3 - vertex 15.2045 16.623 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.0948 20.2262 -3 - vertex 17.155 22.8321 -3 - vertex 18.6529 22.0992 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 19.0948 20.2262 -3 - vertex 13.99 17.4864 -3 - vertex 17.155 22.8321 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.6982 18.6425 -3 - vertex 17.155 22.8321 -3 - vertex 13.99 17.4864 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 17.155 22.8321 -3 - vertex 12.6982 18.6425 -3 - vertex 15.5055 23.4995 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.9729 20.5521 -3 - vertex 15.5055 23.4995 -3 - vertex 12.6982 18.6425 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 15.5055 23.4995 -3 - vertex 10.9729 20.5521 -3 - vertex 14.0164 24.1527 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 14.0164 24.1527 -3 - vertex 10.9729 20.5521 -3 - vertex 13.0733 24.7212 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.71033 23.0922 -3 - vertex 13.0733 24.7212 -3 - vertex 10.9729 20.5521 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 13.0733 24.7212 -3 - vertex 9.71033 23.0922 -3 - vertex 12.1975 25.5292 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 12.1975 25.5292 -3 - vertex 9.07032 24.476 -3 - vertex 11.5037 26.4501 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.07032 24.476 -3 - vertex 12.1975 25.5292 -3 - vertex 9.71033 23.0922 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.704 16.8274 -3 - vertex 26.0816 17.5963 -3 - vertex 25.8979 16.7563 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.1513 17.7384 -3 - vertex 26.0816 17.5963 -3 - vertex 25.4738 17.2443 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.0816 17.5963 -3 - vertex 25.704 16.8274 -3 - vertex 25.4738 17.2443 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.0816 17.5963 -3 - vertex 25.1513 17.7384 -3 - vertex 25.9892 18.2943 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 25.9892 18.2943 -3 - vertex 25.1513 17.7384 -3 - vertex 25.7331 18.8483 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.5942 18.0475 -3 - vertex 25.7331 18.8483 -3 - vertex 25.1513 17.7384 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 25.7331 18.8483 -3 - vertex 24.5942 18.0475 -3 - vertex 25.3447 19.2137 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 25.3447 19.2137 -3 - vertex 24.5942 18.0475 -3 - vertex 24.8554 19.3454 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.5942 18.0475 -3 - vertex 23.3909 19.6849 -3 - vertex 24.8554 19.3454 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.335 18.2522 -3 - vertex 23.3909 19.6849 -3 - vertex 24.5942 18.0475 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 23.3909 19.6849 -3 - vertex 22.335 18.2522 -3 - vertex 22.6368 20.047 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9591 18.304 -3 - vertex 22.6368 20.047 -3 - vertex 22.335 18.2522 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 22.6368 20.047 -3 - vertex 20.9591 18.304 -3 - vertex 22.0911 20.5797 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.8405 19.3078 -3 - vertex 22.0911 20.5797 -3 - vertex 20.9591 18.304 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.4421 21.9215 -3 - vertex 21.7245 21.3239 -3 - vertex 19.6596 20.6529 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.6596 20.6529 -3 - vertex 22.0911 20.5797 -3 - vertex 19.8405 19.3078 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.7245 21.3239 -3 - vertex 19.4421 21.9215 -3 - vertex 21.508 22.3204 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.8405 19.3078 -3 - vertex 20.9591 18.304 -3 - vertex 20.2006 18.5903 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 21.508 22.3204 -3 - vertex 19.4421 21.9215 -3 - vertex 21.2518 23.2891 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.0911 20.5797 -3 - vertex 19.6596 20.6529 -3 - vertex 21.7245 21.3239 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 18.9185 22.6398 -3 - vertex 21.2518 23.2891 -3 - vertex 19.4421 21.9215 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 21.2518 23.2891 -3 - vertex 18.9185 22.6398 -3 - vertex 20.762 24.0784 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 20.762 24.0784 -3 - vertex 18.9185 22.6398 -3 - vertex 20.0338 24.6942 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 20.0338 24.6942 -3 - vertex 18.9185 22.6398 -3 - vertex 19.062 25.1422 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.6852 23.4449 -3 - vertex 19.062 25.1422 -3 - vertex 18.9185 22.6398 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.6852 23.4449 -3 - vertex 17.2513 25.98 -3 - vertex 19.062 25.1422 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.1211 24.4531 -3 - vertex 17.2513 25.98 -3 - vertex 17.6852 23.4449 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 17.2513 25.98 -3 - vertex 15.1211 24.4531 -3 - vertex 15.7223 27.2873 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.4969 25.2416 -3 - vertex 15.7223 27.2873 -3 - vertex 15.1211 24.4531 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 15.7223 27.2873 -3 - vertex 13.4969 25.2416 -3 - vertex 15.122 28.0941 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.5486 25.9653 -3 - vertex 15.122 28.0941 -3 - vertex 13.4969 25.2416 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.1521 -17.7131 -3 - vertex 20.2954 -22.4759 -3 - vertex 19.0386 -23.7798 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.5835 -23.8342 -3 - vertex 19.0386 -23.7798 -3 - vertex 17.855 -25.2923 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.2954 -22.4759 -3 - vertex 17.1521 -17.7131 -3 - vertex 19.6777 -11.13 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.5835 -23.8342 -3 - vertex 17.855 -25.2923 -3 - vertex 16.4055 -27.6373 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.5835 -23.8342 -3 - vertex 16.4055 -27.6373 -3 - vertex 15.3794 -29.9771 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.4887 -31.4602 -3 - vertex 15.3794 -29.9771 -3 - vertex 14.7938 -32.2631 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 19.0386 -23.7798 -3 - vertex 14.5835 -23.8342 -3 - vertex 17.1521 -17.7131 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.871 -34.5351 -3 - vertex 14.7938 -32.2631 -3 - vertex 14.6656 -34.4466 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.7235 1.18648 -3 - vertex 20.9081 -2.19366 -3 - vertex 21.0968 -1.15452 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.0737 -20.4525 -3 - vertex 19.6777 -11.13 -3 - vertex 20.9081 -2.19366 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.6777 -11.13 -3 - vertex 21.6367 -21.3703 -3 - vertex 20.2954 -22.4759 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 19.6777 -11.13 -3 - vertex 20.4179 -3.0084 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.5452 -10.7956 -3 - vertex 20.4179 -3.0084 -3 - vertex 19.6777 -11.13 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.5452 -10.7956 -3 - vertex 19.4334 -3.80993 -3 - vertex 20.4179 -3.0084 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.7619 -4.80944 -3 - vertex 19.5452 -10.7956 -3 - vertex 19.0845 -10.6988 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.5452 -10.7956 -3 - vertex 17.7619 -4.80944 -3 - vertex 19.4334 -3.80993 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.0012 -6.23992 -3 - vertex 19.0845 -10.6988 -3 - vertex 16.7993 -11.2316 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.0845 -10.6988 -3 - vertex 15.0012 -6.23992 -3 - vertex 17.7619 -4.80944 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.6103 -7.15898 -3 - vertex 16.7993 -11.2316 -3 - vertex 13.71 -12.1451 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.6103 -7.15898 -3 - vertex 13.71 -12.1451 -3 - vertex 13.1035 -12.4147 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.2421 -7.67101 -3 - vertex 13.1035 -12.4147 -3 - vertex 12.6527 -12.8127 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 16.7993 -11.2316 -3 - vertex 12.6103 -7.15898 -3 - vertex 15.0012 -6.23992 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.2421 -7.67101 -3 - vertex 12.6527 -12.8127 -3 - vertex 12.4073 -13.2773 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 13.2867 -16.8469 -3 - vertex 10.3474 -19.1774 -3 - vertex 12.417 -13.7469 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.2177 -19.5302 -3 - vertex 12.058 -19.7199 -3 - vertex 11.7785 -19.8211 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 8.75581 -19.1712 -3 - vertex 12.417 -13.7469 -3 - vertex 10.3474 -19.1774 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.06268 -19.3694 -3 - vertex 12.417 -13.7469 -3 - vertex 8.75581 -19.1712 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.1035 -12.4147 -3 - vertex 10.2421 -7.67101 -3 - vertex 12.6103 -7.15898 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 12.417 -13.7469 -3 - vertex 7.06268 -19.3694 -3 - vertex 12.4073 -13.2773 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.4073 -13.2773 -3 - vertex 7.54923 -7.88041 -3 - vertex 10.2421 -7.67101 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 12.4073 -13.2773 -3 - vertex 7.06268 -19.3694 -3 - vertex 7.54923 -7.88041 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.03167 -7.88498 -3 - vertex 7.06268 -19.3694 -3 - vertex 5.689 -19.9339 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.06268 -19.3694 -3 - vertex 5.03167 -7.88498 -3 - vertex 7.54923 -7.88041 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.689 -19.9339 -3 - vertex 3.854 -7.59505 -3 - vertex 5.03167 -7.88498 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.72385 -21.1527 -3 - vertex 3.854 -7.59505 -3 - vertex 5.689 -19.9339 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -4.06681 -20.6308 -3 - vertex 3.72385 -21.1527 -3 - vertex 1.84511 -22.661 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.72385 -21.1527 -3 - vertex -4.70045 -19.8327 -3 - vertex 3.854 -7.59505 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.85646 -21.6547 -3 - vertex 1.84511 -22.661 -3 - vertex 0.168338 -24.355 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.89417 -22.8317 -3 - vertex 0.168338 -24.355 -3 - vertex -1.19093 -26.1306 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.72385 -21.1527 -3 - vertex -4.06681 -20.6308 -3 - vertex -4.70045 -19.8327 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.89417 -22.8317 -3 - vertex -1.19093 -26.1306 -3 - vertex -2.25121 -28.0146 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.89417 -22.8317 -3 - vertex -2.25121 -28.0146 -3 - vertex -3.14673 -30.0798 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.84511 -22.661 -3 - vertex -3.85646 -21.6547 -3 - vertex -4.06681 -20.6308 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.57075 -19.2012 -3 - vertex 3.854 -7.59505 -3 - vertex -4.70045 -19.8327 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -6.41168 -29.738 -3 - vertex -3.14673 -30.0798 -3 - vertex -3.7659 -32.0301 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 47.2139 -19.2263 -3 - vertex 27.528 9.70386 -3 - vertex 27.6094 12.2412 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.989 -19.2301 -3 - vertex 26.953 2.16551 -3 - vertex 27.528 9.70386 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.9177 3.98634 -3 - vertex 27.528 9.70386 -3 - vertex 26.953 2.16551 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.989 -19.2301 -3 - vertex 26.8464 1.29842 -3 - vertex 26.953 2.16551 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.989 -19.2301 -3 - vertex 26.7235 1.18648 -3 - vertex 26.8464 1.29842 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 26.7235 1.18648 -3 - vertex 27.8281 -19.1444 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 27.8281 -19.1444 -3 - vertex 26.5413 -19.2026 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 26.7235 1.18648 -3 - vertex 21.0968 -1.15452 -3 - vertex 26.5455 1.2697 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 26.5413 -19.2026 -3 - vertex 25.4359 -19.4082 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 23.9858 2.16372 -3 - vertex 26.5455 1.2697 -3 - vertex 21.0968 -1.15452 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.5455 1.2697 -3 - vertex 23.9858 2.16372 -3 - vertex 25.9977 1.96397 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.3153 2.68052 -3 - vertex 24.7523 2.4559 -3 - vertex 25.0347 2.67962 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9977 1.96397 -3 - vertex 24.7523 2.4559 -3 - vertex 25.3153 2.68052 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9977 1.96397 -3 - vertex 23.9858 2.16372 -3 - vertex 24.7523 2.4559 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 25.4359 -19.4082 -3 - vertex 23.0737 -20.4525 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.9858 2.16372 -3 - vertex 21.0968 -1.15452 -3 - vertex 23.1222 1.97635 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.0282 0.220415 -3 - vertex 23.1222 1.97635 -3 - vertex 21.0968 -1.15452 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 23.1222 1.97635 -3 - vertex 21.0282 0.220415 -3 - vertex 22.8505 1.9828 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.6777 -11.13 -3 - vertex 23.0737 -20.4525 -3 - vertex 21.6367 -21.3703 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 22.8505 1.9828 -3 - vertex 21.0282 0.220415 -3 - vertex 22.7784 2.30129 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.4865 -0.127098 -3 - vertex 22.7784 2.30129 -3 - vertex 21.0282 0.220415 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.7784 2.30129 -3 - vertex 16.0239 2.90744 -3 - vertex 21.7142 8.22365 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 22.7784 2.30129 -3 - vertex 19.4865 -0.127098 -3 - vertex 16.0239 2.90744 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3368 5.33522 -3 - vertex 21.7142 8.22365 -3 - vertex 16.0239 2.90744 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 16.8564 0.883682 -3 - vertex 19.4865 -0.127098 -3 - vertex 18.2674 -0.466912 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 16.8564 0.883682 -3 - vertex 18.2674 -0.466912 -3 - vertex 17.6745 -0.267811 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.4865 -0.127098 -3 - vertex 16.8564 0.883682 -3 - vertex 16.0239 2.90744 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 21.7142 8.22365 -3 - vertex 15.3368 5.33522 -3 - vertex 19.7157 9.66569 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.9551 7.69881 -3 - vertex 19.7157 9.66569 -3 - vertex 15.3368 5.33522 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 19.7157 9.66569 -3 - vertex 14.9551 7.69881 -3 - vertex 18.6847 10.137 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 18.6847 10.137 -3 - vertex 14.9551 7.69881 -3 - vertex 17.337 10.3363 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.9426 8.95486 -3 - vertex 17.337 10.3363 -3 - vertex 14.9551 7.69881 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.337 10.3363 -3 - vertex 15.3572 9.74689 -3 - vertex 15.9933 10.3315 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.9933 10.3315 -3 - vertex 15.3572 9.74689 -3 - vertex 15.6762 10.1383 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.337 10.3363 -3 - vertex 14.9426 8.95486 -3 - vertex 15.3572 9.74689 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 34.7441 -22.7166 -3 - vertex 31.8275 -24.8188 -3 - vertex 32.0255 -23.3848 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 29.8709 -31.8517 -3 - vertex 32.5255 -33.371 -3 - vertex 31.6707 -35.0376 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 33.8444 -30.1753 -3 - vertex 31.4974 -26.3899 -3 - vertex 31.8275 -24.8188 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 33.8444 -30.1753 -3 - vertex 31.2318 -26.857 -3 - vertex 31.4974 -26.3899 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 29.8709 -31.8517 -3 - vertex 31.6707 -35.0376 -3 - vertex 30.8837 -35.7486 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 33.8444 -30.1753 -3 - vertex 30.2029 -31.1764 -3 - vertex 30.1062 -30.7807 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 30.7817 -27.1595 -3 - vertex 33.8444 -30.1753 -3 - vertex 30.1062 -30.7807 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 32.5255 -33.371 -3 - vertex 29.8709 -31.8517 -3 - vertex 30.2029 -31.1764 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.8442 -34.1555 -3 - vertex 30.8837 -35.7486 -3 - vertex 29.7686 -36.0779 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.8442 -34.1555 -3 - vertex 29.7686 -36.0779 -3 - vertex 29.0223 -36.3831 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.8442 -34.1555 -3 - vertex 29.0223 -36.3831 -3 - vertex 28.553 -36.8405 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9895 -35.834 -3 - vertex 28.553 -36.8405 -3 - vertex 28.4102 -37.3704 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.8837 -35.7486 -3 - vertex 27.8442 -34.1555 -3 - vertex 29.8709 -31.8517 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 33.8444 -30.1753 -3 - vertex 30.7817 -27.1595 -3 - vertex 31.2318 -26.857 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 29.6885 -30.4984 -3 - vertex 30.7817 -27.1595 -3 - vertex 30.1062 -30.7807 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.9763 -27.4135 -3 - vertex 29.6885 -30.4984 -3 - vertex 29.2916 -30.4642 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 29.6885 -30.4984 -3 - vertex 28.9763 -27.4135 -3 - vertex 30.7817 -27.1595 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.199 -31.2235 -3 - vertex 28.9763 -27.4135 -3 - vertex 29.2916 -30.4642 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.3774 -27.4375 -3 - vertex 28.199 -31.2235 -3 - vertex 26.4192 -32.7448 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.199 -31.2235 -3 - vertex 25.3774 -27.4375 -3 - vertex 28.9763 -27.4135 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.9271 -33.7368 -3 - vertex 25.3774 -27.4375 -3 - vertex 26.4192 -32.7448 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.5138 -29.5327 -3 - vertex 24.9271 -33.7368 -3 - vertex 23.5816 -34.2758 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.3087 -31.0557 -3 - vertex 23.5816 -34.2758 -3 - vertex 22.2417 -34.4379 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.3087 -31.0557 -3 - vertex 22.2417 -34.4379 -3 - vertex 21.4183 -34.349 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.3085 -32.3556 -3 - vertex 21.4183 -34.349 -3 - vertex 20.6651 -34.0963 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.5816 -34.2758 -3 - vertex 19.3087 -31.0557 -3 - vertex 19.5138 -29.5327 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.3085 -32.3556 -3 - vertex 20.6651 -34.0963 -3 - vertex 20.0228 -33.6987 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.3774 -27.4375 -3 - vertex 19.9054 -28.0436 -3 - vertex 20.1129 -27.4424 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.3085 -32.3556 -3 - vertex 20.0228 -33.6987 -3 - vertex 19.5322 -33.1754 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.3774 -27.4375 -3 - vertex 19.5138 -29.5327 -3 - vertex 19.9054 -28.0436 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.9271 -33.7368 -3 - vertex 19.5138 -29.5327 -3 - vertex 25.3774 -27.4375 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.4183 -34.349 -3 - vertex 19.3085 -32.3556 -3 - vertex 19.3087 -31.0557 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.528 9.70386 -3 - vertex 26.9177 3.98634 -3 - vertex 27.209 8.08714 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.209 8.08714 -3 - vertex 26.9177 3.98634 -3 - vertex 26.8985 6.51977 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.2082 3.44442 -3 - vertex 23.5966 4.95794 -3 - vertex 23.5377 4.18291 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 23.5966 4.95794 -3 - vertex 23.2082 3.44442 -3 - vertex 23.3811 5.8089 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.2082 3.44442 -3 - vertex 22.8875 6.77518 -3 - vertex 23.3811 5.8089 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.7142 8.22365 -3 - vertex 23.2082 3.44442 -3 - vertex 22.7784 2.30129 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.2082 3.44442 -3 - vertex 21.7142 8.22365 -3 - vertex 22.8875 6.77518 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.0577 29.0611 -3 - vertex 12.0187 29.9363 -3 - vertex 12.2907 30.5214 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.7374 28.4518 -3 - vertex 15.122 28.0941 -3 - vertex 11.8052 27.5343 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 11.8088 29.3224 -3 - vertex 15.0577 29.0611 -3 - vertex 11.7374 28.4518 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.122 28.0941 -3 - vertex 11.7374 28.4518 -3 - vertex 15.0577 29.0611 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.0577 29.0611 -3 - vertex 11.8088 29.3224 -3 - vertex 12.0187 29.9363 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.871 -34.5351 -3 - vertex 14.6656 -34.4466 -3 - vertex 12.1385 -34.7994 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 14.7938 -32.2631 -3 - vertex 11.871 -34.5351 -3 - vertex 11.4887 -31.4602 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 15.3794 -29.9771 -3 - vertex 11.4887 -31.4602 -3 - vertex 14.5835 -23.8342 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.915 -33.0747 -3 - vertex 11.871 -34.5351 -3 - vertex 11.4551 -34.4353 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.871 -34.5351 -3 - vertex 10.915 -33.0747 -3 - vertex 11.4887 -31.4602 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.7197 -33.9677 -3 - vertex 11.4551 -34.4353 -3 - vertex 10.9006 -34.3507 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.4551 -34.4353 -3 - vertex 10.7197 -33.9677 -3 - vertex 10.915 -33.0747 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.2516 -3.15818 -3 - vertex 14.2455 -2.23644 -3 - vertex 14.333 -2.7489 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.8131 -3.7697 -3 - vertex 14.2455 -2.23644 -3 - vertex 14.2516 -3.15818 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 13.172 -4.2601 -3 - vertex 14.2455 -2.23644 -3 - vertex 13.8131 -3.7697 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 14.2455 -2.23644 -3 - vertex 13.172 -4.2601 -3 - vertex 13.5923 -0.94501 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.4032 -4.58609 -3 - vertex 13.5923 -0.94501 -3 - vertex 13.172 -4.2601 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.5814 -4.70438 -3 - vertex 13.5923 -0.94501 -3 - vertex 12.4032 -4.58609 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.2758 -4.53506 -3 - vertex 13.5923 -0.94501 -3 - vertex 11.5814 -4.70438 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 13.5923 -0.94501 -3 - vertex 10.2758 -4.53506 -3 - vertex 12.3489 0.629998 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.01294 -4.00814 -3 - vertex 12.3489 0.629998 -3 - vertex 10.2758 -4.53506 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.74282 -3.09522 -3 - vertex 12.3489 0.629998 -3 - vertex 9.01294 -4.00814 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 12.3489 0.629998 -3 - vertex 7.74282 -3.09522 -3 - vertex 10.5724 2.40247 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 6.41545 -1.76788 -3 - vertex 10.5724 2.40247 -3 - vertex 7.74282 -3.09522 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 10.5724 2.40247 -3 - vertex 6.41545 -1.76788 -3 - vertex 9.13441 3.60373 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.6091 0.441775 -3 - vertex 9.13441 3.60373 -3 - vertex 6.41545 -1.76788 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 9.13441 3.60373 -3 - vertex 4.6091 0.441775 -3 - vertex 8.18559 4.25764 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.39665 0.754678 -3 - vertex 8.18559 4.25764 -3 - vertex 4.6091 0.441775 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 8.18559 4.25764 -3 - vertex 4.39665 0.754678 -3 - vertex 5.26682 5.76024 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.66409 7.13679 -3 - vertex 4.39665 0.754678 -3 - vertex 4.24084 0.464987 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.39665 0.754678 -3 - vertex 1.66409 7.13679 -3 - vertex 5.26682 5.76024 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -1.72768 -3.30659 -3 - vertex 4.37015 -0.506109 -3 - vertex 1.09298 -4.60426 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 4.37015 -0.506109 -3 - vertex -1.72768 -3.30659 -3 - vertex 4.24084 0.464987 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.55278 -2.51803 -3 - vertex 4.24084 0.464987 -3 - vertex -1.72768 -3.30659 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 4.24084 0.464987 -3 - vertex -3.55278 -2.51803 -3 - vertex 1.66409 7.13679 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 1.66409 7.13679 -3 - vertex -3.55278 -2.51803 -3 - vertex -0.248642 7.94666 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -0.248642 7.94666 -3 - vertex -3.55278 -2.51803 -3 - vertex -2.78119 9.30203 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -4.99153 10.6633 -3 - vertex -3.55278 -2.51803 -3 - vertex -3.71458 -2.66291 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 3.854 -7.59505 -3 - vertex -5.57075 -19.2012 -3 - vertex 1.04019 -5.91722 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 1.04019 -5.91722 -3 - vertex -5.57075 -19.2012 -3 - vertex -2.05653 -4.03047 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.1272 -19.1706 -3 - vertex -2.05653 -4.03047 -3 - vertex -5.57075 -19.2012 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.55278 -2.51803 -3 - vertex -4.99153 10.6633 -3 - vertex -2.78119 9.30203 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -2.05653 -4.03047 -3 - vertex -7.1272 -19.1706 -3 - vertex -3.45272 -3.03042 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.4385 -11.5861 -3 - vertex -3.45272 -3.03042 -3 - vertex -7.1272 -19.1706 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.7993 -11.4712 -3 - vertex -3.71458 -2.66291 -3 - vertex -17.4385 -11.5861 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -3.45272 -3.03042 -3 - vertex -17.4385 -11.5861 -3 - vertex -3.71458 -2.66291 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.41055 11.926 -3 - vertex 1.8467 12.7398 -3 - vertex 1.87173 12.344 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 1.8467 12.7398 -3 - vertex 1.41055 11.926 -3 - vertex 1.50002 13.1874 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.41055 11.926 -3 - vertex 0.918757 13.5702 -3 - vertex 1.50002 13.1874 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.535115 11.4454 -3 - vertex 0.918757 13.5702 -3 - vertex 1.41055 11.926 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -0.394194 11.1972 -3 - vertex 0.918757 13.5702 -3 - vertex 0.535115 11.4454 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -0.394194 11.1972 -3 - vertex -0.928844 14.138 -3 - vertex 0.918757 13.5702 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -1.46211 11.1697 -3 - vertex -0.928844 14.138 -3 - vertex -0.394194 11.1972 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -2.75335 11.3511 -3 - vertex -0.928844 14.138 -3 - vertex -1.46211 11.1697 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -2.75335 11.3511 -3 - vertex -3.65881 14.4362 -3 - vertex -0.928844 14.138 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.07797 11.6776 -3 - vertex -3.65881 14.4362 -3 - vertex -2.75335 11.3511 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.23385 14.4578 -3 - vertex -5.07797 11.6776 -3 - vertex -5.71478 11.6495 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.23385 14.4578 -3 - vertex -5.71478 11.6495 -3 - vertex -5.93765 11.491 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.07797 11.6776 -3 - vertex -7.23385 14.4578 -3 - vertex -3.65881 14.4362 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -13.7227 13.3517 -3 - vertex -3.71458 -2.66291 -3 - vertex -17.5299 12.3491 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.4385 -11.5861 -3 - vertex -7.1272 -19.1706 -3 - vertex -8.78621 -19.378 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -11.7016 -19.4898 -3 - vertex -8.78621 -19.378 -3 - vertex -10.3766 -20.1728 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.71458 -2.66291 -3 - vertex -13.7227 13.3517 -3 - vertex -4.99153 10.6633 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -11.7016 -19.4898 -3 - vertex -10.3766 -20.1728 -3 - vertex -11.6824 -19.9072 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -10.3766 -20.1728 -3 - vertex -11.8627 -20.4599 -3 - vertex -11.6824 -19.9072 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -11.8627 -20.4599 -3 - vertex -10.3766 -20.1728 -3 - vertex -12.0544 -21.102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.6062 -18.108 -3 - vertex -22.6991 -20.0641 -3 - vertex -22.6057 -19.3555 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -23.6767 -35.9691 -3 - vertex -22.458 -35.4568 -3 - vertex -23.007 -35.8619 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.4076 -24.3815 -3 - vertex -21.28 -33.2523 -3 - vertex -23.4462 -30.738 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.28 -33.2523 -3 - vertex -23.1278 -21.2395 -3 - vertex -22.6991 -20.0641 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -22.458 -35.4568 -3 - vertex -23.6767 -35.9691 -3 - vertex -24.7956 -33.2498 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.28 -33.2523 -3 - vertex -23.8149 -31.5911 -3 - vertex -23.4462 -30.738 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.7956 -33.2498 -3 - vertex -23.6767 -35.9691 -3 - vertex -24.4194 -36.2501 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.28 -33.2523 -3 - vertex -24.7956 -33.2498 -3 - vertex -23.8149 -31.5911 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.2791 -36.8782 -3 - vertex -24.4194 -36.2501 -3 - vertex -24.9699 -36.888 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.2791 -36.8782 -3 - vertex -24.9699 -36.888 -3 - vertex -25.157 -37.5754 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -24.4194 -36.2501 -3 - vertex -27.2791 -36.8782 -3 - vertex -24.7956 -33.2498 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.299 -23.335 -3 - vertex -17.8179 -22.6324 -3 - vertex -17.2695 -22.7276 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.299 -23.335 -3 - vertex -18.3659 -22.5704 -3 - vertex -17.8179 -22.6324 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -18.5428 -26.6889 -3 - vertex -18.3659 -22.5704 -3 - vertex -17.299 -23.335 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -18.5428 -26.6889 -3 - vertex -18.6886 -22.3738 -3 - vertex -18.3659 -22.5704 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.6991 -20.0641 -3 - vertex -18.6886 -22.3738 -3 - vertex -18.5428 -26.6889 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.6991 -20.0641 -3 - vertex -18.7986 -22.0269 -3 - vertex -18.6886 -22.3738 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -18.7986 -22.0269 -3 - vertex -19.683 -17.584 -3 - vertex -19.3785 -17.1305 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -18.7986 -22.0269 -3 - vertex -20.1126 -17.9213 -3 - vertex -19.683 -17.584 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -18.7986 -22.0269 -3 - vertex -20.6062 -18.108 -3 - vertex -20.1126 -17.9213 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.6991 -20.0641 -3 - vertex -20.6062 -18.108 -3 - vertex -18.7986 -22.0269 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.6991 -20.0641 -3 - vertex -18.5428 -26.6889 -3 - vertex -21.28 -33.2523 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.6062 -18.108 -3 - vertex -22.6057 -19.3555 -3 - vertex -21.1029 -18.1093 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -21.1029 -18.1093 -3 - vertex -22.6057 -19.3555 -3 - vertex -21.3898 -18.0171 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.8641 -19.008 -3 - vertex -21.3898 -18.0171 -3 - vertex -22.6057 -19.3555 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -21.3898 -18.0171 -3 - vertex -22.8641 -19.008 -3 - vertex -21.538 -17.8042 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -23.4908 -18.9156 -3 - vertex -21.538 -17.8042 -3 - vertex -22.8641 -19.008 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.7956 -33.2498 -3 - vertex -21.9191 -34.6287 -3 - vertex -22.458 -35.4568 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -21.538 -17.8042 -3 - vertex -23.4908 -18.9156 -3 - vertex -21.5846 -16.4428 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.9191 -34.6287 -3 - vertex -24.7956 -33.2498 -3 - vertex -21.28 -33.2523 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -23.3419 -14.2877 -3 - vertex -21.5846 -16.4428 -3 - vertex -23.4908 -18.9156 -3 - endloop - endfacet - facet normal -0 -0 -1 - outer loop - vertex -22.1413 -14.5577 -3 - vertex -21.5846 -16.4428 -3 - vertex -23.3419 -14.2877 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.6401 -15.0493 -3 - vertex -22.1413 -14.5577 -3 - vertex -21.8106 -14.7733 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.5846 -16.4428 -3 - vertex -22.1413 -14.5577 -3 - vertex -21.6401 -15.0493 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.1111 -19.1062 -3 - vertex -23.3419 -14.2877 -3 - vertex -23.4908 -18.9156 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.1195 -14.1654 -3 - vertex -24.1111 -19.1062 -3 - vertex -24.7225 -19.9745 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.8809 -15.6487 -3 - vertex -24.7225 -19.9745 -3 - vertex -25.7001 -21.2849 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.1111 -19.1062 -3 - vertex -26.1195 -14.1654 -3 - vertex -23.3419 -14.2877 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -32.1593 -18.5412 -3 - vertex -25.7001 -21.2849 -3 - vertex -26.9351 -22.1109 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -32.1593 -18.5412 -3 - vertex -26.9351 -22.1109 -3 - vertex -28.6031 -22.5277 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.7225 -19.9745 -3 - vertex -30.8809 -15.6487 -3 - vertex -26.1195 -14.1654 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.1195 -14.1654 -3 - vertex -30.8809 -15.6487 -3 - vertex -29.5608 -14.1906 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -30.3887 -14.5514 -3 - vertex -29.5608 -14.1906 -3 - vertex -30.8809 -15.6487 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -32.1593 -18.5412 -3 - vertex -28.6031 -22.5277 -3 - vertex -30.8797 -22.6102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.5608 -14.1906 -3 - vertex -30.3887 -14.5514 -3 - vertex -30.2116 -14.321 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -25.7001 -21.2849 -3 - vertex -32.1593 -18.5412 -3 - vertex -30.8809 -15.6487 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -33.3019 -21.4299 -3 - vertex -30.8797 -22.6102 -3 - vertex -32.5249 -22.5543 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.8797 -22.6102 -3 - vertex -33.3019 -21.4299 -3 - vertex -32.1593 -18.5412 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -33.3295 -22.4108 -3 - vertex -33.3019 -21.4299 -3 - vertex -32.5249 -22.5543 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -33.3019 -21.4299 -3 - vertex -33.3295 -22.4108 -3 - vertex -33.5147 -22.0719 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.78621 -19.378 -3 - vertex -17.4456 -12.0833 -3 - vertex -17.4385 -11.5861 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3785 -17.1305 -3 - vertex -15.1553 -19.8912 -3 - vertex -17.9982 -20.7653 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3785 -17.1305 -3 - vertex -17.9982 -20.7653 -3 - vertex -18.4336 -21.0091 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3785 -17.1305 -3 - vertex -18.4336 -21.0091 -3 - vertex -18.7084 -21.5139 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3785 -17.1305 -3 - vertex -18.7084 -21.5139 -3 - vertex -18.7986 -22.0269 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.1553 -19.8912 -3 - vertex -19.3785 -17.1305 -3 - vertex -17.4456 -12.0833 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.33648 -34.384 -3 - vertex -3.99709 -33.5697 -3 - vertex -7.51249 -36.3769 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.33648 -34.384 -3 - vertex -7.51249 -36.3769 -3 - vertex -7.98605 -36.0592 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -3.99709 -33.5697 -3 - vertex -8.33648 -34.384 -3 - vertex -6.41168 -29.738 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.56822 -35.3052 -3 - vertex -7.98605 -36.0592 -3 - vertex -8.51129 -35.7129 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.98605 -36.0592 -3 - vertex -8.56822 -35.3052 -3 - vertex -8.33648 -34.384 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -8.78621 -19.378 -3 - vertex -11.7016 -19.4898 -3 - vertex -11.9141 -19.2259 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.4456 -12.0833 -3 - vertex -8.78621 -19.378 -3 - vertex -11.9141 -19.2259 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.4456 -12.0833 -3 - vertex -11.9141 -19.2259 -3 - vertex -12.3137 -19.1333 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.93765 11.491 -3 - vertex -10.6367 14.238 -3 - vertex -7.23385 14.4578 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.4456 -12.0833 -3 - vertex -12.3137 -19.1333 -3 - vertex -15.1553 -19.8912 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.93765 11.491 -3 - vertex -13.7227 13.3517 -3 - vertex -10.6367 14.238 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -4.99153 10.6633 -3 - vertex -13.7227 13.3517 -3 - vertex -5.93765 11.491 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -3.71458 -2.66291 -3 - vertex -17.7993 -11.4712 -3 - vertex -17.5299 12.3491 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.7993 -11.4712 -3 - vertex -20.0298 12.0063 -3 - vertex -17.5299 12.3491 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.7993 -11.4712 -3 - vertex -22.4428 11.7593 -3 - vertex -20.0298 12.0063 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.1868 -11.3523 -3 - vertex -22.4428 11.7593 -3 - vertex -17.7993 -11.4712 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.4428 11.7593 -3 - vertex -27.1868 -11.3523 -3 - vertex -25.7097 11.6586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.1868 -11.3523 -3 - vertex -28.6588 11.7129 -3 - vertex -25.7097 11.6586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -34.87 -11.3196 -3 - vertex -28.6588 11.7129 -3 - vertex -27.1868 -11.3523 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -28.6588 11.7129 -3 - vertex -34.87 -11.3196 -3 - vertex -30.1182 11.9311 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -36.1936 -11.4238 -3 - vertex -30.1182 11.9311 -3 - vertex -34.87 -11.3196 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -36.792 -11.6364 -3 - vertex -30.1182 11.9311 -3 - vertex -36.1936 -11.4238 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -30.1182 11.9311 -3 - vertex -36.792 -11.6364 -3 - vertex -30.3887 12.6783 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.3887 12.6783 -3 - vertex -35.7552 21.6337 -3 - vertex -33.0651 20.3093 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.6991 23.0789 -3 - vertex -30.3887 12.6783 -3 - vertex -36.792 -11.6364 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.6991 23.0789 -3 - vertex -36.792 -11.6364 -3 - vertex -37.3951 -12.1929 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -39.1303 25.4589 -3 - vertex -37.3951 -12.1929 -3 - vertex -37.5366 -12.7854 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.3887 12.6783 -3 - vertex -37.6991 23.0789 -3 - vertex -35.7552 21.6337 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -9.69161 -22.56 -3 - vertex -8.46819 -23.4267 -3 - vertex -8.72405 -24.8218 -3 - endloop - endfacet - facet normal -0 -0 -1 - outer loop - vertex -8.78909 -22.7249 -3 - vertex -8.46819 -23.4267 -3 - vertex -9.69161 -22.56 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -12.4124 -23.7203 -3 - vertex -8.72405 -24.8218 -3 - vertex -9.55184 -27.0667 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.46819 -23.4267 -3 - vertex -8.78909 -22.7249 -3 - vertex -8.55624 -22.9989 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.72405 -24.8218 -3 - vertex -10.5461 -22.7271 -3 - vertex -9.69161 -22.56 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.72405 -24.8218 -3 - vertex -11.3967 -23.0769 -3 - vertex -10.5461 -22.7271 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.3894 -29.1914 -3 - vertex -9.55184 -27.0667 -3 - vertex -11.5932 -32.143 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.8281 -32.7116 -3 - vertex -11.5932 -32.143 -3 - vertex -12.3385 -33.8339 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -9.55184 -27.0667 -3 - vertex -14.2216 -26.3227 -3 - vertex -13.7062 -25.2068 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.8281 -32.7116 -3 - vertex -12.3385 -33.8339 -3 - vertex -13.0448 -35.0276 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -8.72405 -24.8218 -3 - vertex -12.4124 -23.7203 -3 - vertex -11.3967 -23.0769 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -13.1427 -24.3848 -3 - vertex -9.55184 -27.0667 -3 - vertex -13.7062 -25.2068 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -14.3732 -35.9691 -3 - vertex -13.0448 -35.0276 -3 - vertex -13.7203 -35.7356 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -9.55184 -27.0667 -3 - vertex -13.1427 -24.3848 -3 - vertex -12.4124 -23.7203 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -13.0448 -35.0276 -3 - vertex -14.3732 -35.9691 -3 - vertex -16.8281 -32.7116 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.8281 -32.7116 -3 - vertex -14.3732 -35.9691 -3 - vertex -14.8949 -36.1495 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -9.55184 -27.0667 -3 - vertex -15.3894 -29.1914 -3 - vertex -14.2216 -26.3227 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.5846 -36.2152 -3 - vertex -14.8949 -36.1495 -3 - vertex -15.4682 -36.5832 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.2226 -36.752 -3 - vertex -15.4682 -36.5832 -3 - vertex -15.9213 -37.1689 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.6989 -37.6188 -3 - vertex -15.9213 -37.1689 -3 - vertex -15.9433 -37.6764 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.5846 -36.2152 -3 - vertex -15.4682 -36.5832 -3 - vertex -16.2226 -36.752 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -14.8949 -36.1495 -3 - vertex -16.5846 -36.2152 -3 - vertex -16.8281 -32.7116 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -11.5932 -32.143 -3 - vertex -16.8281 -32.7116 -3 - vertex -15.3894 -29.1914 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.7285 -35.3062 -3 - vertex -16.5846 -36.2152 -3 - vertex -17.3742 -35.9691 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.7285 -35.3062 -3 - vertex -17.3742 -35.9691 -3 - vertex -17.6987 -35.8223 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -16.5846 -36.2152 -3 - vertex -17.7285 -35.3062 -3 - vertex -16.8281 -32.7116 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.4076 -24.3815 -3 - vertex -23.4462 -30.738 -3 - vertex -23.655 -30.4649 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -25.4741 -26.9141 -3 - vertex -23.655 -30.4649 -3 - vertex -24.0819 -30.2475 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.28 -33.2523 -3 - vertex -24.4076 -24.3815 -3 - vertex -23.1278 -21.2395 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -25.4741 -26.9141 -3 - vertex -24.0819 -30.2475 -3 - vertex -24.4667 -30.1541 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.2338 -28.3696 -3 - vertex -24.4667 -30.1541 -3 - vertex -24.8569 -30.2998 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -23.655 -30.4649 -3 - vertex -25.4741 -26.9141 -3 - vertex -24.4076 -24.3815 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.4667 -30.1541 -3 - vertex -26.2338 -28.3696 -3 - vertex -25.4741 -26.9141 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.8752 -29.0336 -3 - vertex -24.8569 -30.2998 -3 - vertex -26.8283 -32.1012 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.8569 -30.2998 -3 - vertex -26.8752 -29.0336 -3 - vertex -26.2338 -28.3696 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.8283 -32.1012 -3 - vertex -27.5872 -29.1914 -3 - vertex -26.8752 -29.0336 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -26.8283 -32.1012 -3 - vertex -28.1878 -29.097 -3 - vertex -27.5872 -29.1914 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.0969 -33.8499 -3 - vertex -28.1878 -29.097 -3 - vertex -26.8283 -32.1012 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.2578 -34.4631 -3 - vertex -28.1878 -29.097 -3 - vertex -29.0969 -33.8499 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -31.3644 -34.8586 -3 - vertex -28.1878 -29.097 -3 - vertex -30.2578 -34.4631 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.4824 -26.6225 -3 - vertex -28.1878 -29.097 -3 - vertex -31.3644 -34.8586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.1878 -29.097 -3 - vertex -32.142 -25.4759 -3 - vertex -28.5713 -25.7117 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.1878 -29.097 -3 - vertex -35.4824 -26.6225 -3 - vertex -32.142 -25.4759 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.4824 -26.6225 -3 - vertex -31.3644 -34.8586 -3 - vertex -35.0529 -35.0835 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -32.142 -25.4759 -3 - vertex -35.4824 -26.6225 -3 - vertex -34.9626 -25.4747 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -38.7331 -34.5543 -3 - vertex -35.0529 -35.0835 -3 - vertex -38.4261 -34.9619 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -35.0529 -35.0835 -3 - vertex -38.7331 -34.5543 -3 - vertex -35.4824 -26.6225 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.5713 -25.7117 -3 - vertex -27.9105 -26.2055 -3 - vertex -28.1838 -28.4809 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.9105 -26.2055 -3 - vertex -28.5713 -25.7117 -3 - vertex -28.1036 -25.8829 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.5713 -25.7117 -3 - vertex -28.1838 -28.4809 -3 - vertex -28.1878 -29.097 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -11.1208 19.5935 -3 - vertex -11.5389 20.1801 -3 - vertex -10.9412 20.0018 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -12.0133 18.8648 -3 - vertex -11.5389 20.1801 -3 - vertex -11.1208 19.5935 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -12.0133 18.8648 -3 - vertex -12.9783 20.2187 -3 - vertex -11.5389 20.1801 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.009 16.7116 -3 - vertex -12.9783 20.2187 -3 - vertex -12.0133 18.8648 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.009 16.7116 -3 - vertex -16.3196 19.9968 -3 - vertex -12.9783 20.2187 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.0754 15.711 -3 - vertex -16.3196 19.9968 -3 - vertex -15.009 16.7116 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.1789 19.4139 -3 - vertex -17.0754 15.711 -3 - vertex -19.733 14.7364 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.0754 15.711 -3 - vertex -20.1789 19.4139 -3 - vertex -16.3196 19.9968 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.3118 14.0374 -3 - vertex -20.1789 19.4139 -3 - vertex -19.733 14.7364 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.3118 14.0374 -3 - vertex -24.1572 19.0472 -3 - vertex -20.1789 19.4139 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.873 13.6003 -3 - vertex -24.1572 19.0472 -3 - vertex -22.3118 14.0374 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.5587 18.9414 -3 - vertex -24.873 13.6003 -3 - vertex -27.4778 13.4117 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.873 13.6003 -3 - vertex -27.5587 18.9414 -3 - vertex -24.1572 19.0472 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -27.4778 13.4117 -3 - vertex -29.687 19.1409 -3 - vertex -27.5587 18.9414 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.9412 13.2465 -3 - vertex -29.687 19.1409 -3 - vertex -27.4778 13.4117 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.3118 13.0393 -3 - vertex -29.687 19.1409 -3 - vertex -29.9412 13.2465 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -33.0651 20.3093 -3 - vertex -30.3118 13.0393 -3 - vertex -30.3887 12.6783 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.3118 13.0393 -3 - vertex -33.0651 20.3093 -3 - vertex -29.687 19.1409 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 36.2859 -23.7121 -3 - vertex 36.104 -22.9178 -3 - vertex 36.3422 -23.0402 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 35.2001 -22.9271 -3 - vertex 36.2859 -23.7121 -3 - vertex 35.3305 -26.5156 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 36.2859 -23.7121 -3 - vertex 35.2001 -22.9271 -3 - vertex 36.104 -22.9178 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 35.3305 -26.5156 -3 - vertex 34.7441 -22.7166 -3 - vertex 35.2001 -22.9271 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.8275 -24.8188 -3 - vertex 34.7441 -22.7166 -3 - vertex 35.3305 -26.5156 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.8275 -24.8188 -3 - vertex 35.3305 -26.5156 -3 - vertex 33.8444 -30.1753 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 42.943 -20.2657 -3 - vertex 42.0238 -20.3507 -3 - vertex 42.1032 -19.4743 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 41.971 -20.8453 -3 - vertex 42.0238 -20.3507 -3 - vertex 42.943 -20.2657 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 42.0238 -20.3507 -3 - vertex 41.971 -20.8453 -3 - vertex 41.8981 -20.7296 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 47.9875 -20.1225 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 47.8425 -21.0531 -3 - vertex 47.9875 -20.1225 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 47.5305 -21.9981 -3 - vertex 47.8425 -21.0531 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 47.0957 -22.796 -3 - vertex 47.5305 -21.9981 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 46.5684 -23.4293 -3 - vertex 47.0957 -22.796 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 37.9939 -37.5705 -3 - vertex 46.5684 -23.4293 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 46.5684 -23.4293 -3 - vertex 37.9939 -37.5705 -3 - vertex 45.9792 -23.8802 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 38.113 -36.8464 -3 - vertex 45.9792 -23.8802 -3 - vertex 37.9939 -37.5705 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 45.9792 -23.8802 -3 - vertex 38.113 -36.8464 -3 - vertex 45.3585 -24.1311 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 37.9618 -36.3241 -3 - vertex 45.3585 -24.1311 -3 - vertex 38.113 -36.8464 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 38.2188 -29.6614 -3 - vertex 45.3585 -24.1311 -3 - vertex 37.9618 -36.3241 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 45.3585 -24.1311 -3 - vertex 38.2188 -29.6614 -3 - vertex 44.7368 -24.1643 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 40.5923 -24.6171 -3 - vertex 44.1445 -23.9621 -3 - vertex 40.0289 -25.46 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 41.2986 -23.9223 -3 - vertex 44.1445 -23.9621 -3 - vertex 40.5923 -24.6171 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 44.1445 -23.9621 -3 - vertex 41.2986 -23.9223 -3 - vertex 43.6122 -23.5069 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 43.6122 -23.5069 -3 - vertex 41.2986 -23.9223 -3 - vertex 42.7682 -22.851 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 44.7368 -24.1643 -3 - vertex 40.0289 -25.46 -3 - vertex 44.1445 -23.9621 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 37.381 -37.9628 -3 - vertex 37.9939 -37.5705 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 35.8907 -38.1241 -3 - vertex 37.381 -37.9628 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 33.1396 -38.1555 -3 - vertex 35.8907 -38.1241 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 29.8074 -38.0948 -3 - vertex 33.1396 -38.1555 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 20.3084 -38.5182 -3 - vertex 29.8074 -38.0948 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.553 -36.8405 -3 - vertex 25.9895 -35.834 -3 - vertex 27.8442 -34.1555 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.0601 -37.0678 -3 - vertex 28.4102 -37.3704 -3 - vertex 28.6431 -37.8931 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 21.4079 -38.2833 -3 - vertex 29.8074 -38.0948 -3 - vertex 20.3084 -38.5182 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 28.4102 -37.3704 -3 - vertex 24.0601 -37.0678 -3 - vertex 25.9895 -35.834 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 28.6431 -37.8931 -3 - vertex 21.4079 -38.2833 -3 - vertex 24.0601 -37.0678 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 29.8074 -38.0948 -3 - vertex 21.4079 -38.2833 -3 - vertex 28.6431 -37.8931 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex 19.0956 -38.5852 -3 - vertex 20.3084 -38.5182 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.33583 -38.4712 -3 - vertex 19.0956 -38.5852 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 19.0956 -38.5852 -3 - vertex 5.33583 -38.4712 -3 - vertex 17.8945 -38.4707 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 17.8945 -38.4707 -3 - vertex 5.33583 -38.4712 -3 - vertex 16.8412 -38.0675 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.1385 -34.7994 -3 - vertex 14.6656 -34.4466 -3 - vertex 12.2351 -35.1874 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.8379 -35.6738 -3 - vertex 12.2351 -35.1874 -3 - vertex 14.6656 -34.4466 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.1379 -35.6584 -3 - vertex 14.8379 -35.6738 -3 - vertex 15.2376 -36.6526 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.1962 -36.5595 -3 - vertex 15.2376 -36.6526 -3 - vertex 15.8953 -37.4336 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 8.47177 -37.477 -3 - vertex 16.8412 -38.0675 -3 - vertex 5.33583 -38.4712 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 14.8379 -35.6738 -3 - vertex 12.1379 -35.6584 -3 - vertex 12.2351 -35.1874 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.2376 -36.6526 -3 - vertex 11.7916 -36.1064 -3 - vertex 12.1379 -35.6584 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.2376 -36.6526 -3 - vertex 11.1962 -36.5595 -3 - vertex 11.7916 -36.1064 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.8953 -37.4336 -3 - vertex 10.519 -36.9119 -3 - vertex 11.1962 -36.5595 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 10.519 -36.9119 -3 - vertex 16.8412 -38.0675 -3 - vertex 9.92719 -37.0575 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 16.8412 -38.0675 -3 - vertex 10.519 -36.9119 -3 - vertex 15.8953 -37.4336 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 9.92719 -37.0575 -3 - vertex 16.8412 -38.0675 -3 - vertex 8.47177 -37.477 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.962702 -38.4962 -3 - vertex 5.33583 -38.4712 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 4.73542 -37.8041 -3 - vertex 3.43985 -37.8545 -3 - vertex 4.64415 -37.2809 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.84381 -38.3343 -3 - vertex 3.43985 -37.8545 -3 - vertex 4.73542 -37.8041 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 2.31266 -38.26 -3 - vertex 5.33583 -38.4712 -3 - vertex 0.962702 -38.4962 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.84381 -38.3343 -3 - vertex 2.31266 -38.26 -3 - vertex 3.43985 -37.8545 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.33583 -38.4712 -3 - vertex 2.31266 -38.26 -3 - vertex 4.84381 -38.3343 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 117.5 -117.5 -3 - vertex -0.366978 -38.538 -3 - vertex 0.962702 -38.4962 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -117.5 -117.5 -3 - vertex -0.366978 -38.538 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -12.0013 -38.1555 -3 - vertex -0.366978 -38.538 -3 - vertex -117.5 -117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.14673 -30.0798 -3 - vertex -6.41168 -29.738 -3 - vertex -4.26405 -24.3543 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.51249 -36.3769 -3 - vertex -3.80393 -35.193 -3 - vertex -7.31439 -36.7536 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.31439 -36.7536 -3 - vertex -3.80393 -35.193 -3 - vertex -3.26834 -36.6145 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -3.80393 -35.193 -3 - vertex -7.51249 -36.3769 -3 - vertex -3.99709 -33.5697 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.3919 -37.1883 -3 - vertex -3.26834 -36.6145 -3 - vertex -2.45619 -37.7112 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -8.07933 -37.9462 -3 - vertex -1.43333 -38.36 -3 - vertex -8.66873 -38.0883 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.26834 -36.6145 -3 - vertex -7.3919 -37.1883 -3 - vertex -7.31439 -36.7536 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -2.45619 -37.7112 -3 - vertex -7.74517 -37.6801 -3 - vertex -7.3919 -37.1883 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -2.45619 -37.7112 -3 - vertex -8.07933 -37.9462 -3 - vertex -7.74517 -37.6801 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -1.43333 -38.36 -3 - vertex -8.07933 -37.9462 -3 - vertex -2.45619 -37.7112 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -8.66873 -38.0883 -3 - vertex -0.366978 -38.538 -3 - vertex -12.0013 -38.1555 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -0.366978 -38.538 -3 - vertex -8.66873 -38.0883 -3 - vertex -1.43333 -38.36 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -12.0013 -38.1555 -3 - vertex -117.5 -117.5 -3 - vertex -15.3277 -38.0928 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -15.9213 -37.1689 -3 - vertex -16.6989 -37.6188 -3 - vertex -16.2226 -36.752 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.7983 -37.9502 -3 - vertex -16.6989 -37.6188 -3 - vertex -15.9433 -37.6764 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -17.5781 -38.0841 -3 - vertex -15.3277 -38.0928 -3 - vertex -117.5 -117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.7983 -37.9502 -3 - vertex -17.033 -37.9274 -3 - vertex -16.6989 -37.6188 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -15.7983 -37.9502 -3 - vertex -17.5781 -38.0841 -3 - vertex -17.033 -37.9274 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.3277 -38.0928 -3 - vertex -17.5781 -38.0841 -3 - vertex -15.7983 -37.9502 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -17.5781 -38.0841 -3 - vertex -117.5 -117.5 -3 - vertex -20.8226 -38.1301 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -25.0608 -37.8416 -3 - vertex -27.2791 -36.8782 -3 - vertex -25.157 -37.5754 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -28.2835 -38.1638 -3 - vertex -25.0608 -37.8416 -3 - vertex -24.8096 -38.0047 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex -28.2835 -38.1638 -3 - vertex -20.8226 -38.1301 -3 - vertex -117.5 -117.5 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -25.0608 -37.8416 -3 - vertex -28.2835 -38.1638 -3 - vertex -27.2791 -36.8782 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -20.8226 -38.1301 -3 - vertex -28.2835 -38.1638 -3 - vertex -24.8096 -38.0047 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -28.2835 -38.1638 -3 - vertex -117.5 -117.5 -3 - vertex -37.632 -38.1325 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -47.8161 -37.7712 -3 - vertex -117.5 -117.5 -3 - vertex -47.9875 -37.5097 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -47.4646 -37.9547 -3 - vertex -117.5 -117.5 -3 - vertex -47.8161 -37.7712 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -37.632 -38.1325 -3 - vertex -117.5 -117.5 -3 - vertex -47.4646 -37.9547 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 47.7267 -19.5813 -3 - vertex 117.5 117.5 -3 - vertex 47.9875 -20.1225 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.5422 14.7505 -3 - vertex 47.7267 -19.5813 -3 - vertex 47.2139 -19.2263 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.528 9.70386 -3 - vertex 47.2139 -19.2263 -3 - vertex 46.2623 -19.1343 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 41.5319 -19.1343 -3 - vertex 46.2623 -19.1343 -3 - vertex 44.5909 -19.3768 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 42.1032 -19.4743 -3 - vertex 44.5909 -19.3768 -3 - vertex 42.943 -20.2657 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 44.5909 -19.3768 -3 - vertex 42.1032 -19.4743 -3 - vertex 41.8934 -19.2238 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 41.5319 -19.1343 -3 - vertex 44.5909 -19.3768 -3 - vertex 41.8934 -19.2238 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.528 9.70386 -3 - vertex 46.2623 -19.1343 -3 - vertex 41.5319 -19.1343 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 29.9429 -19.4981 -3 - vertex 41.5319 -19.1343 -3 - vertex 38.4798 -20.1181 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.7248 -19.9631 -3 - vertex 38.4798 -20.1181 -3 - vertex 35.5661 -21.102 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.7248 -19.9631 -3 - vertex 35.5661 -21.102 -3 - vertex 35.2187 -21.2043 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.3699 -20.64 -3 - vertex 35.2187 -21.2043 -3 - vertex 34.9156 -21.474 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 30.2029 -31.1764 -3 - vertex 33.8444 -30.1753 -3 - vertex 32.5255 -33.371 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 34.7441 -22.7166 -3 - vertex 32.0255 -23.3848 -3 - vertex 34.62 -22.2927 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 32.0232 -22.2828 -3 - vertex 34.62 -22.2927 -3 - vertex 32.0255 -23.3848 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.8086 -21.404 -3 - vertex 34.62 -22.2927 -3 - vertex 32.0232 -22.2828 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 34.62 -22.2927 -3 - vertex 31.8086 -21.404 -3 - vertex 34.9156 -21.474 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 31.3699 -20.64 -3 - vertex 34.9156 -21.474 -3 - vertex 31.8086 -21.404 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 35.2187 -21.2043 -3 - vertex 31.3699 -20.64 -3 - vertex 30.7248 -19.9631 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 38.4798 -20.1181 -3 - vertex 30.7248 -19.9631 -3 - vertex 29.9429 -19.4981 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.528 9.70386 -3 - vertex 41.5319 -19.1343 -3 - vertex 29.9429 -19.4981 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.528 9.70386 -3 - vertex 29.9429 -19.4981 -3 - vertex 28.989 -19.2301 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.7235 1.18648 -3 - vertex 28.989 -19.2301 -3 - vertex 27.8281 -19.1444 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 47.2139 -19.2263 -3 - vertex 27.6094 12.2412 -3 - vertex 27.5422 14.7505 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 47.7267 -19.5813 -3 - vertex 27.5422 14.7505 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.4742 18.624 -3 - vertex 27.5422 14.7505 -3 - vertex 27.1755 15.8473 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.4742 18.624 -3 - vertex 27.1755 15.8473 -3 - vertex 26.6933 17.4601 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.5422 14.7505 -3 - vertex 26.4742 18.624 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9424 19.4837 -3 - vertex 117.5 117.5 -3 - vertex 26.4742 18.624 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.8319 23.6658 -3 - vertex 25.9424 19.4837 -3 - vertex 25.0752 20.0627 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.0827 22.427 -3 - vertex 25.0752 20.0627 -3 - vertex 23.8499 20.3844 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.2698 21.5943 -3 - vertex 23.8499 20.3844 -3 - vertex 23.1387 20.59 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 22.2698 21.5943 -3 - vertex 23.1387 20.59 -3 - vertex 22.6169 20.9877 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 23.8499 20.3844 -3 - vertex 22.2698 21.5943 -3 - vertex 22.0827 22.427 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.0752 20.0627 -3 - vertex 22.0827 22.427 -3 - vertex 21.8319 23.6658 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9424 19.4837 -3 - vertex 21.8319 23.6658 -3 - vertex 21.2755 24.568 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 25.9424 19.4837 -3 - vertex 21.2755 24.568 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3134 30.0845 -3 - vertex 21.2755 24.568 -3 - vertex 20.1819 25.3734 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.4783 29.8698 -3 - vertex 20.1819 25.3734 -3 - vertex 18.3193 26.3216 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.4783 29.8698 -3 - vertex 18.3193 26.3216 -3 - vertex 17.0772 26.9817 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.6084 29.1601 -3 - vertex 17.0772 26.9817 -3 - vertex 16.2688 27.6146 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.6084 29.1601 -3 - vertex 16.2688 27.6146 -3 - vertex 15.808 28.3106 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 17.0772 26.9817 -3 - vertex 15.6084 29.1601 -3 - vertex 15.4783 29.8698 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3134 30.0845 -3 - vertex 20.1819 25.3734 -3 - vertex 15.4783 29.8698 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 21.2755 24.568 -3 - vertex 15.3134 30.0845 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.0123 26.7794 -3 - vertex 15.122 28.0941 -3 - vertex 12.5486 25.9653 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 11.8052 27.5343 -3 - vertex 15.122 28.0941 -3 - vertex 12.0123 26.7794 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.0577 29.0611 -3 - vertex 12.2907 30.5214 -3 - vertex 15.1584 29.8123 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.1584 29.8123 -3 - vertex 12.2907 30.5214 -3 - vertex 15.3134 30.0845 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 12.0544 30.7144 -3 - vertex 15.3134 30.0845 -3 - vertex 12.2907 30.5214 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3134 30.0845 -3 - vertex 12.0544 30.7144 -3 - vertex 5.25321 38.4452 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.19939 38.083 -3 - vertex 12.0544 30.7144 -3 - vertex 11.5971 30.3591 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 8.51885 25.3107 -3 - vertex 11.5037 26.4501 -3 - vertex 9.07032 24.476 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 11.5037 26.4501 -3 - vertex 8.51885 25.3107 -3 - vertex 11.1066 27.3577 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.91411 25.7528 -3 - vertex 11.1066 27.3577 -3 - vertex 8.51885 25.3107 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 11.1066 27.3577 -3 - vertex 7.91411 25.7528 -3 - vertex 11.0411 28.3898 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.11433 25.9588 -3 - vertex 11.0411 28.3898 -3 - vertex 7.91411 25.7528 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.72413 26.6445 -3 - vertex 11.0411 28.3898 -3 - vertex 7.11433 25.9588 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 11.0411 28.3898 -3 - vertex 5.72413 26.6445 -3 - vertex 11.2319 29.4873 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.72413 26.6445 -3 - vertex 7.11433 25.9588 -3 - vertex 6.4022 26.1795 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 4.3138 28.4461 -3 - vertex 11.2319 29.4873 -3 - vertex 5.72413 26.6445 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.57109 31.3388 -3 - vertex 11.2319 29.4873 -3 - vertex 4.3138 28.4461 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3134 30.0845 -3 - vertex 5.25321 38.4452 -3 - vertex 5.15152 38.5852 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 15.3134 30.0845 -3 - vertex 5.15152 38.5852 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -0.115935 27.2162 -3 - vertex 1.04836 28.6106 -3 - vertex 0.858783 27.1101 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -0.786632 27.5359 -3 - vertex 1.04836 28.6106 -3 - vertex -0.115935 27.2162 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -1.46161 28.0795 -3 - vertex 1.04836 28.6106 -3 - vertex -0.786632 27.5359 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 1.04836 28.6106 -3 - vertex -1.46161 28.0795 -3 - vertex 1.1273 29.8907 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -2.77953 29.7664 -3 - vertex 1.1273 29.8907 -3 - vertex -1.46161 28.0795 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 1.1273 29.8907 -3 - vertex -2.77953 29.7664 -3 - vertex 1.37489 31.173 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -3.97987 32.1322 -3 - vertex 1.37489 31.173 -3 - vertex -2.77953 29.7664 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.37489 31.173 -3 - vertex -3.97987 32.1322 -3 - vertex 2.44067 33.9939 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -4.97284 35.0324 -3 - vertex 2.44067 33.9939 -3 - vertex -3.97987 32.1322 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.55994 36.5001 -3 - vertex 2.44067 33.9939 -3 - vertex -4.97284 35.0324 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 2.44067 33.9939 -3 - vertex -5.55994 36.5001 -3 - vertex 4.08079 37.0842 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 4.08079 37.0842 -3 - vertex -5.55994 36.5001 -3 - vertex 5.15152 38.5852 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -5.8163 36.5812 -3 - vertex 5.15152 38.5852 -3 - vertex -5.55994 36.5001 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -117.5 117.5 -3 - vertex 5.15152 38.5852 -3 - vertex -5.8163 36.5812 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.25507 27.2437 -3 - vertex -6.28322 28.2565 -3 - vertex -6.38329 27.6173 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -6.28322 28.2565 -3 - vertex -8.80952 27.3973 -3 - vertex -6.22131 31.7226 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -7.25507 27.2437 -3 - vertex -6.38329 27.6173 -3 - vertex -6.55612 27.3597 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -6.28322 28.2565 -3 - vertex -7.25507 27.2437 -3 - vertex -8.80952 27.3973 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -11.546 27.7352 -3 - vertex -6.22131 31.7226 -3 - vertex -8.80952 27.3973 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -6.22131 31.7226 -3 - vertex -11.546 27.7352 -3 - vertex -6.055 36.2349 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -13.5562 27.8374 -3 - vertex -6.055 36.2349 -3 - vertex -11.546 27.7352 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -15.2376 27.7001 -3 - vertex -6.055 36.2349 -3 - vertex -13.5562 27.8374 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.8096 27.6578 -3 - vertex -6.055 36.2349 -3 - vertex -15.2376 27.7001 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.8096 27.6578 -3 - vertex -15.2376 27.7001 -3 - vertex -16.9875 27.3196 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.9485 27.2141 -3 - vertex -16.9875 27.3196 -3 - vertex -19.335 26.703 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.8096 27.6578 -3 - vertex -16.9875 27.3196 -3 - vertex -19.9485 27.2141 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.4093 27.9007 -3 - vertex -6.055 36.2349 -3 - vertex -20.8096 27.6578 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -6.055 36.2349 -3 - vertex -22.4093 27.9007 -3 - vertex -5.8163 36.5812 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.3632 27.9554 -3 - vertex -5.8163 36.5812 -3 - vertex -22.4093 27.9007 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -30.666 27.4912 -3 - vertex -5.8163 36.5812 -3 - vertex -24.3632 27.9554 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -24.3225 27.6757 -3 - vertex -27.4214 26.3653 -3 - vertex -24.3632 27.9554 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -29.2879 26.9865 -3 - vertex -24.3632 27.9554 -3 - vertex -27.4214 26.3653 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -24.3632 27.9554 -3 - vertex -29.2879 26.9865 -3 - vertex -30.666 27.4912 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -31.2177 27.4629 -3 - vertex -5.8163 36.5812 -3 - vertex -30.666 27.4912 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -5.8163 36.5812 -3 - vertex -31.2177 27.4629 -3 - vertex -117.5 117.5 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -31.2773 24.779 -3 - vertex -34.2108 23.023 -3 - vertex -31.2912 27.2229 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -36.1697 23.9798 -3 - vertex -31.2912 27.2229 -3 - vertex -34.2108 23.023 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.7877 25.1404 -3 - vertex -31.2912 27.2229 -3 - vertex -36.1697 23.9798 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -31.2912 27.2229 -3 - vertex -37.7877 25.1404 -3 - vertex -31.2177 27.4629 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -38.5782 25.7376 -3 - vertex -31.2177 27.4629 -3 - vertex -37.7877 25.1404 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -39.0347 25.8392 -3 - vertex -31.2177 27.4629 -3 - vertex -38.5782 25.7376 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -31.2177 27.4629 -3 - vertex -39.0347 25.8392 -3 - vertex -117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -47.2102 -36.2359 -3 - vertex -39.9072 -25.4747 -3 - vertex -42.237 -30.9405 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -47.2102 -36.2359 -3 - vertex -42.237 -30.9405 -3 - vertex -43.2543 -33.2915 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -46.1801 -35.8499 -3 - vertex -43.2543 -33.2915 -3 - vertex -44.1198 -34.7306 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -46.1801 -35.8499 -3 - vertex -44.1198 -34.7306 -3 - vertex -45.0296 -35.5019 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -43.2543 -33.2915 -3 - vertex -46.1801 -35.8499 -3 - vertex -47.2102 -36.2359 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -37.5366 -12.7854 -3 - vertex -47.2102 -36.2359 -3 - vertex -47.8577 -36.863 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -37.5366 -12.7854 -3 - vertex -47.8577 -36.863 -3 - vertex -39.1303 25.4589 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -117.5 -117.5 -3 - vertex -47.8577 -36.863 -3 - vertex -47.9875 -37.5097 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -47.8577 -36.863 -3 - vertex -117.5 -117.5 -3 - vertex -117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -47.8577 -36.863 -3 - vertex -117.5 117.5 -3 - vertex -39.1303 25.4589 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 5.15152 38.5852 -3 - vertex -117.5 117.5 -3 - vertex 117.5 117.5 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -39.1303 25.4589 -3 - vertex -117.5 117.5 -3 - vertex -39.0347 25.8392 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 40.0289 -25.46 -3 - vertex 44.7368 -24.1643 -3 - vertex 38.2188 -29.6614 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 36.8272 -33.2656 -3 - vertex 37.9618 -36.3241 -3 - vertex 37.1913 -36.0604 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 37.9618 -36.3241 -3 - vertex 36.8272 -33.2656 -3 - vertex 38.2188 -29.6614 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 36.2918 -35.0946 -3 - vertex 37.1913 -36.0604 -3 - vertex 36.3972 -35.7834 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 37.1913 -36.0604 -3 - vertex 36.2918 -35.0946 -3 - vertex 36.8272 -33.2656 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.72145 16.1788 -3 - vertex 9.76373 17.1908 -3 - vertex 10.4258 16.5104 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 8.86535 15.8492 -3 - vertex 9.76373 17.1908 -3 - vertex 9.72145 16.1788 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 8.028 17.0592 -3 - vertex 9.76373 17.1908 -3 - vertex 8.86535 15.8492 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 9.76373 17.1908 -3 - vertex 8.028 17.0592 -3 - vertex 8.30319 18.4459 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.15178 18.7442 -3 - vertex 8.30319 18.4459 -3 - vertex 8.028 17.0592 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 8.30319 18.4459 -3 - vertex 7.15178 18.7442 -3 - vertex 7.1994 19.1268 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -10.5829 24.4 -3 - vertex -11.2742 24.7069 -3 - vertex -10.6709 24.5009 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -14.1729 23.8467 -3 - vertex -11.2742 24.7069 -3 - vertex -10.5829 24.4 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex -11.2742 24.7069 -3 - vertex -14.1729 23.8467 -3 - vertex -13.9393 24.99 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -14.1729 23.8467 -3 - vertex -16.6107 24.7853 -3 - vertex -13.9393 24.99 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3275 23.0662 -3 - vertex -16.6107 24.7853 -3 - vertex -14.1729 23.8467 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -19.3275 23.0662 -3 - vertex -20.4324 24.2101 -3 - vertex -16.6107 24.7853 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -21.5591 22.7309 -3 - vertex -20.4324 24.2101 -3 - vertex -19.3275 23.0662 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.0432 22.8497 -3 - vertex -20.4324 24.2101 -3 - vertex -21.5591 22.7309 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -22.6641 23.2546 -3 - vertex -20.4324 24.2101 -3 - vertex -22.0432 22.8497 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -20.4324 24.2101 -3 - vertex -22.6641 23.2546 -3 - vertex -23.3809 23.8604 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.4233 -24.8188 -3 - vertex 27.3613 -24.0204 -3 - vertex 27.2283 -24.8188 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 26.0804 -21.8157 -3 - vertex 27.3613 -24.0204 -3 - vertex 24.4233 -24.8188 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.3668 -22.8574 -3 - vertex 26.0804 -21.8157 -3 - vertex 26.9354 -22.1189 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 27.3613 -24.0204 -3 - vertex 26.0804 -21.8157 -3 - vertex 27.3668 -22.8574 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 26.0804 -21.8157 -3 - vertex 24.4233 -24.8188 -3 - vertex 24.8153 -21.9586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.4233 -24.8188 -3 - vertex 23.7526 -22.3987 -3 - vertex 24.8153 -21.9586 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 24.4233 -24.8188 -3 - vertex 22.6861 -23.3258 -3 - vertex 23.7526 -22.3987 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 22.6861 -23.3258 -3 - vertex 24.4233 -24.8188 -3 - vertex 21.6183 -24.6221 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.70773 -21.5983 -3 - vertex 10.169 -23.3758 -3 - vertex 10.0775 -24.2416 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 6.85097 -21.9079 -3 - vertex 10.0775 -24.2416 -3 - vertex 9.7411 -25.4359 -3 - endloop - endfacet - facet normal 0 -0 -1 - outer loop - vertex 8.49325 -21.5121 -3 - vertex 10.169 -23.3758 -3 - vertex 7.70773 -21.5983 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.169 -23.3758 -3 - vertex 8.49325 -21.5121 -3 - vertex 10.0454 -22.5812 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.0454 -22.5812 -3 - vertex 9.16984 -21.6481 -3 - vertex 9.69979 -22.0048 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.84714 -24.6213 -3 - vertex 9.7411 -25.4359 -3 - vertex 7.96204 -29.9101 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 10.0775 -24.2416 -3 - vertex 6.85097 -21.9079 -3 - vertex 7.70773 -21.5983 -3 - endloop - endfacet - facet normal -0 -0 -1 - outer loop - vertex 9.16984 -21.6481 -3 - vertex 10.0454 -22.5812 -3 - vertex 8.49325 -21.5121 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.3456 -29.5107 -3 - vertex 7.96204 -29.9101 -3 - vertex 6.30534 -33.4759 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.7411 -25.4359 -3 - vertex 5.96068 -22.4422 -3 - vertex 6.85097 -21.9079 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.901133 -32.5034 -3 - vertex 6.30534 -33.4759 -3 - vertex 5.71313 -34.2297 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.7411 -25.4359 -3 - vertex 5.07455 -23.2024 -3 - vertex 5.96068 -22.4422 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.901133 -32.5034 -3 - vertex 5.71313 -34.2297 -3 - vertex 5.04571 -34.678 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.901133 -32.5034 -3 - vertex 5.04571 -34.678 -3 - vertex 4.11511 -35.011 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 9.7411 -25.4359 -3 - vertex 3.84714 -24.6213 -3 - vertex 5.07455 -23.2024 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 0.901133 -32.5034 -3 - vertex 4.11511 -35.011 -3 - vertex 3.17687 -35.0966 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.96204 -29.9101 -3 - vertex 2.80055 -26.1986 -3 - vertex 3.84714 -24.6213 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.11766 -33.6813 -3 - vertex 3.17687 -35.0966 -3 - vertex 2.32628 -34.9386 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.96204 -29.9101 -3 - vertex 1.95873 -27.8549 -3 - vertex 2.80055 -26.1986 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 1.11766 -33.6813 -3 - vertex 2.32628 -34.9386 -3 - vertex 1.65861 -34.5411 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 7.96204 -29.9101 -3 - vertex 1.3456 -29.5107 -3 - vertex 1.95873 -27.8549 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 3.17687 -35.0966 -3 - vertex 1.11766 -33.6813 -3 - vertex 0.901133 -32.5034 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 6.30534 -33.4759 -3 - vertex 0.985088 -31.0867 -3 - vertex 1.3456 -29.5107 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex 6.30534 -33.4759 -3 - vertex 0.901133 -32.5034 -3 - vertex 0.985088 -31.0867 -3 - endloop - endfacet - facet normal -0.929682 -0.368364 0 - outer loop - vertex 19.6777 -11.13 -3 - vertex 19.5452 -10.7956 0 - vertex 19.5452 -10.7956 -3 - endloop - endfacet - facet normal -0.929682 -0.368364 0 - outer loop - vertex 19.5452 -10.7956 0 - vertex 19.6777 -11.13 -3 - vertex 19.6777 -11.13 0 - endloop - endfacet - facet normal -0.933646 0.358197 0 - outer loop - vertex 17.1521 -17.7131 -3 - vertex 19.6777 -11.13 0 - vertex 19.6777 -11.13 -3 - endloop - endfacet - facet normal -0.933646 0.358197 0 - outer loop - vertex 19.6777 -11.13 0 - vertex 17.1521 -17.7131 -3 - vertex 17.1521 -17.7131 0 - endloop - endfacet - facet normal -0.922106 0.386938 0 - outer loop - vertex 14.5835 -23.8342 -3 - vertex 17.1521 -17.7131 0 - vertex 17.1521 -17.7131 -3 - endloop - endfacet - facet normal -0.922106 0.386938 0 - outer loop - vertex 17.1521 -17.7131 0 - vertex 14.5835 -23.8342 -3 - vertex 14.5835 -23.8342 0 - endloop - endfacet - facet normal -0.926605 0.376035 0 - outer loop - vertex 11.4887 -31.4602 -3 - vertex 14.5835 -23.8342 0 - vertex 14.5835 -23.8342 -3 - endloop - endfacet - facet normal -0.926605 0.376035 0 - outer loop - vertex 14.5835 -23.8342 0 - vertex 11.4887 -31.4602 -3 - vertex 11.4887 -31.4602 0 - endloop - endfacet - facet normal -0.942271 0.334852 0 - outer loop - vertex 10.915 -33.0747 -3 - vertex 11.4887 -31.4602 0 - vertex 11.4887 -31.4602 -3 - endloop - endfacet - facet normal -0.942271 0.334852 0 - outer loop - vertex 11.4887 -31.4602 0 - vertex 10.915 -33.0747 -3 - vertex 10.915 -33.0747 0 - endloop - endfacet - facet normal -0.976917 0.213621 0 - outer loop - vertex 10.7197 -33.9677 -3 - vertex 10.915 -33.0747 0 - vertex 10.915 -33.0747 -3 - endloop - endfacet - facet normal -0.976917 0.213621 0 - outer loop - vertex 10.915 -33.0747 0 - vertex 10.7197 -33.9677 -3 - vertex 10.7197 -33.9677 0 - endloop - endfacet - facet normal -0.904266 -0.42697 0 - outer loop - vertex 10.9006 -34.3507 -3 - vertex 10.7197 -33.9677 0 - vertex 10.7197 -33.9677 -3 - endloop - endfacet - facet normal -0.904266 -0.42697 0 - outer loop - vertex 10.7197 -33.9677 0 - vertex 10.9006 -34.3507 -3 - vertex 10.9006 -34.3507 0 - endloop - endfacet - facet normal -0.15089 -0.988551 0 - outer loop - vertex 10.9006 -34.3507 -3 - vertex 11.4551 -34.4353 0 - vertex 10.9006 -34.3507 0 - endloop - endfacet - facet normal -0.15089 -0.988551 -0 - outer loop - vertex 11.4551 -34.4353 0 - vertex 10.9006 -34.3507 -3 - vertex 11.4551 -34.4353 -3 - endloop - endfacet - facet normal -0.233297 -0.972406 0 - outer loop - vertex 11.4551 -34.4353 -3 - vertex 11.871 -34.5351 0 - vertex 11.4551 -34.4353 0 - endloop - endfacet - facet normal -0.233297 -0.972406 -0 - outer loop - vertex 11.871 -34.5351 0 - vertex 11.4551 -34.4353 -3 - vertex 11.871 -34.5351 -3 - endloop - endfacet - facet normal -0.702731 -0.711456 0 - outer loop - vertex 11.871 -34.5351 -3 - vertex 12.1385 -34.7994 0 - vertex 11.871 -34.5351 0 - endloop - endfacet - facet normal -0.702731 -0.711456 -0 - outer loop - vertex 12.1385 -34.7994 0 - vertex 11.871 -34.5351 -3 - vertex 12.1385 -34.7994 -3 - endloop - endfacet - facet normal -0.970405 -0.241485 0 - outer loop - vertex 12.2351 -35.1874 -3 - vertex 12.1385 -34.7994 0 - vertex 12.1385 -34.7994 -3 - endloop - endfacet - facet normal -0.970405 -0.241485 0 - outer loop - vertex 12.1385 -34.7994 0 - vertex 12.2351 -35.1874 -3 - vertex 12.2351 -35.1874 0 - endloop - endfacet - facet normal -0.979345 0.202199 0 - outer loop - vertex 12.1379 -35.6584 -3 - vertex 12.2351 -35.1874 0 - vertex 12.2351 -35.1874 -3 - endloop - endfacet - facet normal -0.979345 0.202199 0 - outer loop - vertex 12.2351 -35.1874 0 - vertex 12.1379 -35.6584 -3 - vertex 12.1379 -35.6584 0 - endloop - endfacet - facet normal -0.791253 0.611489 0 - outer loop - vertex 11.7916 -36.1064 -3 - vertex 12.1379 -35.6584 0 - vertex 12.1379 -35.6584 -3 - endloop - endfacet - facet normal -0.791253 0.611489 0 - outer loop - vertex 12.1379 -35.6584 0 - vertex 11.7916 -36.1064 -3 - vertex 11.7916 -36.1064 0 - endloop - endfacet - facet normal -0.605591 0.795776 0 - outer loop - vertex 11.7916 -36.1064 -3 - vertex 11.1962 -36.5595 0 - vertex 11.7916 -36.1064 0 - endloop - endfacet - facet normal -0.605591 0.795776 0 - outer loop - vertex 11.1962 -36.5595 0 - vertex 11.7916 -36.1064 -3 - vertex 11.1962 -36.5595 -3 - endloop - endfacet - facet normal -0.461492 0.887144 0 - outer loop - vertex 11.1962 -36.5595 -3 - vertex 10.519 -36.9119 0 - vertex 11.1962 -36.5595 0 - endloop - endfacet - facet normal -0.461492 0.887144 0 - outer loop - vertex 10.519 -36.9119 0 - vertex 11.1962 -36.5595 -3 - vertex 10.519 -36.9119 -3 - endloop - endfacet - facet normal -0.238946 0.971033 0 - outer loop - vertex 10.519 -36.9119 -3 - vertex 9.92719 -37.0575 0 - vertex 10.519 -36.9119 0 - endloop - endfacet - facet normal -0.238946 0.971033 0 - outer loop - vertex 9.92719 -37.0575 0 - vertex 10.519 -36.9119 -3 - vertex 9.92719 -37.0575 -3 - endloop - endfacet - facet normal -0.276943 0.960886 0 - outer loop - vertex 9.92719 -37.0575 -3 - vertex 8.47177 -37.477 0 - vertex 9.92719 -37.0575 0 - endloop - endfacet - facet normal -0.276943 0.960886 0 - outer loop - vertex 8.47177 -37.477 0 - vertex 9.92719 -37.0575 -3 - vertex 8.47177 -37.477 -3 - endloop - endfacet - facet normal -0.302213 0.95324 0 - outer loop - vertex 8.47177 -37.477 -3 - vertex 5.33583 -38.4712 0 - vertex 8.47177 -37.477 0 - endloop - endfacet - facet normal -0.302213 0.95324 0 - outer loop - vertex 5.33583 -38.4712 0 - vertex 8.47177 -37.477 -3 - vertex 5.33583 -38.4712 -3 - endloop - endfacet - facet normal 0.267926 0.96344 -0 - outer loop - vertex 5.33583 -38.4712 -3 - vertex 4.84381 -38.3343 0 - vertex 5.33583 -38.4712 0 - endloop - endfacet - facet normal 0.267926 0.96344 0 - outer loop - vertex 4.84381 -38.3343 0 - vertex 5.33583 -38.4712 -3 - vertex 4.84381 -38.3343 -3 - endloop - endfacet - facet normal 0.979739 0.200279 0 - outer loop - vertex 4.84381 -38.3343 0 - vertex 4.73542 -37.8041 -3 - vertex 4.73542 -37.8041 0 - endloop - endfacet - facet normal 0.979739 0.200279 0 - outer loop - vertex 4.73542 -37.8041 -3 - vertex 4.84381 -38.3343 0 - vertex 4.84381 -38.3343 -3 - endloop - endfacet - facet normal 0.985121 0.171864 0 - outer loop - vertex 4.73542 -37.8041 0 - vertex 4.64415 -37.2809 -3 - vertex 4.64415 -37.2809 0 - endloop - endfacet - facet normal 0.985121 0.171864 0 - outer loop - vertex 4.64415 -37.2809 -3 - vertex 4.73542 -37.8041 0 - vertex 4.73542 -37.8041 -3 - endloop - endfacet - facet normal -0.43 0.902829 0 - outer loop - vertex 4.64415 -37.2809 -3 - vertex 3.43985 -37.8545 0 - vertex 4.64415 -37.2809 0 - endloop - endfacet - facet normal -0.43 0.902829 0 - outer loop - vertex 3.43985 -37.8545 0 - vertex 4.64415 -37.2809 -3 - vertex 3.43985 -37.8545 -3 - endloop - endfacet - facet normal -0.338512 0.940962 0 - outer loop - vertex 3.43985 -37.8545 -3 - vertex 2.31266 -38.26 0 - vertex 3.43985 -37.8545 0 - endloop - endfacet - facet normal -0.338512 0.940962 0 - outer loop - vertex 2.31266 -38.26 0 - vertex 3.43985 -37.8545 -3 - vertex 2.31266 -38.26 -3 - endloop - endfacet - facet normal -0.172368 0.985033 0 - outer loop - vertex 2.31266 -38.26 -3 - vertex 0.962702 -38.4962 0 - vertex 2.31266 -38.26 0 - endloop - endfacet - facet normal -0.172368 0.985033 0 - outer loop - vertex 0.962702 -38.4962 0 - vertex 2.31266 -38.26 -3 - vertex 0.962702 -38.4962 -3 - endloop - endfacet - facet normal -0.0313759 0.999508 0 - outer loop - vertex 0.962702 -38.4962 -3 - vertex -0.366978 -38.538 0 - vertex 0.962702 -38.4962 0 - endloop - endfacet - facet normal -0.0313759 0.999508 0 - outer loop - vertex -0.366978 -38.538 0 - vertex 0.962702 -38.4962 -3 - vertex -0.366978 -38.538 -3 - endloop - endfacet - facet normal 0.16461 0.986359 -0 - outer loop - vertex -0.366978 -38.538 -3 - vertex -1.43333 -38.36 0 - vertex -0.366978 -38.538 0 - endloop - endfacet - facet normal 0.16461 0.986359 0 - outer loop - vertex -1.43333 -38.36 0 - vertex -0.366978 -38.538 -3 - vertex -1.43333 -38.36 -3 - endloop - endfacet - facet normal 0.535641 0.844446 -0 - outer loop - vertex -1.43333 -38.36 -3 - vertex -2.45619 -37.7112 0 - vertex -1.43333 -38.36 0 - endloop - endfacet - facet normal 0.535641 0.844446 0 - outer loop - vertex -2.45619 -37.7112 0 - vertex -1.43333 -38.36 -3 - vertex -2.45619 -37.7112 -3 - endloop - endfacet - facet normal 0.80363 0.595129 0 - outer loop - vertex -2.45619 -37.7112 0 - vertex -3.26834 -36.6145 -3 - vertex -3.26834 -36.6145 0 - endloop - endfacet - facet normal 0.80363 0.595129 0 - outer loop - vertex -3.26834 -36.6145 -3 - vertex -2.45619 -37.7112 0 - vertex -2.45619 -37.7112 -3 - endloop - endfacet - facet normal 0.935783 0.352578 0 - outer loop - vertex -3.26834 -36.6145 0 - vertex -3.80393 -35.193 -3 - vertex -3.80393 -35.193 0 - endloop - endfacet - facet normal 0.935783 0.352578 0 - outer loop - vertex -3.80393 -35.193 -3 - vertex -3.26834 -36.6145 0 - vertex -3.26834 -36.6145 -3 - endloop - endfacet - facet normal 0.992994 0.118162 0 - outer loop - vertex -3.80393 -35.193 0 - vertex -3.99709 -33.5697 -3 - vertex -3.99709 -33.5697 0 - endloop - endfacet - facet normal 0.992994 0.118162 0 - outer loop - vertex -3.99709 -33.5697 -3 - vertex -3.80393 -35.193 0 - vertex -3.80393 -35.193 -3 - endloop - endfacet - facet normal 0.988913 -0.148494 0 - outer loop - vertex -3.99709 -33.5697 0 - vertex -3.7659 -32.0301 -3 - vertex -3.7659 -32.0301 0 - endloop - endfacet - facet normal 0.988913 -0.148494 0 - outer loop - vertex -3.7659 -32.0301 -3 - vertex -3.99709 -33.5697 0 - vertex -3.99709 -33.5697 -3 - endloop - endfacet - facet normal 0.953123 -0.302584 0 - outer loop - vertex -3.7659 -32.0301 0 - vertex -3.14673 -30.0798 -3 - vertex -3.14673 -30.0798 0 - endloop - endfacet - facet normal 0.953123 -0.302584 0 - outer loop - vertex -3.14673 -30.0798 -3 - vertex -3.7659 -32.0301 0 - vertex -3.7659 -32.0301 -3 - endloop - endfacet - facet normal 0.917453 -0.397844 0 - outer loop - vertex -3.14673 -30.0798 0 - vertex -2.25121 -28.0146 -3 - vertex -2.25121 -28.0146 0 - endloop - endfacet - facet normal 0.917453 -0.397844 0 - outer loop - vertex -2.25121 -28.0146 -3 - vertex -3.14673 -30.0798 0 - vertex -3.14673 -30.0798 -3 - endloop - endfacet - facet normal 0.871478 -0.490435 0 - outer loop - vertex -2.25121 -28.0146 0 - vertex -1.19093 -26.1306 -3 - vertex -1.19093 -26.1306 0 - endloop - endfacet - facet normal 0.871478 -0.490435 0 - outer loop - vertex -1.19093 -26.1306 -3 - vertex -2.25121 -28.0146 0 - vertex -2.25121 -28.0146 -3 - endloop - endfacet - facet normal 0.794031 -0.607877 0 - outer loop - vertex -1.19093 -26.1306 0 - vertex 0.168338 -24.355 -3 - vertex 0.168338 -24.355 0 - endloop - endfacet - facet normal 0.794031 -0.607877 0 - outer loop - vertex 0.168338 -24.355 -3 - vertex -1.19093 -26.1306 0 - vertex -1.19093 -26.1306 -3 - endloop - endfacet - facet normal 0.710709 -0.703486 0 - outer loop - vertex 0.168338 -24.355 0 - vertex 1.84511 -22.661 -3 - vertex 1.84511 -22.661 0 - endloop - endfacet - facet normal 0.710709 -0.703486 0 - outer loop - vertex 1.84511 -22.661 -3 - vertex 0.168338 -24.355 0 - vertex 0.168338 -24.355 -3 - endloop - endfacet - facet normal 0.626061 -0.779774 0 - outer loop - vertex 1.84511 -22.661 -3 - vertex 3.72385 -21.1527 0 - vertex 1.84511 -22.661 0 - endloop - endfacet - facet normal 0.626061 -0.779774 0 - outer loop - vertex 3.72385 -21.1527 0 - vertex 1.84511 -22.661 -3 - vertex 3.72385 -21.1527 -3 - endloop - endfacet - facet normal 0.527042 -0.849839 0 - outer loop - vertex 3.72385 -21.1527 -3 - vertex 5.689 -19.9339 0 - vertex 3.72385 -21.1527 0 - endloop - endfacet - facet normal 0.527042 -0.849839 0 - outer loop - vertex 5.689 -19.9339 0 - vertex 3.72385 -21.1527 -3 - vertex 5.689 -19.9339 -3 - endloop - endfacet - facet normal 0.380142 -0.924928 0 - outer loop - vertex 5.689 -19.9339 -3 - vertex 7.06268 -19.3694 0 - vertex 5.689 -19.9339 0 - endloop - endfacet - facet normal 0.380142 -0.924928 0 - outer loop - vertex 7.06268 -19.3694 0 - vertex 5.689 -19.9339 -3 - vertex 7.06268 -19.3694 -3 - endloop - endfacet - facet normal 0.11624 -0.993221 0 - outer loop - vertex 7.06268 -19.3694 -3 - vertex 8.75581 -19.1712 0 - vertex 7.06268 -19.3694 0 - endloop - endfacet - facet normal 0.11624 -0.993221 0 - outer loop - vertex 8.75581 -19.1712 0 - vertex 7.06268 -19.3694 -3 - vertex 8.75581 -19.1712 -3 - endloop - endfacet - facet normal -0.00391511 -0.999992 0 - outer loop - vertex 8.75581 -19.1712 -3 - vertex 10.3474 -19.1774 0 - vertex 8.75581 -19.1712 0 - endloop - endfacet - facet normal -0.00391511 -0.999992 -0 - outer loop - vertex 10.3474 -19.1774 0 - vertex 8.75581 -19.1712 -3 - vertex 10.3474 -19.1774 -3 - endloop - endfacet - facet normal -0.375648 -0.926763 0 - outer loop - vertex 10.3474 -19.1774 -3 - vertex 11.2177 -19.5302 0 - vertex 10.3474 -19.1774 0 - endloop - endfacet - facet normal -0.375648 -0.926763 -0 - outer loop - vertex 11.2177 -19.5302 0 - vertex 10.3474 -19.1774 -3 - vertex 11.2177 -19.5302 -3 - endloop - endfacet - facet normal -0.460444 -0.887689 0 - outer loop - vertex 11.2177 -19.5302 -3 - vertex 11.7785 -19.8211 0 - vertex 11.2177 -19.5302 0 - endloop - endfacet - facet normal -0.460444 -0.887689 -0 - outer loop - vertex 11.7785 -19.8211 0 - vertex 11.2177 -19.5302 -3 - vertex 11.7785 -19.8211 -3 - endloop - endfacet - facet normal 0.340288 -0.940321 0 - outer loop - vertex 11.7785 -19.8211 -3 - vertex 12.058 -19.7199 0 - vertex 11.7785 -19.8211 0 - endloop - endfacet - facet normal 0.340288 -0.940321 0 - outer loop - vertex 12.058 -19.7199 0 - vertex 11.7785 -19.8211 -3 - vertex 12.058 -19.7199 -3 - endloop - endfacet - facet normal 0.919444 -0.393221 0 - outer loop - vertex 12.058 -19.7199 0 - vertex 13.2867 -16.8469 -3 - vertex 13.2867 -16.8469 0 - endloop - endfacet - facet normal 0.919444 -0.393221 0 - outer loop - vertex 13.2867 -16.8469 -3 - vertex 12.058 -19.7199 0 - vertex 12.058 -19.7199 -3 - endloop - endfacet - facet normal 0.948333 -0.317278 0 - outer loop - vertex 13.2867 -16.8469 0 - vertex 14.1246 -14.3424 -3 - vertex 14.1246 -14.3424 0 - endloop - endfacet - facet normal 0.948333 -0.317278 0 - outer loop - vertex 14.1246 -14.3424 -3 - vertex 13.2867 -16.8469 0 - vertex 13.2867 -16.8469 -3 - endloop - endfacet - facet normal 0.170025 0.98544 -0 - outer loop - vertex 14.1246 -14.3424 -3 - vertex 12.858 -14.1239 0 - vertex 14.1246 -14.3424 0 - endloop - endfacet - facet normal 0.170025 0.98544 0 - outer loop - vertex 12.858 -14.1239 0 - vertex 14.1246 -14.3424 -3 - vertex 12.858 -14.1239 -3 - endloop - endfacet - facet normal 0.649749 0.760149 -0 - outer loop - vertex 12.858 -14.1239 -3 - vertex 12.417 -13.7469 0 - vertex 12.858 -14.1239 0 - endloop - endfacet - facet normal 0.649749 0.760149 0 - outer loop - vertex 12.417 -13.7469 0 - vertex 12.858 -14.1239 -3 - vertex 12.417 -13.7469 -3 - endloop - endfacet - facet normal 0.999788 0.0206018 0 - outer loop - vertex 12.417 -13.7469 0 - vertex 12.4073 -13.2773 -3 - vertex 12.4073 -13.2773 0 - endloop - endfacet - facet normal 0.999788 0.0206018 0 - outer loop - vertex 12.4073 -13.2773 -3 - vertex 12.417 -13.7469 0 - vertex 12.417 -13.7469 -3 - endloop - endfacet - facet normal 0.884204 -0.467101 0 - outer loop - vertex 12.4073 -13.2773 0 - vertex 12.6527 -12.8127 -3 - vertex 12.6527 -12.8127 0 - endloop - endfacet - facet normal 0.884204 -0.467101 0 - outer loop - vertex 12.6527 -12.8127 -3 - vertex 12.4073 -13.2773 0 - vertex 12.4073 -13.2773 -3 - endloop - endfacet - facet normal 0.661795 -0.749685 0 - outer loop - vertex 12.6527 -12.8127 -3 - vertex 13.1035 -12.4147 0 - vertex 12.6527 -12.8127 0 - endloop - endfacet - facet normal 0.661795 -0.749685 0 - outer loop - vertex 13.1035 -12.4147 0 - vertex 12.6527 -12.8127 -3 - vertex 13.1035 -12.4147 -3 - endloop - endfacet - facet normal 0.406349 -0.913718 0 - outer loop - vertex 13.1035 -12.4147 -3 - vertex 13.71 -12.1451 0 - vertex 13.1035 -12.4147 0 - endloop - endfacet - facet normal 0.406349 -0.913718 0 - outer loop - vertex 13.71 -12.1451 0 - vertex 13.1035 -12.4147 -3 - vertex 13.71 -12.1451 -3 - endloop - endfacet - facet normal 0.283559 -0.958955 0 - outer loop - vertex 13.71 -12.1451 -3 - vertex 16.7993 -11.2316 0 - vertex 13.71 -12.1451 0 - endloop - endfacet - facet normal 0.283559 -0.958955 0 - outer loop - vertex 16.7993 -11.2316 0 - vertex 13.71 -12.1451 -3 - vertex 16.7993 -11.2316 -3 - endloop - endfacet - facet normal 0.227026 -0.973889 0 - outer loop - vertex 16.7993 -11.2316 -3 - vertex 19.0845 -10.6988 0 - vertex 16.7993 -11.2316 0 - endloop - endfacet - facet normal 0.227026 -0.973889 0 - outer loop - vertex 19.0845 -10.6988 0 - vertex 16.7993 -11.2316 -3 - vertex 19.0845 -10.6988 -3 - endloop - endfacet - facet normal -0.20555 -0.978647 0 - outer loop - vertex 19.0845 -10.6988 -3 - vertex 19.5452 -10.7956 0 - vertex 19.0845 -10.6988 0 - endloop - endfacet - facet normal -0.20555 -0.978647 -0 - outer loop - vertex 19.5452 -10.7956 0 - vertex 19.0845 -10.6988 -3 - vertex 19.5452 -10.7956 -3 - endloop - endfacet - facet normal -0.339851 0.940479 0 - outer loop - vertex 7.70773 -21.5983 -3 - vertex 6.85097 -21.9079 0 - vertex 7.70773 -21.5983 0 - endloop - endfacet - facet normal -0.339851 0.940479 0 - outer loop - vertex 6.85097 -21.9079 0 - vertex 7.70773 -21.5983 -3 - vertex 6.85097 -21.9079 -3 - endloop - endfacet - facet normal -0.514575 0.857445 0 - outer loop - vertex 6.85097 -21.9079 -3 - vertex 5.96068 -22.4422 0 - vertex 6.85097 -21.9079 0 - endloop - endfacet - facet normal -0.514575 0.857445 0 - outer loop - vertex 5.96068 -22.4422 0 - vertex 6.85097 -21.9079 -3 - vertex 5.96068 -22.4422 -3 - endloop - endfacet - facet normal -0.651148 0.758951 0 - outer loop - vertex 5.96068 -22.4422 -3 - vertex 5.07455 -23.2024 0 - vertex 5.96068 -22.4422 0 - endloop - endfacet - facet normal -0.651148 0.758951 0 - outer loop - vertex 5.07455 -23.2024 0 - vertex 5.96068 -22.4422 -3 - vertex 5.07455 -23.2024 -3 - endloop - endfacet - facet normal -0.756285 0.654243 0 - outer loop - vertex 3.84714 -24.6213 -3 - vertex 5.07455 -23.2024 0 - vertex 5.07455 -23.2024 -3 - endloop - endfacet - facet normal -0.756285 0.654243 0 - outer loop - vertex 5.07455 -23.2024 0 - vertex 3.84714 -24.6213 -3 - vertex 3.84714 -24.6213 0 - endloop - endfacet - facet normal -0.833253 0.552891 0 - outer loop - vertex 2.80055 -26.1986 -3 - vertex 3.84714 -24.6213 0 - vertex 3.84714 -24.6213 -3 - endloop - endfacet - facet normal -0.833253 0.552891 0 - outer loop - vertex 3.84714 -24.6213 0 - vertex 2.80055 -26.1986 -3 - vertex 2.80055 -26.1986 0 - endloop - endfacet - facet normal -0.891463 0.453094 0 - outer loop - vertex 1.95873 -27.8549 -3 - vertex 2.80055 -26.1986 0 - vertex 2.80055 -26.1986 -3 - endloop - endfacet - facet normal -0.891463 0.453094 0 - outer loop - vertex 2.80055 -26.1986 0 - vertex 1.95873 -27.8549 -3 - vertex 1.95873 -27.8549 0 - endloop - endfacet - facet normal -0.937776 0.347241 0 - outer loop - vertex 1.3456 -29.5107 -3 - vertex 1.95873 -27.8549 0 - vertex 1.95873 -27.8549 -3 - endloop - endfacet - facet normal -0.937776 0.347241 0 - outer loop - vertex 1.95873 -27.8549 0 - vertex 1.3456 -29.5107 -3 - vertex 1.3456 -29.5107 0 - endloop - endfacet - facet normal -0.97482 0.222992 0 - outer loop - vertex 0.985088 -31.0867 -3 - vertex 1.3456 -29.5107 0 - vertex 1.3456 -29.5107 -3 - endloop - endfacet - facet normal -0.97482 0.222992 0 - outer loop - vertex 1.3456 -29.5107 0 - vertex 0.985088 -31.0867 -3 - vertex 0.985088 -31.0867 0 - endloop - endfacet - facet normal -0.998249 0.0591584 0 - outer loop - vertex 0.901133 -32.5034 -3 - vertex 0.985088 -31.0867 0 - vertex 0.985088 -31.0867 -3 - endloop - endfacet - facet normal -0.998249 0.0591584 0 - outer loop - vertex 0.985088 -31.0867 0 - vertex 0.901133 -32.5034 -3 - vertex 0.901133 -32.5034 0 - endloop - endfacet - facet normal -0.983521 -0.180795 0 - outer loop - vertex 1.11766 -33.6813 -3 - vertex 0.901133 -32.5034 0 - vertex 0.901133 -32.5034 -3 - endloop - endfacet - facet normal -0.983521 -0.180795 0 - outer loop - vertex 0.901133 -32.5034 0 - vertex 1.11766 -33.6813 -3 - vertex 1.11766 -33.6813 0 - endloop - endfacet - facet normal -0.846397 -0.532553 0 - outer loop - vertex 1.65861 -34.5411 -3 - vertex 1.11766 -33.6813 0 - vertex 1.11766 -33.6813 -3 - endloop - endfacet - facet normal -0.846397 -0.532553 0 - outer loop - vertex 1.11766 -33.6813 0 - vertex 1.65861 -34.5411 -3 - vertex 1.65861 -34.5411 0 - endloop - endfacet - facet normal -0.511641 -0.859199 0 - outer loop - vertex 1.65861 -34.5411 -3 - vertex 2.32628 -34.9386 0 - vertex 1.65861 -34.5411 0 - endloop - endfacet - facet normal -0.511641 -0.859199 -0 - outer loop - vertex 2.32628 -34.9386 0 - vertex 1.65861 -34.5411 -3 - vertex 2.32628 -34.9386 -3 - endloop - endfacet - facet normal -0.182531 -0.9832 0 - outer loop - vertex 2.32628 -34.9386 -3 - vertex 3.17687 -35.0966 0 - vertex 2.32628 -34.9386 0 - endloop - endfacet - facet normal -0.182531 -0.9832 -0 - outer loop - vertex 3.17687 -35.0966 0 - vertex 2.32628 -34.9386 -3 - vertex 3.17687 -35.0966 -3 - endloop - endfacet - facet normal 0.0908592 -0.995864 0 - outer loop - vertex 3.17687 -35.0966 -3 - vertex 4.11511 -35.011 0 - vertex 3.17687 -35.0966 0 - endloop - endfacet - facet normal 0.0908592 -0.995864 0 - outer loop - vertex 4.11511 -35.011 0 - vertex 3.17687 -35.0966 -3 - vertex 4.11511 -35.011 -3 - endloop - endfacet - facet normal 0.336892 -0.941543 0 - outer loop - vertex 4.11511 -35.011 -3 - vertex 5.04571 -34.678 0 - vertex 4.11511 -35.011 0 - endloop - endfacet - facet normal 0.336892 -0.941543 0 - outer loop - vertex 5.04571 -34.678 0 - vertex 4.11511 -35.011 -3 - vertex 5.04571 -34.678 -3 - endloop - endfacet - facet normal 0.557528 -0.830158 0 - outer loop - vertex 5.04571 -34.678 -3 - vertex 5.71313 -34.2297 0 - vertex 5.04571 -34.678 0 - endloop - endfacet - facet normal 0.557528 -0.830158 0 - outer loop - vertex 5.71313 -34.2297 0 - vertex 5.04571 -34.678 -3 - vertex 5.71313 -34.2297 -3 - endloop - endfacet - facet normal 0.786383 -0.61774 0 - outer loop - vertex 5.71313 -34.2297 0 - vertex 6.30534 -33.4759 -3 - vertex 6.30534 -33.4759 0 - endloop - endfacet - facet normal 0.786383 -0.61774 0 - outer loop - vertex 6.30534 -33.4759 -3 - vertex 5.71313 -34.2297 0 - vertex 5.71313 -34.2297 -3 - endloop - endfacet - facet normal 0.906895 -0.421357 0 - outer loop - vertex 6.30534 -33.4759 0 - vertex 7.96204 -29.9101 -3 - vertex 7.96204 -29.9101 0 - endloop - endfacet - facet normal 0.906895 -0.421357 0 - outer loop - vertex 7.96204 -29.9101 -3 - vertex 6.30534 -33.4759 0 - vertex 6.30534 -33.4759 -3 - endloop - endfacet - facet normal 0.929235 -0.36949 0 - outer loop - vertex 7.96204 -29.9101 0 - vertex 9.7411 -25.4359 -3 - vertex 9.7411 -25.4359 0 - endloop - endfacet - facet normal 0.929235 -0.36949 0 - outer loop - vertex 9.7411 -25.4359 -3 - vertex 7.96204 -29.9101 0 - vertex 7.96204 -29.9101 -3 - endloop - endfacet - facet normal 0.962546 -0.271117 0 - outer loop - vertex 9.7411 -25.4359 0 - vertex 10.0775 -24.2416 -3 - vertex 10.0775 -24.2416 0 - endloop - endfacet - facet normal 0.962546 -0.271117 0 - outer loop - vertex 10.0775 -24.2416 -3 - vertex 9.7411 -25.4359 0 - vertex 9.7411 -25.4359 -3 - endloop - endfacet - facet normal 0.994463 -0.105087 0 - outer loop - vertex 10.0775 -24.2416 0 - vertex 10.169 -23.3758 -3 - vertex 10.169 -23.3758 0 - endloop - endfacet - facet normal 0.994463 -0.105087 0 - outer loop - vertex 10.169 -23.3758 -3 - vertex 10.0775 -24.2416 0 - vertex 10.0775 -24.2416 -3 - endloop - endfacet - facet normal 0.988121 0.153677 0 - outer loop - vertex 10.169 -23.3758 0 - vertex 10.0454 -22.5812 -3 - vertex 10.0454 -22.5812 0 - endloop - endfacet - facet normal 0.988121 0.153677 0 - outer loop - vertex 10.0454 -22.5812 -3 - vertex 10.169 -23.3758 0 - vertex 10.169 -23.3758 -3 - endloop - endfacet - facet normal 0.857617 0.514289 0 - outer loop - vertex 10.0454 -22.5812 0 - vertex 9.69979 -22.0048 -3 - vertex 9.69979 -22.0048 0 - endloop - endfacet - facet normal 0.857617 0.514289 0 - outer loop - vertex 9.69979 -22.0048 -3 - vertex 10.0454 -22.5812 0 - vertex 10.0454 -22.5812 -3 - endloop - endfacet - facet normal 0.558467 0.829527 -0 - outer loop - vertex 9.69979 -22.0048 -3 - vertex 9.16984 -21.6481 0 - vertex 9.69979 -22.0048 0 - endloop - endfacet - facet normal 0.558467 0.829527 0 - outer loop - vertex 9.16984 -21.6481 0 - vertex 9.69979 -22.0048 -3 - vertex 9.16984 -21.6481 -3 - endloop - endfacet - facet normal 0.196985 0.980407 -0 - outer loop - vertex 9.16984 -21.6481 -3 - vertex 8.49325 -21.5121 0 - vertex 9.16984 -21.6481 0 - endloop - endfacet - facet normal 0.196985 0.980407 0 - outer loop - vertex 8.49325 -21.5121 0 - vertex 9.16984 -21.6481 -3 - vertex 8.49325 -21.5121 -3 - endloop - endfacet - facet normal -0.109065 0.994035 0 - outer loop - vertex 8.49325 -21.5121 -3 - vertex 7.70773 -21.5983 0 - vertex 8.49325 -21.5121 0 - endloop - endfacet - facet normal -0.109065 0.994035 0 - outer loop - vertex 7.70773 -21.5983 0 - vertex 8.49325 -21.5121 -3 - vertex 7.70773 -21.5983 -3 - endloop - endfacet - facet normal -0.270451 -0.962734 0 - outer loop - vertex 28.989 -19.2301 -3 - vertex 29.9429 -19.4981 0 - vertex 28.989 -19.2301 0 - endloop - endfacet - facet normal -0.270451 -0.962734 -0 - outer loop - vertex 29.9429 -19.4981 0 - vertex 28.989 -19.2301 -3 - vertex 29.9429 -19.4981 -3 - endloop - endfacet - facet normal -0.511153 -0.85949 0 - outer loop - vertex 29.9429 -19.4981 -3 - vertex 30.7248 -19.9631 0 - vertex 29.9429 -19.4981 0 - endloop - endfacet - facet normal -0.511153 -0.85949 -0 - outer loop - vertex 30.7248 -19.9631 0 - vertex 29.9429 -19.4981 -3 - vertex 30.7248 -19.9631 -3 - endloop - endfacet - facet normal -0.723919 -0.689885 0 - outer loop - vertex 31.3699 -20.64 -3 - vertex 30.7248 -19.9631 0 - vertex 30.7248 -19.9631 -3 - endloop - endfacet - facet normal -0.723919 -0.689885 0 - outer loop - vertex 30.7248 -19.9631 0 - vertex 31.3699 -20.64 -3 - vertex 31.3699 -20.64 0 - endloop - endfacet - facet normal -0.867187 -0.497983 0 - outer loop - vertex 31.8086 -21.404 -3 - vertex 31.3699 -20.64 0 - vertex 31.3699 -20.64 -3 - endloop - endfacet - facet normal -0.867187 -0.497983 0 - outer loop - vertex 31.3699 -20.64 0 - vertex 31.8086 -21.404 -3 - vertex 31.8086 -21.404 0 - endloop - endfacet - facet normal -0.971458 -0.237212 0 - outer loop - vertex 32.0232 -22.2828 -3 - vertex 31.8086 -21.404 0 - vertex 31.8086 -21.404 -3 - endloop - endfacet - facet normal -0.971458 -0.237212 0 - outer loop - vertex 31.8086 -21.404 0 - vertex 32.0232 -22.2828 -3 - vertex 32.0232 -22.2828 0 - endloop - endfacet - facet normal -0.999998 -0.00210454 0 - outer loop - vertex 32.0255 -23.3848 -3 - vertex 32.0232 -22.2828 0 - vertex 32.0232 -22.2828 -3 - endloop - endfacet - facet normal -0.999998 -0.00210454 0 - outer loop - vertex 32.0232 -22.2828 0 - vertex 32.0255 -23.3848 -3 - vertex 32.0255 -23.3848 0 - endloop - endfacet - facet normal -0.990595 0.136824 0 - outer loop - vertex 31.8275 -24.8188 -3 - vertex 32.0255 -23.3848 0 - vertex 32.0255 -23.3848 -3 - endloop - endfacet - facet normal -0.990595 0.136824 0 - outer loop - vertex 32.0255 -23.3848 0 - vertex 31.8275 -24.8188 -3 - vertex 31.8275 -24.8188 0 - endloop - endfacet - facet normal -0.978641 0.205575 0 - outer loop - vertex 31.4974 -26.3899 -3 - vertex 31.8275 -24.8188 0 - vertex 31.8275 -24.8188 -3 - endloop - endfacet - facet normal -0.978641 0.205575 0 - outer loop - vertex 31.8275 -24.8188 0 - vertex 31.4974 -26.3899 -3 - vertex 31.4974 -26.3899 0 - endloop - endfacet - facet normal -0.869264 0.494348 0 - outer loop - vertex 31.2318 -26.857 -3 - vertex 31.4974 -26.3899 0 - vertex 31.4974 -26.3899 -3 - endloop - endfacet - facet normal -0.869264 0.494348 0 - outer loop - vertex 31.4974 -26.3899 0 - vertex 31.2318 -26.857 -3 - vertex 31.2318 -26.857 0 - endloop - endfacet - facet normal -0.557816 0.829965 0 - outer loop - vertex 31.2318 -26.857 -3 - vertex 30.7817 -27.1595 0 - vertex 31.2318 -26.857 0 - endloop - endfacet - facet normal -0.557816 0.829965 0 - outer loop - vertex 30.7817 -27.1595 0 - vertex 31.2318 -26.857 -3 - vertex 30.7817 -27.1595 -3 - endloop - endfacet - facet normal -0.13929 0.990252 0 - outer loop - vertex 30.7817 -27.1595 -3 - vertex 28.9763 -27.4135 0 - vertex 30.7817 -27.1595 0 - endloop - endfacet - facet normal -0.13929 0.990252 0 - outer loop - vertex 28.9763 -27.4135 0 - vertex 30.7817 -27.1595 -3 - vertex 28.9763 -27.4135 -3 - endloop - endfacet - facet normal -0.00668289 0.999978 0 - outer loop - vertex 28.9763 -27.4135 -3 - vertex 25.3774 -27.4375 0 - vertex 28.9763 -27.4135 0 - endloop - endfacet - facet normal -0.00668289 0.999978 0 - outer loop - vertex 25.3774 -27.4375 0 - vertex 28.9763 -27.4135 -3 - vertex 25.3774 -27.4375 -3 - endloop - endfacet - facet normal -0.00092424 1 0 - outer loop - vertex 25.3774 -27.4375 -3 - vertex 20.1129 -27.4424 0 - vertex 25.3774 -27.4375 0 - endloop - endfacet - facet normal -0.00092424 1 0 - outer loop - vertex 20.1129 -27.4424 0 - vertex 25.3774 -27.4375 -3 - vertex 20.1129 -27.4424 -3 - endloop - endfacet - facet normal -0.945282 0.326255 0 - outer loop - vertex 19.9054 -28.0436 -3 - vertex 20.1129 -27.4424 0 - vertex 20.1129 -27.4424 -3 - endloop - endfacet - facet normal -0.945282 0.326255 0 - outer loop - vertex 20.1129 -27.4424 0 - vertex 19.9054 -28.0436 -3 - vertex 19.9054 -28.0436 0 - endloop - endfacet - facet normal -0.967122 0.254313 0 - outer loop - vertex 19.5138 -29.5327 -3 - vertex 19.9054 -28.0436 0 - vertex 19.9054 -28.0436 -3 - endloop - endfacet - facet normal -0.967122 0.254313 0 - outer loop - vertex 19.9054 -28.0436 0 - vertex 19.5138 -29.5327 -3 - vertex 19.5138 -29.5327 0 - endloop - endfacet - facet normal -0.991046 0.133521 0 - outer loop - vertex 19.3087 -31.0557 -3 - vertex 19.5138 -29.5327 0 - vertex 19.5138 -29.5327 -3 - endloop - endfacet - facet normal -0.991046 0.133521 0 - outer loop - vertex 19.5138 -29.5327 0 - vertex 19.3087 -31.0557 -3 - vertex 19.3087 -31.0557 0 - endloop - endfacet - facet normal -1 8.95066e-05 0 - outer loop - vertex 19.3085 -32.3556 -3 - vertex 19.3087 -31.0557 0 - vertex 19.3087 -31.0557 -3 - endloop - endfacet - facet normal -1 8.95066e-05 0 - outer loop - vertex 19.3087 -31.0557 0 - vertex 19.3085 -32.3556 -3 - vertex 19.3085 -32.3556 0 - endloop - endfacet - facet normal -0.964746 -0.263183 0 - outer loop - vertex 19.5322 -33.1754 -3 - vertex 19.3085 -32.3556 0 - vertex 19.3085 -32.3556 -3 - endloop - endfacet - facet normal -0.964746 -0.263183 0 - outer loop - vertex 19.3085 -32.3556 0 - vertex 19.5322 -33.1754 -3 - vertex 19.5322 -33.1754 0 - endloop - endfacet - facet normal -0.729596 -0.683879 0 - outer loop - vertex 20.0228 -33.6987 -3 - vertex 19.5322 -33.1754 0 - vertex 19.5322 -33.1754 -3 - endloop - endfacet - facet normal -0.729596 -0.683879 0 - outer loop - vertex 19.5322 -33.1754 0 - vertex 20.0228 -33.6987 -3 - vertex 20.0228 -33.6987 0 - endloop - endfacet - facet normal -0.526282 -0.85031 0 - outer loop - vertex 20.0228 -33.6987 -3 - vertex 20.6651 -34.0963 0 - vertex 20.0228 -33.6987 0 - endloop - endfacet - facet normal -0.526282 -0.85031 -0 - outer loop - vertex 20.6651 -34.0963 0 - vertex 20.0228 -33.6987 -3 - vertex 20.6651 -34.0963 -3 - endloop - endfacet - facet normal -0.318074 -0.948066 0 - outer loop - vertex 20.6651 -34.0963 -3 - vertex 21.4183 -34.349 0 - vertex 20.6651 -34.0963 0 - endloop - endfacet - facet normal -0.318074 -0.948066 -0 - outer loop - vertex 21.4183 -34.349 0 - vertex 20.6651 -34.0963 -3 - vertex 21.4183 -34.349 -3 - endloop - endfacet - facet normal -0.107309 -0.994226 0 - outer loop - vertex 21.4183 -34.349 -3 - vertex 22.2417 -34.4379 0 - vertex 21.4183 -34.349 0 - endloop - endfacet - facet normal -0.107309 -0.994226 -0 - outer loop - vertex 22.2417 -34.4379 0 - vertex 21.4183 -34.349 -3 - vertex 22.2417 -34.4379 -3 - endloop - endfacet - facet normal 0.120086 -0.992763 0 - outer loop - vertex 22.2417 -34.4379 -3 - vertex 23.5816 -34.2758 0 - vertex 22.2417 -34.4379 0 - endloop - endfacet - facet normal 0.120086 -0.992763 0 - outer loop - vertex 23.5816 -34.2758 0 - vertex 22.2417 -34.4379 -3 - vertex 23.5816 -34.2758 -3 - endloop - endfacet - facet normal 0.371865 -0.928287 0 - outer loop - vertex 23.5816 -34.2758 -3 - vertex 24.9271 -33.7368 0 - vertex 23.5816 -34.2758 0 - endloop - endfacet - facet normal 0.371865 -0.928287 0 - outer loop - vertex 24.9271 -33.7368 0 - vertex 23.5816 -34.2758 -3 - vertex 24.9271 -33.7368 -3 - endloop - endfacet - facet normal 0.553658 -0.832744 0 - outer loop - vertex 24.9271 -33.7368 -3 - vertex 26.4192 -32.7448 0 - vertex 24.9271 -33.7368 0 - endloop - endfacet - facet normal 0.553658 -0.832744 0 - outer loop - vertex 26.4192 -32.7448 0 - vertex 24.9271 -33.7368 -3 - vertex 26.4192 -32.7448 -3 - endloop - endfacet - facet normal 0.649717 -0.760176 0 - outer loop - vertex 26.4192 -32.7448 -3 - vertex 28.199 -31.2235 0 - vertex 26.4192 -32.7448 0 - endloop - endfacet - facet normal 0.649717 -0.760176 0 - outer loop - vertex 28.199 -31.2235 0 - vertex 26.4192 -32.7448 -3 - vertex 28.199 -31.2235 -3 - endloop - endfacet - facet normal 0.570708 -0.821153 0 - outer loop - vertex 28.199 -31.2235 -3 - vertex 29.2916 -30.4642 0 - vertex 28.199 -31.2235 0 - endloop - endfacet - facet normal 0.570708 -0.821153 0 - outer loop - vertex 29.2916 -30.4642 0 - vertex 28.199 -31.2235 -3 - vertex 29.2916 -30.4642 -3 - endloop - endfacet - facet normal -0.0859885 -0.996296 0 - outer loop - vertex 29.2916 -30.4642 -3 - vertex 29.6885 -30.4984 0 - vertex 29.2916 -30.4642 0 - endloop - endfacet - facet normal -0.0859885 -0.996296 -0 - outer loop - vertex 29.6885 -30.4984 0 - vertex 29.2916 -30.4642 -3 - vertex 29.6885 -30.4984 -3 - endloop - endfacet - facet normal -0.559844 -0.828598 0 - outer loop - vertex 29.6885 -30.4984 -3 - vertex 30.1062 -30.7807 0 - vertex 29.6885 -30.4984 0 - endloop - endfacet - facet normal -0.559844 -0.828598 -0 - outer loop - vertex 30.1062 -30.7807 0 - vertex 29.6885 -30.4984 -3 - vertex 30.1062 -30.7807 -3 - endloop - endfacet - facet normal -0.971403 -0.237438 0 - outer loop - vertex 30.2029 -31.1764 -3 - vertex 30.1062 -30.7807 0 - vertex 30.1062 -30.7807 -3 - endloop - endfacet - facet normal -0.971403 -0.237438 0 - outer loop - vertex 30.1062 -30.7807 0 - vertex 30.2029 -31.1764 -3 - vertex 30.2029 -31.1764 0 - endloop - endfacet - facet normal -0.897428 0.441162 0 - outer loop - vertex 29.8709 -31.8517 -3 - vertex 30.2029 -31.1764 0 - vertex 30.2029 -31.1764 -3 - endloop - endfacet - facet normal -0.897428 0.441162 0 - outer loop - vertex 30.2029 -31.1764 0 - vertex 29.8709 -31.8517 -3 - vertex 29.8709 -31.8517 0 - endloop - endfacet - facet normal -0.750818 0.660509 0 - outer loop - vertex 27.8442 -34.1555 -3 - vertex 29.8709 -31.8517 0 - vertex 29.8709 -31.8517 -3 - endloop - endfacet - facet normal -0.750818 0.660509 0 - outer loop - vertex 29.8709 -31.8517 0 - vertex 27.8442 -34.1555 -3 - vertex 27.8442 -34.1555 0 - endloop - endfacet - facet normal -0.671006 0.741452 0 - outer loop - vertex 27.8442 -34.1555 -3 - vertex 25.9895 -35.834 0 - vertex 27.8442 -34.1555 0 - endloop - endfacet - facet normal -0.671006 0.741452 0 - outer loop - vertex 25.9895 -35.834 0 - vertex 27.8442 -34.1555 -3 - vertex 25.9895 -35.834 -3 - endloop - endfacet - facet normal -0.538751 0.842465 0 - outer loop - vertex 25.9895 -35.834 -3 - vertex 24.0601 -37.0678 0 - vertex 25.9895 -35.834 0 - endloop - endfacet - facet normal -0.538751 0.842465 0 - outer loop - vertex 24.0601 -37.0678 0 - vertex 25.9895 -35.834 -3 - vertex 24.0601 -37.0678 -3 - endloop - endfacet - facet normal -0.416623 0.909079 0 - outer loop - vertex 24.0601 -37.0678 -3 - vertex 21.4079 -38.2833 0 - vertex 24.0601 -37.0678 0 - endloop - endfacet - facet normal -0.416623 0.909079 0 - outer loop - vertex 21.4079 -38.2833 0 - vertex 24.0601 -37.0678 -3 - vertex 21.4079 -38.2833 -3 - endloop - endfacet - facet normal -0.208885 0.97794 0 - outer loop - vertex 21.4079 -38.2833 -3 - vertex 20.3084 -38.5182 0 - vertex 21.4079 -38.2833 0 - endloop - endfacet - facet normal -0.208885 0.97794 0 - outer loop - vertex 20.3084 -38.5182 0 - vertex 21.4079 -38.2833 -3 - vertex 20.3084 -38.5182 -3 - endloop - endfacet - facet normal -0.0552232 0.998474 0 - outer loop - vertex 20.3084 -38.5182 -3 - vertex 19.0956 -38.5852 0 - vertex 20.3084 -38.5182 0 - endloop - endfacet - facet normal -0.0552232 0.998474 0 - outer loop - vertex 19.0956 -38.5852 0 - vertex 20.3084 -38.5182 -3 - vertex 19.0956 -38.5852 -3 - endloop - endfacet - facet normal 0.0949344 0.995484 -0 - outer loop - vertex 19.0956 -38.5852 -3 - vertex 17.8945 -38.4707 0 - vertex 19.0956 -38.5852 0 - endloop - endfacet - facet normal 0.0949344 0.995484 0 - outer loop - vertex 17.8945 -38.4707 0 - vertex 19.0956 -38.5852 -3 - vertex 17.8945 -38.4707 -3 - endloop - endfacet - facet normal 0.357488 0.933918 -0 - outer loop - vertex 17.8945 -38.4707 -3 - vertex 16.8412 -38.0675 0 - vertex 17.8945 -38.4707 0 - endloop - endfacet - facet normal 0.357488 0.933918 0 - outer loop - vertex 16.8412 -38.0675 0 - vertex 17.8945 -38.4707 -3 - vertex 16.8412 -38.0675 -3 - endloop - endfacet - facet normal 0.556683 0.830725 -0 - outer loop - vertex 16.8412 -38.0675 -3 - vertex 15.8953 -37.4336 0 - vertex 16.8412 -38.0675 0 - endloop - endfacet - facet normal 0.556683 0.830725 0 - outer loop - vertex 15.8953 -37.4336 0 - vertex 16.8412 -38.0675 -3 - vertex 15.8953 -37.4336 -3 - endloop - endfacet - facet normal 0.764952 0.644087 0 - outer loop - vertex 15.8953 -37.4336 0 - vertex 15.2376 -36.6526 -3 - vertex 15.2376 -36.6526 0 - endloop - endfacet - facet normal 0.764952 0.644087 0 - outer loop - vertex 15.2376 -36.6526 -3 - vertex 15.8953 -37.4336 0 - vertex 15.8953 -37.4336 -3 - endloop - endfacet - facet normal 0.925772 0.378082 0 - outer loop - vertex 15.2376 -36.6526 0 - vertex 14.8379 -35.6738 -3 - vertex 14.8379 -35.6738 0 - endloop - endfacet - facet normal 0.925772 0.378082 0 - outer loop - vertex 14.8379 -35.6738 -3 - vertex 15.2376 -36.6526 0 - vertex 15.2376 -36.6526 -3 - endloop - endfacet - facet normal 0.990293 0.138993 0 - outer loop - vertex 14.8379 -35.6738 0 - vertex 14.6656 -34.4466 -3 - vertex 14.6656 -34.4466 0 - endloop - endfacet - facet normal 0.990293 0.138993 0 - outer loop - vertex 14.6656 -34.4466 -3 - vertex 14.8379 -35.6738 0 - vertex 14.8379 -35.6738 -3 - endloop - endfacet - facet normal 0.99828 -0.0586187 0 - outer loop - vertex 14.6656 -34.4466 0 - vertex 14.7938 -32.2631 -3 - vertex 14.7938 -32.2631 0 - endloop - endfacet - facet normal 0.99828 -0.0586187 0 - outer loop - vertex 14.7938 -32.2631 -3 - vertex 14.6656 -34.4466 0 - vertex 14.6656 -34.4466 -3 - endloop - endfacet - facet normal 0.96872 -0.248157 0 - outer loop - vertex 14.7938 -32.2631 0 - vertex 15.3794 -29.9771 -3 - vertex 15.3794 -29.9771 0 - endloop - endfacet - facet normal 0.96872 -0.248157 0 - outer loop - vertex 15.3794 -29.9771 -3 - vertex 14.7938 -32.2631 0 - vertex 14.7938 -32.2631 -3 - endloop - endfacet - facet normal 0.915816 -0.401597 0 - outer loop - vertex 15.3794 -29.9771 0 - vertex 16.4055 -27.6373 -3 - vertex 16.4055 -27.6373 0 - endloop - endfacet - facet normal 0.915816 -0.401597 0 - outer loop - vertex 16.4055 -27.6373 -3 - vertex 15.3794 -29.9771 0 - vertex 15.3794 -29.9771 -3 - endloop - endfacet - facet normal 0.850611 -0.525795 0 - outer loop - vertex 16.4055 -27.6373 0 - vertex 17.855 -25.2923 -3 - vertex 17.855 -25.2923 0 - endloop - endfacet - facet normal 0.850611 -0.525795 0 - outer loop - vertex 17.855 -25.2923 -3 - vertex 16.4055 -27.6373 0 - vertex 16.4055 -27.6373 -3 - endloop - endfacet - facet normal 0.787541 -0.616262 0 - outer loop - vertex 17.855 -25.2923 0 - vertex 19.0386 -23.7798 -3 - vertex 19.0386 -23.7798 0 - endloop - endfacet - facet normal 0.787541 -0.616262 0 - outer loop - vertex 19.0386 -23.7798 -3 - vertex 17.855 -25.2923 0 - vertex 17.855 -25.2923 -3 - endloop - endfacet - facet normal 0.719973 -0.694002 0 - outer loop - vertex 19.0386 -23.7798 0 - vertex 20.2954 -22.4759 -3 - vertex 20.2954 -22.4759 0 - endloop - endfacet - facet normal 0.719973 -0.694002 0 - outer loop - vertex 20.2954 -22.4759 -3 - vertex 19.0386 -23.7798 0 - vertex 19.0386 -23.7798 -3 - endloop - endfacet - facet normal 0.636055 -0.771644 0 - outer loop - vertex 20.2954 -22.4759 -3 - vertex 21.6367 -21.3703 0 - vertex 20.2954 -22.4759 0 - endloop - endfacet - facet normal 0.636055 -0.771644 0 - outer loop - vertex 21.6367 -21.3703 0 - vertex 20.2954 -22.4759 -3 - vertex 21.6367 -21.3703 -3 - endloop - endfacet - facet normal 0.538257 -0.842781 0 - outer loop - vertex 21.6367 -21.3703 -3 - vertex 23.0737 -20.4525 0 - vertex 21.6367 -21.3703 0 - endloop - endfacet - facet normal 0.538257 -0.842781 0 - outer loop - vertex 23.0737 -20.4525 0 - vertex 21.6367 -21.3703 -3 - vertex 23.0737 -20.4525 -3 - endloop - endfacet - facet normal 0.404347 -0.914606 0 - outer loop - vertex 23.0737 -20.4525 -3 - vertex 25.4359 -19.4082 0 - vertex 23.0737 -20.4525 0 - endloop - endfacet - facet normal 0.404347 -0.914606 0 - outer loop - vertex 25.4359 -19.4082 0 - vertex 23.0737 -20.4525 -3 - vertex 25.4359 -19.4082 -3 - endloop - endfacet - facet normal 0.182814 -0.983148 0 - outer loop - vertex 25.4359 -19.4082 -3 - vertex 26.5413 -19.2026 0 - vertex 25.4359 -19.4082 0 - endloop - endfacet - facet normal 0.182814 -0.983148 0 - outer loop - vertex 26.5413 -19.2026 0 - vertex 25.4359 -19.4082 -3 - vertex 26.5413 -19.2026 -3 - endloop - endfacet - facet normal 0.0452162 -0.998977 0 - outer loop - vertex 26.5413 -19.2026 -3 - vertex 27.8281 -19.1444 0 - vertex 26.5413 -19.2026 0 - endloop - endfacet - facet normal 0.0452162 -0.998977 0 - outer loop - vertex 27.8281 -19.1444 0 - vertex 26.5413 -19.2026 -3 - vertex 27.8281 -19.1444 -3 - endloop - endfacet - facet normal -0.0736221 -0.997286 0 - outer loop - vertex 27.8281 -19.1444 -3 - vertex 28.989 -19.2301 0 - vertex 27.8281 -19.1444 0 - endloop - endfacet - facet normal -0.0736221 -0.997286 -0 - outer loop - vertex 28.989 -19.2301 0 - vertex 27.8281 -19.1444 -3 - vertex 28.989 -19.2301 -3 - endloop - endfacet - facet normal -0.382628 0.923903 0 - outer loop - vertex 24.8153 -21.9586 -3 - vertex 23.7526 -22.3987 0 - vertex 24.8153 -21.9586 0 - endloop - endfacet - facet normal -0.382628 0.923903 0 - outer loop - vertex 23.7526 -22.3987 0 - vertex 24.8153 -21.9586 -3 - vertex 23.7526 -22.3987 -3 - endloop - endfacet - facet normal -0.656055 0.754713 0 - outer loop - vertex 23.7526 -22.3987 -3 - vertex 22.6861 -23.3258 0 - vertex 23.7526 -22.3987 0 - endloop - endfacet - facet normal -0.656055 0.754713 0 - outer loop - vertex 22.6861 -23.3258 0 - vertex 23.7526 -22.3987 -3 - vertex 22.6861 -23.3258 -3 - endloop - endfacet - facet normal -0.77183 0.635829 0 - outer loop - vertex 21.6183 -24.6221 -3 - vertex 22.6861 -23.3258 0 - vertex 22.6861 -23.3258 -3 - endloop - endfacet - facet normal -0.77183 0.635829 0 - outer loop - vertex 22.6861 -23.3258 0 - vertex 21.6183 -24.6221 -3 - vertex 21.6183 -24.6221 0 - endloop - endfacet - facet normal -0.0699516 -0.99755 0 - outer loop - vertex 21.6183 -24.6221 -3 - vertex 24.4233 -24.8188 0 - vertex 21.6183 -24.6221 0 - endloop - endfacet - facet normal -0.0699516 -0.99755 -0 - outer loop - vertex 24.4233 -24.8188 0 - vertex 21.6183 -24.6221 -3 - vertex 24.4233 -24.8188 -3 - endloop - endfacet - facet normal 0 -1 0 - outer loop - vertex 24.4233 -24.8188 -3 - vertex 27.2283 -24.8188 0 - vertex 24.4233 -24.8188 0 - endloop - endfacet - facet normal 0 -1 -0 - outer loop - vertex 27.2283 -24.8188 0 - vertex 24.4233 -24.8188 -3 - vertex 27.2283 -24.8188 -3 - endloop - endfacet - facet normal 0.986418 -0.164252 0 - outer loop - vertex 27.2283 -24.8188 0 - vertex 27.3613 -24.0204 -3 - vertex 27.3613 -24.0204 0 - endloop - endfacet - facet normal 0.986418 -0.164252 0 - outer loop - vertex 27.3613 -24.0204 -3 - vertex 27.2283 -24.8188 0 - vertex 27.2283 -24.8188 -3 - endloop - endfacet - facet normal 0.999989 -0.00473466 0 - outer loop - vertex 27.3613 -24.0204 0 - vertex 27.3668 -22.8574 -3 - vertex 27.3668 -22.8574 0 - endloop - endfacet - facet normal 0.999989 -0.00473466 0 - outer loop - vertex 27.3668 -22.8574 -3 - vertex 27.3613 -24.0204 0 - vertex 27.3613 -24.0204 -3 - endloop - endfacet - facet normal 0.863473 0.504395 0 - outer loop - vertex 27.3668 -22.8574 0 - vertex 26.9354 -22.1189 -3 - vertex 26.9354 -22.1189 0 - endloop - endfacet - facet normal 0.863473 0.504395 0 - outer loop - vertex 26.9354 -22.1189 -3 - vertex 27.3668 -22.8574 0 - vertex 27.3668 -22.8574 -3 - endloop - endfacet - facet normal 0.334224 0.942494 -0 - outer loop - vertex 26.9354 -22.1189 -3 - vertex 26.0804 -21.8157 0 - vertex 26.9354 -22.1189 0 - endloop - endfacet - facet normal 0.334224 0.942494 0 - outer loop - vertex 26.0804 -21.8157 0 - vertex 26.9354 -22.1189 -3 - vertex 26.0804 -21.8157 -3 - endloop - endfacet - facet normal -0.112261 0.993679 0 - outer loop - vertex 26.0804 -21.8157 -3 - vertex 24.8153 -21.9586 0 - vertex 26.0804 -21.8157 0 - endloop - endfacet - facet normal -0.112261 0.993679 0 - outer loop - vertex 24.8153 -21.9586 0 - vertex 26.0804 -21.8157 -3 - vertex 24.8153 -21.9586 -3 - endloop - endfacet - facet normal -0.0126654 -0.99992 0 - outer loop - vertex -27.1868 -11.3523 -3 - vertex -17.7993 -11.4712 0 - vertex -27.1868 -11.3523 0 - endloop - endfacet - facet normal -0.0126654 -0.99992 -0 - outer loop - vertex -17.7993 -11.4712 0 - vertex -27.1868 -11.3523 -3 - vertex -17.7993 -11.4712 -3 - endloop - endfacet - facet normal -0.303355 -0.952878 0 - outer loop - vertex -17.7993 -11.4712 -3 - vertex -17.4385 -11.5861 0 - vertex -17.7993 -11.4712 0 - endloop - endfacet - facet normal -0.303355 -0.952878 -0 - outer loop - vertex -17.4385 -11.5861 0 - vertex -17.7993 -11.4712 -3 - vertex -17.4385 -11.5861 -3 - endloop - endfacet - facet normal -0.999899 0.0142188 0 - outer loop - vertex -17.4456 -12.0833 -3 - vertex -17.4385 -11.5861 0 - vertex -17.4385 -11.5861 -3 - endloop - endfacet - facet normal -0.999899 0.0142188 0 - outer loop - vertex -17.4385 -11.5861 0 - vertex -17.4456 -12.0833 -3 - vertex -17.4456 -12.0833 0 - endloop - endfacet - facet normal -0.933863 0.35763 0 - outer loop - vertex -19.3785 -17.1305 -3 - vertex -17.4456 -12.0833 0 - vertex -17.4456 -12.0833 -3 - endloop - endfacet - facet normal -0.933863 0.35763 0 - outer loop - vertex -17.4456 -12.0833 0 - vertex -19.3785 -17.1305 -3 - vertex -19.3785 -17.1305 0 - endloop - endfacet - facet normal -0.830148 0.557543 0 - outer loop - vertex -19.683 -17.584 -3 - vertex -19.3785 -17.1305 0 - vertex -19.3785 -17.1305 -3 - endloop - endfacet - facet normal -0.830148 0.557543 0 - outer loop - vertex -19.3785 -17.1305 0 - vertex -19.683 -17.584 -3 - vertex -19.683 -17.584 0 - endloop - endfacet - facet normal -0.617609 0.786485 0 - outer loop - vertex -19.683 -17.584 -3 - vertex -20.1126 -17.9213 0 - vertex -19.683 -17.584 0 - endloop - endfacet - facet normal -0.617609 0.786485 0 - outer loop - vertex -20.1126 -17.9213 0 - vertex -19.683 -17.584 -3 - vertex -20.1126 -17.9213 -3 - endloop - endfacet - facet normal -0.353642 0.935381 0 - outer loop - vertex -20.1126 -17.9213 -3 - vertex -20.6062 -18.108 0 - vertex -20.1126 -17.9213 0 - endloop - endfacet - facet normal -0.353642 0.935381 0 - outer loop - vertex -20.6062 -18.108 0 - vertex -20.1126 -17.9213 -3 - vertex -20.6062 -18.108 -3 - endloop - endfacet - facet normal -0.00259595 0.999997 0 - outer loop - vertex -20.6062 -18.108 -3 - vertex -21.1029 -18.1093 0 - vertex -20.6062 -18.108 0 - endloop - endfacet - facet normal -0.00259595 0.999997 0 - outer loop - vertex -21.1029 -18.1093 0 - vertex -20.6062 -18.108 -3 - vertex -21.1029 -18.1093 -3 - endloop - endfacet - facet normal 0.306009 0.952029 -0 - outer loop - vertex -21.1029 -18.1093 -3 - vertex -21.3898 -18.0171 0 - vertex -21.1029 -18.1093 0 - endloop - endfacet - facet normal 0.306009 0.952029 0 - outer loop - vertex -21.3898 -18.0171 0 - vertex -21.1029 -18.1093 -3 - vertex -21.3898 -18.0171 -3 - endloop - endfacet - facet normal 0.820593 0.571513 0 - outer loop - vertex -21.3898 -18.0171 0 - vertex -21.538 -17.8042 -3 - vertex -21.538 -17.8042 0 - endloop - endfacet - facet normal 0.820593 0.571513 0 - outer loop - vertex -21.538 -17.8042 -3 - vertex -21.3898 -18.0171 0 - vertex -21.3898 -18.0171 -3 - endloop - endfacet - facet normal 0.999415 0.0341969 0 - outer loop - vertex -21.538 -17.8042 0 - vertex -21.5846 -16.4428 -3 - vertex -21.5846 -16.4428 0 - endloop - endfacet - facet normal 0.999415 0.0341969 0 - outer loop - vertex -21.5846 -16.4428 -3 - vertex -21.538 -17.8042 0 - vertex -21.538 -17.8042 -3 - endloop - endfacet - facet normal 0.999208 0.039804 0 - outer loop - vertex -21.5846 -16.4428 0 - vertex -21.6401 -15.0493 -3 - vertex -21.6401 -15.0493 0 - endloop - endfacet - facet normal 0.999208 0.039804 0 - outer loop - vertex -21.6401 -15.0493 -3 - vertex -21.5846 -16.4428 0 - vertex -21.5846 -16.4428 -3 - endloop - endfacet - facet normal 0.85074 0.525587 0 - outer loop - vertex -21.6401 -15.0493 0 - vertex -21.8106 -14.7733 -3 - vertex -21.8106 -14.7733 0 - endloop - endfacet - facet normal 0.85074 0.525587 0 - outer loop - vertex -21.8106 -14.7733 -3 - vertex -21.6401 -15.0493 0 - vertex -21.6401 -15.0493 -3 - endloop - endfacet - facet normal 0.546243 0.837626 -0 - outer loop - vertex -21.8106 -14.7733 -3 - vertex -22.1413 -14.5577 0 - vertex -21.8106 -14.7733 0 - endloop - endfacet - facet normal 0.546243 0.837626 0 - outer loop - vertex -22.1413 -14.5577 0 - vertex -21.8106 -14.7733 -3 - vertex -22.1413 -14.5577 -3 - endloop - endfacet - facet normal 0.21941 0.975633 -0 - outer loop - vertex -22.1413 -14.5577 -3 - vertex -23.3419 -14.2877 0 - vertex -22.1413 -14.5577 0 - endloop - endfacet - facet normal 0.21941 0.975633 0 - outer loop - vertex -23.3419 -14.2877 0 - vertex -22.1413 -14.5577 -3 - vertex -23.3419 -14.2877 -3 - endloop - endfacet - facet normal 0.0439983 0.999032 -0 - outer loop - vertex -23.3419 -14.2877 -3 - vertex -26.1195 -14.1654 0 - vertex -23.3419 -14.2877 0 - endloop - endfacet - facet normal 0.0439983 0.999032 0 - outer loop - vertex -26.1195 -14.1654 0 - vertex -23.3419 -14.2877 -3 - vertex -26.1195 -14.1654 -3 - endloop - endfacet - facet normal -0.00734919 0.999973 0 - outer loop - vertex -26.1195 -14.1654 -3 - vertex -29.5608 -14.1906 0 - vertex -26.1195 -14.1654 0 - endloop - endfacet - facet normal -0.00734919 0.999973 0 - outer loop - vertex -29.5608 -14.1906 0 - vertex -26.1195 -14.1654 -3 - vertex -29.5608 -14.1906 -3 - endloop - endfacet - facet normal -0.196359 0.980532 0 - outer loop - vertex -29.5608 -14.1906 -3 - vertex -30.2116 -14.321 0 - vertex -29.5608 -14.1906 0 - endloop - endfacet - facet normal -0.196359 0.980532 0 - outer loop - vertex -30.2116 -14.321 0 - vertex -29.5608 -14.1906 -3 - vertex -30.2116 -14.321 -3 - endloop - endfacet - facet normal -0.792981 0.609246 0 - outer loop - vertex -30.3887 -14.5514 -3 - vertex -30.2116 -14.321 0 - vertex -30.2116 -14.321 -3 - endloop - endfacet - facet normal -0.792981 0.609246 0 - outer loop - vertex -30.2116 -14.321 0 - vertex -30.3887 -14.5514 -3 - vertex -30.3887 -14.5514 0 - endloop - endfacet - facet normal -0.912409 0.409279 0 - outer loop - vertex -30.8809 -15.6487 -3 - vertex -30.3887 -14.5514 0 - vertex -30.3887 -14.5514 -3 - endloop - endfacet - facet normal -0.912409 0.409279 0 - outer loop - vertex -30.3887 -14.5514 0 - vertex -30.8809 -15.6487 -3 - vertex -30.8809 -15.6487 0 - endloop - endfacet - facet normal -0.91465 0.404247 0 - outer loop - vertex -32.1593 -18.5412 -3 - vertex -30.8809 -15.6487 0 - vertex -30.8809 -15.6487 -3 - endloop - endfacet - facet normal -0.91465 0.404247 0 - outer loop - vertex -30.8809 -15.6487 0 - vertex -32.1593 -18.5412 -3 - vertex -32.1593 -18.5412 0 - endloop - endfacet - facet normal -0.929897 0.36782 0 - outer loop - vertex -33.3019 -21.4299 -3 - vertex -32.1593 -18.5412 0 - vertex -32.1593 -18.5412 -3 - endloop - endfacet - facet normal -0.929897 0.36782 0 - outer loop - vertex -32.1593 -18.5412 0 - vertex -33.3019 -21.4299 -3 - vertex -33.3019 -21.4299 0 - endloop - endfacet - facet normal -0.949218 0.314618 0 - outer loop - vertex -33.5147 -22.0719 -3 - vertex -33.3019 -21.4299 0 - vertex -33.3019 -21.4299 -3 - endloop - endfacet - facet normal -0.949218 0.314618 0 - outer loop - vertex -33.3019 -21.4299 0 - vertex -33.5147 -22.0719 -3 - vertex -33.5147 -22.0719 0 - endloop - endfacet - facet normal -0.877443 -0.47968 0 - outer loop - vertex -33.3295 -22.4108 -3 - vertex -33.5147 -22.0719 0 - vertex -33.5147 -22.0719 -3 - endloop - endfacet - facet normal -0.877443 -0.47968 0 - outer loop - vertex -33.5147 -22.0719 0 - vertex -33.3295 -22.4108 -3 - vertex -33.3295 -22.4108 0 - endloop - endfacet - facet normal -0.175573 -0.984466 0 - outer loop - vertex -33.3295 -22.4108 -3 - vertex -32.5249 -22.5543 0 - vertex -33.3295 -22.4108 0 - endloop - endfacet - facet normal -0.175573 -0.984466 -0 - outer loop - vertex -32.5249 -22.5543 0 - vertex -33.3295 -22.4108 -3 - vertex -32.5249 -22.5543 -3 - endloop - endfacet - facet normal -0.0340039 -0.999422 0 - outer loop - vertex -32.5249 -22.5543 -3 - vertex -30.8797 -22.6102 0 - vertex -32.5249 -22.5543 0 - endloop - endfacet - facet normal -0.0340039 -0.999422 -0 - outer loop - vertex -30.8797 -22.6102 0 - vertex -32.5249 -22.5543 -3 - vertex -30.8797 -22.6102 -3 - endloop - endfacet - facet normal 0.0362533 -0.999343 0 - outer loop - vertex -30.8797 -22.6102 -3 - vertex -28.6031 -22.5277 0 - vertex -30.8797 -22.6102 0 - endloop - endfacet - facet normal 0.0362533 -0.999343 0 - outer loop - vertex -28.6031 -22.5277 0 - vertex -30.8797 -22.6102 -3 - vertex -28.6031 -22.5277 -3 - endloop - endfacet - facet normal 0.242378 -0.970182 0 - outer loop - vertex -28.6031 -22.5277 -3 - vertex -26.9351 -22.1109 0 - vertex -28.6031 -22.5277 0 - endloop - endfacet - facet normal 0.242378 -0.970182 0 - outer loop - vertex -26.9351 -22.1109 0 - vertex -28.6031 -22.5277 -3 - vertex -26.9351 -22.1109 -3 - endloop - endfacet - facet normal 0.555939 -0.831223 0 - outer loop - vertex -26.9351 -22.1109 -3 - vertex -25.7001 -21.2849 0 - vertex -26.9351 -22.1109 0 - endloop - endfacet - facet normal 0.555939 -0.831223 0 - outer loop - vertex -25.7001 -21.2849 0 - vertex -26.9351 -22.1109 -3 - vertex -25.7001 -21.2849 -3 - endloop - endfacet - facet normal 0.801538 -0.597944 0 - outer loop - vertex -25.7001 -21.2849 0 - vertex -24.7225 -19.9745 -3 - vertex -24.7225 -19.9745 0 - endloop - endfacet - facet normal 0.801538 -0.597944 0 - outer loop - vertex -24.7225 -19.9745 -3 - vertex -25.7001 -21.2849 0 - vertex -25.7001 -21.2849 -3 - endloop - endfacet - facet normal 0.817601 -0.575785 0 - outer loop - vertex -24.7225 -19.9745 0 - vertex -24.1111 -19.1062 -3 - vertex -24.1111 -19.1062 0 - endloop - endfacet - facet normal 0.817601 -0.575785 0 - outer loop - vertex -24.1111 -19.1062 -3 - vertex -24.7225 -19.9745 0 - vertex -24.7225 -19.9745 -3 - endloop - endfacet - facet normal 0.293726 -0.95589 0 - outer loop - vertex -24.1111 -19.1062 -3 - vertex -23.4908 -18.9156 0 - vertex -24.1111 -19.1062 0 - endloop - endfacet - facet normal 0.293726 -0.95589 0 - outer loop - vertex -23.4908 -18.9156 0 - vertex -24.1111 -19.1062 -3 - vertex -23.4908 -18.9156 -3 - endloop - endfacet - facet normal -0.145773 -0.989318 0 - outer loop - vertex -23.4908 -18.9156 -3 - vertex -22.8641 -19.008 0 - vertex -23.4908 -18.9156 0 - endloop - endfacet - facet normal -0.145773 -0.989318 -0 - outer loop - vertex -22.8641 -19.008 0 - vertex -23.4908 -18.9156 -3 - vertex -22.8641 -19.008 -3 - endloop - endfacet - facet normal -0.802531 -0.59661 0 - outer loop - vertex -22.6057 -19.3555 -3 - vertex -22.8641 -19.008 0 - vertex -22.8641 -19.008 -3 - endloop - endfacet - facet normal -0.802531 -0.59661 0 - outer loop - vertex -22.8641 -19.008 0 - vertex -22.6057 -19.3555 -3 - vertex -22.6057 -19.3555 0 - endloop - endfacet - facet normal -0.991425 0.130676 0 - outer loop - vertex -22.6991 -20.0641 -3 - vertex -22.6057 -19.3555 0 - vertex -22.6057 -19.3555 -3 - endloop - endfacet - facet normal -0.991425 0.130676 0 - outer loop - vertex -22.6057 -19.3555 0 - vertex -22.6991 -20.0641 -3 - vertex -22.6991 -20.0641 0 - endloop - endfacet - facet normal -0.939482 0.342598 0 - outer loop - vertex -23.1278 -21.2395 -3 - vertex -22.6991 -20.0641 0 - vertex -22.6991 -20.0641 -3 - endloop - endfacet - facet normal -0.939482 0.342598 0 - outer loop - vertex -22.6991 -20.0641 0 - vertex -23.1278 -21.2395 -3 - vertex -23.1278 -21.2395 0 - endloop - endfacet - facet normal -0.926121 0.377226 0 - outer loop - vertex -24.4076 -24.3815 -3 - vertex -23.1278 -21.2395 0 - vertex -23.1278 -21.2395 -3 - endloop - endfacet - facet normal -0.926121 0.377226 0 - outer loop - vertex -23.1278 -21.2395 0 - vertex -24.4076 -24.3815 -3 - vertex -24.4076 -24.3815 0 - endloop - endfacet - facet normal -0.921607 0.388125 0 - outer loop - vertex -25.4741 -26.9141 -3 - vertex -24.4076 -24.3815 0 - vertex -24.4076 -24.3815 -3 - endloop - endfacet - facet normal -0.921607 0.388125 0 - outer loop - vertex -24.4076 -24.3815 0 - vertex -25.4741 -26.9141 -3 - vertex -25.4741 -26.9141 0 - endloop - endfacet - facet normal -0.886525 0.462682 0 - outer loop - vertex -26.2338 -28.3696 -3 - vertex -25.4741 -26.9141 0 - vertex -25.4741 -26.9141 -3 - endloop - endfacet - facet normal -0.886525 0.462682 0 - outer loop - vertex -25.4741 -26.9141 0 - vertex -26.2338 -28.3696 -3 - vertex -26.2338 -28.3696 0 - endloop - endfacet - facet normal -0.719187 0.694816 0 - outer loop - vertex -26.8752 -29.0336 -3 - vertex -26.2338 -28.3696 0 - vertex -26.2338 -28.3696 -3 - endloop - endfacet - facet normal -0.719187 0.694816 0 - outer loop - vertex -26.2338 -28.3696 0 - vertex -26.8752 -29.0336 -3 - vertex -26.8752 -29.0336 0 - endloop - endfacet - facet normal -0.216473 0.976289 0 - outer loop - vertex -26.8752 -29.0336 -3 - vertex -27.5872 -29.1914 0 - vertex -26.8752 -29.0336 0 - endloop - endfacet - facet normal -0.216473 0.976289 0 - outer loop - vertex -27.5872 -29.1914 0 - vertex -26.8752 -29.0336 -3 - vertex -27.5872 -29.1914 -3 - endloop - endfacet - facet normal 0.155401 0.987851 -0 - outer loop - vertex -27.5872 -29.1914 -3 - vertex -28.1878 -29.097 0 - vertex -27.5872 -29.1914 0 - endloop - endfacet - facet normal 0.155401 0.987851 0 - outer loop - vertex -28.1878 -29.097 0 - vertex -27.5872 -29.1914 -3 - vertex -28.1878 -29.097 -3 - endloop - endfacet - facet normal 0.99998 -0.00638056 0 - outer loop - vertex -28.1878 -29.097 0 - vertex -28.1838 -28.4809 -3 - vertex -28.1838 -28.4809 0 - endloop - endfacet - facet normal 0.99998 -0.00638056 0 - outer loop - vertex -28.1838 -28.4809 -3 - vertex -28.1878 -29.097 0 - vertex -28.1878 -29.097 -3 - endloop - endfacet - facet normal 0.992864 -0.119255 0 - outer loop - vertex -28.1838 -28.4809 0 - vertex -27.9105 -26.2055 -3 - vertex -27.9105 -26.2055 0 - endloop - endfacet - facet normal 0.992864 -0.119255 0 - outer loop - vertex -27.9105 -26.2055 -3 - vertex -28.1838 -28.4809 0 - vertex -28.1838 -28.4809 -3 - endloop - endfacet - facet normal 0.858031 0.513598 0 - outer loop - vertex -27.9105 -26.2055 0 - vertex -28.1036 -25.8829 -3 - vertex -28.1036 -25.8829 0 - endloop - endfacet - facet normal 0.858031 0.513598 0 - outer loop - vertex -28.1036 -25.8829 -3 - vertex -27.9105 -26.2055 0 - vertex -27.9105 -26.2055 -3 - endloop - endfacet - facet normal 0.343726 0.93907 -0 - outer loop - vertex -28.1036 -25.8829 -3 - vertex -28.5713 -25.7117 0 - vertex -28.1036 -25.8829 0 - endloop - endfacet - facet normal 0.343726 0.93907 0 - outer loop - vertex -28.5713 -25.7117 0 - vertex -28.1036 -25.8829 -3 - vertex -28.5713 -25.7117 -3 - endloop - endfacet - facet normal 0.0659122 0.997825 -0 - outer loop - vertex -28.5713 -25.7117 -3 - vertex -32.142 -25.4759 0 - vertex -28.5713 -25.7117 0 - endloop - endfacet - facet normal 0.0659122 0.997825 0 - outer loop - vertex -32.142 -25.4759 0 - vertex -28.5713 -25.7117 -3 - vertex -32.142 -25.4759 -3 - endloop - endfacet - facet normal 0.000432103 1 -0 - outer loop - vertex -32.142 -25.4759 -3 - vertex -34.9626 -25.4747 0 - vertex -32.142 -25.4759 0 - endloop - endfacet - facet normal 0.000432103 1 0 - outer loop - vertex -34.9626 -25.4747 0 - vertex -32.142 -25.4759 -3 - vertex -34.9626 -25.4747 -3 - endloop - endfacet - facet normal -0.910935 0.41255 0 - outer loop - vertex -35.4824 -26.6225 -3 - vertex -34.9626 -25.4747 0 - vertex -34.9626 -25.4747 -3 - endloop - endfacet - facet normal -0.910935 0.41255 0 - outer loop - vertex -34.9626 -25.4747 0 - vertex -35.4824 -26.6225 -3 - vertex -35.4824 -26.6225 0 - endloop - endfacet - facet normal -0.92531 0.379212 0 - outer loop - vertex -38.7331 -34.5543 -3 - vertex -35.4824 -26.6225 0 - vertex -35.4824 -26.6225 -3 - endloop - endfacet - facet normal -0.92531 0.379212 0 - outer loop - vertex -35.4824 -26.6225 0 - vertex -38.7331 -34.5543 -3 - vertex -38.7331 -34.5543 0 - endloop - endfacet - facet normal -0.798774 -0.601632 0 - outer loop - vertex -38.4261 -34.9619 -3 - vertex -38.7331 -34.5543 0 - vertex -38.7331 -34.5543 -3 - endloop - endfacet - facet normal -0.798774 -0.601632 0 - outer loop - vertex -38.7331 -34.5543 0 - vertex -38.4261 -34.9619 -3 - vertex -38.4261 -34.9619 0 - endloop - endfacet - facet normal -0.0360382 -0.99935 0 - outer loop - vertex -38.4261 -34.9619 -3 - vertex -35.0529 -35.0835 0 - vertex -38.4261 -34.9619 0 - endloop - endfacet - facet normal -0.0360382 -0.99935 -0 - outer loop - vertex -35.0529 -35.0835 0 - vertex -38.4261 -34.9619 -3 - vertex -35.0529 -35.0835 -3 - endloop - endfacet - facet normal 0.0608671 -0.998146 0 - outer loop - vertex -35.0529 -35.0835 -3 - vertex -31.3644 -34.8586 0 - vertex -35.0529 -35.0835 0 - endloop - endfacet - facet normal 0.0608671 -0.998146 0 - outer loop - vertex -31.3644 -34.8586 0 - vertex -35.0529 -35.0835 -3 - vertex -31.3644 -34.8586 -3 - endloop - endfacet - facet normal 0.33651 -0.94168 0 - outer loop - vertex -31.3644 -34.8586 -3 - vertex -30.2578 -34.4631 0 - vertex -31.3644 -34.8586 0 - endloop - endfacet - facet normal 0.33651 -0.94168 0 - outer loop - vertex -30.2578 -34.4631 0 - vertex -31.3644 -34.8586 -3 - vertex -30.2578 -34.4631 -3 - endloop - endfacet - facet normal 0.467106 -0.884201 0 - outer loop - vertex -30.2578 -34.4631 -3 - vertex -29.0969 -33.8499 0 - vertex -30.2578 -34.4631 0 - endloop - endfacet - facet normal 0.467106 -0.884201 0 - outer loop - vertex -29.0969 -33.8499 0 - vertex -30.2578 -34.4631 -3 - vertex -29.0969 -33.8499 -3 - endloop - endfacet - facet normal 0.610499 -0.792017 0 - outer loop - vertex -29.0969 -33.8499 -3 - vertex -26.8283 -32.1012 0 - vertex -29.0969 -33.8499 0 - endloop - endfacet - facet normal 0.610499 -0.792017 0 - outer loop - vertex -26.8283 -32.1012 0 - vertex -29.0969 -33.8499 -3 - vertex -26.8283 -32.1012 -3 - endloop - endfacet - facet normal 0.674561 -0.738219 0 - outer loop - vertex -26.8283 -32.1012 -3 - vertex -24.8569 -30.2998 0 - vertex -26.8283 -32.1012 0 - endloop - endfacet - facet normal 0.674561 -0.738219 0 - outer loop - vertex -24.8569 -30.2998 0 - vertex -26.8283 -32.1012 -3 - vertex -24.8569 -30.2998 -3 - endloop - endfacet - facet normal 0.349743 -0.936846 0 - outer loop - vertex -24.8569 -30.2998 -3 - vertex -24.4667 -30.1541 0 - vertex -24.8569 -30.2998 0 - endloop - endfacet - facet normal 0.349743 -0.936846 0 - outer loop - vertex -24.4667 -30.1541 0 - vertex -24.8569 -30.2998 -3 - vertex -24.4667 -30.1541 -3 - endloop - endfacet - facet normal -0.235678 -0.971831 0 - outer loop - vertex -24.4667 -30.1541 -3 - vertex -24.0819 -30.2475 0 - vertex -24.4667 -30.1541 0 - endloop - endfacet - facet normal -0.235678 -0.971831 -0 - outer loop - vertex -24.0819 -30.2475 0 - vertex -24.4667 -30.1541 -3 - vertex -24.0819 -30.2475 -3 - endloop - endfacet - facet normal -0.453986 -0.891009 0 - outer loop - vertex -24.0819 -30.2475 -3 - vertex -23.655 -30.4649 0 - vertex -24.0819 -30.2475 0 - endloop - endfacet - facet normal -0.453986 -0.891009 -0 - outer loop - vertex -23.655 -30.4649 0 - vertex -24.0819 -30.2475 -3 - vertex -23.655 -30.4649 -3 - endloop - endfacet - facet normal -0.79441 -0.607382 0 - outer loop - vertex -23.4462 -30.738 -3 - vertex -23.655 -30.4649 0 - vertex -23.655 -30.4649 -3 - endloop - endfacet - facet normal -0.79441 -0.607382 0 - outer loop - vertex -23.655 -30.4649 0 - vertex -23.4462 -30.738 -3 - vertex -23.4462 -30.738 0 - endloop - endfacet - facet normal -0.917968 0.396655 0 - outer loop - vertex -23.8149 -31.5911 -3 - vertex -23.4462 -30.738 0 - vertex -23.4462 -30.738 -3 - endloop - endfacet - facet normal -0.917968 0.396655 0 - outer loop - vertex -23.4462 -30.738 0 - vertex -23.8149 -31.5911 -3 - vertex -23.8149 -31.5911 0 - endloop - endfacet - facet normal -0.860785 0.508968 0 - outer loop - vertex -24.7956 -33.2498 -3 - vertex -23.8149 -31.5911 0 - vertex -23.8149 -31.5911 -3 - endloop - endfacet - facet normal -0.860785 0.508968 0 - outer loop - vertex -23.8149 -31.5911 0 - vertex -24.7956 -33.2498 -3 - vertex -24.7956 -33.2498 0 - endloop - endfacet - facet normal -0.825216 0.564817 0 - outer loop - vertex -27.2791 -36.8782 -3 - vertex -24.7956 -33.2498 0 - vertex -24.7956 -33.2498 -3 - endloop - endfacet - facet normal -0.825216 0.564817 0 - outer loop - vertex -24.7956 -33.2498 0 - vertex -27.2791 -36.8782 -3 - vertex -27.2791 -36.8782 0 - endloop - endfacet - facet normal -0.788011 0.615661 0 - outer loop - vertex -28.2835 -38.1638 -3 - vertex -27.2791 -36.8782 0 - vertex -27.2791 -36.8782 -3 - endloop - endfacet - facet normal -0.788011 0.615661 0 - outer loop - vertex -27.2791 -36.8782 0 - vertex -28.2835 -38.1638 -3 - vertex -28.2835 -38.1638 0 - endloop - endfacet - facet normal 0.0033546 0.999994 -0 - outer loop - vertex -28.2835 -38.1638 -3 - vertex -37.632 -38.1325 0 - vertex -28.2835 -38.1638 0 - endloop - endfacet - facet normal 0.0033546 0.999994 0 - outer loop - vertex -37.632 -38.1325 0 - vertex -28.2835 -38.1638 -3 - vertex -37.632 -38.1325 -3 - endloop - endfacet - facet normal 0.018075 0.999837 -0 - outer loop - vertex -37.632 -38.1325 -3 - vertex -47.4646 -37.9547 0 - vertex -37.632 -38.1325 0 - endloop - endfacet - facet normal 0.018075 0.999837 0 - outer loop - vertex -47.4646 -37.9547 0 - vertex -37.632 -38.1325 -3 - vertex -47.4646 -37.9547 -3 - endloop - endfacet - facet normal 0.462743 0.886493 -0 - outer loop - vertex -47.4646 -37.9547 -3 - vertex -47.8161 -37.7712 0 - vertex -47.4646 -37.9547 0 - endloop - endfacet - facet normal 0.462743 0.886493 0 - outer loop - vertex -47.8161 -37.7712 0 - vertex -47.4646 -37.9547 -3 - vertex -47.8161 -37.7712 -3 - endloop - endfacet - facet normal 0.836367 0.54817 0 - outer loop - vertex -47.8161 -37.7712 0 - vertex -47.9875 -37.5097 -3 - vertex -47.9875 -37.5097 0 - endloop - endfacet - facet normal 0.836367 0.54817 0 - outer loop - vertex -47.9875 -37.5097 -3 - vertex -47.8161 -37.7712 0 - vertex -47.8161 -37.7712 -3 - endloop - endfacet - facet normal 0.980441 -0.196811 0 - outer loop - vertex -47.9875 -37.5097 0 - vertex -47.8577 -36.863 -3 - vertex -47.8577 -36.863 0 - endloop - endfacet - facet normal 0.980441 -0.196811 0 - outer loop - vertex -47.8577 -36.863 -3 - vertex -47.9875 -37.5097 0 - vertex -47.9875 -37.5097 -3 - endloop - endfacet - facet normal 0.695658 -0.718373 0 - outer loop - vertex -47.8577 -36.863 -3 - vertex -47.2102 -36.2359 0 - vertex -47.8577 -36.863 0 - endloop - endfacet - facet normal 0.695658 -0.718373 0 - outer loop - vertex -47.2102 -36.2359 0 - vertex -47.8577 -36.863 -3 - vertex -47.2102 -36.2359 -3 - endloop - endfacet - facet normal 0.350904 -0.936412 0 - outer loop - vertex -47.2102 -36.2359 -3 - vertex -46.1801 -35.8499 0 - vertex -47.2102 -36.2359 0 - endloop - endfacet - facet normal 0.350904 -0.936412 0 - outer loop - vertex -46.1801 -35.8499 0 - vertex -47.2102 -36.2359 -3 - vertex -46.1801 -35.8499 -3 - endloop - endfacet - facet normal 0.289535 -0.957168 0 - outer loop - vertex -46.1801 -35.8499 -3 - vertex -45.0296 -35.5019 0 - vertex -46.1801 -35.8499 0 - endloop - endfacet - facet normal 0.289535 -0.957168 0 - outer loop - vertex -45.0296 -35.5019 0 - vertex -46.1801 -35.8499 -3 - vertex -45.0296 -35.5019 -3 - endloop - endfacet - facet normal 0.646662 -0.762777 0 - outer loop - vertex -45.0296 -35.5019 -3 - vertex -44.1198 -34.7306 0 - vertex -45.0296 -35.5019 0 - endloop - endfacet - facet normal 0.646662 -0.762777 0 - outer loop - vertex -44.1198 -34.7306 0 - vertex -45.0296 -35.5019 -3 - vertex -44.1198 -34.7306 -3 - endloop - endfacet - facet normal 0.856952 -0.515395 0 - outer loop - vertex -44.1198 -34.7306 0 - vertex -43.2543 -33.2915 -3 - vertex -43.2543 -33.2915 0 - endloop - endfacet - facet normal 0.856952 -0.515395 0 - outer loop - vertex -43.2543 -33.2915 -3 - vertex -44.1198 -34.7306 0 - vertex -44.1198 -34.7306 -3 - endloop - endfacet - facet normal 0.917761 -0.397133 0 - outer loop - vertex -43.2543 -33.2915 0 - vertex -42.237 -30.9405 -3 - vertex -42.237 -30.9405 0 - endloop - endfacet - facet normal 0.917761 -0.397133 0 - outer loop - vertex -42.237 -30.9405 -3 - vertex -43.2543 -33.2915 0 - vertex -43.2543 -33.2915 -3 - endloop - endfacet - facet normal 0.919921 -0.392104 0 - outer loop - vertex -42.237 -30.9405 0 - vertex -39.9072 -25.4747 -3 - vertex -39.9072 -25.4747 0 - endloop - endfacet - facet normal 0.919921 -0.392104 0 - outer loop - vertex -39.9072 -25.4747 -3 - vertex -42.237 -30.9405 0 - vertex -42.237 -30.9405 -3 - endloop - endfacet - facet normal 0.92143 -0.388544 0 - outer loop - vertex -39.9072 -25.4747 0 - vertex -37.0548 -18.7102 -3 - vertex -37.0548 -18.7102 0 - endloop - endfacet - facet normal 0.92143 -0.388544 0 - outer loop - vertex -37.0548 -18.7102 -3 - vertex -39.9072 -25.4747 0 - vertex -39.9072 -25.4747 -3 - endloop - endfacet - facet normal 0.937894 -0.346922 0 - outer loop - vertex -37.0548 -18.7102 0 - vertex -35.6081 -14.799 -3 - vertex -35.6081 -14.799 0 - endloop - endfacet - facet normal 0.937894 -0.346922 0 - outer loop - vertex -35.6081 -14.799 -3 - vertex -37.0548 -18.7102 0 - vertex -37.0548 -18.7102 -3 - endloop - endfacet - facet normal 0.984127 -0.177463 0 - outer loop - vertex -35.6081 -14.799 0 - vertex -35.4871 -14.1281 -3 - vertex -35.4871 -14.1281 0 - endloop - endfacet - facet normal 0.984127 -0.177463 0 - outer loop - vertex -35.4871 -14.1281 -3 - vertex -35.6081 -14.799 0 - vertex -35.6081 -14.799 -3 - endloop - endfacet - facet normal 0.978316 0.207116 0 - outer loop - vertex -35.4871 -14.1281 0 - vertex -35.5739 -13.718 -3 - vertex -35.5739 -13.718 0 - endloop - endfacet - facet normal 0.978316 0.207116 0 - outer loop - vertex -35.5739 -13.718 -3 - vertex -35.4871 -14.1281 0 - vertex -35.4871 -14.1281 -3 - endloop - endfacet - facet normal 0.525627 0.850715 -0 - outer loop - vertex -35.5739 -13.718 -3 - vertex -35.9073 -13.512 0 - vertex -35.5739 -13.718 0 - endloop - endfacet - facet normal 0.525627 0.850715 0 - outer loop - vertex -35.9073 -13.512 0 - vertex -35.5739 -13.718 -3 - vertex -35.9073 -13.512 -3 - endloop - endfacet - facet normal 0.0947129 0.995505 -0 - outer loop - vertex -35.9073 -13.512 -3 - vertex -36.5262 -13.4531 0 - vertex -35.9073 -13.512 0 - endloop - endfacet - facet normal 0.0947129 0.995505 0 - outer loop - vertex -36.5262 -13.4531 0 - vertex -35.9073 -13.512 -3 - vertex -36.5262 -13.4531 -3 - endloop - endfacet - facet normal 0.264376 0.96442 -0 - outer loop - vertex -36.5262 -13.4531 -3 - vertex -37.2393 -13.2576 0 - vertex -36.5262 -13.4531 0 - endloop - endfacet - facet normal 0.264376 0.96442 0 - outer loop - vertex -37.2393 -13.2576 0 - vertex -36.5262 -13.4531 -3 - vertex -37.2393 -13.2576 -3 - endloop - endfacet - facet normal 0.846268 0.532757 0 - outer loop - vertex -37.2393 -13.2576 0 - vertex -37.5366 -12.7854 -3 - vertex -37.5366 -12.7854 0 - endloop - endfacet - facet normal 0.846268 0.532757 0 - outer loop - vertex -37.5366 -12.7854 -3 - vertex -37.2393 -13.2576 0 - vertex -37.2393 -13.2576 -3 - endloop - endfacet - facet normal 0.972647 -0.232287 0 - outer loop - vertex -37.5366 -12.7854 0 - vertex -37.3951 -12.1929 -3 - vertex -37.3951 -12.1929 0 - endloop - endfacet - facet normal 0.972647 -0.232287 0 - outer loop - vertex -37.3951 -12.1929 -3 - vertex -37.5366 -12.7854 0 - vertex -37.5366 -12.7854 -3 - endloop - endfacet - facet normal 0.678121 -0.73495 0 - outer loop - vertex -37.3951 -12.1929 -3 - vertex -36.792 -11.6364 0 - vertex -37.3951 -12.1929 0 - endloop - endfacet - facet normal 0.678121 -0.73495 0 - outer loop - vertex -36.792 -11.6364 0 - vertex -37.3951 -12.1929 -3 - vertex -36.792 -11.6364 -3 - endloop - endfacet - facet normal 0.33489 -0.942257 0 - outer loop - vertex -36.792 -11.6364 -3 - vertex -36.1936 -11.4238 0 - vertex -36.792 -11.6364 0 - endloop - endfacet - facet normal 0.33489 -0.942257 0 - outer loop - vertex -36.1936 -11.4238 0 - vertex -36.792 -11.6364 -3 - vertex -36.1936 -11.4238 -3 - endloop - endfacet - facet normal 0.0784345 -0.996919 0 - outer loop - vertex -36.1936 -11.4238 -3 - vertex -34.87 -11.3196 0 - vertex -36.1936 -11.4238 0 - endloop - endfacet - facet normal 0.0784345 -0.996919 0 - outer loop - vertex -34.87 -11.3196 0 - vertex -36.1936 -11.4238 -3 - vertex -34.87 -11.3196 -3 - endloop - endfacet - facet normal -0.00425069 -0.999991 0 - outer loop - vertex -34.87 -11.3196 -3 - vertex -27.1868 -11.3523 0 - vertex -34.87 -11.3196 0 - endloop - endfacet - facet normal -0.00425069 -0.999991 -0 - outer loop - vertex -27.1868 -11.3523 0 - vertex -34.87 -11.3196 -3 - vertex -27.1868 -11.3523 -3 - endloop - endfacet - facet normal -0.778969 -0.627062 0 - outer loop - vertex -11.7016 -19.4898 -3 - vertex -11.9141 -19.2259 0 - vertex -11.9141 -19.2259 -3 - endloop - endfacet - facet normal -0.778969 -0.627062 0 - outer loop - vertex -11.9141 -19.2259 0 - vertex -11.7016 -19.4898 -3 - vertex -11.7016 -19.4898 0 - endloop - endfacet - facet normal -0.998948 -0.0458637 0 - outer loop - vertex -11.6824 -19.9072 -3 - vertex -11.7016 -19.4898 0 - vertex -11.7016 -19.4898 -3 - endloop - endfacet - facet normal -0.998948 -0.0458637 0 - outer loop - vertex -11.7016 -19.4898 0 - vertex -11.6824 -19.9072 -3 - vertex -11.6824 -19.9072 0 - endloop - endfacet - facet normal -0.950718 0.310058 0 - outer loop - vertex -11.8627 -20.4599 -3 - vertex -11.6824 -19.9072 0 - vertex -11.6824 -19.9072 -3 - endloop - endfacet - facet normal -0.950718 0.310058 0 - outer loop - vertex -11.6824 -19.9072 0 - vertex -11.8627 -20.4599 -3 - vertex -11.8627 -20.4599 0 - endloop - endfacet - facet normal -0.958208 0.286074 0 - outer loop - vertex -12.0544 -21.102 -3 - vertex -11.8627 -20.4599 0 - vertex -11.8627 -20.4599 -3 - endloop - endfacet - facet normal -0.958208 0.286074 0 - outer loop - vertex -11.8627 -20.4599 0 - vertex -12.0544 -21.102 -3 - vertex -12.0544 -21.102 0 - endloop - endfacet - facet normal 0.484491 -0.874796 0 - outer loop - vertex -12.0544 -21.102 -3 - vertex -10.3766 -20.1728 0 - vertex -12.0544 -21.102 0 - endloop - endfacet - facet normal 0.484491 -0.874796 0 - outer loop - vertex -10.3766 -20.1728 0 - vertex -12.0544 -21.102 -3 - vertex -10.3766 -20.1728 -3 - endloop - endfacet - facet normal 0.447022 -0.894523 0 - outer loop - vertex -10.3766 -20.1728 -3 - vertex -8.78621 -19.378 0 - vertex -10.3766 -20.1728 0 - endloop - endfacet - facet normal 0.447022 -0.894523 0 - outer loop - vertex -8.78621 -19.378 0 - vertex -10.3766 -20.1728 -3 - vertex -8.78621 -19.378 -3 - endloop - endfacet - facet normal 0.124012 -0.992281 0 - outer loop - vertex -8.78621 -19.378 -3 - vertex -7.1272 -19.1706 0 - vertex -8.78621 -19.378 0 - endloop - endfacet - facet normal 0.124012 -0.992281 0 - outer loop - vertex -7.1272 -19.1706 0 - vertex -8.78621 -19.378 -3 - vertex -7.1272 -19.1706 -3 - endloop - endfacet - facet normal -0.019656 -0.999807 0 - outer loop - vertex -7.1272 -19.1706 -3 - vertex -5.57075 -19.2012 0 - vertex -7.1272 -19.1706 0 - endloop - endfacet - facet normal -0.019656 -0.999807 -0 - outer loop - vertex -5.57075 -19.2012 0 - vertex -7.1272 -19.1706 -3 - vertex -5.57075 -19.2012 -3 - endloop - endfacet - facet normal -0.587249 -0.809407 0 - outer loop - vertex -5.57075 -19.2012 -3 - vertex -4.70045 -19.8327 0 - vertex -5.57075 -19.2012 0 - endloop - endfacet - facet normal -0.587249 -0.809407 -0 - outer loop - vertex -4.70045 -19.8327 0 - vertex -5.57075 -19.2012 -3 - vertex -4.70045 -19.8327 -3 - endloop - endfacet - facet normal -0.783181 -0.621793 0 - outer loop - vertex -4.06681 -20.6308 -3 - vertex -4.70045 -19.8327 0 - vertex -4.70045 -19.8327 -3 - endloop - endfacet - facet normal -0.783181 -0.621793 0 - outer loop - vertex -4.70045 -19.8327 0 - vertex -4.06681 -20.6308 -3 - vertex -4.06681 -20.6308 0 - endloop - endfacet - facet normal -0.979543 -0.201235 0 - outer loop - vertex -3.85646 -21.6547 -3 - vertex -4.06681 -20.6308 0 - vertex -4.06681 -20.6308 -3 - endloop - endfacet - facet normal -0.979543 -0.201235 0 - outer loop - vertex -4.06681 -20.6308 0 - vertex -3.85646 -21.6547 -3 - vertex -3.85646 -21.6547 0 - endloop - endfacet - facet normal -0.999487 0.0320236 0 - outer loop - vertex -3.89417 -22.8317 -3 - vertex -3.85646 -21.6547 0 - vertex -3.85646 -21.6547 -3 - endloop - endfacet - facet normal -0.999487 0.0320236 0 - outer loop - vertex -3.85646 -21.6547 0 - vertex -3.89417 -22.8317 -3 - vertex -3.89417 -22.8317 0 - endloop - endfacet - facet normal -0.971741 0.236051 0 - outer loop - vertex -4.26405 -24.3543 -3 - vertex -3.89417 -22.8317 0 - vertex -3.89417 -22.8317 -3 - endloop - endfacet - facet normal -0.971741 0.236051 0 - outer loop - vertex -3.89417 -22.8317 0 - vertex -4.26405 -24.3543 -3 - vertex -4.26405 -24.3543 0 - endloop - endfacet - facet normal -0.928824 0.370521 0 - outer loop - vertex -6.41168 -29.738 -3 - vertex -4.26405 -24.3543 0 - vertex -4.26405 -24.3543 -3 - endloop - endfacet - facet normal -0.928824 0.370521 0 - outer loop - vertex -4.26405 -24.3543 0 - vertex -6.41168 -29.738 -3 - vertex -6.41168 -29.738 0 - endloop - endfacet - facet normal -0.923854 0.382746 0 - outer loop - vertex -8.33648 -34.384 -3 - vertex -6.41168 -29.738 0 - vertex -6.41168 -29.738 -3 - endloop - endfacet - facet normal -0.923854 0.382746 0 - outer loop - vertex -6.41168 -29.738 0 - vertex -8.33648 -34.384 -3 - vertex -8.33648 -34.384 0 - endloop - endfacet - facet normal -0.969782 0.243973 0 - outer loop - vertex -8.56822 -35.3052 -3 - vertex -8.33648 -34.384 0 - vertex -8.33648 -34.384 -3 - endloop - endfacet - facet normal -0.969782 0.243973 0 - outer loop - vertex -8.33648 -34.384 0 - vertex -8.56822 -35.3052 -3 - vertex -8.56822 -35.3052 0 - endloop - endfacet - facet normal -0.990389 -0.138307 0 - outer loop - vertex -8.51129 -35.7129 -3 - vertex -8.56822 -35.3052 0 - vertex -8.56822 -35.3052 -3 - endloop - endfacet - facet normal -0.990389 -0.138307 0 - outer loop - vertex -8.56822 -35.3052 0 - vertex -8.51129 -35.7129 -3 - vertex -8.51129 -35.7129 0 - endloop - endfacet - facet normal -0.550548 -0.834803 0 - outer loop - vertex -8.51129 -35.7129 -3 - vertex -7.98605 -36.0592 0 - vertex -8.51129 -35.7129 0 - endloop - endfacet - facet normal -0.550548 -0.834803 -0 - outer loop - vertex -7.98605 -36.0592 0 - vertex -8.51129 -35.7129 -3 - vertex -7.98605 -36.0592 -3 - endloop - endfacet - facet normal -0.557022 -0.830498 0 - outer loop - vertex -7.98605 -36.0592 -3 - vertex -7.51249 -36.3769 0 - vertex -7.98605 -36.0592 0 - endloop - endfacet - facet normal -0.557022 -0.830498 -0 - outer loop - vertex -7.51249 -36.3769 0 - vertex -7.98605 -36.0592 -3 - vertex -7.51249 -36.3769 -3 - endloop - endfacet - facet normal -0.885076 -0.465446 0 - outer loop - vertex -7.31439 -36.7536 -3 - vertex -7.51249 -36.3769 0 - vertex -7.51249 -36.3769 -3 - endloop - endfacet - facet normal -0.885076 -0.465446 0 - outer loop - vertex -7.51249 -36.3769 0 - vertex -7.31439 -36.7536 -3 - vertex -7.31439 -36.7536 0 - endloop - endfacet - facet normal -0.984477 0.175514 0 - outer loop - vertex -7.3919 -37.1883 -3 - vertex -7.31439 -36.7536 0 - vertex -7.31439 -36.7536 -3 - endloop - endfacet - facet normal -0.984477 0.175514 0 - outer loop - vertex -7.31439 -36.7536 0 - vertex -7.3919 -37.1883 -3 - vertex -7.3919 -37.1883 0 - endloop - endfacet - facet normal -0.812154 0.583443 0 - outer loop - vertex -7.74517 -37.6801 -3 - vertex -7.3919 -37.1883 0 - vertex -7.3919 -37.1883 -3 - endloop - endfacet - facet normal -0.812154 0.583443 0 - outer loop - vertex -7.3919 -37.1883 0 - vertex -7.74517 -37.6801 -3 - vertex -7.74517 -37.6801 0 - endloop - endfacet - facet normal -0.622963 0.782251 0 - outer loop - vertex -7.74517 -37.6801 -3 - vertex -8.07933 -37.9462 0 - vertex -7.74517 -37.6801 0 - endloop - endfacet - facet normal -0.622963 0.782251 0 - outer loop - vertex -8.07933 -37.9462 0 - vertex -7.74517 -37.6801 -3 - vertex -8.07933 -37.9462 -3 - endloop - endfacet - facet normal -0.234375 0.972146 0 - outer loop - vertex -8.07933 -37.9462 -3 - vertex -8.66873 -38.0883 0 - vertex -8.07933 -37.9462 0 - endloop - endfacet - facet normal -0.234375 0.972146 0 - outer loop - vertex -8.66873 -38.0883 0 - vertex -8.07933 -37.9462 -3 - vertex -8.66873 -38.0883 -3 - endloop - endfacet - facet normal -0.02015 0.999797 0 - outer loop - vertex -8.66873 -38.0883 -3 - vertex -12.0013 -38.1555 0 - vertex -8.66873 -38.0883 0 - endloop - endfacet - facet normal -0.02015 0.999797 0 - outer loop - vertex -12.0013 -38.1555 0 - vertex -8.66873 -38.0883 -3 - vertex -12.0013 -38.1555 -3 - endloop - endfacet - facet normal 0.0188466 0.999822 -0 - outer loop - vertex -12.0013 -38.1555 -3 - vertex -15.3277 -38.0928 0 - vertex -12.0013 -38.1555 0 - endloop - endfacet - facet normal 0.0188466 0.999822 0 - outer loop - vertex -15.3277 -38.0928 0 - vertex -12.0013 -38.1555 -3 - vertex -15.3277 -38.0928 -3 - endloop - endfacet - facet normal 0.289952 0.957041 -0 - outer loop - vertex -15.3277 -38.0928 -3 - vertex -15.7983 -37.9502 0 - vertex -15.3277 -38.0928 0 - endloop - endfacet - facet normal 0.289952 0.957041 0 - outer loop - vertex -15.7983 -37.9502 0 - vertex -15.3277 -38.0928 -3 - vertex -15.7983 -37.9502 -3 - endloop - endfacet - facet normal 0.88368 0.468092 0 - outer loop - vertex -15.7983 -37.9502 0 - vertex -15.9433 -37.6764 -3 - vertex -15.9433 -37.6764 0 - endloop - endfacet - facet normal 0.88368 0.468092 0 - outer loop - vertex -15.9433 -37.6764 -3 - vertex -15.7983 -37.9502 0 - vertex -15.7983 -37.9502 -3 - endloop - endfacet - facet normal 0.999065 -0.0432335 0 - outer loop - vertex -15.9433 -37.6764 0 - vertex -15.9213 -37.1689 -3 - vertex -15.9213 -37.1689 0 - endloop - endfacet - facet normal 0.999065 -0.0432335 0 - outer loop - vertex -15.9213 -37.1689 -3 - vertex -15.9433 -37.6764 0 - vertex -15.9433 -37.6764 -3 - endloop - endfacet - facet normal 0.790901 -0.611944 0 - outer loop - vertex -15.9213 -37.1689 0 - vertex -15.4682 -36.5832 -3 - vertex -15.4682 -36.5832 0 - endloop - endfacet - facet normal 0.790901 -0.611944 0 - outer loop - vertex -15.4682 -36.5832 -3 - vertex -15.9213 -37.1689 0 - vertex -15.9213 -37.1689 -3 - endloop - endfacet - facet normal 0.603331 -0.797491 0 - outer loop - vertex -15.4682 -36.5832 -3 - vertex -14.8949 -36.1495 0 - vertex -15.4682 -36.5832 0 - endloop - endfacet - facet normal 0.603331 -0.797491 0 - outer loop - vertex -14.8949 -36.1495 0 - vertex -15.4682 -36.5832 -3 - vertex -14.8949 -36.1495 -3 - endloop - endfacet - facet normal 0.32682 -0.945087 0 - outer loop - vertex -14.8949 -36.1495 -3 - vertex -14.3732 -35.9691 0 - vertex -14.8949 -36.1495 0 - endloop - endfacet - facet normal 0.32682 -0.945087 0 - outer loop - vertex -14.3732 -35.9691 0 - vertex -14.8949 -36.1495 -3 - vertex -14.3732 -35.9691 -3 - endloop - endfacet - facet normal 0.336732 -0.941601 0 - outer loop - vertex -14.3732 -35.9691 -3 - vertex -13.7203 -35.7356 0 - vertex -14.3732 -35.9691 0 - endloop - endfacet - facet normal 0.336732 -0.941601 0 - outer loop - vertex -13.7203 -35.7356 0 - vertex -14.3732 -35.9691 -3 - vertex -13.7203 -35.7356 -3 - endloop - endfacet - facet normal 0.723518 -0.690305 0 - outer loop - vertex -13.7203 -35.7356 0 - vertex -13.0448 -35.0276 -3 - vertex -13.0448 -35.0276 0 - endloop - endfacet - facet normal 0.723518 -0.690305 0 - outer loop - vertex -13.0448 -35.0276 -3 - vertex -13.7203 -35.7356 0 - vertex -13.7203 -35.7356 -3 - endloop - endfacet - facet normal 0.860653 -0.509193 0 - outer loop - vertex -13.0448 -35.0276 0 - vertex -12.3385 -33.8339 -3 - vertex -12.3385 -33.8339 0 - endloop - endfacet - facet normal 0.860653 -0.509193 0 - outer loop - vertex -12.3385 -33.8339 -3 - vertex -13.0448 -35.0276 0 - vertex -13.0448 -35.0276 -3 - endloop - endfacet - facet normal 0.915054 -0.403331 0 - outer loop - vertex -12.3385 -33.8339 0 - vertex -11.5932 -32.143 -3 - vertex -11.5932 -32.143 0 - endloop - endfacet - facet normal 0.915054 -0.403331 0 - outer loop - vertex -11.5932 -32.143 -3 - vertex -12.3385 -33.8339 0 - vertex -12.3385 -33.8339 -3 - endloop - endfacet - facet normal 0.927789 -0.373105 0 - outer loop - vertex -11.5932 -32.143 0 - vertex -9.55184 -27.0667 -3 - vertex -9.55184 -27.0667 0 - endloop - endfacet - facet normal 0.927789 -0.373105 0 - outer loop - vertex -9.55184 -27.0667 -3 - vertex -11.5932 -32.143 0 - vertex -11.5932 -32.143 -3 - endloop - endfacet - facet normal 0.938245 -0.345971 0 - outer loop - vertex -9.55184 -27.0667 0 - vertex -8.72405 -24.8218 -3 - vertex -8.72405 -24.8218 0 - endloop - endfacet - facet normal 0.938245 -0.345971 0 - outer loop - vertex -8.72405 -24.8218 -3 - vertex -9.55184 -27.0667 0 - vertex -9.55184 -27.0667 -3 - endloop - endfacet - facet normal 0.983596 -0.180388 0 - outer loop - vertex -8.72405 -24.8218 0 - vertex -8.46819 -23.4267 -3 - vertex -8.46819 -23.4267 0 - endloop - endfacet - facet normal 0.983596 -0.180388 0 - outer loop - vertex -8.46819 -23.4267 -3 - vertex -8.72405 -24.8218 0 - vertex -8.72405 -24.8218 -3 - endloop - endfacet - facet normal 0.979467 0.201603 0 - outer loop - vertex -8.46819 -23.4267 0 - vertex -8.55624 -22.9989 -3 - vertex -8.55624 -22.9989 0 - endloop - endfacet - facet normal 0.979467 0.201603 0 - outer loop - vertex -8.55624 -22.9989 -3 - vertex -8.46819 -23.4267 0 - vertex -8.46819 -23.4267 -3 - endloop - endfacet - facet normal 0.762012 0.647563 0 - outer loop - vertex -8.55624 -22.9989 0 - vertex -8.78909 -22.7249 -3 - vertex -8.78909 -22.7249 0 - endloop - endfacet - facet normal 0.762012 0.647563 0 - outer loop - vertex -8.78909 -22.7249 -3 - vertex -8.55624 -22.9989 0 - vertex -8.55624 -22.9989 -3 - endloop - endfacet - facet normal 0.179668 0.983727 -0 - outer loop - vertex -8.78909 -22.7249 -3 - vertex -9.69161 -22.56 0 - vertex -8.78909 -22.7249 0 - endloop - endfacet - facet normal 0.179668 0.983727 0 - outer loop - vertex -9.69161 -22.56 0 - vertex -8.78909 -22.7249 -3 - vertex -9.69161 -22.56 -3 - endloop - endfacet - facet normal -0.191908 0.981413 0 - outer loop - vertex -9.69161 -22.56 -3 - vertex -10.5461 -22.7271 0 - vertex -9.69161 -22.56 0 - endloop - endfacet - facet normal -0.191908 0.981413 0 - outer loop - vertex -10.5461 -22.7271 0 - vertex -9.69161 -22.56 -3 - vertex -10.5461 -22.7271 -3 - endloop - endfacet - facet normal -0.380356 0.92484 0 - outer loop - vertex -10.5461 -22.7271 -3 - vertex -11.3967 -23.0769 0 - vertex -10.5461 -22.7271 0 - endloop - endfacet - facet normal -0.380356 0.92484 0 - outer loop - vertex -11.3967 -23.0769 0 - vertex -10.5461 -22.7271 -3 - vertex -11.3967 -23.0769 -3 - endloop - endfacet - facet normal -0.535069 0.844808 0 - outer loop - vertex -11.3967 -23.0769 -3 - vertex -12.4124 -23.7203 0 - vertex -11.3967 -23.0769 0 - endloop - endfacet - facet normal -0.535069 0.844808 0 - outer loop - vertex -12.4124 -23.7203 0 - vertex -11.3967 -23.0769 -3 - vertex -12.4124 -23.7203 -3 - endloop - endfacet - facet normal -0.673005 0.739638 0 - outer loop - vertex -12.4124 -23.7203 -3 - vertex -13.1427 -24.3848 0 - vertex -12.4124 -23.7203 0 - endloop - endfacet - facet normal -0.673005 0.739638 0 - outer loop - vertex -13.1427 -24.3848 0 - vertex -12.4124 -23.7203 -3 - vertex -13.1427 -24.3848 -3 - endloop - endfacet - facet normal -0.824808 0.565412 0 - outer loop - vertex -13.7062 -25.2068 -3 - vertex -13.1427 -24.3848 0 - vertex -13.1427 -24.3848 -3 - endloop - endfacet - facet normal -0.824808 0.565412 0 - outer loop - vertex -13.1427 -24.3848 0 - vertex -13.7062 -25.2068 -3 - vertex -13.7062 -25.2068 0 - endloop - endfacet - facet normal -0.907849 0.419297 0 - outer loop - vertex -14.2216 -26.3227 -3 - vertex -13.7062 -25.2068 0 - vertex -13.7062 -25.2068 -3 - endloop - endfacet - facet normal -0.907849 0.419297 0 - outer loop - vertex -13.7062 -25.2068 0 - vertex -14.2216 -26.3227 -3 - vertex -14.2216 -26.3227 0 - endloop - endfacet - facet normal -0.926196 0.377043 0 - outer loop - vertex -15.3894 -29.1914 -3 - vertex -14.2216 -26.3227 0 - vertex -14.2216 -26.3227 -3 - endloop - endfacet - facet normal -0.926196 0.377043 0 - outer loop - vertex -14.2216 -26.3227 0 - vertex -15.3894 -29.1914 -3 - vertex -15.3894 -29.1914 0 - endloop - endfacet - facet normal -0.925675 0.37832 0 - outer loop - vertex -16.8281 -32.7116 -3 - vertex -15.3894 -29.1914 0 - vertex -15.3894 -29.1914 -3 - endloop - endfacet - facet normal -0.925675 0.37832 0 - outer loop - vertex -15.3894 -29.1914 0 - vertex -16.8281 -32.7116 -3 - vertex -16.8281 -32.7116 0 - endloop - endfacet - facet normal -0.944728 0.327855 0 - outer loop - vertex -17.7285 -35.3062 -3 - vertex -16.8281 -32.7116 0 - vertex -16.8281 -32.7116 -3 - endloop - endfacet - facet normal -0.944728 0.327855 0 - outer loop - vertex -16.8281 -32.7116 0 - vertex -17.7285 -35.3062 -3 - vertex -17.7285 -35.3062 0 - endloop - endfacet - facet normal -0.998333 -0.0577213 0 - outer loop - vertex -17.6987 -35.8223 -3 - vertex -17.7285 -35.3062 0 - vertex -17.7285 -35.3062 -3 - endloop - endfacet - facet normal -0.998333 -0.0577213 0 - outer loop - vertex -17.7285 -35.3062 0 - vertex -17.6987 -35.8223 -3 - vertex -17.6987 -35.8223 0 - endloop - endfacet - facet normal -0.412173 -0.911106 0 - outer loop - vertex -17.6987 -35.8223 -3 - vertex -17.3742 -35.9691 0 - vertex -17.6987 -35.8223 0 - endloop - endfacet - facet normal -0.412173 -0.911106 -0 - outer loop - vertex -17.3742 -35.9691 0 - vertex -17.6987 -35.8223 -3 - vertex -17.3742 -35.9691 -3 - endloop - endfacet - facet normal -0.297585 -0.954695 0 - outer loop - vertex -17.3742 -35.9691 -3 - vertex -16.5846 -36.2152 0 - vertex -17.3742 -35.9691 0 - endloop - endfacet - facet normal -0.297585 -0.954695 -0 - outer loop - vertex -16.5846 -36.2152 0 - vertex -17.3742 -35.9691 -3 - vertex -16.5846 -36.2152 -3 - endloop - endfacet - facet normal -0.829044 -0.559183 0 - outer loop - vertex -16.2226 -36.752 -3 - vertex -16.5846 -36.2152 0 - vertex -16.5846 -36.2152 -3 - endloop - endfacet - facet normal -0.829044 -0.559183 0 - outer loop - vertex -16.5846 -36.2152 0 - vertex -16.2226 -36.752 -3 - vertex -16.2226 -36.752 0 - endloop - endfacet - facet normal -0.876406 0.481572 0 - outer loop - vertex -16.6989 -37.6188 -3 - vertex -16.2226 -36.752 0 - vertex -16.2226 -36.752 -3 - endloop - endfacet - facet normal -0.876406 0.481572 0 - outer loop - vertex -16.2226 -36.752 0 - vertex -16.6989 -37.6188 -3 - vertex -16.6989 -37.6188 0 - endloop - endfacet - facet normal -0.678562 0.734543 0 - outer loop - vertex -16.6989 -37.6188 -3 - vertex -17.033 -37.9274 0 - vertex -16.6989 -37.6188 0 - endloop - endfacet - facet normal -0.678562 0.734543 0 - outer loop - vertex -17.033 -37.9274 0 - vertex -16.6989 -37.6188 -3 - vertex -17.033 -37.9274 -3 - endloop - endfacet - facet normal -0.276188 0.961104 0 - outer loop - vertex -17.033 -37.9274 -3 - vertex -17.5781 -38.0841 0 - vertex -17.033 -37.9274 0 - endloop - endfacet - facet normal -0.276188 0.961104 0 - outer loop - vertex -17.5781 -38.0841 0 - vertex -17.033 -37.9274 -3 - vertex -17.5781 -38.0841 -3 - endloop - endfacet - facet normal -0.0141874 0.999899 0 - outer loop - vertex -17.5781 -38.0841 -3 - vertex -20.8226 -38.1301 0 - vertex -17.5781 -38.0841 0 - endloop - endfacet - facet normal -0.0141874 0.999899 0 - outer loop - vertex -20.8226 -38.1301 0 - vertex -17.5781 -38.0841 -3 - vertex -20.8226 -38.1301 -3 - endloop - endfacet - facet normal 0.0314237 0.999506 -0 - outer loop - vertex -20.8226 -38.1301 -3 - vertex -24.8096 -38.0047 0 - vertex -20.8226 -38.1301 0 - endloop - endfacet - facet normal 0.0314237 0.999506 0 - outer loop - vertex -24.8096 -38.0047 0 - vertex -20.8226 -38.1301 -3 - vertex -24.8096 -38.0047 -3 - endloop - endfacet - facet normal 0.544713 0.838623 -0 - outer loop - vertex -24.8096 -38.0047 -3 - vertex -25.0608 -37.8416 0 - vertex -24.8096 -38.0047 0 - endloop - endfacet - facet normal 0.544713 0.838623 0 - outer loop - vertex -25.0608 -37.8416 0 - vertex -24.8096 -38.0047 -3 - vertex -25.0608 -37.8416 -3 - endloop - endfacet - facet normal 0.940452 0.339927 0 - outer loop - vertex -25.0608 -37.8416 0 - vertex -25.157 -37.5754 -3 - vertex -25.157 -37.5754 0 - endloop - endfacet - facet normal 0.940452 0.339927 0 - outer loop - vertex -25.157 -37.5754 -3 - vertex -25.0608 -37.8416 0 - vertex -25.0608 -37.8416 -3 - endloop - endfacet - facet normal 0.964896 -0.262631 0 - outer loop - vertex -25.157 -37.5754 0 - vertex -24.9699 -36.888 -3 - vertex -24.9699 -36.888 0 - endloop - endfacet - facet normal 0.964896 -0.262631 0 - outer loop - vertex -24.9699 -36.888 -3 - vertex -25.157 -37.5754 0 - vertex -25.157 -37.5754 -3 - endloop - endfacet - facet normal 0.757107 -0.653291 0 - outer loop - vertex -24.9699 -36.888 0 - vertex -24.4194 -36.2501 -3 - vertex -24.4194 -36.2501 0 - endloop - endfacet - facet normal 0.757107 -0.653291 0 - outer loop - vertex -24.4194 -36.2501 -3 - vertex -24.9699 -36.888 0 - vertex -24.9699 -36.888 -3 - endloop - endfacet - facet normal 0.353851 -0.935302 0 - outer loop - vertex -24.4194 -36.2501 -3 - vertex -23.6767 -35.9691 0 - vertex -24.4194 -36.2501 0 - endloop - endfacet - facet normal 0.353851 -0.935302 0 - outer loop - vertex -23.6767 -35.9691 0 - vertex -24.4194 -36.2501 -3 - vertex -23.6767 -35.9691 -3 - endloop - endfacet - facet normal 0.158077 -0.987427 0 - outer loop - vertex -23.6767 -35.9691 -3 - vertex -23.007 -35.8619 0 - vertex -23.6767 -35.9691 0 - endloop - endfacet - facet normal 0.158077 -0.987427 0 - outer loop - vertex -23.007 -35.8619 0 - vertex -23.6767 -35.9691 -3 - vertex -23.007 -35.8619 -3 - endloop - endfacet - facet normal 0.593681 -0.8047 0 - outer loop - vertex -23.007 -35.8619 -3 - vertex -22.458 -35.4568 0 - vertex -23.007 -35.8619 0 - endloop - endfacet - facet normal 0.593681 -0.8047 0 - outer loop - vertex -22.458 -35.4568 0 - vertex -23.007 -35.8619 -3 - vertex -22.458 -35.4568 -3 - endloop - endfacet - facet normal 0.83817 -0.545409 0 - outer loop - vertex -22.458 -35.4568 0 - vertex -21.9191 -34.6287 -3 - vertex -21.9191 -34.6287 0 - endloop - endfacet - facet normal 0.83817 -0.545409 0 - outer loop - vertex -21.9191 -34.6287 -3 - vertex -22.458 -35.4568 0 - vertex -22.458 -35.4568 -3 - endloop - endfacet - facet normal 0.906982 -0.42117 0 - outer loop - vertex -21.9191 -34.6287 0 - vertex -21.28 -33.2523 -3 - vertex -21.28 -33.2523 0 - endloop - endfacet - facet normal 0.906982 -0.42117 0 - outer loop - vertex -21.28 -33.2523 -3 - vertex -21.9191 -34.6287 0 - vertex -21.9191 -34.6287 -3 - endloop - endfacet - facet normal 0.922958 -0.384901 0 - outer loop - vertex -21.28 -33.2523 0 - vertex -18.5428 -26.6889 -3 - vertex -18.5428 -26.6889 0 - endloop - endfacet - facet normal 0.922958 -0.384901 0 - outer loop - vertex -18.5428 -26.6889 -3 - vertex -21.28 -33.2523 0 - vertex -21.28 -33.2523 -3 - endloop - endfacet - facet normal 0.9376 -0.347716 0 - outer loop - vertex -18.5428 -26.6889 0 - vertex -17.299 -23.335 -3 - vertex -17.299 -23.335 0 - endloop - endfacet - facet normal 0.9376 -0.347716 0 - outer loop - vertex -17.299 -23.335 -3 - vertex -18.5428 -26.6889 0 - vertex -18.5428 -26.6889 -3 - endloop - endfacet - facet normal 0.99882 -0.0485627 0 - outer loop - vertex -17.299 -23.335 0 - vertex -17.2695 -22.7276 -3 - vertex -17.2695 -22.7276 0 - endloop - endfacet - facet normal 0.99882 -0.0485627 0 - outer loop - vertex -17.2695 -22.7276 -3 - vertex -17.299 -23.335 0 - vertex -17.299 -23.335 -3 - endloop - endfacet - facet normal 0.171081 0.985257 -0 - outer loop - vertex -17.2695 -22.7276 -3 - vertex -17.8179 -22.6324 0 - vertex -17.2695 -22.7276 0 - endloop - endfacet - facet normal 0.171081 0.985257 0 - outer loop - vertex -17.8179 -22.6324 0 - vertex -17.2695 -22.7276 -3 - vertex -17.8179 -22.6324 -3 - endloop - endfacet - facet normal 0.112446 0.993658 -0 - outer loop - vertex -17.8179 -22.6324 -3 - vertex -18.3659 -22.5704 0 - vertex -17.8179 -22.6324 0 - endloop - endfacet - facet normal 0.112446 0.993658 0 - outer loop - vertex -18.3659 -22.5704 0 - vertex -17.8179 -22.6324 -3 - vertex -18.3659 -22.5704 -3 - endloop - endfacet - facet normal 0.520189 0.854051 -0 - outer loop - vertex -18.3659 -22.5704 -3 - vertex -18.6886 -22.3738 0 - vertex -18.3659 -22.5704 0 - endloop - endfacet - facet normal 0.520189 0.854051 0 - outer loop - vertex -18.6886 -22.3738 0 - vertex -18.3659 -22.5704 -3 - vertex -18.6886 -22.3738 -3 - endloop - endfacet - facet normal 0.953226 0.302258 0 - outer loop - vertex -18.6886 -22.3738 0 - vertex -18.7986 -22.0269 -3 - vertex -18.7986 -22.0269 0 - endloop - endfacet - facet normal 0.953226 0.302258 0 - outer loop - vertex -18.7986 -22.0269 -3 - vertex -18.6886 -22.3738 0 - vertex -18.6886 -22.3738 -3 - endloop - endfacet - facet normal 0.984904 -0.1731 0 - outer loop - vertex -18.7986 -22.0269 0 - vertex -18.7084 -21.5139 -3 - vertex -18.7084 -21.5139 0 - endloop - endfacet - facet normal 0.984904 -0.1731 0 - outer loop - vertex -18.7084 -21.5139 -3 - vertex -18.7986 -22.0269 0 - vertex -18.7986 -22.0269 -3 - endloop - endfacet - facet normal 0.878265 -0.478174 0 - outer loop - vertex -18.7084 -21.5139 0 - vertex -18.4336 -21.0091 -3 - vertex -18.4336 -21.0091 0 - endloop - endfacet - facet normal 0.878265 -0.478174 0 - outer loop - vertex -18.4336 -21.0091 -3 - vertex -18.7084 -21.5139 0 - vertex -18.7084 -21.5139 -3 - endloop - endfacet - facet normal 0.488581 -0.872518 0 - outer loop - vertex -18.4336 -21.0091 -3 - vertex -17.9982 -20.7653 0 - vertex -18.4336 -21.0091 0 - endloop - endfacet - facet normal 0.488581 -0.872518 0 - outer loop - vertex -17.9982 -20.7653 0 - vertex -18.4336 -21.0091 -3 - vertex -17.9982 -20.7653 -3 - endloop - endfacet - facet normal 0.293895 -0.955838 0 - outer loop - vertex -17.9982 -20.7653 -3 - vertex -15.1553 -19.8912 0 - vertex -17.9982 -20.7653 0 - endloop - endfacet - facet normal 0.293895 -0.955838 0 - outer loop - vertex -15.1553 -19.8912 0 - vertex -17.9982 -20.7653 -3 - vertex -15.1553 -19.8912 -3 - endloop - endfacet - facet normal 0.257693 -0.966227 0 - outer loop - vertex -15.1553 -19.8912 -3 - vertex -12.3137 -19.1333 0 - vertex -15.1553 -19.8912 0 - endloop - endfacet - facet normal 0.257693 -0.966227 0 - outer loop - vertex -12.3137 -19.1333 0 - vertex -15.1553 -19.8912 -3 - vertex -12.3137 -19.1333 -3 - endloop - endfacet - facet normal -0.225556 -0.97423 0 - outer loop - vertex -12.3137 -19.1333 -3 - vertex -11.9141 -19.2259 0 - vertex -12.3137 -19.1333 0 - endloop - endfacet - facet normal -0.225556 -0.97423 -0 - outer loop - vertex -11.9141 -19.2259 0 - vertex -12.3137 -19.1333 -3 - vertex -11.9141 -19.2259 -3 - endloop - endfacet - facet normal -0.569265 -0.822154 0 - outer loop - vertex 47.2139 -19.2263 -3 - vertex 47.7267 -19.5813 0 - vertex 47.2139 -19.2263 0 - endloop - endfacet - facet normal -0.569265 -0.822154 -0 - outer loop - vertex 47.7267 -19.5813 0 - vertex 47.2139 -19.2263 -3 - vertex 47.7267 -19.5813 -3 - endloop - endfacet - facet normal -0.900824 -0.434184 0 - outer loop - vertex 47.9875 -20.1225 -3 - vertex 47.7267 -19.5813 0 - vertex 47.7267 -19.5813 -3 - endloop - endfacet - facet normal -0.900824 -0.434184 0 - outer loop - vertex 47.7267 -19.5813 0 - vertex 47.9875 -20.1225 -3 - vertex 47.9875 -20.1225 0 - endloop - endfacet - facet normal -0.988067 0.154023 0 - outer loop - vertex 47.8425 -21.0531 -3 - vertex 47.9875 -20.1225 0 - vertex 47.9875 -20.1225 -3 - endloop - endfacet - facet normal -0.988067 0.154023 0 - outer loop - vertex 47.9875 -20.1225 0 - vertex 47.8425 -21.0531 -3 - vertex 47.8425 -21.0531 0 - endloop - endfacet - facet normal -0.94959 0.313495 0 - outer loop - vertex 47.5305 -21.9981 -3 - vertex 47.8425 -21.0531 0 - vertex 47.8425 -21.0531 -3 - endloop - endfacet - facet normal -0.94959 0.313495 0 - outer loop - vertex 47.8425 -21.0531 0 - vertex 47.5305 -21.9981 -3 - vertex 47.5305 -21.9981 0 - endloop - endfacet - facet normal -0.87808 0.478513 0 - outer loop - vertex 47.0957 -22.796 -3 - vertex 47.5305 -21.9981 0 - vertex 47.5305 -21.9981 -3 - endloop - endfacet - facet normal -0.87808 0.478513 0 - outer loop - vertex 47.5305 -21.9981 0 - vertex 47.0957 -22.796 -3 - vertex 47.0957 -22.796 0 - endloop - endfacet - facet normal -0.768497 0.639853 0 - outer loop - vertex 46.5684 -23.4293 -3 - vertex 47.0957 -22.796 0 - vertex 47.0957 -22.796 -3 - endloop - endfacet - facet normal -0.768497 0.639853 0 - outer loop - vertex 47.0957 -22.796 0 - vertex 46.5684 -23.4293 -3 - vertex 46.5684 -23.4293 0 - endloop - endfacet - facet normal -0.607748 0.79413 0 - outer loop - vertex 46.5684 -23.4293 -3 - vertex 45.9792 -23.8802 0 - vertex 46.5684 -23.4293 0 - endloop - endfacet - facet normal -0.607748 0.79413 0 - outer loop - vertex 45.9792 -23.8802 0 - vertex 46.5684 -23.4293 -3 - vertex 45.9792 -23.8802 -3 - endloop - endfacet - facet normal -0.374765 0.92712 0 - outer loop - vertex 45.9792 -23.8802 -3 - vertex 45.3585 -24.1311 0 - vertex 45.9792 -23.8802 0 - endloop - endfacet - facet normal -0.374765 0.92712 0 - outer loop - vertex 45.3585 -24.1311 0 - vertex 45.9792 -23.8802 -3 - vertex 45.3585 -24.1311 -3 - endloop - endfacet - facet normal -0.0533306 0.998577 0 - outer loop - vertex 45.3585 -24.1311 -3 - vertex 44.7368 -24.1643 0 - vertex 45.3585 -24.1311 0 - endloop - endfacet - facet normal -0.0533306 0.998577 0 - outer loop - vertex 44.7368 -24.1643 0 - vertex 45.3585 -24.1311 -3 - vertex 44.7368 -24.1643 -3 - endloop - endfacet - facet normal 0.323025 0.94639 -0 - outer loop - vertex 44.7368 -24.1643 -3 - vertex 44.1445 -23.9621 0 - vertex 44.7368 -24.1643 0 - endloop - endfacet - facet normal 0.323025 0.94639 0 - outer loop - vertex 44.1445 -23.9621 0 - vertex 44.7368 -24.1643 -3 - vertex 44.1445 -23.9621 -3 - endloop - endfacet - facet normal 0.649875 0.760041 -0 - outer loop - vertex 44.1445 -23.9621 -3 - vertex 43.6122 -23.5069 0 - vertex 44.1445 -23.9621 0 - endloop - endfacet - facet normal 0.649875 0.760041 0 - outer loop - vertex 43.6122 -23.5069 0 - vertex 44.1445 -23.9621 -3 - vertex 43.6122 -23.5069 -3 - endloop - endfacet - facet normal 0.613628 0.789596 -0 - outer loop - vertex 43.6122 -23.5069 -3 - vertex 42.7682 -22.851 0 - vertex 43.6122 -23.5069 0 - endloop - endfacet - facet normal 0.613628 0.789596 0 - outer loop - vertex 42.7682 -22.851 0 - vertex 43.6122 -23.5069 -3 - vertex 42.7682 -22.851 -3 - endloop - endfacet - facet normal -0.589043 0.808102 0 - outer loop - vertex 42.7682 -22.851 -3 - vertex 41.2986 -23.9223 0 - vertex 42.7682 -22.851 0 - endloop - endfacet - facet normal -0.589043 0.808102 0 - outer loop - vertex 41.2986 -23.9223 0 - vertex 42.7682 -22.851 -3 - vertex 41.2986 -23.9223 -3 - endloop - endfacet - facet normal -0.701303 0.712864 0 - outer loop - vertex 41.2986 -23.9223 -3 - vertex 40.5923 -24.6171 0 - vertex 41.2986 -23.9223 0 - endloop - endfacet - facet normal -0.701303 0.712864 0 - outer loop - vertex 40.5923 -24.6171 0 - vertex 41.2986 -23.9223 -3 - vertex 40.5923 -24.6171 -3 - endloop - endfacet - facet normal -0.831353 0.555744 0 - outer loop - vertex 40.0289 -25.46 -3 - vertex 40.5923 -24.6171 0 - vertex 40.5923 -24.6171 -3 - endloop - endfacet - facet normal -0.831353 0.555744 0 - outer loop - vertex 40.5923 -24.6171 0 - vertex 40.0289 -25.46 -3 - vertex 40.0289 -25.46 0 - endloop - endfacet - facet normal -0.918395 0.395664 0 - outer loop - vertex 38.2188 -29.6614 -3 - vertex 40.0289 -25.46 0 - vertex 40.0289 -25.46 -3 - endloop - endfacet - facet normal -0.918395 0.395664 0 - outer loop - vertex 40.0289 -25.46 0 - vertex 38.2188 -29.6614 -3 - vertex 38.2188 -29.6614 0 - endloop - endfacet - facet normal -0.932877 0.360196 0 - outer loop - vertex 36.8272 -33.2656 -3 - vertex 38.2188 -29.6614 0 - vertex 38.2188 -29.6614 -3 - endloop - endfacet - facet normal -0.932877 0.360196 0 - outer loop - vertex 38.2188 -29.6614 0 - vertex 36.8272 -33.2656 -3 - vertex 36.8272 -33.2656 0 - endloop - endfacet - facet normal -0.959728 0.28093 0 - outer loop - vertex 36.2918 -35.0946 -3 - vertex 36.8272 -33.2656 0 - vertex 36.8272 -33.2656 -3 - endloop - endfacet - facet normal -0.959728 0.28093 0 - outer loop - vertex 36.8272 -33.2656 0 - vertex 36.2918 -35.0946 -3 - vertex 36.2918 -35.0946 0 - endloop - endfacet - facet normal -0.988492 -0.151276 0 - outer loop - vertex 36.3972 -35.7834 -3 - vertex 36.2918 -35.0946 0 - vertex 36.2918 -35.0946 -3 - endloop - endfacet - facet normal -0.988492 -0.151276 0 - outer loop - vertex 36.2918 -35.0946 0 - vertex 36.3972 -35.7834 -3 - vertex 36.3972 -35.7834 0 - endloop - endfacet - facet normal -0.329373 -0.9442 0 - outer loop - vertex 36.3972 -35.7834 -3 - vertex 37.1913 -36.0604 0 - vertex 36.3972 -35.7834 0 - endloop - endfacet - facet normal -0.329373 -0.9442 -0 - outer loop - vertex 37.1913 -36.0604 0 - vertex 36.3972 -35.7834 -3 - vertex 37.1913 -36.0604 -3 - endloop - endfacet - facet normal -0.323821 -0.946118 0 - outer loop - vertex 37.1913 -36.0604 -3 - vertex 37.9618 -36.3241 0 - vertex 37.1913 -36.0604 0 - endloop - endfacet - facet normal -0.323821 -0.946118 -0 - outer loop - vertex 37.9618 -36.3241 0 - vertex 37.1913 -36.0604 -3 - vertex 37.9618 -36.3241 -3 - endloop - endfacet - facet normal -0.960551 -0.278105 0 - outer loop - vertex 38.113 -36.8464 -3 - vertex 37.9618 -36.3241 0 - vertex 37.9618 -36.3241 -3 - endloop - endfacet - facet normal -0.960551 -0.278105 0 - outer loop - vertex 37.9618 -36.3241 0 - vertex 38.113 -36.8464 -3 - vertex 38.113 -36.8464 0 - endloop - endfacet - facet normal -0.986742 0.162295 0 - outer loop - vertex 37.9939 -37.5705 -3 - vertex 38.113 -36.8464 0 - vertex 38.113 -36.8464 -3 - endloop - endfacet - facet normal -0.986742 0.162295 0 - outer loop - vertex 38.113 -36.8464 0 - vertex 37.9939 -37.5705 -3 - vertex 37.9939 -37.5705 0 - endloop - endfacet - facet normal -0.539022 0.842292 0 - outer loop - vertex 37.9939 -37.5705 -3 - vertex 37.381 -37.9628 0 - vertex 37.9939 -37.5705 0 - endloop - endfacet - facet normal -0.539022 0.842292 0 - outer loop - vertex 37.381 -37.9628 0 - vertex 37.9939 -37.5705 -3 - vertex 37.381 -37.9628 -3 - endloop - endfacet - facet normal -0.10763 0.994191 0 - outer loop - vertex 37.381 -37.9628 -3 - vertex 35.8907 -38.1241 0 - vertex 37.381 -37.9628 0 - endloop - endfacet - facet normal -0.10763 0.994191 0 - outer loop - vertex 35.8907 -38.1241 0 - vertex 37.381 -37.9628 -3 - vertex 35.8907 -38.1241 -3 - endloop - endfacet - facet normal -0.0113945 0.999935 0 - outer loop - vertex 35.8907 -38.1241 -3 - vertex 33.1396 -38.1555 0 - vertex 35.8907 -38.1241 0 - endloop - endfacet - facet normal -0.0113945 0.999935 0 - outer loop - vertex 33.1396 -38.1555 0 - vertex 35.8907 -38.1241 -3 - vertex 33.1396 -38.1555 -3 - endloop - endfacet - facet normal 0.0181925 0.999835 -0 - outer loop - vertex 33.1396 -38.1555 -3 - vertex 29.8074 -38.0948 0 - vertex 33.1396 -38.1555 0 - endloop - endfacet - facet normal 0.0181925 0.999835 0 - outer loop - vertex 29.8074 -38.0948 0 - vertex 33.1396 -38.1555 -3 - vertex 29.8074 -38.0948 -3 - endloop - endfacet - facet normal 0.170719 0.98532 -0 - outer loop - vertex 29.8074 -38.0948 -3 - vertex 28.6431 -37.8931 0 - vertex 29.8074 -38.0948 0 - endloop - endfacet - facet normal 0.170719 0.98532 0 - outer loop - vertex 28.6431 -37.8931 0 - vertex 29.8074 -38.0948 -3 - vertex 28.6431 -37.8931 -3 - endloop - endfacet - facet normal 0.913427 0.407002 0 - outer loop - vertex 28.6431 -37.8931 0 - vertex 28.4102 -37.3704 -3 - vertex 28.4102 -37.3704 0 - endloop - endfacet - facet normal 0.913427 0.407002 0 - outer loop - vertex 28.4102 -37.3704 -3 - vertex 28.6431 -37.8931 0 - vertex 28.6431 -37.8931 -3 - endloop - endfacet - facet normal 0.965523 -0.260316 0 - outer loop - vertex 28.4102 -37.3704 0 - vertex 28.553 -36.8405 -3 - vertex 28.553 -36.8405 0 - endloop - endfacet - facet normal 0.965523 -0.260316 0 - outer loop - vertex 28.553 -36.8405 -3 - vertex 28.4102 -37.3704 0 - vertex 28.4102 -37.3704 -3 - endloop - endfacet - facet normal 0.697974 -0.716123 0 - outer loop - vertex 28.553 -36.8405 -3 - vertex 29.0223 -36.3831 0 - vertex 28.553 -36.8405 0 - endloop - endfacet - facet normal 0.697974 -0.716123 0 - outer loop - vertex 29.0223 -36.3831 0 - vertex 28.553 -36.8405 -3 - vertex 29.0223 -36.3831 -3 - endloop - endfacet - facet normal 0.378617 -0.925554 0 - outer loop - vertex 29.0223 -36.3831 -3 - vertex 29.7686 -36.0779 0 - vertex 29.0223 -36.3831 0 - endloop - endfacet - facet normal 0.378617 -0.925554 0 - outer loop - vertex 29.7686 -36.0779 0 - vertex 29.0223 -36.3831 -3 - vertex 29.7686 -36.0779 -3 - endloop - endfacet - facet normal 0.28314 -0.959079 0 - outer loop - vertex 29.7686 -36.0779 -3 - vertex 30.8837 -35.7486 0 - vertex 29.7686 -36.0779 0 - endloop - endfacet - facet normal 0.28314 -0.959079 0 - outer loop - vertex 30.8837 -35.7486 0 - vertex 29.7686 -36.0779 -3 - vertex 30.8837 -35.7486 -3 - endloop - endfacet - facet normal 0.670445 -0.741959 0 - outer loop - vertex 30.8837 -35.7486 -3 - vertex 31.6707 -35.0376 0 - vertex 30.8837 -35.7486 0 - endloop - endfacet - facet normal 0.670445 -0.741959 0 - outer loop - vertex 31.6707 -35.0376 0 - vertex 30.8837 -35.7486 -3 - vertex 31.6707 -35.0376 -3 - endloop - endfacet - facet normal 0.889774 -0.456402 0 - outer loop - vertex 31.6707 -35.0376 0 - vertex 32.5255 -33.371 -3 - vertex 32.5255 -33.371 0 - endloop - endfacet - facet normal 0.889774 -0.456402 0 - outer loop - vertex 32.5255 -33.371 -3 - vertex 31.6707 -35.0376 0 - vertex 31.6707 -35.0376 -3 - endloop - endfacet - facet normal 0.924374 -0.381489 0 - outer loop - vertex 32.5255 -33.371 0 - vertex 33.8444 -30.1753 -3 - vertex 33.8444 -30.1753 0 - endloop - endfacet - facet normal 0.924374 -0.381489 0 - outer loop - vertex 33.8444 -30.1753 -3 - vertex 32.5255 -33.371 0 - vertex 32.5255 -33.371 -3 - endloop - endfacet - facet normal 0.926524 -0.376236 0 - outer loop - vertex 33.8444 -30.1753 0 - vertex 35.3305 -26.5156 -3 - vertex 35.3305 -26.5156 0 - endloop - endfacet - facet normal 0.926524 -0.376236 0 - outer loop - vertex 35.3305 -26.5156 -3 - vertex 33.8444 -30.1753 0 - vertex 33.8444 -30.1753 -3 - endloop - endfacet - facet normal 0.946541 -0.322585 0 - outer loop - vertex 35.3305 -26.5156 0 - vertex 36.2859 -23.7121 -3 - vertex 36.2859 -23.7121 0 - endloop - endfacet - facet normal 0.946541 -0.322585 0 - outer loop - vertex 36.2859 -23.7121 -3 - vertex 35.3305 -26.5156 0 - vertex 35.3305 -26.5156 -3 - endloop - endfacet - facet normal 0.99651 -0.0834774 0 - outer loop - vertex 36.2859 -23.7121 0 - vertex 36.3422 -23.0402 -3 - vertex 36.3422 -23.0402 0 - endloop - endfacet - facet normal 0.99651 -0.0834774 0 - outer loop - vertex 36.3422 -23.0402 -3 - vertex 36.2859 -23.7121 0 - vertex 36.2859 -23.7121 -3 - endloop - endfacet - facet normal 0.457043 0.889445 -0 - outer loop - vertex 36.3422 -23.0402 -3 - vertex 36.104 -22.9178 0 - vertex 36.3422 -23.0402 0 - endloop - endfacet - facet normal 0.457043 0.889445 0 - outer loop - vertex 36.104 -22.9178 0 - vertex 36.3422 -23.0402 -3 - vertex 36.104 -22.9178 -3 - endloop - endfacet - facet normal -0.010303 0.999947 0 - outer loop - vertex 36.104 -22.9178 -3 - vertex 35.2001 -22.9271 0 - vertex 36.104 -22.9178 0 - endloop - endfacet - facet normal -0.010303 0.999947 0 - outer loop - vertex 35.2001 -22.9271 0 - vertex 36.104 -22.9178 -3 - vertex 35.2001 -22.9271 -3 - endloop - endfacet - facet normal 0.419058 0.907959 -0 - outer loop - vertex 35.2001 -22.9271 -3 - vertex 34.7441 -22.7166 0 - vertex 35.2001 -22.9271 0 - endloop - endfacet - facet normal 0.419058 0.907959 0 - outer loop - vertex 34.7441 -22.7166 0 - vertex 35.2001 -22.9271 -3 - vertex 34.7441 -22.7166 -3 - endloop - endfacet - facet normal 0.959742 0.280882 0 - outer loop - vertex 34.7441 -22.7166 0 - vertex 34.62 -22.2927 -3 - vertex 34.62 -22.2927 0 - endloop - endfacet - facet normal 0.959742 0.280882 0 - outer loop - vertex 34.62 -22.2927 -3 - vertex 34.7441 -22.7166 0 - vertex 34.7441 -22.7166 -3 - endloop - endfacet - facet normal 0.94057 -0.3396 0 - outer loop - vertex 34.62 -22.2927 0 - vertex 34.9156 -21.474 -3 - vertex 34.9156 -21.474 0 - endloop - endfacet - facet normal 0.94057 -0.3396 0 - outer loop - vertex 34.9156 -21.474 -3 - vertex 34.62 -22.2927 0 - vertex 34.62 -22.2927 -3 - endloop - endfacet - facet normal 0.664894 -0.746938 0 - outer loop - vertex 34.9156 -21.474 -3 - vertex 35.2187 -21.2043 0 - vertex 34.9156 -21.474 0 - endloop - endfacet - facet normal 0.664894 -0.746938 0 - outer loop - vertex 35.2187 -21.2043 0 - vertex 34.9156 -21.474 -3 - vertex 35.2187 -21.2043 -3 - endloop - endfacet - facet normal 0.282474 -0.959275 0 - outer loop - vertex 35.2187 -21.2043 -3 - vertex 35.5661 -21.102 0 - vertex 35.2187 -21.2043 0 - endloop - endfacet - facet normal 0.282474 -0.959275 0 - outer loop - vertex 35.5661 -21.102 0 - vertex 35.2187 -21.2043 -3 - vertex 35.5661 -21.102 -3 - endloop - endfacet - facet normal 0.319916 -0.947446 0 - outer loop - vertex 35.5661 -21.102 -3 - vertex 38.4798 -20.1181 0 - vertex 35.5661 -21.102 0 - endloop - endfacet - facet normal 0.319916 -0.947446 0 - outer loop - vertex 38.4798 -20.1181 0 - vertex 35.5661 -21.102 -3 - vertex 38.4798 -20.1181 -3 - endloop - endfacet - facet normal 0.306814 -0.951769 0 - outer loop - vertex 38.4798 -20.1181 -3 - vertex 41.5319 -19.1343 0 - vertex 38.4798 -20.1181 0 - endloop - endfacet - facet normal 0.306814 -0.951769 0 - outer loop - vertex 41.5319 -19.1343 0 - vertex 38.4798 -20.1181 -3 - vertex 41.5319 -19.1343 -3 - endloop - endfacet - facet normal -0.240332 -0.970691 0 - outer loop - vertex 41.5319 -19.1343 -3 - vertex 41.8934 -19.2238 0 - vertex 41.5319 -19.1343 0 - endloop - endfacet - facet normal -0.240332 -0.970691 -0 - outer loop - vertex 41.8934 -19.2238 0 - vertex 41.5319 -19.1343 -3 - vertex 41.8934 -19.2238 -3 - endloop - endfacet - facet normal -0.766739 -0.641959 0 - outer loop - vertex 42.1032 -19.4743 -3 - vertex 41.8934 -19.2238 0 - vertex 41.8934 -19.2238 -3 - endloop - endfacet - facet normal -0.766739 -0.641959 0 - outer loop - vertex 41.8934 -19.2238 0 - vertex 42.1032 -19.4743 -3 - vertex 42.1032 -19.4743 0 - endloop - endfacet - facet normal -0.995926 0.090175 0 - outer loop - vertex 42.0238 -20.3507 -3 - vertex 42.1032 -19.4743 0 - vertex 42.1032 -19.4743 -3 - endloop - endfacet - facet normal -0.995926 0.090175 0 - outer loop - vertex 42.1032 -19.4743 0 - vertex 42.0238 -20.3507 -3 - vertex 42.0238 -20.3507 0 - endloop - endfacet - facet normal -0.949137 0.314864 0 - outer loop - vertex 41.8981 -20.7296 -3 - vertex 42.0238 -20.3507 0 - vertex 42.0238 -20.3507 -3 - endloop - endfacet - facet normal -0.949137 0.314864 0 - outer loop - vertex 42.0238 -20.3507 0 - vertex 41.8981 -20.7296 -3 - vertex 41.8981 -20.7296 0 - endloop - endfacet - facet normal -0.846258 -0.532773 0 - outer loop - vertex 41.971 -20.8453 -3 - vertex 41.8981 -20.7296 0 - vertex 41.8981 -20.7296 -3 - endloop - endfacet - facet normal -0.846258 -0.532773 0 - outer loop - vertex 41.8981 -20.7296 0 - vertex 41.971 -20.8453 -3 - vertex 41.971 -20.8453 0 - endloop - endfacet - facet normal 0.512131 -0.858907 0 - outer loop - vertex 41.971 -20.8453 -3 - vertex 42.943 -20.2657 0 - vertex 41.971 -20.8453 0 - endloop - endfacet - facet normal 0.512131 -0.858907 0 - outer loop - vertex 42.943 -20.2657 0 - vertex 41.971 -20.8453 -3 - vertex 42.943 -20.2657 -3 - endloop - endfacet - facet normal 0.474768 -0.880111 0 - outer loop - vertex 42.943 -20.2657 -3 - vertex 44.5909 -19.3768 0 - vertex 42.943 -20.2657 0 - endloop - endfacet - facet normal 0.474768 -0.880111 0 - outer loop - vertex 44.5909 -19.3768 0 - vertex 42.943 -20.2657 -3 - vertex 44.5909 -19.3768 -3 - endloop - endfacet - facet normal 0.143592 -0.989637 0 - outer loop - vertex 44.5909 -19.3768 -3 - vertex 46.2623 -19.1343 0 - vertex 44.5909 -19.3768 0 - endloop - endfacet - facet normal 0.143592 -0.989637 0 - outer loop - vertex 46.2623 -19.1343 0 - vertex 44.5909 -19.3768 -3 - vertex 46.2623 -19.1343 -3 - endloop - endfacet - facet normal -0.096262 -0.995356 0 - outer loop - vertex 46.2623 -19.1343 -3 - vertex 47.2139 -19.2263 0 - vertex 46.2623 -19.1343 0 - endloop - endfacet - facet normal -0.096262 -0.995356 -0 - outer loop - vertex 47.2139 -19.2263 0 - vertex 46.2623 -19.1343 -3 - vertex 47.2139 -19.2263 -3 - endloop - endfacet - facet normal -0.989139 0.146981 0 - outer loop - vertex 5.19939 38.083 -3 - vertex 5.25321 38.4452 0 - vertex 5.25321 38.4452 -3 - endloop - endfacet - facet normal -0.989139 0.146981 0 - outer loop - vertex 5.25321 38.4452 0 - vertex 5.19939 38.083 -3 - vertex 5.19939 38.083 0 - endloop - endfacet - facet normal -0.909259 0.41623 0 - outer loop - vertex 4.72188 37.0399 -3 - vertex 5.19939 38.083 0 - vertex 5.19939 38.083 -3 - endloop - endfacet - facet normal -0.909259 0.41623 0 - outer loop - vertex 5.19939 38.083 0 - vertex 4.72188 37.0399 -3 - vertex 4.72188 37.0399 0 - endloop - endfacet - facet normal -0.923768 0.382952 0 - outer loop - vertex 4.30515 36.0346 -3 - vertex 4.72188 37.0399 0 - vertex 4.72188 37.0399 -3 - endloop - endfacet - facet normal -0.923768 0.382952 0 - outer loop - vertex 4.72188 37.0399 0 - vertex 4.30515 36.0346 -3 - vertex 4.30515 36.0346 0 - endloop - endfacet - facet normal -0.970112 0.242658 0 - outer loop - vertex 3.93589 34.5584 -3 - vertex 4.30515 36.0346 0 - vertex 4.30515 36.0346 -3 - endloop - endfacet - facet normal -0.970112 0.242658 0 - outer loop - vertex 4.30515 36.0346 0 - vertex 3.93589 34.5584 -3 - vertex 3.93589 34.5584 0 - endloop - endfacet - facet normal -0.993642 0.112587 0 - outer loop - vertex 3.57109 31.3388 -3 - vertex 3.93589 34.5584 0 - vertex 3.93589 34.5584 -3 - endloop - endfacet - facet normal -0.993642 0.112587 0 - outer loop - vertex 3.93589 34.5584 0 - vertex 3.57109 31.3388 -3 - vertex 3.57109 31.3388 0 - endloop - endfacet - facet normal -0.99786 -0.0653884 0 - outer loop - vertex 3.67763 29.7129 -3 - vertex 3.57109 31.3388 0 - vertex 3.57109 31.3388 -3 - endloop - endfacet - facet normal -0.99786 -0.0653884 0 - outer loop - vertex 3.57109 31.3388 0 - vertex 3.67763 29.7129 -3 - vertex 3.67763 29.7129 0 - endloop - endfacet - facet normal -0.893644 -0.448776 0 - outer loop - vertex 4.3138 28.4461 -3 - vertex 3.67763 29.7129 0 - vertex 3.67763 29.7129 -3 - endloop - endfacet - facet normal -0.893644 -0.448776 0 - outer loop - vertex 3.67763 29.7129 0 - vertex 4.3138 28.4461 -3 - vertex 4.3138 28.4461 0 - endloop - endfacet - facet normal -0.787428 -0.616407 0 - outer loop - vertex 5.72413 26.6445 -3 - vertex 4.3138 28.4461 0 - vertex 4.3138 28.4461 -3 - endloop - endfacet - facet normal -0.787428 -0.616407 0 - outer loop - vertex 4.3138 28.4461 0 - vertex 5.72413 26.6445 -3 - vertex 5.72413 26.6445 0 - endloop - endfacet - facet normal -0.565537 -0.824723 0 - outer loop - vertex 5.72413 26.6445 -3 - vertex 6.4022 26.1795 0 - vertex 5.72413 26.6445 0 - endloop - endfacet - facet normal -0.565537 -0.824723 -0 - outer loop - vertex 6.4022 26.1795 0 - vertex 5.72413 26.6445 -3 - vertex 6.4022 26.1795 -3 - endloop - endfacet - facet normal -0.296038 -0.955176 0 - outer loop - vertex 6.4022 26.1795 -3 - vertex 7.11433 25.9588 0 - vertex 6.4022 26.1795 0 - endloop - endfacet - facet normal -0.296038 -0.955176 -0 - outer loop - vertex 7.11433 25.9588 0 - vertex 6.4022 26.1795 -3 - vertex 7.11433 25.9588 -3 - endloop - endfacet - facet normal -0.249452 -0.968387 0 - outer loop - vertex 7.11433 25.9588 -3 - vertex 7.91411 25.7528 0 - vertex 7.11433 25.9588 0 - endloop - endfacet - facet normal -0.249452 -0.968387 -0 - outer loop - vertex 7.91411 25.7528 0 - vertex 7.11433 25.9588 -3 - vertex 7.91411 25.7528 -3 - endloop - endfacet - facet normal -0.590139 -0.807301 0 - outer loop - vertex 7.91411 25.7528 -3 - vertex 8.51885 25.3107 0 - vertex 7.91411 25.7528 0 - endloop - endfacet - facet normal -0.590139 -0.807301 -0 - outer loop - vertex 8.51885 25.3107 0 - vertex 7.91411 25.7528 -3 - vertex 8.51885 25.3107 -3 - endloop - endfacet - facet normal -0.834337 -0.551255 0 - outer loop - vertex 9.07032 24.476 -3 - vertex 8.51885 25.3107 0 - vertex 8.51885 25.3107 -3 - endloop - endfacet - facet normal -0.834337 -0.551255 0 - outer loop - vertex 8.51885 25.3107 0 - vertex 9.07032 24.476 -3 - vertex 9.07032 24.476 0 - endloop - endfacet - facet normal -0.907633 -0.419764 0 - outer loop - vertex 9.71033 23.0922 -3 - vertex 9.07032 24.476 0 - vertex 9.07032 24.476 -3 - endloop - endfacet - facet normal -0.907633 -0.419764 0 - outer loop - vertex 9.07032 24.476 0 - vertex 9.71033 23.0922 -3 - vertex 9.71033 23.0922 0 - endloop - endfacet - facet normal -0.895482 -0.445097 0 - outer loop - vertex 10.9729 20.5521 -3 - vertex 9.71033 23.0922 0 - vertex 9.71033 23.0922 -3 - endloop - endfacet - facet normal -0.895482 -0.445097 0 - outer loop - vertex 9.71033 23.0922 0 - vertex 10.9729 20.5521 -3 - vertex 10.9729 20.5521 0 - endloop - endfacet - facet normal -0.741992 -0.670408 0 - outer loop - vertex 12.6982 18.6425 -3 - vertex 10.9729 20.5521 0 - vertex 10.9729 20.5521 -3 - endloop - endfacet - facet normal -0.741992 -0.670408 0 - outer loop - vertex 10.9729 20.5521 0 - vertex 12.6982 18.6425 -3 - vertex 12.6982 18.6425 0 - endloop - endfacet - facet normal -0.66692 -0.745129 0 - outer loop - vertex 12.6982 18.6425 -3 - vertex 13.99 17.4864 0 - vertex 12.6982 18.6425 0 - endloop - endfacet - facet normal -0.66692 -0.745129 -0 - outer loop - vertex 13.99 17.4864 0 - vertex 12.6982 18.6425 -3 - vertex 13.99 17.4864 -3 - endloop - endfacet - facet normal -0.579406 -0.815039 0 - outer loop - vertex 13.99 17.4864 -3 - vertex 15.2045 16.623 0 - vertex 13.99 17.4864 0 - endloop - endfacet - facet normal -0.579406 -0.815039 -0 - outer loop - vertex 15.2045 16.623 0 - vertex 13.99 17.4864 -3 - vertex 15.2045 16.623 -3 - endloop - endfacet - facet normal -0.462357 -0.886694 0 - outer loop - vertex 15.2045 16.623 -3 - vertex 16.5954 15.8977 0 - vertex 15.2045 16.623 0 - endloop - endfacet - facet normal -0.462357 -0.886694 -0 - outer loop - vertex 16.5954 15.8977 0 - vertex 15.2045 16.623 -3 - vertex 16.5954 15.8977 -3 - endloop - endfacet - facet normal -0.377272 -0.926103 0 - outer loop - vertex 16.5954 15.8977 -3 - vertex 18.4164 15.1559 0 - vertex 16.5954 15.8977 0 - endloop - endfacet - facet normal -0.377272 -0.926103 -0 - outer loop - vertex 18.4164 15.1559 0 - vertex 16.5954 15.8977 -3 - vertex 18.4164 15.1559 -3 - endloop - endfacet - facet normal -0.305414 -0.95222 0 - outer loop - vertex 18.4164 15.1559 -3 - vertex 20.0668 14.6265 0 - vertex 18.4164 15.1559 0 - endloop - endfacet - facet normal -0.305414 -0.95222 -0 - outer loop - vertex 20.0668 14.6265 0 - vertex 18.4164 15.1559 -3 - vertex 20.0668 14.6265 -3 - endloop - endfacet - facet normal 0.198377 -0.980126 0 - outer loop - vertex 20.0668 14.6265 -3 - vertex 21.1653 14.8489 0 - vertex 20.0668 14.6265 0 - endloop - endfacet - facet normal 0.198377 -0.980126 0 - outer loop - vertex 21.1653 14.8489 0 - vertex 20.0668 14.6265 -3 - vertex 21.1653 14.8489 -3 - endloop - endfacet - facet normal 0.403705 -0.914889 0 - outer loop - vertex 21.1653 14.8489 -3 - vertex 23.3802 15.8262 0 - vertex 21.1653 14.8489 0 - endloop - endfacet - facet normal 0.403705 -0.914889 0 - outer loop - vertex 23.3802 15.8262 0 - vertex 21.1653 14.8489 -3 - vertex 23.3802 15.8262 -3 - endloop - endfacet - facet normal 0.513821 -0.857898 0 - outer loop - vertex 23.3802 15.8262 -3 - vertex 24.7931 16.6725 0 - vertex 23.3802 15.8262 0 - endloop - endfacet - facet normal 0.513821 -0.857898 0 - outer loop - vertex 24.7931 16.6725 0 - vertex 23.3802 15.8262 -3 - vertex 24.7931 16.6725 -3 - endloop - endfacet - facet normal 0.988574 0.150735 0 - outer loop - vertex 24.7931 16.6725 0 - vertex 24.7174 17.1695 -3 - vertex 24.7174 17.1695 0 - endloop - endfacet - facet normal 0.988574 0.150735 0 - outer loop - vertex 24.7174 17.1695 -3 - vertex 24.7931 16.6725 0 - vertex 24.7931 16.6725 -3 - endloop - endfacet - facet normal 0.409608 0.912261 -0 - outer loop - vertex 24.7174 17.1695 -3 - vertex 24.1542 17.4223 0 - vertex 24.7174 17.1695 0 - endloop - endfacet - facet normal 0.409608 0.912261 0 - outer loop - vertex 24.1542 17.4223 0 - vertex 24.7174 17.1695 -3 - vertex 24.1542 17.4223 -3 - endloop - endfacet - facet normal 0.049214 0.998788 -0 - outer loop - vertex 24.1542 17.4223 -3 - vertex 22.547 17.5015 0 - vertex 24.1542 17.4223 0 - endloop - endfacet - facet normal 0.049214 0.998788 0 - outer loop - vertex 22.547 17.5015 0 - vertex 24.1542 17.4223 -3 - vertex 22.547 17.5015 -3 - endloop - endfacet - facet normal 0.0234404 0.999725 -0 - outer loop - vertex 22.547 17.5015 -3 - vertex 20.2159 17.5562 0 - vertex 22.547 17.5015 0 - endloop - endfacet - facet normal 0.0234404 0.999725 0 - outer loop - vertex 20.2159 17.5562 0 - vertex 22.547 17.5015 -3 - vertex 20.2159 17.5562 -3 - endloop - endfacet - facet normal 0.471751 0.881732 -0 - outer loop - vertex 20.2159 17.5562 -3 - vertex 19.8437 17.7553 0 - vertex 20.2159 17.5562 0 - endloop - endfacet - facet normal 0.471751 0.881732 0 - outer loop - vertex 19.8437 17.7553 0 - vertex 20.2159 17.5562 -3 - vertex 19.8437 17.7553 -3 - endloop - endfacet - facet normal 0.853692 0.520778 0 - outer loop - vertex 19.8437 17.7553 0 - vertex 19.5351 18.2611 -3 - vertex 19.5351 18.2611 0 - endloop - endfacet - facet normal 0.853692 0.520778 0 - outer loop - vertex 19.5351 18.2611 -3 - vertex 19.8437 17.7553 0 - vertex 19.8437 17.7553 -3 - endloop - endfacet - facet normal 0.975799 0.21867 0 - outer loop - vertex 19.5351 18.2611 0 - vertex 19.0948 20.2262 -3 - vertex 19.0948 20.2262 0 - endloop - endfacet - facet normal 0.975799 0.21867 0 - outer loop - vertex 19.0948 20.2262 -3 - vertex 19.5351 18.2611 0 - vertex 19.5351 18.2611 -3 - endloop - endfacet - facet normal 0.973279 0.229626 0 - outer loop - vertex 19.0948 20.2262 0 - vertex 18.6529 22.0992 -3 - vertex 18.6529 22.0992 0 - endloop - endfacet - facet normal 0.973279 0.229626 0 - outer loop - vertex 18.6529 22.0992 -3 - vertex 19.0948 20.2262 0 - vertex 19.0948 20.2262 -3 - endloop - endfacet - facet normal 0.439505 0.89824 -0 - outer loop - vertex 18.6529 22.0992 -3 - vertex 17.155 22.8321 0 - vertex 18.6529 22.0992 0 - endloop - endfacet - facet normal 0.439505 0.89824 0 - outer loop - vertex 17.155 22.8321 0 - vertex 18.6529 22.0992 -3 - vertex 17.155 22.8321 -3 - endloop - endfacet - facet normal 0.375086 0.92699 -0 - outer loop - vertex 17.155 22.8321 -3 - vertex 15.5055 23.4995 0 - vertex 17.155 22.8321 0 - endloop - endfacet - facet normal 0.375086 0.92699 0 - outer loop - vertex 15.5055 23.4995 0 - vertex 17.155 22.8321 -3 - vertex 15.5055 23.4995 -3 - endloop - endfacet - facet normal 0.401684 0.915778 -0 - outer loop - vertex 15.5055 23.4995 -3 - vertex 14.0164 24.1527 0 - vertex 15.5055 23.4995 0 - endloop - endfacet - facet normal 0.401684 0.915778 0 - outer loop - vertex 14.0164 24.1527 0 - vertex 15.5055 23.4995 -3 - vertex 14.0164 24.1527 -3 - endloop - endfacet - facet normal 0.516309 0.856402 -0 - outer loop - vertex 14.0164 24.1527 -3 - vertex 13.0733 24.7212 0 - vertex 14.0164 24.1527 0 - endloop - endfacet - facet normal 0.516309 0.856402 0 - outer loop - vertex 13.0733 24.7212 0 - vertex 14.0164 24.1527 -3 - vertex 13.0733 24.7212 -3 - endloop - endfacet - facet normal 0.678054 0.735012 -0 - outer loop - vertex 13.0733 24.7212 -3 - vertex 12.1975 25.5292 0 - vertex 13.0733 24.7212 0 - endloop - endfacet - facet normal 0.678054 0.735012 0 - outer loop - vertex 12.1975 25.5292 0 - vertex 13.0733 24.7212 -3 - vertex 12.1975 25.5292 -3 - endloop - endfacet - facet normal 0.798708 0.601719 0 - outer loop - vertex 12.1975 25.5292 0 - vertex 11.5037 26.4501 -3 - vertex 11.5037 26.4501 0 - endloop - endfacet - facet normal 0.798708 0.601719 0 - outer loop - vertex 11.5037 26.4501 -3 - vertex 12.1975 25.5292 0 - vertex 12.1975 25.5292 -3 - endloop - endfacet - facet normal 0.916155 0.400824 0 - outer loop - vertex 11.5037 26.4501 0 - vertex 11.1066 27.3577 -3 - vertex 11.1066 27.3577 0 - endloop - endfacet - facet normal 0.916155 0.400824 0 - outer loop - vertex 11.1066 27.3577 -3 - vertex 11.5037 26.4501 0 - vertex 11.5037 26.4501 -3 - endloop - endfacet - facet normal 0.997988 0.0634007 0 - outer loop - vertex 11.1066 27.3577 0 - vertex 11.0411 28.3898 -3 - vertex 11.0411 28.3898 0 - endloop - endfacet - facet normal 0.997988 0.0634007 0 - outer loop - vertex 11.0411 28.3898 -3 - vertex 11.1066 27.3577 0 - vertex 11.1066 27.3577 -3 - endloop - endfacet - facet normal 0.985212 -0.171342 0 - outer loop - vertex 11.0411 28.3898 0 - vertex 11.2319 29.4873 -3 - vertex 11.2319 29.4873 0 - endloop - endfacet - facet normal 0.985212 -0.171342 0 - outer loop - vertex 11.2319 29.4873 -3 - vertex 11.0411 28.3898 0 - vertex 11.0411 28.3898 -3 - endloop - endfacet - facet normal 0.92237 -0.386308 0 - outer loop - vertex 11.2319 29.4873 0 - vertex 11.5971 30.3591 -3 - vertex 11.5971 30.3591 0 - endloop - endfacet - facet normal 0.92237 -0.386308 0 - outer loop - vertex 11.5971 30.3591 -3 - vertex 11.2319 29.4873 0 - vertex 11.2319 29.4873 -3 - endloop - endfacet - facet normal 0.613523 -0.789677 0 - outer loop - vertex 11.5971 30.3591 -3 - vertex 12.0544 30.7144 0 - vertex 11.5971 30.3591 0 - endloop - endfacet - facet normal 0.613523 -0.789677 0 - outer loop - vertex 12.0544 30.7144 0 - vertex 11.5971 30.3591 -3 - vertex 12.0544 30.7144 -3 - endloop - endfacet - facet normal -0.632498 -0.774562 0 - outer loop - vertex 12.0544 30.7144 -3 - vertex 12.2907 30.5214 0 - vertex 12.0544 30.7144 0 - endloop - endfacet - facet normal -0.632498 -0.774562 -0 - outer loop - vertex 12.2907 30.5214 0 - vertex 12.0544 30.7144 -3 - vertex 12.2907 30.5214 -3 - endloop - endfacet - facet normal -0.906769 0.421628 0 - outer loop - vertex 12.0187 29.9363 -3 - vertex 12.2907 30.5214 0 - vertex 12.2907 30.5214 -3 - endloop - endfacet - facet normal -0.906769 0.421628 0 - outer loop - vertex 12.2907 30.5214 0 - vertex 12.0187 29.9363 -3 - vertex 12.0187 29.9363 0 - endloop - endfacet - facet normal -0.946212 0.323547 0 - outer loop - vertex 11.8088 29.3224 -3 - vertex 12.0187 29.9363 0 - vertex 12.0187 29.9363 -3 - endloop - endfacet - facet normal -0.946212 0.323547 0 - outer loop - vertex 12.0187 29.9363 0 - vertex 11.8088 29.3224 -3 - vertex 11.8088 29.3224 0 - endloop - endfacet - facet normal -0.996661 0.0816499 0 - outer loop - vertex 11.7374 28.4518 -3 - vertex 11.8088 29.3224 0 - vertex 11.8088 29.3224 -3 - endloop - endfacet - facet normal -0.996661 0.0816499 0 - outer loop - vertex 11.8088 29.3224 0 - vertex 11.7374 28.4518 -3 - vertex 11.7374 28.4518 0 - endloop - endfacet - facet normal -0.997288 -0.0735994 0 - outer loop - vertex 11.8052 27.5343 -3 - vertex 11.7374 28.4518 0 - vertex 11.7374 28.4518 -3 - endloop - endfacet - facet normal -0.997288 -0.0735994 0 - outer loop - vertex 11.7374 28.4518 0 - vertex 11.8052 27.5343 -3 - vertex 11.8052 27.5343 0 - endloop - endfacet - facet normal -0.964338 -0.264675 0 - outer loop - vertex 12.0123 26.7794 -3 - vertex 11.8052 27.5343 0 - vertex 11.8052 27.5343 -3 - endloop - endfacet - facet normal -0.964338 -0.264675 0 - outer loop - vertex 11.8052 27.5343 0 - vertex 12.0123 26.7794 -3 - vertex 12.0123 26.7794 0 - endloop - endfacet - facet normal -0.835126 -0.550059 0 - outer loop - vertex 12.5486 25.9653 -3 - vertex 12.0123 26.7794 0 - vertex 12.0123 26.7794 -3 - endloop - endfacet - facet normal -0.835126 -0.550059 0 - outer loop - vertex 12.0123 26.7794 0 - vertex 12.5486 25.9653 -3 - vertex 12.5486 25.9653 0 - endloop - endfacet - facet normal -0.606684 -0.794943 0 - outer loop - vertex 12.5486 25.9653 -3 - vertex 13.4969 25.2416 0 - vertex 12.5486 25.9653 0 - endloop - endfacet - facet normal -0.606684 -0.794943 -0 - outer loop - vertex 13.4969 25.2416 0 - vertex 12.5486 25.9653 -3 - vertex 13.4969 25.2416 -3 - endloop - endfacet - facet normal -0.436683 -0.899615 0 - outer loop - vertex 13.4969 25.2416 -3 - vertex 15.1211 24.4531 0 - vertex 13.4969 25.2416 0 - endloop - endfacet - facet normal -0.436683 -0.899615 -0 - outer loop - vertex 15.1211 24.4531 0 - vertex 13.4969 25.2416 -3 - vertex 15.1211 24.4531 -3 - endloop - endfacet - facet normal -0.365946 -0.930636 0 - outer loop - vertex 15.1211 24.4531 -3 - vertex 17.6852 23.4449 0 - vertex 15.1211 24.4531 0 - endloop - endfacet - facet normal -0.365946 -0.930636 -0 - outer loop - vertex 17.6852 23.4449 0 - vertex 15.1211 24.4531 -3 - vertex 17.6852 23.4449 -3 - endloop - endfacet - facet normal -0.54663 -0.837374 0 - outer loop - vertex 17.6852 23.4449 -3 - vertex 18.9185 22.6398 0 - vertex 17.6852 23.4449 0 - endloop - endfacet - facet normal -0.54663 -0.837374 -0 - outer loop - vertex 18.9185 22.6398 0 - vertex 17.6852 23.4449 -3 - vertex 18.9185 22.6398 -3 - endloop - endfacet - facet normal -0.808126 -0.58901 0 - outer loop - vertex 19.4421 21.9215 -3 - vertex 18.9185 22.6398 0 - vertex 18.9185 22.6398 -3 - endloop - endfacet - facet normal -0.808126 -0.58901 0 - outer loop - vertex 18.9185 22.6398 0 - vertex 19.4421 21.9215 -3 - vertex 19.4421 21.9215 0 - endloop - endfacet - facet normal -0.985617 -0.168992 0 - outer loop - vertex 19.6596 20.6529 -3 - vertex 19.4421 21.9215 0 - vertex 19.4421 21.9215 -3 - endloop - endfacet - facet normal -0.985617 -0.168992 0 - outer loop - vertex 19.4421 21.9215 0 - vertex 19.6596 20.6529 -3 - vertex 19.6596 20.6529 0 - endloop - endfacet - facet normal -0.991076 -0.133297 0 - outer loop - vertex 19.8405 19.3078 -3 - vertex 19.6596 20.6529 0 - vertex 19.6596 20.6529 -3 - endloop - endfacet - facet normal -0.991076 -0.133297 0 - outer loop - vertex 19.6596 20.6529 0 - vertex 19.8405 19.3078 -3 - vertex 19.8405 19.3078 0 - endloop - endfacet - facet normal -0.89371 -0.448645 0 - outer loop - vertex 20.2006 18.5903 -3 - vertex 19.8405 19.3078 0 - vertex 19.8405 19.3078 -3 - endloop - endfacet - facet normal -0.89371 -0.448645 0 - outer loop - vertex 19.8405 19.3078 0 - vertex 20.2006 18.5903 -3 - vertex 20.2006 18.5903 0 - endloop - endfacet - facet normal -0.353154 -0.935565 0 - outer loop - vertex 20.2006 18.5903 -3 - vertex 20.9591 18.304 0 - vertex 20.2006 18.5903 0 - endloop - endfacet - facet normal -0.353154 -0.935565 -0 - outer loop - vertex 20.9591 18.304 0 - vertex 20.2006 18.5903 -3 - vertex 20.9591 18.304 -3 - endloop - endfacet - facet normal -0.0375868 -0.999293 0 - outer loop - vertex 20.9591 18.304 -3 - vertex 22.335 18.2522 0 - vertex 20.9591 18.304 0 - endloop - endfacet - facet normal -0.0375868 -0.999293 -0 - outer loop - vertex 22.335 18.2522 0 - vertex 20.9591 18.304 -3 - vertex 22.335 18.2522 -3 - endloop - endfacet - facet normal -0.0902677 -0.995918 0 - outer loop - vertex 22.335 18.2522 -3 - vertex 24.5942 18.0475 0 - vertex 22.335 18.2522 0 - endloop - endfacet - facet normal -0.0902677 -0.995918 -0 - outer loop - vertex 24.5942 18.0475 0 - vertex 22.335 18.2522 -3 - vertex 24.5942 18.0475 -3 - endloop - endfacet - facet normal -0.485131 -0.874442 0 - outer loop - vertex 24.5942 18.0475 -3 - vertex 25.1513 17.7384 0 - vertex 24.5942 18.0475 0 - endloop - endfacet - facet normal -0.485131 -0.874442 -0 - outer loop - vertex 25.1513 17.7384 0 - vertex 24.5942 18.0475 -3 - vertex 25.1513 17.7384 -3 - endloop - endfacet - facet normal -0.837387 -0.54661 0 - outer loop - vertex 25.4738 17.2443 -3 - vertex 25.1513 17.7384 0 - vertex 25.1513 17.7384 -3 - endloop - endfacet - facet normal -0.837387 -0.54661 0 - outer loop - vertex 25.1513 17.7384 0 - vertex 25.4738 17.2443 -3 - vertex 25.4738 17.2443 0 - endloop - endfacet - facet normal -0.875441 -0.483325 0 - outer loop - vertex 25.704 16.8274 -3 - vertex 25.4738 17.2443 0 - vertex 25.4738 17.2443 -3 - endloop - endfacet - facet normal -0.875441 -0.483325 0 - outer loop - vertex 25.4738 17.2443 0 - vertex 25.704 16.8274 -3 - vertex 25.704 16.8274 0 - endloop - endfacet - facet normal -0.34429 -0.938863 0 - outer loop - vertex 25.704 16.8274 -3 - vertex 25.8979 16.7563 0 - vertex 25.704 16.8274 0 - endloop - endfacet - facet normal -0.34429 -0.938863 -0 - outer loop - vertex 25.8979 16.7563 0 - vertex 25.704 16.8274 -3 - vertex 25.8979 16.7563 -3 - endloop - endfacet - facet normal 0.976922 -0.213594 0 - outer loop - vertex 25.8979 16.7563 0 - vertex 26.0816 17.5963 -3 - vertex 26.0816 17.5963 0 - endloop - endfacet - facet normal 0.976922 -0.213594 0 - outer loop - vertex 26.0816 17.5963 -3 - vertex 25.8979 16.7563 0 - vertex 25.8979 16.7563 -3 - endloop - endfacet - facet normal 0.991357 0.131195 0 - outer loop - vertex 26.0816 17.5963 0 - vertex 25.9892 18.2943 -3 - vertex 25.9892 18.2943 0 - endloop - endfacet - facet normal 0.991357 0.131195 0 - outer loop - vertex 25.9892 18.2943 -3 - vertex 26.0816 17.5963 0 - vertex 26.0816 17.5963 -3 - endloop - endfacet - facet normal 0.907716 0.419585 0 - outer loop - vertex 25.9892 18.2943 0 - vertex 25.7331 18.8483 -3 - vertex 25.7331 18.8483 0 - endloop - endfacet - facet normal 0.907716 0.419585 0 - outer loop - vertex 25.7331 18.8483 -3 - vertex 25.9892 18.2943 0 - vertex 25.9892 18.2943 -3 - endloop - endfacet - facet normal 0.685144 0.728407 -0 - outer loop - vertex 25.7331 18.8483 -3 - vertex 25.3447 19.2137 0 - vertex 25.7331 18.8483 0 - endloop - endfacet - facet normal 0.685144 0.728407 0 - outer loop - vertex 25.3447 19.2137 0 - vertex 25.7331 18.8483 -3 - vertex 25.3447 19.2137 -3 - endloop - endfacet - facet normal 0.260028 0.965601 -0 - outer loop - vertex 25.3447 19.2137 -3 - vertex 24.8554 19.3454 0 - vertex 25.3447 19.2137 0 - endloop - endfacet - facet normal 0.260028 0.965601 0 - outer loop - vertex 24.8554 19.3454 0 - vertex 25.3447 19.2137 -3 - vertex 24.8554 19.3454 -3 - endloop - endfacet - facet normal 0.225805 0.974172 -0 - outer loop - vertex 24.8554 19.3454 -3 - vertex 23.3909 19.6849 0 - vertex 24.8554 19.3454 0 - endloop - endfacet - facet normal 0.225805 0.974172 0 - outer loop - vertex 23.3909 19.6849 0 - vertex 24.8554 19.3454 -3 - vertex 23.3909 19.6849 -3 - endloop - endfacet - facet normal 0.432873 0.901455 -0 - outer loop - vertex 23.3909 19.6849 -3 - vertex 22.6368 20.047 0 - vertex 23.3909 19.6849 0 - endloop - endfacet - facet normal 0.432873 0.901455 0 - outer loop - vertex 22.6368 20.047 0 - vertex 23.3909 19.6849 -3 - vertex 22.6368 20.047 -3 - endloop - endfacet - facet normal 0.698531 0.71558 -0 - outer loop - vertex 22.6368 20.047 -3 - vertex 22.0911 20.5797 0 - vertex 22.6368 20.047 0 - endloop - endfacet - facet normal 0.698531 0.71558 0 - outer loop - vertex 22.0911 20.5797 0 - vertex 22.6368 20.047 -3 - vertex 22.0911 20.5797 -3 - endloop - endfacet - facet normal 0.897086 0.441856 0 - outer loop - vertex 22.0911 20.5797 0 - vertex 21.7245 21.3239 -3 - vertex 21.7245 21.3239 0 - endloop - endfacet - facet normal 0.897086 0.441856 0 - outer loop - vertex 21.7245 21.3239 -3 - vertex 22.0911 20.5797 0 - vertex 22.0911 20.5797 -3 - endloop - endfacet - facet normal 0.977198 0.212332 0 - outer loop - vertex 21.7245 21.3239 0 - vertex 21.508 22.3204 -3 - vertex 21.508 22.3204 0 - endloop - endfacet - facet normal 0.977198 0.212332 0 - outer loop - vertex 21.508 22.3204 -3 - vertex 21.7245 21.3239 0 - vertex 21.7245 21.3239 -3 - endloop - endfacet - facet normal 0.966755 0.255705 0 - outer loop - vertex 21.508 22.3204 0 - vertex 21.2518 23.2891 -3 - vertex 21.2518 23.2891 0 - endloop - endfacet - facet normal 0.966755 0.255705 0 - outer loop - vertex 21.2518 23.2891 -3 - vertex 21.508 22.3204 0 - vertex 21.508 22.3204 -3 - endloop - endfacet - facet normal 0.849732 0.527214 0 - outer loop - vertex 21.2518 23.2891 0 - vertex 20.762 24.0784 -3 - vertex 20.762 24.0784 0 - endloop - endfacet - facet normal 0.849732 0.527214 0 - outer loop - vertex 20.762 24.0784 -3 - vertex 21.2518 23.2891 0 - vertex 21.2518 23.2891 -3 - endloop - endfacet - facet normal 0.645661 0.763624 -0 - outer loop - vertex 20.762 24.0784 -3 - vertex 20.0338 24.6942 0 - vertex 20.762 24.0784 0 - endloop - endfacet - facet normal 0.645661 0.763624 0 - outer loop - vertex 20.0338 24.6942 0 - vertex 20.762 24.0784 -3 - vertex 20.0338 24.6942 -3 - endloop - endfacet - facet normal 0.418642 0.908151 -0 - outer loop - vertex 20.0338 24.6942 -3 - vertex 19.062 25.1422 0 - vertex 20.0338 24.6942 0 - endloop - endfacet - facet normal 0.418642 0.908151 0 - outer loop - vertex 19.062 25.1422 0 - vertex 20.0338 24.6942 -3 - vertex 19.062 25.1422 -3 - endloop - endfacet - facet normal 0.419948 0.907548 -0 - outer loop - vertex 19.062 25.1422 -3 - vertex 17.2513 25.98 0 - vertex 19.062 25.1422 0 - endloop - endfacet - facet normal 0.419948 0.907548 0 - outer loop - vertex 17.2513 25.98 0 - vertex 19.062 25.1422 -3 - vertex 17.2513 25.98 -3 - endloop - endfacet - facet normal 0.649834 0.760076 -0 - outer loop - vertex 17.2513 25.98 -3 - vertex 15.7223 27.2873 0 - vertex 17.2513 25.98 0 - endloop - endfacet - facet normal 0.649834 0.760076 0 - outer loop - vertex 15.7223 27.2873 0 - vertex 17.2513 25.98 -3 - vertex 15.7223 27.2873 -3 - endloop - endfacet - facet normal 0.802285 0.596942 0 - outer loop - vertex 15.7223 27.2873 0 - vertex 15.122 28.0941 -3 - vertex 15.122 28.0941 0 - endloop - endfacet - facet normal 0.802285 0.596942 0 - outer loop - vertex 15.122 28.0941 -3 - vertex 15.7223 27.2873 0 - vertex 15.7223 27.2873 -3 - endloop - endfacet - facet normal 0.997794 0.066389 0 - outer loop - vertex 15.122 28.0941 0 - vertex 15.0577 29.0611 -3 - vertex 15.0577 29.0611 0 - endloop - endfacet - facet normal 0.997794 0.066389 0 - outer loop - vertex 15.0577 29.0611 -3 - vertex 15.122 28.0941 0 - vertex 15.122 28.0941 -3 - endloop - endfacet - facet normal 0.991125 -0.132935 0 - outer loop - vertex 15.0577 29.0611 0 - vertex 15.1584 29.8123 -3 - vertex 15.1584 29.8123 0 - endloop - endfacet - facet normal 0.991125 -0.132935 0 - outer loop - vertex 15.1584 29.8123 -3 - vertex 15.0577 29.0611 0 - vertex 15.0577 29.0611 -3 - endloop - endfacet - facet normal 0.868998 -0.494816 0 - outer loop - vertex 15.1584 29.8123 0 - vertex 15.3134 30.0845 -3 - vertex 15.3134 30.0845 0 - endloop - endfacet - facet normal 0.868998 -0.494816 0 - outer loop - vertex 15.3134 30.0845 -3 - vertex 15.1584 29.8123 0 - vertex 15.1584 29.8123 -3 - endloop - endfacet - facet normal -0.793235 -0.608916 0 - outer loop - vertex 15.4783 29.8698 -3 - vertex 15.3134 30.0845 0 - vertex 15.3134 30.0845 -3 - endloop - endfacet - facet normal -0.793235 -0.608916 0 - outer loop - vertex 15.3134 30.0845 0 - vertex 15.4783 29.8698 -3 - vertex 15.4783 29.8698 0 - endloop - endfacet - facet normal -0.983592 -0.18041 0 - outer loop - vertex 15.6084 29.1601 -3 - vertex 15.4783 29.8698 0 - vertex 15.4783 29.8698 -3 - endloop - endfacet - facet normal -0.983592 -0.18041 0 - outer loop - vertex 15.4783 29.8698 0 - vertex 15.6084 29.1601 -3 - vertex 15.6084 29.1601 0 - endloop - endfacet - facet normal -0.973498 -0.228694 0 - outer loop - vertex 15.808 28.3106 -3 - vertex 15.6084 29.1601 0 - vertex 15.6084 29.1601 -3 - endloop - endfacet - facet normal -0.973498 -0.228694 0 - outer loop - vertex 15.6084 29.1601 0 - vertex 15.808 28.3106 -3 - vertex 15.808 28.3106 0 - endloop - endfacet - facet normal -0.833811 -0.55205 0 - outer loop - vertex 16.2688 27.6146 -3 - vertex 15.808 28.3106 0 - vertex 15.808 28.3106 -3 - endloop - endfacet - facet normal -0.833811 -0.55205 0 - outer loop - vertex 15.808 28.3106 0 - vertex 16.2688 27.6146 -3 - vertex 16.2688 27.6146 0 - endloop - endfacet - facet normal -0.616484 -0.787368 0 - outer loop - vertex 16.2688 27.6146 -3 - vertex 17.0772 26.9817 0 - vertex 16.2688 27.6146 0 - endloop - endfacet - facet normal -0.616484 -0.787368 -0 - outer loop - vertex 17.0772 26.9817 0 - vertex 16.2688 27.6146 -3 - vertex 17.0772 26.9817 -3 - endloop - endfacet - facet normal -0.469274 -0.883053 0 - outer loop - vertex 17.0772 26.9817 -3 - vertex 18.3193 26.3216 0 - vertex 17.0772 26.9817 0 - endloop - endfacet - facet normal -0.469274 -0.883053 -0 - outer loop - vertex 18.3193 26.3216 0 - vertex 17.0772 26.9817 -3 - vertex 18.3193 26.3216 -3 - endloop - endfacet - facet normal -0.453671 -0.891169 0 - outer loop - vertex 18.3193 26.3216 -3 - vertex 20.1819 25.3734 0 - vertex 18.3193 26.3216 0 - endloop - endfacet - facet normal -0.453671 -0.891169 -0 - outer loop - vertex 20.1819 25.3734 0 - vertex 18.3193 26.3216 -3 - vertex 20.1819 25.3734 -3 - endloop - endfacet - facet normal -0.592966 -0.805227 0 - outer loop - vertex 20.1819 25.3734 -3 - vertex 21.2755 24.568 0 - vertex 20.1819 25.3734 0 - endloop - endfacet - facet normal -0.592966 -0.805227 -0 - outer loop - vertex 21.2755 24.568 0 - vertex 20.1819 25.3734 -3 - vertex 21.2755 24.568 -3 - endloop - endfacet - facet normal -0.85116 -0.524906 0 - outer loop - vertex 21.8319 23.6658 -3 - vertex 21.2755 24.568 0 - vertex 21.2755 24.568 -3 - endloop - endfacet - facet normal -0.85116 -0.524906 0 - outer loop - vertex 21.2755 24.568 0 - vertex 21.8319 23.6658 -3 - vertex 21.8319 23.6658 0 - endloop - endfacet - facet normal -0.980126 -0.198375 0 - outer loop - vertex 22.0827 22.427 -3 - vertex 21.8319 23.6658 0 - vertex 21.8319 23.6658 -3 - endloop - endfacet - facet normal -0.980126 -0.198375 0 - outer loop - vertex 21.8319 23.6658 0 - vertex 22.0827 22.427 -3 - vertex 22.0827 22.427 0 - endloop - endfacet - facet normal -0.975671 -0.219241 0 - outer loop - vertex 22.2698 21.5943 -3 - vertex 22.0827 22.427 0 - vertex 22.0827 22.427 -3 - endloop - endfacet - facet normal -0.975671 -0.219241 0 - outer loop - vertex 22.0827 22.427 0 - vertex 22.2698 21.5943 -3 - vertex 22.2698 21.5943 0 - endloop - endfacet - facet normal -0.867972 -0.496613 0 - outer loop - vertex 22.6169 20.9877 -3 - vertex 22.2698 21.5943 0 - vertex 22.2698 21.5943 -3 - endloop - endfacet - facet normal -0.867972 -0.496613 0 - outer loop - vertex 22.2698 21.5943 0 - vertex 22.6169 20.9877 -3 - vertex 22.6169 20.9877 0 - endloop - endfacet - facet normal -0.60611 -0.795381 0 - outer loop - vertex 22.6169 20.9877 -3 - vertex 23.1387 20.59 0 - vertex 22.6169 20.9877 0 - endloop - endfacet - facet normal -0.60611 -0.795381 -0 - outer loop - vertex 23.1387 20.59 0 - vertex 22.6169 20.9877 -3 - vertex 23.1387 20.59 -3 - endloop - endfacet - facet normal -0.277742 -0.960656 0 - outer loop - vertex 23.1387 20.59 -3 - vertex 23.8499 20.3844 0 - vertex 23.1387 20.59 0 - endloop - endfacet - facet normal -0.277742 -0.960656 -0 - outer loop - vertex 23.8499 20.3844 0 - vertex 23.1387 20.59 -3 - vertex 23.8499 20.3844 -3 - endloop - endfacet - facet normal -0.253903 -0.96723 0 - outer loop - vertex 23.8499 20.3844 -3 - vertex 25.0752 20.0627 0 - vertex 23.8499 20.3844 0 - endloop - endfacet - facet normal -0.253903 -0.96723 -0 - outer loop - vertex 25.0752 20.0627 0 - vertex 23.8499 20.3844 -3 - vertex 25.0752 20.0627 -3 - endloop - endfacet - facet normal -0.555295 -0.831654 0 - outer loop - vertex 25.0752 20.0627 -3 - vertex 25.9424 19.4837 0 - vertex 25.0752 20.0627 0 - endloop - endfacet - facet normal -0.555295 -0.831654 -0 - outer loop - vertex 25.9424 19.4837 0 - vertex 25.0752 20.0627 -3 - vertex 25.9424 19.4837 -3 - endloop - endfacet - facet normal -0.850459 -0.526041 0 - outer loop - vertex 26.4742 18.624 -3 - vertex 25.9424 19.4837 0 - vertex 25.9424 19.4837 -3 - endloop - endfacet - facet normal -0.850459 -0.526041 0 - outer loop - vertex 25.9424 19.4837 0 - vertex 26.4742 18.624 -3 - vertex 26.4742 18.624 0 - endloop - endfacet - facet normal -0.982731 -0.185042 0 - outer loop - vertex 26.6933 17.4601 -3 - vertex 26.4742 18.624 0 - vertex 26.4742 18.624 -3 - endloop - endfacet - facet normal -0.982731 -0.185042 0 - outer loop - vertex 26.4742 18.624 0 - vertex 26.6933 17.4601 -3 - vertex 26.6933 17.4601 0 - endloop - endfacet - facet normal -0.95811 -0.286401 0 - outer loop - vertex 27.1755 15.8473 -3 - vertex 26.6933 17.4601 0 - vertex 26.6933 17.4601 -3 - endloop - endfacet - facet normal -0.95811 -0.286401 0 - outer loop - vertex 26.6933 17.4601 0 - vertex 27.1755 15.8473 -3 - vertex 27.1755 15.8473 0 - endloop - endfacet - facet normal -0.948381 -0.317134 0 - outer loop - vertex 27.5422 14.7505 -3 - vertex 27.1755 15.8473 0 - vertex 27.1755 15.8473 -3 - endloop - endfacet - facet normal -0.948381 -0.317134 0 - outer loop - vertex 27.1755 15.8473 0 - vertex 27.5422 14.7505 -3 - vertex 27.5422 14.7505 0 - endloop - endfacet - facet normal -0.999642 -0.0267694 0 - outer loop - vertex 27.6094 12.2412 -3 - vertex 27.5422 14.7505 0 - vertex 27.5422 14.7505 -3 - endloop - endfacet - facet normal -0.999642 -0.0267694 0 - outer loop - vertex 27.5422 14.7505 0 - vertex 27.6094 12.2412 -3 - vertex 27.6094 12.2412 0 - endloop - endfacet - facet normal -0.999486 0.0320667 0 - outer loop - vertex 27.528 9.70386 -3 - vertex 27.6094 12.2412 0 - vertex 27.6094 12.2412 -3 - endloop - endfacet - facet normal -0.999486 0.0320667 0 - outer loop - vertex 27.6094 12.2412 0 - vertex 27.528 9.70386 -3 - vertex 27.528 9.70386 0 - endloop - endfacet - facet normal -0.981091 0.193547 0 - outer loop - vertex 27.209 8.08714 -3 - vertex 27.528 9.70386 0 - vertex 27.528 9.70386 -3 - endloop - endfacet - facet normal -0.981091 0.193547 0 - outer loop - vertex 27.528 9.70386 0 - vertex 27.209 8.08714 -3 - vertex 27.209 8.08714 0 - endloop - endfacet - facet normal -0.980935 0.194337 0 - outer loop - vertex 26.8985 6.51977 -3 - vertex 27.209 8.08714 0 - vertex 27.209 8.08714 -3 - endloop - endfacet - facet normal -0.980935 0.194337 0 - outer loop - vertex 27.209 8.08714 0 - vertex 26.8985 6.51977 -3 - vertex 26.8985 6.51977 0 - endloop - endfacet - facet normal -0.999971 -0.00756314 0 - outer loop - vertex 26.9177 3.98634 -3 - vertex 26.8985 6.51977 0 - vertex 26.8985 6.51977 -3 - endloop - endfacet - facet normal -0.999971 -0.00756314 0 - outer loop - vertex 26.8985 6.51977 0 - vertex 26.9177 3.98634 -3 - vertex 26.9177 3.98634 0 - endloop - endfacet - facet normal -0.999812 -0.0193848 0 - outer loop - vertex 26.953 2.16551 -3 - vertex 26.9177 3.98634 0 - vertex 26.9177 3.98634 -3 - endloop - endfacet - facet normal -0.999812 -0.0193848 0 - outer loop - vertex 26.9177 3.98634 0 - vertex 26.953 2.16551 -3 - vertex 26.953 2.16551 0 - endloop - endfacet - facet normal -0.99253 0.121998 0 - outer loop - vertex 26.8464 1.29842 -3 - vertex 26.953 2.16551 0 - vertex 26.953 2.16551 -3 - endloop - endfacet - facet normal -0.99253 0.121998 0 - outer loop - vertex 26.953 2.16551 0 - vertex 26.8464 1.29842 -3 - vertex 26.8464 1.29842 0 - endloop - endfacet - facet normal -0.673406 0.739273 0 - outer loop - vertex 26.8464 1.29842 -3 - vertex 26.7235 1.18648 0 - vertex 26.8464 1.29842 0 - endloop - endfacet - facet normal -0.673406 0.739273 0 - outer loop - vertex 26.7235 1.18648 0 - vertex 26.8464 1.29842 -3 - vertex 26.7235 1.18648 -3 - endloop - endfacet - facet normal 0.423462 0.905914 -0 - outer loop - vertex 26.7235 1.18648 -3 - vertex 26.5455 1.2697 0 - vertex 26.7235 1.18648 0 - endloop - endfacet - facet normal 0.423462 0.905914 0 - outer loop - vertex 26.5455 1.2697 0 - vertex 26.7235 1.18648 -3 - vertex 26.5455 1.2697 -3 - endloop - endfacet - facet normal 0.785068 0.61941 0 - outer loop - vertex 26.5455 1.2697 0 - vertex 25.9977 1.96397 -3 - vertex 25.9977 1.96397 0 - endloop - endfacet - facet normal 0.785068 0.61941 0 - outer loop - vertex 25.9977 1.96397 -3 - vertex 26.5455 1.2697 0 - vertex 26.5455 1.2697 -3 - endloop - endfacet - facet normal 0.724168 0.689624 0 - outer loop - vertex 25.9977 1.96397 0 - vertex 25.3153 2.68052 -3 - vertex 25.3153 2.68052 0 - endloop - endfacet - facet normal 0.724168 0.689624 0 - outer loop - vertex 25.3153 2.68052 -3 - vertex 25.9977 1.96397 0 - vertex 25.9977 1.96397 -3 - endloop - endfacet - facet normal -0.00319409 0.999995 0 - outer loop - vertex 25.3153 2.68052 -3 - vertex 25.0347 2.67962 0 - vertex 25.3153 2.68052 0 - endloop - endfacet - facet normal -0.00319409 0.999995 0 - outer loop - vertex 25.0347 2.67962 0 - vertex 25.3153 2.68052 -3 - vertex 25.0347 2.67962 -3 - endloop - endfacet - facet normal -0.620982 0.783825 0 - outer loop - vertex 25.0347 2.67962 -3 - vertex 24.7523 2.4559 0 - vertex 25.0347 2.67962 0 - endloop - endfacet - facet normal -0.620982 0.783825 0 - outer loop - vertex 24.7523 2.4559 0 - vertex 25.0347 2.67962 -3 - vertex 24.7523 2.4559 -3 - endloop - endfacet - facet normal -0.356176 0.934419 0 - outer loop - vertex 24.7523 2.4559 -3 - vertex 23.9858 2.16372 0 - vertex 24.7523 2.4559 0 - endloop - endfacet - facet normal -0.356176 0.934419 0 - outer loop - vertex 23.9858 2.16372 0 - vertex 24.7523 2.4559 -3 - vertex 23.9858 2.16372 -3 - endloop - endfacet - facet normal -0.21204 0.977261 0 - outer loop - vertex 23.9858 2.16372 -3 - vertex 23.1222 1.97635 0 - vertex 23.9858 2.16372 0 - endloop - endfacet - facet normal -0.21204 0.977261 0 - outer loop - vertex 23.1222 1.97635 0 - vertex 23.9858 2.16372 -3 - vertex 23.1222 1.97635 -3 - endloop - endfacet - facet normal 0.0237086 0.999719 -0 - outer loop - vertex 23.1222 1.97635 -3 - vertex 22.8505 1.9828 0 - vertex 23.1222 1.97635 0 - endloop - endfacet - facet normal 0.0237086 0.999719 0 - outer loop - vertex 22.8505 1.9828 0 - vertex 23.1222 1.97635 -3 - vertex 22.8505 1.9828 -3 - endloop - endfacet - facet normal 0.97535 0.220664 0 - outer loop - vertex 22.8505 1.9828 0 - vertex 22.7784 2.30129 -3 - vertex 22.7784 2.30129 0 - endloop - endfacet - facet normal 0.97535 0.220664 0 - outer loop - vertex 22.7784 2.30129 -3 - vertex 22.8505 1.9828 0 - vertex 22.8505 1.9828 -3 - endloop - endfacet - facet normal 0.936019 -0.35195 0 - outer loop - vertex 22.7784 2.30129 0 - vertex 23.2082 3.44442 -3 - vertex 23.2082 3.44442 0 - endloop - endfacet - facet normal 0.936019 -0.35195 0 - outer loop - vertex 23.2082 3.44442 -3 - vertex 22.7784 2.30129 0 - vertex 22.7784 2.30129 -3 - endloop - endfacet - facet normal 0.913236 -0.40743 0 - outer loop - vertex 23.2082 3.44442 0 - vertex 23.5377 4.18291 -3 - vertex 23.5377 4.18291 0 - endloop - endfacet - facet normal 0.913236 -0.40743 0 - outer loop - vertex 23.5377 4.18291 -3 - vertex 23.2082 3.44442 0 - vertex 23.2082 3.44442 -3 - endloop - endfacet - facet normal 0.997125 -0.0757773 0 - outer loop - vertex 23.5377 4.18291 0 - vertex 23.5966 4.95794 -3 - vertex 23.5966 4.95794 0 - endloop - endfacet - facet normal 0.997125 -0.0757773 0 - outer loop - vertex 23.5966 4.95794 -3 - vertex 23.5377 4.18291 0 - vertex 23.5377 4.18291 -3 - endloop - endfacet - facet normal 0.969407 0.245457 0 - outer loop - vertex 23.5966 4.95794 0 - vertex 23.3811 5.8089 -3 - vertex 23.3811 5.8089 0 - endloop - endfacet - facet normal 0.969407 0.245457 0 - outer loop - vertex 23.3811 5.8089 -3 - vertex 23.5966 4.95794 0 - vertex 23.5966 4.95794 -3 - endloop - endfacet - facet normal 0.890531 0.454923 0 - outer loop - vertex 23.3811 5.8089 0 - vertex 22.8875 6.77518 -3 - vertex 22.8875 6.77518 0 - endloop - endfacet - facet normal 0.890531 0.454923 0 - outer loop - vertex 22.8875 6.77518 -3 - vertex 23.3811 5.8089 0 - vertex 23.3811 5.8089 -3 - endloop - endfacet - facet normal 0.77704 0.629451 0 - outer loop - vertex 22.8875 6.77518 0 - vertex 21.7142 8.22365 -3 - vertex 21.7142 8.22365 0 - endloop - endfacet - facet normal 0.77704 0.629451 0 - outer loop - vertex 21.7142 8.22365 -3 - vertex 22.8875 6.77518 0 - vertex 22.8875 6.77518 -3 - endloop - endfacet - facet normal 0.585146 0.810928 -0 - outer loop - vertex 21.7142 8.22365 -3 - vertex 19.7157 9.66569 0 - vertex 21.7142 8.22365 0 - endloop - endfacet - facet normal 0.585146 0.810928 0 - outer loop - vertex 19.7157 9.66569 0 - vertex 21.7142 8.22365 -3 - vertex 19.7157 9.66569 -3 - endloop - endfacet - facet normal 0.415721 0.909492 -0 - outer loop - vertex 19.7157 9.66569 -3 - vertex 18.6847 10.137 0 - vertex 19.7157 9.66569 0 - endloop - endfacet - facet normal 0.415721 0.909492 0 - outer loop - vertex 18.6847 10.137 0 - vertex 19.7157 9.66569 -3 - vertex 18.6847 10.137 -3 - endloop - endfacet - facet normal 0.146348 0.989233 -0 - outer loop - vertex 18.6847 10.137 -3 - vertex 17.337 10.3363 0 - vertex 18.6847 10.137 0 - endloop - endfacet - facet normal 0.146348 0.989233 0 - outer loop - vertex 17.337 10.3363 0 - vertex 18.6847 10.137 -3 - vertex 17.337 10.3363 -3 - endloop - endfacet - facet normal -0.00363232 0.999993 0 - outer loop - vertex 17.337 10.3363 -3 - vertex 15.9933 10.3315 0 - vertex 17.337 10.3363 0 - endloop - endfacet - facet normal -0.00363232 0.999993 0 - outer loop - vertex 15.9933 10.3315 0 - vertex 17.337 10.3363 -3 - vertex 15.9933 10.3315 -3 - endloop - endfacet - facet normal -0.520358 0.853948 0 - outer loop - vertex 15.9933 10.3315 -3 - vertex 15.6762 10.1383 0 - vertex 15.9933 10.3315 0 - endloop - endfacet - facet normal -0.520358 0.853948 0 - outer loop - vertex 15.6762 10.1383 0 - vertex 15.9933 10.3315 -3 - vertex 15.6762 10.1383 -3 - endloop - endfacet - facet normal -0.775154 0.631772 0 - outer loop - vertex 15.3572 9.74689 -3 - vertex 15.6762 10.1383 0 - vertex 15.6762 10.1383 -3 - endloop - endfacet - facet normal -0.775154 0.631772 0 - outer loop - vertex 15.6762 10.1383 0 - vertex 15.3572 9.74689 -3 - vertex 15.3572 9.74689 0 - endloop - endfacet - facet normal -0.885944 0.463791 0 - outer loop - vertex 14.9426 8.95486 -3 - vertex 15.3572 9.74689 0 - vertex 15.3572 9.74689 -3 - endloop - endfacet - facet normal -0.885944 0.463791 0 - outer loop - vertex 15.3572 9.74689 0 - vertex 14.9426 8.95486 -3 - vertex 14.9426 8.95486 0 - endloop - endfacet - facet normal -0.999951 -0.00991933 0 - outer loop - vertex 14.9551 7.69881 -3 - vertex 14.9426 8.95486 0 - vertex 14.9426 8.95486 -3 - endloop - endfacet - facet normal -0.999951 -0.00991933 0 - outer loop - vertex 14.9426 8.95486 0 - vertex 14.9551 7.69881 -3 - vertex 14.9551 7.69881 0 - endloop - endfacet - facet normal -0.987205 -0.159458 0 - outer loop - vertex 15.3368 5.33522 -3 - vertex 14.9551 7.69881 0 - vertex 14.9551 7.69881 -3 - endloop - endfacet - facet normal -0.987205 -0.159458 0 - outer loop - vertex 14.9551 7.69881 0 - vertex 15.3368 5.33522 -3 - vertex 15.3368 5.33522 0 - endloop - endfacet - facet normal -0.962213 -0.272299 0 - outer loop - vertex 16.0239 2.90744 -3 - vertex 15.3368 5.33522 0 - vertex 15.3368 5.33522 -3 - endloop - endfacet - facet normal -0.962213 -0.272299 0 - outer loop - vertex 15.3368 5.33522 0 - vertex 16.0239 2.90744 -3 - vertex 16.0239 2.90744 0 - endloop - endfacet - facet normal -0.924811 -0.380427 0 - outer loop - vertex 16.8564 0.883682 -3 - vertex 16.0239 2.90744 0 - vertex 16.0239 2.90744 -3 - endloop - endfacet - facet normal -0.924811 -0.380427 0 - outer loop - vertex 16.0239 2.90744 0 - vertex 16.8564 0.883682 -3 - vertex 16.8564 0.883682 0 - endloop - endfacet - facet normal -0.815204 -0.579174 0 - outer loop - vertex 17.6745 -0.267811 -3 - vertex 16.8564 0.883682 0 - vertex 16.8564 0.883682 -3 - endloop - endfacet - facet normal -0.815204 -0.579174 0 - outer loop - vertex 16.8564 0.883682 0 - vertex 17.6745 -0.267811 -3 - vertex 17.6745 -0.267811 0 - endloop - endfacet - facet normal -0.318326 -0.947981 0 - outer loop - vertex 17.6745 -0.267811 -3 - vertex 18.2674 -0.466912 0 - vertex 17.6745 -0.267811 0 - endloop - endfacet - facet normal -0.318326 -0.947981 -0 - outer loop - vertex 18.2674 -0.466912 0 - vertex 17.6745 -0.267811 -3 - vertex 18.2674 -0.466912 -3 - endloop - endfacet - facet normal 0.268508 -0.963277 0 - outer loop - vertex 18.2674 -0.466912 -3 - vertex 19.4865 -0.127098 0 - vertex 18.2674 -0.466912 0 - endloop - endfacet - facet normal 0.268508 -0.963277 0 - outer loop - vertex 19.4865 -0.127098 0 - vertex 18.2674 -0.466912 -3 - vertex 19.4865 -0.127098 -3 - endloop - endfacet - facet normal 0.219889 -0.975525 0 - outer loop - vertex 19.4865 -0.127098 -3 - vertex 21.0282 0.220415 0 - vertex 19.4865 -0.127098 0 - endloop - endfacet - facet normal 0.219889 -0.975525 0 - outer loop - vertex 21.0282 0.220415 0 - vertex 19.4865 -0.127098 -3 - vertex 21.0282 0.220415 -3 - endloop - endfacet - facet normal -0.998758 -0.0498338 0 - outer loop - vertex 21.0968 -1.15452 -3 - vertex 21.0282 0.220415 0 - vertex 21.0282 0.220415 -3 - endloop - endfacet - facet normal -0.998758 -0.0498338 0 - outer loop - vertex 21.0282 0.220415 0 - vertex 21.0968 -1.15452 -3 - vertex 21.0968 -1.15452 0 - endloop - endfacet - facet normal -0.983918 0.178619 0 - outer loop - vertex 20.9081 -2.19366 -3 - vertex 21.0968 -1.15452 0 - vertex 21.0968 -1.15452 -3 - endloop - endfacet - facet normal -0.983918 0.178619 0 - outer loop - vertex 21.0968 -1.15452 0 - vertex 20.9081 -2.19366 -3 - vertex 20.9081 -2.19366 0 - endloop - endfacet - facet normal -0.856849 0.515568 0 - outer loop - vertex 20.4179 -3.0084 -3 - vertex 20.9081 -2.19366 0 - vertex 20.9081 -2.19366 -3 - endloop - endfacet - facet normal -0.856849 0.515568 0 - outer loop - vertex 20.9081 -2.19366 0 - vertex 20.4179 -3.0084 -3 - vertex 20.4179 -3.0084 0 - endloop - endfacet - facet normal -0.631353 0.775495 0 - outer loop - vertex 20.4179 -3.0084 -3 - vertex 19.4334 -3.80993 0 - vertex 20.4179 -3.0084 0 - endloop - endfacet - facet normal -0.631353 0.775495 0 - outer loop - vertex 19.4334 -3.80993 0 - vertex 20.4179 -3.0084 -3 - vertex 19.4334 -3.80993 -3 - endloop - endfacet - facet normal -0.513213 0.858261 0 - outer loop - vertex 19.4334 -3.80993 -3 - vertex 17.7619 -4.80944 0 - vertex 19.4334 -3.80993 0 - endloop - endfacet - facet normal -0.513213 0.858261 0 - outer loop - vertex 17.7619 -4.80944 0 - vertex 19.4334 -3.80993 -3 - vertex 17.7619 -4.80944 -3 - endloop - endfacet - facet normal -0.460069 0.887883 0 - outer loop - vertex 17.7619 -4.80944 -3 - vertex 15.0012 -6.23992 0 - vertex 17.7619 -4.80944 0 - endloop - endfacet - facet normal -0.460069 0.887883 0 - outer loop - vertex 15.0012 -6.23992 0 - vertex 17.7619 -4.80944 -3 - vertex 15.0012 -6.23992 -3 - endloop - endfacet - facet normal -0.358805 0.933413 0 - outer loop - vertex 15.0012 -6.23992 -3 - vertex 12.6103 -7.15898 0 - vertex 15.0012 -6.23992 0 - endloop - endfacet - facet normal -0.358805 0.933413 0 - outer loop - vertex 12.6103 -7.15898 0 - vertex 15.0012 -6.23992 -3 - vertex 12.6103 -7.15898 -3 - endloop - endfacet - facet normal -0.211321 0.977417 0 - outer loop - vertex 12.6103 -7.15898 -3 - vertex 10.2421 -7.67101 0 - vertex 12.6103 -7.15898 0 - endloop - endfacet - facet normal -0.211321 0.977417 0 - outer loop - vertex 10.2421 -7.67101 0 - vertex 12.6103 -7.15898 -3 - vertex 10.2421 -7.67101 -3 - endloop - endfacet - facet normal -0.0775281 0.99699 0 - outer loop - vertex 10.2421 -7.67101 -3 - vertex 7.54923 -7.88041 0 - vertex 10.2421 -7.67101 0 - endloop - endfacet - facet normal -0.0775281 0.99699 0 - outer loop - vertex 7.54923 -7.88041 0 - vertex 10.2421 -7.67101 -3 - vertex 7.54923 -7.88041 -3 - endloop - endfacet - facet normal -0.00181695 0.999998 0 - outer loop - vertex 7.54923 -7.88041 -3 - vertex 5.03167 -7.88498 0 - vertex 7.54923 -7.88041 0 - endloop - endfacet - facet normal -0.00181695 0.999998 0 - outer loop - vertex 5.03167 -7.88498 0 - vertex 7.54923 -7.88041 -3 - vertex 5.03167 -7.88498 -3 - endloop - endfacet - facet normal 0.239055 0.971006 -0 - outer loop - vertex 5.03167 -7.88498 -3 - vertex 3.854 -7.59505 0 - vertex 5.03167 -7.88498 0 - endloop - endfacet - facet normal 0.239055 0.971006 0 - outer loop - vertex 3.854 -7.59505 0 - vertex 5.03167 -7.88498 -3 - vertex 3.854 -7.59505 -3 - endloop - endfacet - facet normal 0.512147 0.858898 -0 - outer loop - vertex 3.854 -7.59505 -3 - vertex 1.04019 -5.91722 0 - vertex 3.854 -7.59505 0 - endloop - endfacet - facet normal 0.512147 0.858898 0 - outer loop - vertex 1.04019 -5.91722 0 - vertex 3.854 -7.59505 -3 - vertex 1.04019 -5.91722 -3 - endloop - endfacet - facet normal 0.520307 0.85398 -0 - outer loop - vertex 1.04019 -5.91722 -3 - vertex -2.05653 -4.03047 0 - vertex 1.04019 -5.91722 0 - endloop - endfacet - facet normal 0.520307 0.85398 0 - outer loop - vertex -2.05653 -4.03047 0 - vertex 1.04019 -5.91722 -3 - vertex -2.05653 -4.03047 -3 - endloop - endfacet - facet normal 0.582306 0.812969 -0 - outer loop - vertex -2.05653 -4.03047 -3 - vertex -3.45272 -3.03042 0 - vertex -2.05653 -4.03047 0 - endloop - endfacet - facet normal 0.582306 0.812969 0 - outer loop - vertex -3.45272 -3.03042 0 - vertex -2.05653 -4.03047 -3 - vertex -3.45272 -3.03042 -3 - endloop - endfacet - facet normal 0.814407 0.580294 0 - outer loop - vertex -3.45272 -3.03042 0 - vertex -3.71458 -2.66291 -3 - vertex -3.71458 -2.66291 0 - endloop - endfacet - facet normal 0.814407 0.580294 0 - outer loop - vertex -3.71458 -2.66291 -3 - vertex -3.45272 -3.03042 0 - vertex -3.45272 -3.03042 -3 - endloop - endfacet - facet normal 0.667074 -0.744991 0 - outer loop - vertex -3.71458 -2.66291 -3 - vertex -3.55278 -2.51803 0 - vertex -3.71458 -2.66291 0 - endloop - endfacet - facet normal 0.667074 -0.744991 0 - outer loop - vertex -3.55278 -2.51803 0 - vertex -3.71458 -2.66291 -3 - vertex -3.55278 -2.51803 -3 - endloop - endfacet - facet normal -0.396625 -0.917981 0 - outer loop - vertex -3.55278 -2.51803 -3 - vertex -1.72768 -3.30659 0 - vertex -3.55278 -2.51803 0 - endloop - endfacet - facet normal -0.396625 -0.917981 -0 - outer loop - vertex -1.72768 -3.30659 0 - vertex -3.55278 -2.51803 -3 - vertex -1.72768 -3.30659 -3 - endloop - endfacet - facet normal -0.417951 -0.90847 0 - outer loop - vertex -1.72768 -3.30659 -3 - vertex 1.09298 -4.60426 0 - vertex -1.72768 -3.30659 0 - endloop - endfacet - facet normal -0.417951 -0.90847 -0 - outer loop - vertex 1.09298 -4.60426 0 - vertex -1.72768 -3.30659 -3 - vertex 1.09298 -4.60426 -3 - endloop - endfacet - facet normal -0.324179 -0.945996 0 - outer loop - vertex 1.09298 -4.60426 -3 - vertex 3.9592 -5.58648 0 - vertex 1.09298 -4.60426 0 - endloop - endfacet - facet normal -0.324179 -0.945996 -0 - outer loop - vertex 3.9592 -5.58648 0 - vertex 1.09298 -4.60426 -3 - vertex 3.9592 -5.58648 -3 - endloop - endfacet - facet normal -0.208038 -0.978121 0 - outer loop - vertex 3.9592 -5.58648 -3 - vertex 5.81183 -5.98051 0 - vertex 3.9592 -5.58648 0 - endloop - endfacet - facet normal -0.208038 -0.978121 -0 - outer loop - vertex 5.81183 -5.98051 0 - vertex 3.9592 -5.58648 -3 - vertex 5.81183 -5.98051 -3 - endloop - endfacet - facet normal 0.0684734 -0.997653 0 - outer loop - vertex 5.81183 -5.98051 -3 - vertex 7.21237 -5.88439 0 - vertex 5.81183 -5.98051 0 - endloop - endfacet - facet normal 0.0684734 -0.997653 0 - outer loop - vertex 7.21237 -5.88439 0 - vertex 5.81183 -5.98051 -3 - vertex 7.21237 -5.88439 -3 - endloop - endfacet - facet normal 0.219818 -0.975541 0 - outer loop - vertex 7.21237 -5.88439 -3 - vertex 7.79727 -5.75259 0 - vertex 7.21237 -5.88439 0 - endloop - endfacet - facet normal 0.219818 -0.975541 0 - outer loop - vertex 7.79727 -5.75259 0 - vertex 7.21237 -5.88439 -3 - vertex 7.79727 -5.75259 -3 - endloop - endfacet - facet normal 0.71334 0.700818 0 - outer loop - vertex 7.79727 -5.75259 0 - vertex 7.03104 -4.97268 -3 - vertex 7.03104 -4.97268 0 - endloop - endfacet - facet normal 0.71334 0.700818 0 - outer loop - vertex 7.03104 -4.97268 -3 - vertex 7.79727 -5.75259 0 - vertex 7.79727 -5.75259 -3 - endloop - endfacet - facet normal 0.78473 0.619838 0 - outer loop - vertex 7.03104 -4.97268 0 - vertex 5.97791 -3.63939 -3 - vertex 5.97791 -3.63939 0 - endloop - endfacet - facet normal 0.78473 0.619838 0 - outer loop - vertex 5.97791 -3.63939 -3 - vertex 7.03104 -4.97268 0 - vertex 7.03104 -4.97268 -3 - endloop - endfacet - facet normal 0.861751 0.507331 0 - outer loop - vertex 5.97791 -3.63939 0 - vertex 5.02006 -2.01238 -3 - vertex 5.02006 -2.01238 0 - endloop - endfacet - facet normal 0.861751 0.507331 0 - outer loop - vertex 5.02006 -2.01238 -3 - vertex 5.97791 -3.63939 0 - vertex 5.97791 -3.63939 -3 - endloop - endfacet - facet normal 0.918179 0.396167 0 - outer loop - vertex 5.02006 -2.01238 0 - vertex 4.37015 -0.506109 -3 - vertex 4.37015 -0.506109 0 - endloop - endfacet - facet normal 0.918179 0.396167 0 - outer loop - vertex 4.37015 -0.506109 -3 - vertex 5.02006 -2.01238 0 - vertex 5.02006 -2.01238 -3 - endloop - endfacet - facet normal 0.99125 0.131995 0 - outer loop - vertex 4.37015 -0.506109 0 - vertex 4.24084 0.464987 -3 - vertex 4.24084 0.464987 0 - endloop - endfacet - facet normal 0.99125 0.131995 0 - outer loop - vertex 4.24084 0.464987 -3 - vertex 4.37015 -0.506109 0 - vertex 4.37015 -0.506109 -3 - endloop - endfacet - facet normal 0.880686 -0.473701 0 - outer loop - vertex 4.24084 0.464987 0 - vertex 4.39665 0.754678 -3 - vertex 4.39665 0.754678 0 - endloop - endfacet - facet normal 0.880686 -0.473701 0 - outer loop - vertex 4.39665 0.754678 -3 - vertex 4.24084 0.464987 0 - vertex 4.24084 0.464987 -3 - endloop - endfacet - facet normal -0.827333 -0.561712 0 - outer loop - vertex 4.6091 0.441775 -3 - vertex 4.39665 0.754678 0 - vertex 4.39665 0.754678 -3 - endloop - endfacet - facet normal -0.827333 -0.561712 0 - outer loop - vertex 4.39665 0.754678 0 - vertex 4.6091 0.441775 -3 - vertex 4.6091 0.441775 0 - endloop - endfacet - facet normal -0.774222 -0.632914 0 - outer loop - vertex 6.41545 -1.76788 -3 - vertex 4.6091 0.441775 0 - vertex 4.6091 0.441775 -3 - endloop - endfacet - facet normal -0.774222 -0.632914 0 - outer loop - vertex 4.6091 0.441775 0 - vertex 6.41545 -1.76788 -3 - vertex 6.41545 -1.76788 0 - endloop - endfacet - facet normal -0.707099 -0.707114 0 - outer loop - vertex 6.41545 -1.76788 -3 - vertex 7.74282 -3.09522 0 - vertex 6.41545 -1.76788 0 - endloop - endfacet - facet normal -0.707099 -0.707114 -0 - outer loop - vertex 7.74282 -3.09522 0 - vertex 6.41545 -1.76788 -3 - vertex 7.74282 -3.09522 -3 - endloop - endfacet - facet normal -0.583644 -0.812009 0 - outer loop - vertex 7.74282 -3.09522 -3 - vertex 9.01294 -4.00814 0 - vertex 7.74282 -3.09522 0 - endloop - endfacet - facet normal -0.583644 -0.812009 -0 - outer loop - vertex 9.01294 -4.00814 0 - vertex 7.74282 -3.09522 -3 - vertex 9.01294 -4.00814 -3 - endloop - endfacet - facet normal -0.385065 -0.92289 0 - outer loop - vertex 9.01294 -4.00814 -3 - vertex 10.2758 -4.53506 0 - vertex 9.01294 -4.00814 0 - endloop - endfacet - facet normal -0.385065 -0.92289 -0 - outer loop - vertex 10.2758 -4.53506 0 - vertex 9.01294 -4.00814 -3 - vertex 10.2758 -4.53506 -3 - endloop - endfacet - facet normal -0.128613 -0.991695 0 - outer loop - vertex 10.2758 -4.53506 -3 - vertex 11.5814 -4.70438 0 - vertex 10.2758 -4.53506 0 - endloop - endfacet - facet normal -0.128613 -0.991695 -0 - outer loop - vertex 11.5814 -4.70438 0 - vertex 10.2758 -4.53506 -3 - vertex 11.5814 -4.70438 -3 - endloop - endfacet - facet normal 0.142467 -0.9898 0 - outer loop - vertex 11.5814 -4.70438 -3 - vertex 12.4032 -4.58609 0 - vertex 11.5814 -4.70438 0 - endloop - endfacet - facet normal 0.142467 -0.9898 0 - outer loop - vertex 12.4032 -4.58609 0 - vertex 11.5814 -4.70438 -3 - vertex 12.4032 -4.58609 -3 - endloop - endfacet - facet normal 0.390375 -0.920656 0 - outer loop - vertex 12.4032 -4.58609 -3 - vertex 13.172 -4.2601 0 - vertex 12.4032 -4.58609 0 - endloop - endfacet - facet normal 0.390375 -0.920656 0 - outer loop - vertex 13.172 -4.2601 0 - vertex 12.4032 -4.58609 -3 - vertex 13.172 -4.2601 -3 - endloop - endfacet - facet normal 0.607582 -0.794257 0 - outer loop - vertex 13.172 -4.2601 -3 - vertex 13.8131 -3.7697 0 - vertex 13.172 -4.2601 0 - endloop - endfacet - facet normal 0.607582 -0.794257 0 - outer loop - vertex 13.8131 -3.7697 0 - vertex 13.172 -4.2601 -3 - vertex 13.8131 -3.7697 -3 - endloop - endfacet - facet normal 0.812619 -0.582795 0 - outer loop - vertex 13.8131 -3.7697 0 - vertex 14.2516 -3.15818 -3 - vertex 14.2516 -3.15818 0 - endloop - endfacet - facet normal 0.812619 -0.582795 0 - outer loop - vertex 14.2516 -3.15818 -3 - vertex 13.8131 -3.7697 0 - vertex 13.8131 -3.7697 -3 - endloop - endfacet - facet normal 0.980799 -0.195021 0 - outer loop - vertex 14.2516 -3.15818 0 - vertex 14.333 -2.7489 -3 - vertex 14.333 -2.7489 0 - endloop - endfacet - facet normal 0.980799 -0.195021 0 - outer loop - vertex 14.333 -2.7489 -3 - vertex 14.2516 -3.15818 0 - vertex 14.2516 -3.15818 -3 - endloop - endfacet - facet normal 0.98573 0.168336 0 - outer loop - vertex 14.333 -2.7489 0 - vertex 14.2455 -2.23644 -3 - vertex 14.2455 -2.23644 0 - endloop - endfacet - facet normal 0.98573 0.168336 0 - outer loop - vertex 14.2455 -2.23644 -3 - vertex 14.333 -2.7489 0 - vertex 14.333 -2.7489 -3 - endloop - endfacet - facet normal 0.892341 0.451362 0 - outer loop - vertex 14.2455 -2.23644 0 - vertex 13.5923 -0.94501 -3 - vertex 13.5923 -0.94501 0 - endloop - endfacet - facet normal 0.892341 0.451362 0 - outer loop - vertex 13.5923 -0.94501 -3 - vertex 14.2455 -2.23644 0 - vertex 14.2455 -2.23644 -3 - endloop - endfacet - facet normal 0.784902 0.61962 0 - outer loop - vertex 13.5923 -0.94501 0 - vertex 12.3489 0.629998 -3 - vertex 12.3489 0.629998 0 - endloop - endfacet - facet normal 0.784902 0.61962 0 - outer loop - vertex 12.3489 0.629998 -3 - vertex 13.5923 -0.94501 0 - vertex 13.5923 -0.94501 -3 - endloop - endfacet - facet normal 0.706306 0.707906 -0 - outer loop - vertex 12.3489 0.629998 -3 - vertex 10.5724 2.40247 0 - vertex 12.3489 0.629998 0 - endloop - endfacet - facet normal 0.706306 0.707906 0 - outer loop - vertex 10.5724 2.40247 0 - vertex 12.3489 0.629998 -3 - vertex 10.5724 2.40247 -3 - endloop - endfacet - facet normal 0.641095 0.767462 -0 - outer loop - vertex 10.5724 2.40247 -3 - vertex 9.13441 3.60373 0 - vertex 10.5724 2.40247 0 - endloop - endfacet - facet normal 0.641095 0.767462 0 - outer loop - vertex 9.13441 3.60373 0 - vertex 10.5724 2.40247 -3 - vertex 9.13441 3.60373 -3 - endloop - endfacet - facet normal 0.56747 0.823394 -0 - outer loop - vertex 9.13441 3.60373 -3 - vertex 8.18559 4.25764 0 - vertex 9.13441 3.60373 0 - endloop - endfacet - facet normal 0.56747 0.823394 0 - outer loop - vertex 8.18559 4.25764 0 - vertex 9.13441 3.60373 -3 - vertex 8.18559 4.25764 -3 - endloop - endfacet - facet normal 0.457713 0.8891 -0 - outer loop - vertex 8.18559 4.25764 -3 - vertex 5.26682 5.76024 0 - vertex 8.18559 4.25764 0 - endloop - endfacet - facet normal 0.457713 0.8891 0 - outer loop - vertex 5.26682 5.76024 0 - vertex 8.18559 4.25764 -3 - vertex 5.26682 5.76024 -3 - endloop - endfacet - facet normal 0.356921 0.934135 -0 - outer loop - vertex 5.26682 5.76024 -3 - vertex 1.66409 7.13679 0 - vertex 5.26682 5.76024 0 - endloop - endfacet - facet normal 0.356921 0.934135 0 - outer loop - vertex 1.66409 7.13679 0 - vertex 5.26682 5.76024 -3 - vertex 1.66409 7.13679 -3 - endloop - endfacet - facet normal 0.389896 0.920859 -0 - outer loop - vertex 1.66409 7.13679 -3 - vertex -0.248642 7.94666 0 - vertex 1.66409 7.13679 0 - endloop - endfacet - facet normal 0.389896 0.920859 0 - outer loop - vertex -0.248642 7.94666 0 - vertex 1.66409 7.13679 -3 - vertex -0.248642 7.94666 -3 - endloop - endfacet - facet normal 0.471857 0.881675 -0 - outer loop - vertex -0.248642 7.94666 -3 - vertex -2.78119 9.30203 0 - vertex -0.248642 7.94666 0 - endloop - endfacet - facet normal 0.471857 0.881675 0 - outer loop - vertex -2.78119 9.30203 0 - vertex -0.248642 7.94666 -3 - vertex -2.78119 9.30203 -3 - endloop - endfacet - facet normal 0.524404 0.851469 -0 - outer loop - vertex -2.78119 9.30203 -3 - vertex -4.99153 10.6633 0 - vertex -2.78119 9.30203 0 - endloop - endfacet - facet normal 0.524404 0.851469 0 - outer loop - vertex -4.99153 10.6633 0 - vertex -2.78119 9.30203 -3 - vertex -4.99153 10.6633 -3 - endloop - endfacet - facet normal 0.658419 0.752652 -0 - outer loop - vertex -4.99153 10.6633 -3 - vertex -5.93765 11.491 0 - vertex -4.99153 10.6633 0 - endloop - endfacet - facet normal 0.658419 0.752652 0 - outer loop - vertex -5.93765 11.491 0 - vertex -4.99153 10.6633 -3 - vertex -5.93765 11.491 -3 - endloop - endfacet - facet normal 0.579458 -0.815002 0 - outer loop - vertex -5.93765 11.491 -3 - vertex -5.71478 11.6495 0 - vertex -5.93765 11.491 0 - endloop - endfacet - facet normal 0.579458 -0.815002 0 - outer loop - vertex -5.71478 11.6495 0 - vertex -5.93765 11.491 -3 - vertex -5.71478 11.6495 -3 - endloop - endfacet - facet normal 0.0440908 -0.999028 0 - outer loop - vertex -5.71478 11.6495 -3 - vertex -5.07797 11.6776 0 - vertex -5.71478 11.6495 0 - endloop - endfacet - facet normal 0.0440908 -0.999028 0 - outer loop - vertex -5.07797 11.6776 0 - vertex -5.71478 11.6495 -3 - vertex -5.07797 11.6776 -3 - endloop - endfacet - facet normal -0.139075 -0.990282 0 - outer loop - vertex -5.07797 11.6776 -3 - vertex -2.75335 11.3511 0 - vertex -5.07797 11.6776 0 - endloop - endfacet - facet normal -0.139075 -0.990282 -0 - outer loop - vertex -2.75335 11.3511 0 - vertex -5.07797 11.6776 -3 - vertex -2.75335 11.3511 -3 - endloop - endfacet - facet normal -0.139152 -0.990271 0 - outer loop - vertex -2.75335 11.3511 -3 - vertex -1.46211 11.1697 0 - vertex -2.75335 11.3511 0 - endloop - endfacet - facet normal -0.139152 -0.990271 -0 - outer loop - vertex -1.46211 11.1697 0 - vertex -2.75335 11.3511 -3 - vertex -1.46211 11.1697 -3 - endloop - endfacet - facet normal 0.0257838 -0.999668 0 - outer loop - vertex -1.46211 11.1697 -3 - vertex -0.394194 11.1972 0 - vertex -1.46211 11.1697 0 - endloop - endfacet - facet normal 0.0257838 -0.999668 0 - outer loop - vertex -0.394194 11.1972 0 - vertex -1.46211 11.1697 -3 - vertex -0.394194 11.1972 -3 - endloop - endfacet - facet normal 0.258065 -0.966128 0 - outer loop - vertex -0.394194 11.1972 -3 - vertex 0.535115 11.4454 0 - vertex -0.394194 11.1972 0 - endloop - endfacet - facet normal 0.258065 -0.966128 0 - outer loop - vertex 0.535115 11.4454 0 - vertex -0.394194 11.1972 -3 - vertex 0.535115 11.4454 -3 - endloop - endfacet - facet normal 0.481248 -0.876585 0 - outer loop - vertex 0.535115 11.4454 -3 - vertex 1.41055 11.926 0 - vertex 0.535115 11.4454 0 - endloop - endfacet - facet normal 0.481248 -0.876585 0 - outer loop - vertex 1.41055 11.926 0 - vertex 0.535115 11.4454 -3 - vertex 1.41055 11.926 -3 - endloop - endfacet - facet normal 0.671564 -0.740947 0 - outer loop - vertex 1.41055 11.926 -3 - vertex 1.87173 12.344 0 - vertex 1.41055 11.926 0 - endloop - endfacet - facet normal 0.671564 -0.740947 0 - outer loop - vertex 1.87173 12.344 0 - vertex 1.41055 11.926 -3 - vertex 1.87173 12.344 -3 - endloop - endfacet - facet normal 0.998006 0.0631228 0 - outer loop - vertex 1.87173 12.344 0 - vertex 1.8467 12.7398 -3 - vertex 1.8467 12.7398 0 - endloop - endfacet - facet normal 0.998006 0.0631228 0 - outer loop - vertex 1.8467 12.7398 -3 - vertex 1.87173 12.344 0 - vertex 1.87173 12.344 -3 - endloop - endfacet - facet normal 0.790564 0.612379 0 - outer loop - vertex 1.8467 12.7398 0 - vertex 1.50002 13.1874 -3 - vertex 1.50002 13.1874 0 - endloop - endfacet - facet normal 0.790564 0.612379 0 - outer loop - vertex 1.50002 13.1874 -3 - vertex 1.8467 12.7398 0 - vertex 1.8467 12.7398 -3 - endloop - endfacet - facet normal 0.55001 0.835158 -0 - outer loop - vertex 1.50002 13.1874 -3 - vertex 0.918757 13.5702 0 - vertex 1.50002 13.1874 0 - endloop - endfacet - facet normal 0.55001 0.835158 0 - outer loop - vertex 0.918757 13.5702 0 - vertex 1.50002 13.1874 -3 - vertex 0.918757 13.5702 -3 - endloop - endfacet - facet normal 0.293762 0.955879 -0 - outer loop - vertex 0.918757 13.5702 -3 - vertex -0.928844 14.138 0 - vertex 0.918757 13.5702 0 - endloop - endfacet - facet normal 0.293762 0.955879 0 - outer loop - vertex -0.928844 14.138 0 - vertex 0.918757 13.5702 -3 - vertex -0.928844 14.138 -3 - endloop - endfacet - facet normal 0.108589 0.994087 -0 - outer loop - vertex -0.928844 14.138 -3 - vertex -3.65881 14.4362 0 - vertex -0.928844 14.138 0 - endloop - endfacet - facet normal 0.108589 0.994087 0 - outer loop - vertex -3.65881 14.4362 0 - vertex -0.928844 14.138 -3 - vertex -3.65881 14.4362 -3 - endloop - endfacet - facet normal 0.00602839 0.999982 -0 - outer loop - vertex -3.65881 14.4362 -3 - vertex -7.23385 14.4578 0 - vertex -3.65881 14.4362 0 - endloop - endfacet - facet normal 0.00602839 0.999982 0 - outer loop - vertex -7.23385 14.4578 0 - vertex -3.65881 14.4362 -3 - vertex -7.23385 14.4578 -3 - endloop - endfacet - facet normal -0.0644585 0.99792 0 - outer loop - vertex -7.23385 14.4578 -3 - vertex -10.6367 14.238 0 - vertex -7.23385 14.4578 0 - endloop - endfacet - facet normal -0.0644585 0.99792 0 - outer loop - vertex -10.6367 14.238 0 - vertex -7.23385 14.4578 -3 - vertex -10.6367 14.238 -3 - endloop - endfacet - facet normal -0.276015 0.961153 0 - outer loop - vertex -10.6367 14.238 -3 - vertex -13.7227 13.3517 0 - vertex -10.6367 14.238 0 - endloop - endfacet - facet normal -0.276015 0.961153 0 - outer loop - vertex -13.7227 13.3517 0 - vertex -10.6367 14.238 -3 - vertex -13.7227 13.3517 -3 - endloop - endfacet - facet normal -0.25467 0.967028 0 - outer loop - vertex -13.7227 13.3517 -3 - vertex -17.5299 12.3491 0 - vertex -13.7227 13.3517 0 - endloop - endfacet - facet normal -0.25467 0.967028 0 - outer loop - vertex -17.5299 12.3491 0 - vertex -13.7227 13.3517 -3 - vertex -17.5299 12.3491 -3 - endloop - endfacet - facet normal -0.135841 0.990731 0 - outer loop - vertex -17.5299 12.3491 -3 - vertex -20.0298 12.0063 0 - vertex -17.5299 12.3491 0 - endloop - endfacet - facet normal -0.135841 0.990731 0 - outer loop - vertex -20.0298 12.0063 0 - vertex -17.5299 12.3491 -3 - vertex -20.0298 12.0063 -3 - endloop - endfacet - facet normal -0.101855 0.994799 0 - outer loop - vertex -20.0298 12.0063 -3 - vertex -22.4428 11.7593 0 - vertex -20.0298 12.0063 0 - endloop - endfacet - facet normal -0.101855 0.994799 0 - outer loop - vertex -22.4428 11.7593 0 - vertex -20.0298 12.0063 -3 - vertex -22.4428 11.7593 -3 - endloop - endfacet - facet normal -0.0308153 0.999525 0 - outer loop - vertex -22.4428 11.7593 -3 - vertex -25.7097 11.6586 0 - vertex -22.4428 11.7593 0 - endloop - endfacet - facet normal -0.0308153 0.999525 0 - outer loop - vertex -25.7097 11.6586 0 - vertex -22.4428 11.7593 -3 - vertex -25.7097 11.6586 -3 - endloop - endfacet - facet normal 0.0184303 0.99983 -0 - outer loop - vertex -25.7097 11.6586 -3 - vertex -28.6588 11.7129 0 - vertex -25.7097 11.6586 0 - endloop - endfacet - facet normal 0.0184303 0.99983 0 - outer loop - vertex -28.6588 11.7129 0 - vertex -25.7097 11.6586 -3 - vertex -28.6588 11.7129 -3 - endloop - endfacet - facet normal 0.147852 0.989009 -0 - outer loop - vertex -28.6588 11.7129 -3 - vertex -30.1182 11.9311 0 - vertex -28.6588 11.7129 0 - endloop - endfacet - facet normal 0.147852 0.989009 0 - outer loop - vertex -30.1182 11.9311 0 - vertex -28.6588 11.7129 -3 - vertex -30.1182 11.9311 -3 - endloop - endfacet - facet normal 0.940295 0.34036 0 - outer loop - vertex -30.1182 11.9311 0 - vertex -30.3887 12.6783 -3 - vertex -30.3887 12.6783 0 - endloop - endfacet - facet normal 0.940295 0.34036 0 - outer loop - vertex -30.3887 12.6783 -3 - vertex -30.1182 11.9311 0 - vertex -30.1182 11.9311 -3 - endloop - endfacet - facet normal 0.978074 -0.208259 0 - outer loop - vertex -30.3887 12.6783 0 - vertex -30.3118 13.0393 -3 - vertex -30.3118 13.0393 0 - endloop - endfacet - facet normal 0.978074 -0.208259 0 - outer loop - vertex -30.3118 13.0393 -3 - vertex -30.3887 12.6783 0 - vertex -30.3887 12.6783 -3 - endloop - endfacet - facet normal 0.488021 -0.872832 0 - outer loop - vertex -30.3118 13.0393 -3 - vertex -29.9412 13.2465 0 - vertex -30.3118 13.0393 0 - endloop - endfacet - facet normal 0.488021 -0.872832 0 - outer loop - vertex -29.9412 13.2465 0 - vertex -30.3118 13.0393 -3 - vertex -29.9412 13.2465 -3 - endloop - endfacet - facet normal 0.0669219 -0.997758 0 - outer loop - vertex -29.9412 13.2465 -3 - vertex -27.4778 13.4117 0 - vertex -29.9412 13.2465 0 - endloop - endfacet - facet normal 0.0669219 -0.997758 0 - outer loop - vertex -27.4778 13.4117 0 - vertex -29.9412 13.2465 -3 - vertex -27.4778 13.4117 -3 - endloop - endfacet - facet normal 0.0722192 -0.997389 0 - outer loop - vertex -27.4778 13.4117 -3 - vertex -24.873 13.6003 0 - vertex -27.4778 13.4117 0 - endloop - endfacet - facet normal 0.0722192 -0.997389 0 - outer loop - vertex -24.873 13.6003 0 - vertex -27.4778 13.4117 -3 - vertex -24.873 13.6003 -3 - endloop - endfacet - facet normal 0.168213 -0.985751 0 - outer loop - vertex -24.873 13.6003 -3 - vertex -22.3118 14.0374 0 - vertex -24.873 13.6003 0 - endloop - endfacet - facet normal 0.168213 -0.985751 0 - outer loop - vertex -22.3118 14.0374 0 - vertex -24.873 13.6003 -3 - vertex -22.3118 14.0374 -3 - endloop - endfacet - facet normal 0.261629 -0.965169 0 - outer loop - vertex -22.3118 14.0374 -3 - vertex -19.733 14.7364 0 - vertex -22.3118 14.0374 0 - endloop - endfacet - facet normal 0.261629 -0.965169 0 - outer loop - vertex -19.733 14.7364 0 - vertex -22.3118 14.0374 -3 - vertex -19.733 14.7364 -3 - endloop - endfacet - facet normal 0.344283 -0.938866 0 - outer loop - vertex -19.733 14.7364 -3 - vertex -17.0754 15.711 0 - vertex -19.733 14.7364 0 - endloop - endfacet - facet normal 0.344283 -0.938866 0 - outer loop - vertex -17.0754 15.711 0 - vertex -19.733 14.7364 -3 - vertex -17.0754 15.711 -3 - endloop - endfacet - facet normal 0.435809 -0.900039 0 - outer loop - vertex -17.0754 15.711 -3 - vertex -15.009 16.7116 0 - vertex -17.0754 15.711 0 - endloop - endfacet - facet normal 0.435809 -0.900039 0 - outer loop - vertex -15.009 16.7116 0 - vertex -17.0754 15.711 -3 - vertex -15.009 16.7116 -3 - endloop - endfacet - facet normal 0.583649 -0.812006 0 - outer loop - vertex -15.009 16.7116 -3 - vertex -12.0133 18.8648 0 - vertex -15.009 16.7116 0 - endloop - endfacet - facet normal 0.583649 -0.812006 0 - outer loop - vertex -12.0133 18.8648 0 - vertex -15.009 16.7116 -3 - vertex -12.0133 18.8648 -3 - endloop - endfacet - facet normal 0.632447 -0.774604 0 - outer loop - vertex -12.0133 18.8648 -3 - vertex -11.1208 19.5935 0 - vertex -12.0133 18.8648 0 - endloop - endfacet - facet normal 0.632447 -0.774604 0 - outer loop - vertex -11.1208 19.5935 0 - vertex -12.0133 18.8648 -3 - vertex -11.1208 19.5935 -3 - endloop - endfacet - facet normal 0.915349 -0.40266 0 - outer loop - vertex -11.1208 19.5935 0 - vertex -10.9412 20.0018 -3 - vertex -10.9412 20.0018 0 - endloop - endfacet - facet normal 0.915349 -0.40266 0 - outer loop - vertex -10.9412 20.0018 -3 - vertex -11.1208 19.5935 0 - vertex -11.1208 19.5935 -3 - endloop - endfacet - facet normal 0.285826 0.958281 -0 - outer loop - vertex -10.9412 20.0018 -3 - vertex -11.5389 20.1801 0 - vertex -10.9412 20.0018 0 - endloop - endfacet - facet normal 0.285826 0.958281 0 - outer loop - vertex -11.5389 20.1801 0 - vertex -10.9412 20.0018 -3 - vertex -11.5389 20.1801 -3 - endloop - endfacet - facet normal 0.0268157 0.99964 -0 - outer loop - vertex -11.5389 20.1801 -3 - vertex -12.9783 20.2187 0 - vertex -11.5389 20.1801 0 - endloop - endfacet - facet normal 0.0268157 0.99964 0 - outer loop - vertex -12.9783 20.2187 0 - vertex -11.5389 20.1801 -3 - vertex -12.9783 20.2187 -3 - endloop - endfacet - facet normal -0.0662732 0.997802 0 - outer loop - vertex -12.9783 20.2187 -3 - vertex -16.3196 19.9968 0 - vertex -12.9783 20.2187 0 - endloop - endfacet - facet normal -0.0662732 0.997802 0 - outer loop - vertex -16.3196 19.9968 0 - vertex -12.9783 20.2187 -3 - vertex -16.3196 19.9968 -3 - endloop - endfacet - facet normal -0.149342 0.988786 0 - outer loop - vertex -16.3196 19.9968 -3 - vertex -20.1789 19.4139 0 - vertex -16.3196 19.9968 0 - endloop - endfacet - facet normal -0.149342 0.988786 0 - outer loop - vertex -20.1789 19.4139 0 - vertex -16.3196 19.9968 -3 - vertex -20.1789 19.4139 -3 - endloop - endfacet - facet normal -0.0917718 0.99578 0 - outer loop - vertex -20.1789 19.4139 -3 - vertex -24.1572 19.0472 0 - vertex -20.1789 19.4139 0 - endloop - endfacet - facet normal -0.0917718 0.99578 0 - outer loop - vertex -24.1572 19.0472 0 - vertex -20.1789 19.4139 -3 - vertex -24.1572 19.0472 -3 - endloop - endfacet - facet normal -0.0311054 0.999516 0 - outer loop - vertex -24.1572 19.0472 -3 - vertex -27.5587 18.9414 0 - vertex -24.1572 19.0472 0 - endloop - endfacet - facet normal -0.0311054 0.999516 0 - outer loop - vertex -27.5587 18.9414 0 - vertex -24.1572 19.0472 -3 - vertex -27.5587 18.9414 -3 - endloop - endfacet - facet normal 0.0933351 0.995635 -0 - outer loop - vertex -27.5587 18.9414 -3 - vertex -29.687 19.1409 0 - vertex -27.5587 18.9414 0 - endloop - endfacet - facet normal 0.0933351 0.995635 0 - outer loop - vertex -29.687 19.1409 0 - vertex -27.5587 18.9414 -3 - vertex -29.687 19.1409 -3 - endloop - endfacet - facet normal 0.326889 0.945063 -0 - outer loop - vertex -29.687 19.1409 -3 - vertex -33.0651 20.3093 0 - vertex -29.687 19.1409 0 - endloop - endfacet - facet normal 0.326889 0.945063 0 - outer loop - vertex -33.0651 20.3093 0 - vertex -29.687 19.1409 -3 - vertex -33.0651 20.3093 -3 - endloop - endfacet - facet normal 0.441663 0.897181 -0 - outer loop - vertex -33.0651 20.3093 -3 - vertex -35.7552 21.6337 0 - vertex -33.0651 20.3093 0 - endloop - endfacet - facet normal 0.441663 0.897181 0 - outer loop - vertex -35.7552 21.6337 0 - vertex -33.0651 20.3093 -3 - vertex -35.7552 21.6337 -3 - endloop - endfacet - facet normal 0.596659 0.802495 -0 - outer loop - vertex -35.7552 21.6337 -3 - vertex -37.6991 23.0789 0 - vertex -35.7552 21.6337 0 - endloop - endfacet - facet normal 0.596659 0.802495 0 - outer loop - vertex -37.6991 23.0789 0 - vertex -35.7552 21.6337 -3 - vertex -37.6991 23.0789 -3 - endloop - endfacet - facet normal 0.746999 0.664825 0 - outer loop - vertex -37.6991 23.0789 0 - vertex -38.3729 23.836 -3 - vertex -38.3729 23.836 0 - endloop - endfacet - facet normal 0.746999 0.664825 0 - outer loop - vertex -38.3729 23.836 -3 - vertex -37.6991 23.0789 0 - vertex -37.6991 23.0789 -3 - endloop - endfacet - facet normal 0.857117 0.515122 0 - outer loop - vertex -38.3729 23.836 0 - vertex -38.8382 24.6102 -3 - vertex -38.8382 24.6102 0 - endloop - endfacet - facet normal 0.857117 0.515122 0 - outer loop - vertex -38.8382 24.6102 -3 - vertex -38.3729 23.836 0 - vertex -38.3729 23.836 -3 - endloop - endfacet - facet normal 0.945559 0.32545 0 - outer loop - vertex -38.8382 24.6102 0 - vertex -39.1303 25.4589 -3 - vertex -39.1303 25.4589 0 - endloop - endfacet - facet normal 0.945559 0.32545 0 - outer loop - vertex -39.1303 25.4589 -3 - vertex -38.8382 24.6102 0 - vertex -38.8382 24.6102 -3 - endloop - endfacet - facet normal 0.969805 -0.24388 0 - outer loop - vertex -39.1303 25.4589 0 - vertex -39.0347 25.8392 -3 - vertex -39.0347 25.8392 0 - endloop - endfacet - facet normal 0.969805 -0.24388 0 - outer loop - vertex -39.0347 25.8392 -3 - vertex -39.1303 25.4589 0 - vertex -39.1303 25.4589 -3 - endloop - endfacet - facet normal -0.217347 -0.976094 0 - outer loop - vertex -39.0347 25.8392 -3 - vertex -38.5782 25.7376 0 - vertex -39.0347 25.8392 0 - endloop - endfacet - facet normal -0.217347 -0.976094 -0 - outer loop - vertex -38.5782 25.7376 0 - vertex -39.0347 25.8392 -3 - vertex -38.5782 25.7376 -3 - endloop - endfacet - facet normal -0.602798 -0.797894 0 - outer loop - vertex -38.5782 25.7376 -3 - vertex -37.7877 25.1404 0 - vertex -38.5782 25.7376 0 - endloop - endfacet - facet normal -0.602798 -0.797894 -0 - outer loop - vertex -37.7877 25.1404 0 - vertex -38.5782 25.7376 -3 - vertex -37.7877 25.1404 -3 - endloop - endfacet - facet normal -0.582847 -0.812582 0 - outer loop - vertex -37.7877 25.1404 -3 - vertex -36.1697 23.9798 0 - vertex -37.7877 25.1404 0 - endloop - endfacet - facet normal -0.582847 -0.812582 -0 - outer loop - vertex -36.1697 23.9798 0 - vertex -37.7877 25.1404 -3 - vertex -36.1697 23.9798 -3 - endloop - endfacet - facet normal -0.438905 -0.898534 0 - outer loop - vertex -36.1697 23.9798 -3 - vertex -34.2108 23.023 0 - vertex -36.1697 23.9798 0 - endloop - endfacet - facet normal -0.438905 -0.898534 -0 - outer loop - vertex -34.2108 23.023 0 - vertex -36.1697 23.9798 -3 - vertex -34.2108 23.023 -3 - endloop - endfacet - facet normal -0.304923 -0.952377 0 - outer loop - vertex -34.2108 23.023 -3 - vertex -32.1178 22.3529 0 - vertex -34.2108 23.023 0 - endloop - endfacet - facet normal -0.304923 -0.952377 -0 - outer loop - vertex -32.1178 22.3529 0 - vertex -34.2108 23.023 -3 - vertex -32.1178 22.3529 -3 - endloop - endfacet - facet normal -0.147036 -0.989131 0 - outer loop - vertex -32.1178 22.3529 -3 - vertex -30.0976 22.0525 0 - vertex -32.1178 22.3529 0 - endloop - endfacet - facet normal -0.147036 -0.989131 -0 - outer loop - vertex -30.0976 22.0525 0 - vertex -32.1178 22.3529 -3 - vertex -30.0976 22.0525 -3 - endloop - endfacet - facet normal -0.0457632 -0.998952 0 - outer loop - vertex -30.0976 22.0525 -3 - vertex -28.3511 21.9725 0 - vertex -30.0976 22.0525 0 - endloop - endfacet - facet normal -0.0457632 -0.998952 -0 - outer loop - vertex -28.3511 21.9725 0 - vertex -30.0976 22.0525 -3 - vertex -28.3511 21.9725 -3 - endloop - endfacet - facet normal 0.491954 0.870621 -0 - outer loop - vertex -28.3511 21.9725 -3 - vertex -29.0303 22.3563 0 - vertex -28.3511 21.9725 0 - endloop - endfacet - facet normal 0.491954 0.870621 0 - outer loop - vertex -29.0303 22.3563 0 - vertex -28.3511 21.9725 -3 - vertex -29.0303 22.3563 -3 - endloop - endfacet - facet normal 0.563624 0.826031 -0 - outer loop - vertex -29.0303 22.3563 -3 - vertex -30.3878 23.2826 0 - vertex -29.0303 22.3563 0 - endloop - endfacet - facet normal 0.563624 0.826031 0 - outer loop - vertex -30.3878 23.2826 0 - vertex -29.0303 22.3563 -3 - vertex -30.3878 23.2826 -3 - endloop - endfacet - facet normal 0.796403 0.604766 0 - outer loop - vertex -30.3878 23.2826 0 - vertex -31.0943 24.213 -3 - vertex -31.0943 24.213 0 - endloop - endfacet - facet normal 0.796403 0.604766 0 - outer loop - vertex -31.0943 24.213 -3 - vertex -30.3878 23.2826 0 - vertex -30.3878 23.2826 -3 - endloop - endfacet - facet normal 0.951494 0.307667 0 - outer loop - vertex -31.0943 24.213 0 - vertex -31.2773 24.779 -3 - vertex -31.2773 24.779 0 - endloop - endfacet - facet normal 0.951494 0.307667 0 - outer loop - vertex -31.2773 24.779 -3 - vertex -31.0943 24.213 0 - vertex -31.0943 24.213 -3 - endloop - endfacet - facet normal 0.935098 -0.35439 0 - outer loop - vertex -31.2773 24.779 0 - vertex -31.1793 25.0376 -3 - vertex -31.1793 25.0376 0 - endloop - endfacet - facet normal 0.935098 -0.35439 0 - outer loop - vertex -31.1793 25.0376 -3 - vertex -31.2773 24.779 0 - vertex -31.2773 24.779 -3 - endloop - endfacet - facet normal -0.153546 -0.988142 0 - outer loop - vertex -31.1793 25.0376 -3 - vertex -30.8173 24.9813 0 - vertex -31.1793 25.0376 0 - endloop - endfacet - facet normal -0.153546 -0.988142 -0 - outer loop - vertex -30.8173 24.9813 0 - vertex -31.1793 25.0376 -3 - vertex -30.8173 24.9813 -3 - endloop - endfacet - facet normal -0.527885 -0.849316 0 - outer loop - vertex -30.8173 24.9813 -3 - vertex -30.2081 24.6027 0 - vertex -30.8173 24.9813 0 - endloop - endfacet - facet normal -0.527885 -0.849316 -0 - outer loop - vertex -30.2081 24.6027 0 - vertex -30.8173 24.9813 -3 - vertex -30.2081 24.6027 -3 - endloop - endfacet - facet normal -0.502983 -0.864296 0 - outer loop - vertex -30.2081 24.6027 -3 - vertex -29.3958 24.13 0 - vertex -30.2081 24.6027 0 - endloop - endfacet - facet normal -0.502983 -0.864296 -0 - outer loop - vertex -29.3958 24.13 0 - vertex -30.2081 24.6027 -3 - vertex -29.3958 24.13 -3 - endloop - endfacet - facet normal -0.286557 -0.958063 0 - outer loop - vertex -29.3958 24.13 -3 - vertex -28.4642 23.8513 0 - vertex -29.3958 24.13 0 - endloop - endfacet - facet normal -0.286557 -0.958063 -0 - outer loop - vertex -28.4642 23.8513 0 - vertex -29.3958 24.13 -3 - vertex -28.4642 23.8513 -3 - endloop - endfacet - facet normal -0.0843211 -0.996439 0 - outer loop - vertex -28.4642 23.8513 -3 - vertex -27.3687 23.7586 0 - vertex -28.4642 23.8513 0 - endloop - endfacet - facet normal -0.0843211 -0.996439 -0 - outer loop - vertex -27.3687 23.7586 0 - vertex -28.4642 23.8513 -3 - vertex -27.3687 23.7586 -3 - endloop - endfacet - facet normal 0.065101 -0.997879 0 - outer loop - vertex -27.3687 23.7586 -3 - vertex -26.0647 23.8437 0 - vertex -27.3687 23.7586 0 - endloop - endfacet - facet normal 0.065101 -0.997879 0 - outer loop - vertex -26.0647 23.8437 0 - vertex -27.3687 23.7586 -3 - vertex -26.0647 23.8437 -3 - endloop - endfacet - facet normal 0.119464 -0.992839 0 - outer loop - vertex -26.0647 23.8437 -3 - vertex -24.664 24.0122 0 - vertex -26.0647 23.8437 0 - endloop - endfacet - facet normal 0.119464 -0.992839 0 - outer loop - vertex -24.664 24.0122 0 - vertex -26.0647 23.8437 -3 - vertex -24.664 24.0122 -3 - endloop - endfacet - facet normal 0.193693 0.981062 -0 - outer loop - vertex -24.664 24.0122 -3 - vertex -26.0224 24.2804 0 - vertex -24.664 24.0122 0 - endloop - endfacet - facet normal 0.193693 0.981062 0 - outer loop - vertex -26.0224 24.2804 0 - vertex -24.664 24.0122 -3 - vertex -26.0224 24.2804 -3 - endloop - endfacet - facet normal 0.282043 0.959402 -0 - outer loop - vertex -26.0224 24.2804 -3 - vertex -28.1365 24.9019 0 - vertex -26.0224 24.2804 0 - endloop - endfacet - facet normal 0.282043 0.959402 0 - outer loop - vertex -28.1365 24.9019 0 - vertex -26.0224 24.2804 -3 - vertex -28.1365 24.9019 -3 - endloop - endfacet - facet normal 0.487989 0.87285 -0 - outer loop - vertex -28.1365 24.9019 -3 - vertex -29.9035 25.8898 0 - vertex -28.1365 24.9019 0 - endloop - endfacet - facet normal 0.487989 0.87285 0 - outer loop - vertex -29.9035 25.8898 0 - vertex -28.1365 24.9019 -3 - vertex -29.9035 25.8898 -3 - endloop - endfacet - facet normal 0.641558 0.767075 -0 - outer loop - vertex -29.9035 25.8898 -3 - vertex -31.116 26.9038 0 - vertex -29.9035 25.8898 0 - endloop - endfacet - facet normal 0.641558 0.767075 0 - outer loop - vertex -31.116 26.9038 0 - vertex -29.9035 25.8898 -3 - vertex -31.116 26.9038 -3 - endloop - endfacet - facet normal 0.876545 0.48132 0 - outer loop - vertex -31.116 26.9038 0 - vertex -31.2912 27.2229 -3 - vertex -31.2912 27.2229 0 - endloop - endfacet - facet normal 0.876545 0.48132 0 - outer loop - vertex -31.2912 27.2229 -3 - vertex -31.116 26.9038 0 - vertex -31.116 26.9038 -3 - endloop - endfacet - facet normal 0.956151 -0.292876 0 - outer loop - vertex -31.2912 27.2229 0 - vertex -31.2177 27.4629 -3 - vertex -31.2177 27.4629 0 - endloop - endfacet - facet normal 0.956151 -0.292876 0 - outer loop - vertex -31.2177 27.4629 -3 - vertex -31.2912 27.2229 0 - vertex -31.2912 27.2229 -3 - endloop - endfacet - facet normal 0.0512406 -0.998686 0 - outer loop - vertex -31.2177 27.4629 -3 - vertex -30.666 27.4912 0 - vertex -31.2177 27.4629 0 - endloop - endfacet - facet normal 0.0512406 -0.998686 0 - outer loop - vertex -30.666 27.4912 0 - vertex -31.2177 27.4629 -3 - vertex -30.666 27.4912 -3 - endloop - endfacet - facet normal -0.343857 -0.939022 0 - outer loop - vertex -30.666 27.4912 -3 - vertex -29.2879 26.9865 0 - vertex -30.666 27.4912 0 - endloop - endfacet - facet normal -0.343857 -0.939022 -0 - outer loop - vertex -29.2879 26.9865 0 - vertex -30.666 27.4912 -3 - vertex -29.2879 26.9865 -3 - endloop - endfacet - facet normal -0.315787 -0.94883 0 - outer loop - vertex -29.2879 26.9865 -3 - vertex -27.4214 26.3653 0 - vertex -29.2879 26.9865 0 - endloop - endfacet - facet normal -0.315787 -0.94883 -0 - outer loop - vertex -27.4214 26.3653 0 - vertex -29.2879 26.9865 -3 - vertex -27.4214 26.3653 -3 - endloop - endfacet - facet normal -0.0620611 -0.998072 0 - outer loop - vertex -27.4214 26.3653 -3 - vertex -24.8433 26.205 0 - vertex -27.4214 26.3653 0 - endloop - endfacet - facet normal -0.0620611 -0.998072 -0 - outer loop - vertex -24.8433 26.205 0 - vertex -27.4214 26.3653 -3 - vertex -24.8433 26.205 -3 - endloop - endfacet - facet normal 0.0113967 -0.999935 0 - outer loop - vertex -24.8433 26.205 -3 - vertex -22.0473 26.2369 0 - vertex -24.8433 26.205 0 - endloop - endfacet - facet normal 0.0113967 -0.999935 0 - outer loop - vertex -22.0473 26.2369 0 - vertex -24.8433 26.205 -3 - vertex -22.0473 26.2369 -3 - endloop - endfacet - facet normal 0.196528 -0.980498 0 - outer loop - vertex -22.0473 26.2369 -3 - vertex -21.4485 26.3569 0 - vertex -22.0473 26.2369 0 - endloop - endfacet - facet normal 0.196528 -0.980498 0 - outer loop - vertex -21.4485 26.3569 0 - vertex -22.0473 26.2369 -3 - vertex -21.4485 26.3569 -3 - endloop - endfacet - facet normal 0.743557 -0.668673 0 - outer loop - vertex -21.4485 26.3569 0 - vertex -21.2681 26.5576 -3 - vertex -21.2681 26.5576 0 - endloop - endfacet - facet normal 0.743557 -0.668673 0 - outer loop - vertex -21.2681 26.5576 -3 - vertex -21.4485 26.3569 0 - vertex -21.4485 26.3569 -3 - endloop - endfacet - facet normal 0.261077 0.965318 -0 - outer loop - vertex -21.2681 26.5576 -3 - vertex -22.4212 26.8695 0 - vertex -21.2681 26.5576 0 - endloop - endfacet - facet normal 0.261077 0.965318 0 - outer loop - vertex -22.4212 26.8695 0 - vertex -21.2681 26.5576 -3 - vertex -22.4212 26.8695 -3 - endloop - endfacet - facet normal 0.309949 0.950753 -0 - outer loop - vertex -22.4212 26.8695 -3 - vertex -23.8902 27.3484 0 - vertex -22.4212 26.8695 0 - endloop - endfacet - facet normal 0.309949 0.950753 0 - outer loop - vertex -23.8902 27.3484 0 - vertex -22.4212 26.8695 -3 - vertex -23.8902 27.3484 -3 - endloop - endfacet - facet normal 0.603717 0.797199 -0 - outer loop - vertex -23.8902 27.3484 -3 - vertex -24.3225 27.6757 0 - vertex -23.8902 27.3484 0 - endloop - endfacet - facet normal 0.603717 0.797199 0 - outer loop - vertex -24.3225 27.6757 0 - vertex -23.8902 27.3484 -3 - vertex -24.3225 27.6757 -3 - endloop - endfacet - facet normal 0.98955 0.144189 0 - outer loop - vertex -24.3225 27.6757 0 - vertex -24.3632 27.9554 -3 - vertex -24.3632 27.9554 0 - endloop - endfacet - facet normal 0.98955 0.144189 0 - outer loop - vertex -24.3632 27.9554 -3 - vertex -24.3225 27.6757 0 - vertex -24.3225 27.6757 -3 - endloop - endfacet - facet normal -0.0279773 -0.999609 0 - outer loop - vertex -24.3632 27.9554 -3 - vertex -22.4093 27.9007 0 - vertex -24.3632 27.9554 0 - endloop - endfacet - facet normal -0.0279773 -0.999609 -0 - outer loop - vertex -22.4093 27.9007 0 - vertex -24.3632 27.9554 -3 - vertex -22.4093 27.9007 -3 - endloop - endfacet - facet normal -0.150133 -0.988666 0 - outer loop - vertex -22.4093 27.9007 -3 - vertex -20.8096 27.6578 0 - vertex -22.4093 27.9007 0 - endloop - endfacet - facet normal -0.150133 -0.988666 -0 - outer loop - vertex -20.8096 27.6578 0 - vertex -22.4093 27.9007 -3 - vertex -20.8096 27.6578 -3 - endloop - endfacet - facet normal -0.458094 -0.888904 0 - outer loop - vertex -20.8096 27.6578 -3 - vertex -19.9485 27.2141 0 - vertex -20.8096 27.6578 0 - endloop - endfacet - facet normal -0.458094 -0.888904 -0 - outer loop - vertex -19.9485 27.2141 0 - vertex -20.8096 27.6578 -3 - vertex -19.9485 27.2141 -3 - endloop - endfacet - facet normal -0.64002 -0.768358 0 - outer loop - vertex -19.9485 27.2141 -3 - vertex -19.335 26.703 0 - vertex -19.9485 27.2141 0 - endloop - endfacet - facet normal -0.64002 -0.768358 -0 - outer loop - vertex -19.335 26.703 0 - vertex -19.9485 27.2141 -3 - vertex -19.335 26.703 -3 - endloop - endfacet - facet normal 0.254037 -0.967194 0 - outer loop - vertex -19.335 26.703 -3 - vertex -16.9875 27.3196 0 - vertex -19.335 26.703 0 - endloop - endfacet - facet normal 0.254037 -0.967194 0 - outer loop - vertex -16.9875 27.3196 0 - vertex -19.335 26.703 -3 - vertex -16.9875 27.3196 -3 - endloop - endfacet - facet normal 0.212489 -0.977163 0 - outer loop - vertex -16.9875 27.3196 -3 - vertex -15.2376 27.7001 0 - vertex -16.9875 27.3196 0 - endloop - endfacet - facet normal 0.212489 -0.977163 0 - outer loop - vertex -15.2376 27.7001 0 - vertex -16.9875 27.3196 -3 - vertex -15.2376 27.7001 -3 - endloop - endfacet - facet normal 0.0813778 -0.996683 0 - outer loop - vertex -15.2376 27.7001 -3 - vertex -13.5562 27.8374 0 - vertex -15.2376 27.7001 0 - endloop - endfacet - facet normal 0.0813778 -0.996683 0 - outer loop - vertex -13.5562 27.8374 0 - vertex -15.2376 27.7001 -3 - vertex -13.5562 27.8374 -3 - endloop - endfacet - facet normal -0.0507625 -0.998711 0 - outer loop - vertex -13.5562 27.8374 -3 - vertex -11.546 27.7352 0 - vertex -13.5562 27.8374 0 - endloop - endfacet - facet normal -0.0507625 -0.998711 -0 - outer loop - vertex -11.546 27.7352 0 - vertex -13.5562 27.8374 -3 - vertex -11.546 27.7352 -3 - endloop - endfacet - facet normal -0.122536 -0.992464 0 - outer loop - vertex -11.546 27.7352 -3 - vertex -8.80952 27.3973 0 - vertex -11.546 27.7352 0 - endloop - endfacet - facet normal -0.122536 -0.992464 -0 - outer loop - vertex -8.80952 27.3973 0 - vertex -11.546 27.7352 -3 - vertex -8.80952 27.3973 -3 - endloop - endfacet - facet normal -0.0983783 -0.995149 0 - outer loop - vertex -8.80952 27.3973 -3 - vertex -7.25507 27.2437 0 - vertex -8.80952 27.3973 0 - endloop - endfacet - facet normal -0.0983783 -0.995149 -0 - outer loop - vertex -7.25507 27.2437 0 - vertex -8.80952 27.3973 -3 - vertex -7.25507 27.2437 -3 - endloop - endfacet - facet normal 0.163792 -0.986495 0 - outer loop - vertex -7.25507 27.2437 -3 - vertex -6.55612 27.3597 0 - vertex -7.25507 27.2437 0 - endloop - endfacet - facet normal 0.163792 -0.986495 0 - outer loop - vertex -6.55612 27.3597 0 - vertex -7.25507 27.2437 -3 - vertex -6.55612 27.3597 -3 - endloop - endfacet - facet normal 0.830428 -0.557126 0 - outer loop - vertex -6.55612 27.3597 0 - vertex -6.38329 27.6173 -3 - vertex -6.38329 27.6173 0 - endloop - endfacet - facet normal 0.830428 -0.557126 0 - outer loop - vertex -6.38329 27.6173 -3 - vertex -6.55612 27.3597 0 - vertex -6.55612 27.3597 -3 - endloop - endfacet - facet normal 0.987965 -0.154679 0 - outer loop - vertex -6.38329 27.6173 0 - vertex -6.28322 28.2565 -3 - vertex -6.28322 28.2565 0 - endloop - endfacet - facet normal 0.987965 -0.154679 0 - outer loop - vertex -6.28322 28.2565 -3 - vertex -6.38329 27.6173 0 - vertex -6.38329 27.6173 -3 - endloop - endfacet - facet normal 0.99984 -0.0178603 0 - outer loop - vertex -6.28322 28.2565 0 - vertex -6.22131 31.7226 -3 - vertex -6.22131 31.7226 0 - endloop - endfacet - facet normal 0.99984 -0.0178603 0 - outer loop - vertex -6.22131 31.7226 -3 - vertex -6.28322 28.2565 0 - vertex -6.28322 28.2565 -3 - endloop - endfacet - facet normal 0.999322 -0.0368307 0 - outer loop - vertex -6.22131 31.7226 0 - vertex -6.055 36.2349 -3 - vertex -6.055 36.2349 0 - endloop - endfacet - facet normal 0.999322 -0.0368307 0 - outer loop - vertex -6.055 36.2349 -3 - vertex -6.22131 31.7226 0 - vertex -6.22131 31.7226 -3 - endloop - endfacet - facet normal 0.823305 -0.5676 0 - outer loop - vertex -6.055 36.2349 0 - vertex -5.8163 36.5812 -3 - vertex -5.8163 36.5812 0 - endloop - endfacet - facet normal 0.823305 -0.5676 0 - outer loop - vertex -5.8163 36.5812 -3 - vertex -6.055 36.2349 0 - vertex -6.055 36.2349 -3 - endloop - endfacet - facet normal -0.301391 -0.953501 0 - outer loop - vertex -5.8163 36.5812 -3 - vertex -5.55994 36.5001 0 - vertex -5.8163 36.5812 0 - endloop - endfacet - facet normal -0.301391 -0.953501 -0 - outer loop - vertex -5.55994 36.5001 0 - vertex -5.8163 36.5812 -3 - vertex -5.55994 36.5001 -3 - endloop - endfacet - facet normal -0.928472 -0.371402 0 - outer loop - vertex -4.97284 35.0324 -3 - vertex -5.55994 36.5001 0 - vertex -5.55994 36.5001 -3 - endloop - endfacet - facet normal -0.928472 -0.371402 0 - outer loop - vertex -5.55994 36.5001 0 - vertex -4.97284 35.0324 -3 - vertex -4.97284 35.0324 0 - endloop - endfacet - facet normal -0.946087 -0.323913 0 - outer loop - vertex -3.97987 32.1322 -3 - vertex -4.97284 35.0324 0 - vertex -4.97284 35.0324 -3 - endloop - endfacet - facet normal -0.946087 -0.323913 0 - outer loop - vertex -4.97284 35.0324 0 - vertex -3.97987 32.1322 -3 - vertex -3.97987 32.1322 0 - endloop - endfacet - facet normal -0.891782 -0.452466 0 - outer loop - vertex -2.77953 29.7664 -3 - vertex -3.97987 32.1322 0 - vertex -3.97987 32.1322 -3 - endloop - endfacet - facet normal -0.891782 -0.452466 0 - outer loop - vertex -3.97987 32.1322 0 - vertex -2.77953 29.7664 -3 - vertex -2.77953 29.7664 0 - endloop - endfacet - facet normal -0.788004 -0.61567 0 - outer loop - vertex -1.46161 28.0795 -3 - vertex -2.77953 29.7664 0 - vertex -2.77953 29.7664 -3 - endloop - endfacet - facet normal -0.788004 -0.61567 0 - outer loop - vertex -2.77953 29.7664 0 - vertex -1.46161 28.0795 -3 - vertex -1.46161 28.0795 0 - endloop - endfacet - facet normal -0.627252 -0.778816 0 - outer loop - vertex -1.46161 28.0795 -3 - vertex -0.786632 27.5359 0 - vertex -1.46161 28.0795 0 - endloop - endfacet - facet normal -0.627252 -0.778816 -0 - outer loop - vertex -0.786632 27.5359 0 - vertex -1.46161 28.0795 -3 - vertex -0.786632 27.5359 -3 - endloop - endfacet - facet normal -0.430266 -0.902702 0 - outer loop - vertex -0.786632 27.5359 -3 - vertex -0.115935 27.2162 0 - vertex -0.786632 27.5359 0 - endloop - endfacet - facet normal -0.430266 -0.902702 -0 - outer loop - vertex -0.115935 27.2162 0 - vertex -0.786632 27.5359 -3 - vertex -0.115935 27.2162 -3 - endloop - endfacet - facet normal -0.108301 -0.994118 0 - outer loop - vertex -0.115935 27.2162 -3 - vertex 0.858783 27.1101 0 - vertex -0.115935 27.2162 0 - endloop - endfacet - facet normal -0.108301 -0.994118 -0 - outer loop - vertex 0.858783 27.1101 0 - vertex -0.115935 27.2162 -3 - vertex 0.858783 27.1101 -3 - endloop - endfacet - facet normal 0.992113 -0.125344 0 - outer loop - vertex 0.858783 27.1101 0 - vertex 1.04836 28.6106 -3 - vertex 1.04836 28.6106 0 - endloop - endfacet - facet normal 0.992113 -0.125344 0 - outer loop - vertex 1.04836 28.6106 -3 - vertex 0.858783 27.1101 0 - vertex 0.858783 27.1101 -3 - endloop - endfacet - facet normal 0.998104 -0.0615481 0 - outer loop - vertex 1.04836 28.6106 0 - vertex 1.1273 29.8907 -3 - vertex 1.1273 29.8907 0 - endloop - endfacet - facet normal 0.998104 -0.0615481 0 - outer loop - vertex 1.1273 29.8907 -3 - vertex 1.04836 28.6106 0 - vertex 1.04836 28.6106 -3 - endloop - endfacet - facet normal 0.981864 -0.189585 0 - outer loop - vertex 1.1273 29.8907 0 - vertex 1.37489 31.173 -3 - vertex 1.37489 31.173 0 - endloop - endfacet - facet normal 0.981864 -0.189585 0 - outer loop - vertex 1.37489 31.173 -3 - vertex 1.1273 29.8907 0 - vertex 1.1273 29.8907 -3 - endloop - endfacet - facet normal 0.935462 -0.353427 0 - outer loop - vertex 1.37489 31.173 0 - vertex 2.44067 33.9939 -3 - vertex 2.44067 33.9939 0 - endloop - endfacet - facet normal 0.935462 -0.353427 0 - outer loop - vertex 2.44067 33.9939 -3 - vertex 1.37489 31.173 0 - vertex 1.37489 31.173 -3 - endloop - endfacet - facet normal 0.883303 -0.468802 0 - outer loop - vertex 2.44067 33.9939 0 - vertex 4.08079 37.0842 -3 - vertex 4.08079 37.0842 0 - endloop - endfacet - facet normal 0.883303 -0.468802 0 - outer loop - vertex 4.08079 37.0842 -3 - vertex 2.44067 33.9939 0 - vertex 2.44067 33.9939 -3 - endloop - endfacet - facet normal 0.814108 -0.580714 0 - outer loop - vertex 4.08079 37.0842 0 - vertex 5.15152 38.5852 -3 - vertex 5.15152 38.5852 0 - endloop - endfacet - facet normal 0.814108 -0.580714 0 - outer loop - vertex 5.15152 38.5852 -3 - vertex 4.08079 37.0842 0 - vertex 4.08079 37.0842 -3 - endloop - endfacet - facet normal -0.809167 -0.587578 0 - outer loop - vertex 5.25321 38.4452 -3 - vertex 5.15152 38.5852 0 - vertex 5.15152 38.5852 -3 - endloop - endfacet - facet normal -0.809167 -0.587578 0 - outer loop - vertex 5.15152 38.5852 0 - vertex 5.25321 38.4452 -3 - vertex 5.25321 38.4452 0 - endloop - endfacet - facet normal -0.887211 -0.461365 0 - outer loop - vertex 8.028 17.0592 -3 - vertex 7.15178 18.7442 0 - vertex 7.15178 18.7442 -3 - endloop - endfacet - facet normal -0.887211 -0.461365 0 - outer loop - vertex 7.15178 18.7442 0 - vertex 8.028 17.0592 -3 - vertex 8.028 17.0592 0 - endloop - endfacet - facet normal -0.822305 -0.569047 0 - outer loop - vertex 8.86535 15.8492 -3 - vertex 8.028 17.0592 0 - vertex 8.028 17.0592 -3 - endloop - endfacet - facet normal -0.822305 -0.569047 0 - outer loop - vertex 8.028 17.0592 0 - vertex 8.86535 15.8492 -3 - vertex 8.86535 15.8492 0 - endloop - endfacet - facet normal 0.359337 -0.933208 0 - outer loop - vertex 8.86535 15.8492 -3 - vertex 9.72145 16.1788 0 - vertex 8.86535 15.8492 0 - endloop - endfacet - facet normal 0.359337 -0.933208 0 - outer loop - vertex 9.72145 16.1788 0 - vertex 8.86535 15.8492 -3 - vertex 9.72145 16.1788 -3 - endloop - endfacet - facet normal 0.425917 -0.904762 0 - outer loop - vertex 9.72145 16.1788 -3 - vertex 10.4258 16.5104 0 - vertex 9.72145 16.1788 0 - endloop - endfacet - facet normal 0.425917 -0.904762 0 - outer loop - vertex 10.4258 16.5104 0 - vertex 9.72145 16.1788 -3 - vertex 10.4258 16.5104 -3 - endloop - endfacet - facet normal 0.716732 0.697349 0 - outer loop - vertex 10.4258 16.5104 0 - vertex 9.76373 17.1908 -3 - vertex 9.76373 17.1908 0 - endloop - endfacet - facet normal 0.716732 0.697349 0 - outer loop - vertex 9.76373 17.1908 -3 - vertex 10.4258 16.5104 0 - vertex 10.4258 16.5104 -3 - endloop - endfacet - facet normal 0.65174 0.758443 -0 - outer loop - vertex 9.76373 17.1908 -3 - vertex 8.30319 18.4459 0 - vertex 9.76373 17.1908 0 - endloop - endfacet - facet normal 0.65174 0.758443 0 - outer loop - vertex 8.30319 18.4459 0 - vertex 9.76373 17.1908 -3 - vertex 8.30319 18.4459 -3 - endloop - endfacet - facet normal 0.52501 0.851096 -0 - outer loop - vertex 8.30319 18.4459 -3 - vertex 7.1994 19.1268 0 - vertex 8.30319 18.4459 0 - endloop - endfacet - facet normal 0.52501 0.851096 0 - outer loop - vertex 7.1994 19.1268 0 - vertex 8.30319 18.4459 -3 - vertex 7.1994 19.1268 -3 - endloop - endfacet - facet normal -0.992345 0.123496 0 - outer loop - vertex 7.15178 18.7442 -3 - vertex 7.1994 19.1268 0 - vertex 7.1994 19.1268 -3 - endloop - endfacet - facet normal -0.992345 0.123496 0 - outer loop - vertex 7.1994 19.1268 0 - vertex 7.15178 18.7442 -3 - vertex 7.15178 18.7442 0 - endloop - endfacet - facet normal -0.148843 0.988861 0 - outer loop - vertex -16.6107 24.7853 -3 - vertex -20.4324 24.2101 0 - vertex -16.6107 24.7853 0 - endloop - endfacet - facet normal -0.148843 0.988861 0 - outer loop - vertex -20.4324 24.2101 0 - vertex -16.6107 24.7853 -3 - vertex -20.4324 24.2101 -3 - endloop - endfacet - facet normal -0.117787 0.993039 0 - outer loop - vertex -20.4324 24.2101 -3 - vertex -23.3809 23.8604 0 - vertex -20.4324 24.2101 0 - endloop - endfacet - facet normal -0.117787 0.993039 0 - outer loop - vertex -23.3809 23.8604 0 - vertex -20.4324 24.2101 -3 - vertex -23.3809 23.8604 -3 - endloop - endfacet - facet normal -0.645441 -0.76381 0 - outer loop - vertex -23.3809 23.8604 -3 - vertex -22.6641 23.2546 0 - vertex -23.3809 23.8604 0 - endloop - endfacet - facet normal -0.645441 -0.76381 -0 - outer loop - vertex -22.6641 23.2546 0 - vertex -23.3809 23.8604 -3 - vertex -22.6641 23.2546 -3 - endloop - endfacet - facet normal -0.546303 -0.837588 0 - outer loop - vertex -22.6641 23.2546 -3 - vertex -22.0432 22.8497 0 - vertex -22.6641 23.2546 0 - endloop - endfacet - facet normal -0.546303 -0.837588 -0 - outer loop - vertex -22.0432 22.8497 0 - vertex -22.6641 23.2546 -3 - vertex -22.0432 22.8497 -3 - endloop - endfacet - facet normal -0.238224 -0.97121 0 - outer loop - vertex -22.0432 22.8497 -3 - vertex -21.5591 22.7309 0 - vertex -22.0432 22.8497 0 - endloop - endfacet - facet normal -0.238224 -0.97121 -0 - outer loop - vertex -21.5591 22.7309 0 - vertex -22.0432 22.8497 -3 - vertex -21.5591 22.7309 -3 - endloop - endfacet - facet normal 0.148545 -0.988906 0 - outer loop - vertex -21.5591 22.7309 -3 - vertex -19.3275 23.0662 0 - vertex -21.5591 22.7309 0 - endloop - endfacet - facet normal 0.148545 -0.988906 0 - outer loop - vertex -19.3275 23.0662 0 - vertex -21.5591 22.7309 -3 - vertex -19.3275 23.0662 -3 - endloop - endfacet - facet normal 0.149712 -0.98873 0 - outer loop - vertex -19.3275 23.0662 -3 - vertex -14.1729 23.8467 0 - vertex -19.3275 23.0662 0 - endloop - endfacet - facet normal 0.149712 -0.98873 0 - outer loop - vertex -14.1729 23.8467 0 - vertex -19.3275 23.0662 -3 - vertex -14.1729 23.8467 -3 - endloop - endfacet - facet normal 0.152324 -0.988331 0 - outer loop - vertex -14.1729 23.8467 -3 - vertex -10.5829 24.4 0 - vertex -14.1729 23.8467 0 - endloop - endfacet - facet normal 0.152324 -0.988331 0 - outer loop - vertex -10.5829 24.4 0 - vertex -14.1729 23.8467 -3 - vertex -10.5829 24.4 -3 - endloop - endfacet - facet normal 0.753595 0.657339 0 - outer loop - vertex -10.5829 24.4 0 - vertex -10.6709 24.5009 -3 - vertex -10.6709 24.5009 0 - endloop - endfacet - facet normal 0.753595 0.657339 0 - outer loop - vertex -10.6709 24.5009 -3 - vertex -10.5829 24.4 0 - vertex -10.5829 24.4 -3 - endloop - endfacet - facet normal 0.323243 0.946316 -0 - outer loop - vertex -10.6709 24.5009 -3 - vertex -11.2742 24.7069 0 - vertex -10.6709 24.5009 0 - endloop - endfacet - facet normal 0.323243 0.946316 0 - outer loop - vertex -11.2742 24.7069 0 - vertex -10.6709 24.5009 -3 - vertex -11.2742 24.7069 -3 - endloop - endfacet - facet normal 0.105601 0.994409 -0 - outer loop - vertex -11.2742 24.7069 -3 - vertex -13.9393 24.99 0 - vertex -11.2742 24.7069 0 - endloop - endfacet - facet normal 0.105601 0.994409 0 - outer loop - vertex -13.9393 24.99 0 - vertex -11.2742 24.7069 -3 - vertex -13.9393 24.99 -3 - endloop - endfacet - facet normal -0.0763677 0.99708 0 - outer loop - vertex -13.9393 24.99 -3 - vertex -16.6107 24.7853 0 - vertex -13.9393 24.99 0 - endloop - endfacet - facet normal -0.0763677 0.99708 0 - outer loop - vertex -16.6107 24.7853 0 - vertex -13.9393 24.99 -3 - vertex -16.6107 24.7853 -3 - endloop - endfacet - facet normal -1 0 0 - outer loop - vertex -117.5 -117.5 -3 - vertex -117.5 117.5 0 - vertex -117.5 117.5 -3 - endloop - endfacet - facet normal -1 -0 0 - outer loop - vertex -117.5 117.5 0 - vertex -117.5 -117.5 -3 - vertex -117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.5713 -25.7117 0 - vertex -27.9105 -26.2055 0 - vertex -28.1036 -25.8829 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -32.142 -25.4759 0 - vertex -28.1838 -28.4809 0 - vertex -28.5713 -25.7117 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -27.9105 -26.2055 0 - vertex -28.5713 -25.7117 0 - vertex -28.1838 -28.4809 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.9073 -13.512 0 - vertex -35.4871 -14.1281 0 - vertex -35.5739 -13.718 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -36.5262 -13.4531 0 - vertex -35.4871 -14.1281 0 - vertex -35.9073 -13.512 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.4871 -14.1281 0 - vertex -36.5262 -13.4531 0 - vertex -35.6081 -14.799 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.2393 -13.2576 0 - vertex -35.6081 -14.799 0 - vertex -36.5262 -13.4531 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.6081 -14.799 0 - vertex -37.2393 -13.2576 0 - vertex -37.0548 -18.7102 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.5366 -12.7854 0 - vertex -37.0548 -18.7102 0 - vertex -37.2393 -13.2576 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -38.8382 24.6102 0 - vertex -37.3951 -12.1929 0 - vertex -38.3729 23.836 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -39.1303 25.4589 0 - vertex -37.3951 -12.1929 0 - vertex -38.8382 24.6102 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.3951 -12.1929 0 - vertex -39.1303 25.4589 0 - vertex -37.5366 -12.7854 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.5366 -12.7854 0 - vertex -39.9072 -25.4747 0 - vertex -37.0548 -18.7102 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -47.8577 -36.863 0 - vertex -37.5366 -12.7854 0 - vertex -39.1303 25.4589 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -26.0224 24.2804 0 - vertex -26.0647 23.8437 0 - vertex -24.664 24.0122 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -26.0224 24.2804 0 - vertex -27.3687 23.7586 0 - vertex -26.0647 23.8437 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1365 24.9019 0 - vertex -27.3687 23.7586 0 - vertex -26.0224 24.2804 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1365 24.9019 0 - vertex -28.4642 23.8513 0 - vertex -27.3687 23.7586 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1365 24.9019 0 - vertex -29.3958 24.13 0 - vertex -28.4642 23.8513 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.9035 25.8898 0 - vertex -29.3958 24.13 0 - vertex -28.1365 24.9019 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.9035 25.8898 0 - vertex -30.2081 24.6027 0 - vertex -29.3958 24.13 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.9035 25.8898 0 - vertex -30.8173 24.9813 0 - vertex -30.2081 24.6027 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.1793 25.0376 0 - vertex -29.9035 25.8898 0 - vertex -31.116 26.9038 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.9035 25.8898 0 - vertex -31.1793 25.0376 0 - vertex -30.8173 24.9813 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.2912 27.2229 0 - vertex -31.1793 25.0376 0 - vertex -31.116 26.9038 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -34.2108 23.023 0 - vertex -31.1793 25.0376 0 - vertex -31.2912 27.2229 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.5389 20.1801 0 - vertex -11.1208 19.5935 0 - vertex -10.9412 20.0018 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.5389 20.1801 0 - vertex -12.0133 18.8648 0 - vertex -11.1208 19.5935 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -12.9783 20.2187 0 - vertex -12.0133 18.8648 0 - vertex -11.5389 20.1801 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -12.9783 20.2187 0 - vertex -15.009 16.7116 0 - vertex -12.0133 18.8648 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -16.3196 19.9968 0 - vertex -15.009 16.7116 0 - vertex -12.9783 20.2187 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.3196 19.9968 0 - vertex -17.0754 15.711 0 - vertex -15.009 16.7116 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -20.1789 19.4139 0 - vertex -17.0754 15.711 0 - vertex -16.3196 19.9968 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.0754 15.711 0 - vertex -20.1789 19.4139 0 - vertex -19.733 14.7364 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.1789 19.4139 0 - vertex -22.3118 14.0374 0 - vertex -19.733 14.7364 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -24.1572 19.0472 0 - vertex -22.3118 14.0374 0 - vertex -20.1789 19.4139 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.1572 19.0472 0 - vertex -24.873 13.6003 0 - vertex -22.3118 14.0374 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -27.5587 18.9414 0 - vertex -24.873 13.6003 0 - vertex -24.1572 19.0472 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.873 13.6003 0 - vertex -27.5587 18.9414 0 - vertex -27.4778 13.4117 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.687 19.1409 0 - vertex -27.4778 13.4117 0 - vertex -27.5587 18.9414 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.687 19.1409 0 - vertex -29.9412 13.2465 0 - vertex -27.4778 13.4117 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.687 19.1409 0 - vertex -30.3118 13.0393 0 - vertex -29.9412 13.2465 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -33.0651 20.3093 0 - vertex -30.3118 13.0393 0 - vertex -29.687 19.1409 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.3118 13.0393 0 - vertex -33.0651 20.3093 0 - vertex -30.3887 12.6783 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.2082 3.44442 0 - vertex 23.5966 4.95794 0 - vertex 23.3811 5.8089 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.5966 4.95794 0 - vertex 23.2082 3.44442 0 - vertex 23.5377 4.18291 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.8875 6.77518 0 - vertex 23.2082 3.44442 0 - vertex 23.3811 5.8089 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.0239 2.90744 0 - vertex 23.2082 3.44442 0 - vertex 22.8875 6.77518 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.0239 2.90744 0 - vertex 22.8875 6.77518 0 - vertex 21.7142 8.22365 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 47.2139 -19.2263 0 - vertex 26.9177 3.98634 0 - vertex 26.953 2.16551 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 26.9177 3.98634 0 - vertex 27.209 8.08714 0 - vertex 26.8985 6.51977 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 26.7235 1.18648 0 - vertex 38.4798 -20.1181 0 - vertex 26.8464 1.29842 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.9177 3.98634 0 - vertex 27.528 9.70386 0 - vertex 27.209 8.08714 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 38.4798 -20.1181 0 - vertex 26.7235 1.18648 0 - vertex 29.9429 -19.4981 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.9429 -19.4981 0 - vertex 26.7235 1.18648 0 - vertex 28.989 -19.2301 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.6777 -11.13 0 - vertex 28.989 -19.2301 0 - vertex 26.7235 1.18648 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.9081 -2.19366 0 - vertex 26.7235 1.18648 0 - vertex 26.5455 1.2697 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 28.989 -19.2301 0 - vertex 19.6777 -11.13 0 - vertex 27.8281 -19.1444 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.9858 2.16372 0 - vertex 26.5455 1.2697 0 - vertex 25.9977 1.96397 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 27.8281 -19.1444 0 - vertex 19.6777 -11.13 0 - vertex 26.5413 -19.2026 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 24.7523 2.4559 0 - vertex 25.9977 1.96397 0 - vertex 25.3153 2.68052 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.7523 2.4559 0 - vertex 25.3153 2.68052 0 - vertex 25.0347 2.67962 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 23.9858 2.16372 0 - vertex 25.9977 1.96397 0 - vertex 24.7523 2.4559 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.5455 1.2697 0 - vertex 23.9858 2.16372 0 - vertex 21.0968 -1.15452 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.0968 -1.15452 0 - vertex 23.9858 2.16372 0 - vertex 23.1222 1.97635 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.7235 1.18648 0 - vertex 20.9081 -2.19366 0 - vertex 20.4179 -3.0084 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.0282 0.220415 0 - vertex 23.1222 1.97635 0 - vertex 22.8505 1.9828 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.0282 0.220415 0 - vertex 22.8505 1.9828 0 - vertex 22.7784 2.30129 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.2082 3.44442 0 - vertex 16.0239 2.90744 0 - vertex 22.7784 2.30129 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.5455 1.2697 0 - vertex 21.0968 -1.15452 0 - vertex 20.9081 -2.19366 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.5413 -19.2026 0 - vertex 19.6777 -11.13 0 - vertex 25.4359 -19.4082 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.1222 1.97635 0 - vertex 21.0282 0.220415 0 - vertex 21.0968 -1.15452 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.3368 5.33522 0 - vertex 21.7142 8.22365 0 - vertex 19.7157 9.66569 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 19.4865 -0.127098 0 - vertex 22.7784 2.30129 0 - vertex 16.0239 2.90744 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.9551 7.69881 0 - vertex 19.7157 9.66569 0 - vertex 18.6847 10.137 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.7784 2.30129 0 - vertex 19.4865 -0.127098 0 - vertex 21.0282 0.220415 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 16.8564 0.883682 0 - vertex 19.4865 -0.127098 0 - vertex 16.0239 2.90744 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.9551 7.69881 0 - vertex 18.6847 10.137 0 - vertex 17.337 10.3363 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.4865 -0.127098 0 - vertex 16.8564 0.883682 0 - vertex 18.2674 -0.466912 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.2674 -0.466912 0 - vertex 16.8564 0.883682 0 - vertex 17.6745 -0.267811 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.3572 9.74689 0 - vertex 17.337 10.3363 0 - vertex 15.9933 10.3315 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.3572 9.74689 0 - vertex 15.9933 10.3315 0 - vertex 15.6762 10.1383 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.9426 8.95486 0 - vertex 17.337 10.3363 0 - vertex 15.3572 9.74689 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.7142 8.22365 0 - vertex 15.3368 5.33522 0 - vertex 16.0239 2.90744 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.7157 9.66569 0 - vertex 14.9551 7.69881 0 - vertex 15.3368 5.33522 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.337 10.3363 0 - vertex 14.9426 8.95486 0 - vertex 14.9551 7.69881 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.4359 -19.4082 0 - vertex 19.6777 -11.13 0 - vertex 23.0737 -20.4525 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.7235 1.18648 0 - vertex 20.4179 -3.0084 0 - vertex 19.6777 -11.13 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 17.1521 -17.7131 0 - vertex 23.0737 -20.4525 0 - vertex 19.6777 -11.13 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.0737 -20.4525 0 - vertex 17.1521 -17.7131 0 - vertex 21.6367 -21.3703 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.4179 -3.0084 0 - vertex 19.5452 -10.7956 0 - vertex 19.6777 -11.13 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.4334 -3.80993 0 - vertex 19.5452 -10.7956 0 - vertex 20.4179 -3.0084 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 17.7619 -4.80944 0 - vertex 19.5452 -10.7956 0 - vertex 19.4334 -3.80993 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.5452 -10.7956 0 - vertex 17.7619 -4.80944 0 - vertex 19.0845 -10.6988 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 15.0012 -6.23992 0 - vertex 19.0845 -10.6988 0 - vertex 17.7619 -4.80944 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.0845 -10.6988 0 - vertex 15.0012 -6.23992 0 - vertex 16.7993 -11.2316 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 12.6103 -7.15898 0 - vertex 16.7993 -11.2316 0 - vertex 15.0012 -6.23992 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.7993 -11.2316 0 - vertex 12.6103 -7.15898 0 - vertex 13.71 -12.1451 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.71 -12.1451 0 - vertex 12.6103 -7.15898 0 - vertex 13.1035 -12.4147 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 10.2421 -7.67101 0 - vertex 13.1035 -12.4147 0 - vertex 12.6103 -7.15898 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.1035 -12.4147 0 - vertex 10.2421 -7.67101 0 - vertex 12.6527 -12.8127 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.6527 -12.8127 0 - vertex 10.2421 -7.67101 0 - vertex 12.4073 -13.2773 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 11.2177 -19.5302 0 - vertex 12.4073 -13.2773 0 - vertex 10.3474 -19.1774 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.058 -19.7199 0 - vertex 11.2177 -19.5302 0 - vertex 11.7785 -19.8211 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.4073 -13.2773 0 - vertex 11.2177 -19.5302 0 - vertex 12.058 -19.7199 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 7.54923 -7.88041 0 - vertex 12.4073 -13.2773 0 - vertex 10.2421 -7.67101 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.4073 -13.2773 0 - vertex 8.75581 -19.1712 0 - vertex 10.3474 -19.1774 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.06268 -19.3694 0 - vertex 12.4073 -13.2773 0 - vertex 7.54923 -7.88041 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.4073 -13.2773 0 - vertex 7.06268 -19.3694 0 - vertex 8.75581 -19.1712 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.03167 -7.88498 0 - vertex 7.06268 -19.3694 0 - vertex 7.54923 -7.88041 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.06268 -19.3694 0 - vertex 5.03167 -7.88498 0 - vertex 5.689 -19.9339 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.854 -7.59505 0 - vertex 5.689 -19.9339 0 - vertex 5.03167 -7.88498 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.854 -7.59505 0 - vertex 3.72385 -21.1527 0 - vertex 5.689 -19.9339 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -4.70045 -19.8327 0 - vertex 3.72385 -21.1527 0 - vertex 3.854 -7.59505 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.57075 -19.2012 0 - vertex 3.854 -7.59505 0 - vertex 1.04019 -5.91722 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex -4.06681 -20.6308 0 - vertex 3.72385 -21.1527 0 - vertex -4.70045 -19.8327 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex -3.85646 -21.6547 0 - vertex 1.84511 -22.661 0 - vertex -4.06681 -20.6308 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.57075 -19.2012 0 - vertex 1.04019 -5.91722 0 - vertex -2.05653 -4.03047 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.84511 -22.661 0 - vertex -3.85646 -21.6547 0 - vertex 0.168338 -24.355 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 0.168338 -24.355 0 - vertex -3.89417 -22.8317 0 - vertex -1.19093 -26.1306 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.1272 -19.1706 0 - vertex -2.05653 -4.03047 0 - vertex -3.45272 -3.03042 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.4385 -11.5861 0 - vertex -3.45272 -3.03042 0 - vertex -3.71458 -2.66291 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -4.26405 -24.3543 0 - vertex -1.19093 -26.1306 0 - vertex -3.89417 -22.8317 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.6367 -21.3703 0 - vertex 17.1521 -17.7131 0 - vertex 20.2954 -22.4759 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.2954 -22.4759 0 - vertex 17.1521 -17.7131 0 - vertex 19.0386 -23.7798 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.5835 -23.8342 0 - vertex 19.0386 -23.7798 0 - vertex 17.1521 -17.7131 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.0386 -23.7798 0 - vertex 14.5835 -23.8342 0 - vertex 17.855 -25.2923 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.855 -25.2923 0 - vertex 14.5835 -23.8342 0 - vertex 16.4055 -27.6373 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.4055 -27.6373 0 - vertex 14.5835 -23.8342 0 - vertex 15.3794 -29.9771 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.3794 -29.9771 0 - vertex 11.4887 -31.4602 0 - vertex 14.7938 -32.2631 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.4887 -31.4602 0 - vertex 15.3794 -29.9771 0 - vertex 14.5835 -23.8342 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 25.1513 17.7384 0 - vertex 26.0816 17.5963 0 - vertex 25.9892 18.2943 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.1513 17.7384 0 - vertex 25.9892 18.2943 0 - vertex 25.7331 18.8483 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 25.704 16.8274 0 - vertex 26.0816 17.5963 0 - vertex 25.4738 17.2443 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.0816 17.5963 0 - vertex 25.704 16.8274 0 - vertex 25.8979 16.7563 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.5942 18.0475 0 - vertex 25.7331 18.8483 0 - vertex 25.3447 19.2137 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.0816 17.5963 0 - vertex 25.1513 17.7384 0 - vertex 25.4738 17.2443 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.5942 18.0475 0 - vertex 25.3447 19.2137 0 - vertex 24.8554 19.3454 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.7331 18.8483 0 - vertex 24.5942 18.0475 0 - vertex 25.1513 17.7384 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.3909 19.6849 0 - vertex 24.5942 18.0475 0 - vertex 24.8554 19.3454 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.335 18.2522 0 - vertex 23.3909 19.6849 0 - vertex 22.6368 20.047 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.3909 19.6849 0 - vertex 22.335 18.2522 0 - vertex 24.5942 18.0475 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.9591 18.304 0 - vertex 22.6368 20.047 0 - vertex 22.0911 20.5797 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.6596 20.6529 0 - vertex 22.0911 20.5797 0 - vertex 21.7245 21.3239 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.4421 21.9215 0 - vertex 21.7245 21.3239 0 - vertex 21.508 22.3204 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.4421 21.9215 0 - vertex 21.508 22.3204 0 - vertex 21.2518 23.2891 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.0911 20.5797 0 - vertex 19.6596 20.6529 0 - vertex 19.8405 19.3078 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.9185 22.6398 0 - vertex 21.2518 23.2891 0 - vertex 20.762 24.0784 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.6368 20.047 0 - vertex 20.9591 18.304 0 - vertex 22.335 18.2522 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.9185 22.6398 0 - vertex 20.762 24.0784 0 - vertex 20.0338 24.6942 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.0911 20.5797 0 - vertex 19.8405 19.3078 0 - vertex 20.9591 18.304 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.9591 18.304 0 - vertex 19.8405 19.3078 0 - vertex 20.2006 18.5903 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.7245 21.3239 0 - vertex 19.4421 21.9215 0 - vertex 19.6596 20.6529 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.9185 22.6398 0 - vertex 20.0338 24.6942 0 - vertex 19.062 25.1422 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.2518 23.2891 0 - vertex 18.9185 22.6398 0 - vertex 19.4421 21.9215 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.062 25.1422 0 - vertex 17.6852 23.4449 0 - vertex 18.9185 22.6398 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.2513 25.98 0 - vertex 17.6852 23.4449 0 - vertex 19.062 25.1422 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.1211 24.4531 0 - vertex 17.2513 25.98 0 - vertex 15.7223 27.2873 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.4969 25.2416 0 - vertex 15.7223 27.2873 0 - vertex 15.122 28.0941 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.2513 25.98 0 - vertex 15.1211 24.4531 0 - vertex 17.6852 23.4449 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 11.7374 28.4518 0 - vertex 15.122 28.0941 0 - vertex 15.0577 29.0611 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.7223 27.2873 0 - vertex 13.4969 25.2416 0 - vertex 15.1211 24.4531 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.0303 22.3563 0 - vertex -30.0976 22.0525 0 - vertex -28.3511 21.9725 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.3878 23.2826 0 - vertex -30.0976 22.0525 0 - vertex -29.0303 22.3563 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -32.1178 22.3529 0 - vertex -30.3878 23.2826 0 - vertex -31.0943 24.213 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.3878 23.2826 0 - vertex -32.1178 22.3529 0 - vertex -30.0976 22.0525 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -34.2108 23.023 0 - vertex -31.0943 24.213 0 - vertex -31.2773 24.779 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.1793 25.0376 0 - vertex -34.2108 23.023 0 - vertex -31.2773 24.779 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.5428 -26.6889 0 - vertex -23.655 -30.4649 0 - vertex -23.4462 -30.738 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -25.4741 -26.9141 0 - vertex -18.5428 -26.6889 0 - vertex -24.4076 -24.3815 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.5428 -26.6889 0 - vertex -25.4741 -26.9141 0 - vertex -23.655 -30.4649 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -23.655 -30.4649 0 - vertex -25.4741 -26.9141 0 - vertex -24.0819 -30.2475 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.0819 -30.2475 0 - vertex -25.4741 -26.9141 0 - vertex -24.4667 -30.1541 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -26.2338 -28.3696 0 - vertex -24.4667 -30.1541 0 - vertex -25.4741 -26.9141 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.4667 -30.1541 0 - vertex -26.2338 -28.3696 0 - vertex -24.8569 -30.2998 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -26.8752 -29.0336 0 - vertex -24.8569 -30.2998 0 - vertex -26.2338 -28.3696 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.8569 -30.2998 0 - vertex -26.8752 -29.0336 0 - vertex -26.8283 -32.1012 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -27.5872 -29.1914 0 - vertex -26.8283 -32.1012 0 - vertex -26.8752 -29.0336 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1878 -29.097 0 - vertex -26.8283 -32.1012 0 - vertex -27.5872 -29.1914 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1878 -29.097 0 - vertex -29.0969 -33.8499 0 - vertex -26.8283 -32.1012 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1838 -28.4809 0 - vertex -32.142 -25.4759 0 - vertex -28.1878 -29.097 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -35.4824 -26.6225 0 - vertex -28.1878 -29.097 0 - vertex -32.142 -25.4759 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1878 -29.097 0 - vertex -30.2578 -34.4631 0 - vertex -29.0969 -33.8499 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1878 -29.097 0 - vertex -31.3644 -34.8586 0 - vertex -30.2578 -34.4631 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.4824 -26.6225 0 - vertex -32.142 -25.4759 0 - vertex -34.9626 -25.4747 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.1878 -29.097 0 - vertex -35.4824 -26.6225 0 - vertex -31.3644 -34.8586 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.3644 -34.8586 0 - vertex -35.4824 -26.6225 0 - vertex -35.0529 -35.0835 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -38.7331 -34.5543 0 - vertex -35.0529 -35.0835 0 - vertex -35.4824 -26.6225 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.0529 -35.0835 0 - vertex -38.7331 -34.5543 0 - vertex -38.4261 -34.9619 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.6886 -22.3738 0 - vertex -24.4076 -24.3815 0 - vertex -18.5428 -26.6889 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -23.8149 -31.5911 0 - vertex -21.28 -33.2523 0 - vertex -23.4462 -30.738 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.5428 -26.6889 0 - vertex -23.4462 -30.738 0 - vertex -21.28 -33.2523 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -24.7956 -33.2498 0 - vertex -21.28 -33.2523 0 - vertex -23.8149 -31.5911 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.28 -33.2523 0 - vertex -24.7956 -33.2498 0 - vertex -22.458 -35.4568 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -23.6767 -35.9691 0 - vertex -22.458 -35.4568 0 - vertex -24.7956 -33.2498 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.458 -35.4568 0 - vertex -23.6767 -35.9691 0 - vertex -23.007 -35.8619 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -23.6767 -35.9691 0 - vertex -24.7956 -33.2498 0 - vertex -24.4194 -36.2501 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -27.2791 -36.8782 0 - vertex -24.4194 -36.2501 0 - vertex -24.7956 -33.2498 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.4194 -36.2501 0 - vertex -27.2791 -36.8782 0 - vertex -24.9699 -36.888 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.9699 -36.888 0 - vertex -27.2791 -36.8782 0 - vertex -25.157 -37.5754 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.4212 26.8695 0 - vertex -21.4485 26.3569 0 - vertex -21.2681 26.5576 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.4485 26.3569 0 - vertex -22.4212 26.8695 0 - vertex -22.0473 26.2369 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.8433 26.205 0 - vertex -22.4212 26.8695 0 - vertex -23.8902 27.3484 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.4212 26.8695 0 - vertex -24.8433 26.205 0 - vertex -22.0473 26.2369 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.3225 27.6757 0 - vertex -24.8433 26.205 0 - vertex -23.8902 27.3484 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -27.4214 26.3653 0 - vertex -24.3225 27.6757 0 - vertex -24.3632 27.9554 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.78909 -22.7249 0 - vertex -8.46819 -23.4267 0 - vertex -8.55624 -22.9989 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.46819 -23.4267 0 - vertex -8.78909 -22.7249 0 - vertex -9.69161 -22.56 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.46819 -23.4267 0 - vertex -9.69161 -22.56 0 - vertex -8.72405 -24.8218 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -10.5461 -22.7271 0 - vertex -8.72405 -24.8218 0 - vertex -9.69161 -22.56 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -11.3967 -23.0769 0 - vertex -8.72405 -24.8218 0 - vertex -10.5461 -22.7271 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -12.4124 -23.7203 0 - vertex -8.72405 -24.8218 0 - vertex -11.3967 -23.0769 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.72405 -24.8218 0 - vertex -12.4124 -23.7203 0 - vertex -9.55184 -27.0667 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -13.1427 -24.3848 0 - vertex -9.55184 -27.0667 0 - vertex -12.4124 -23.7203 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -14.2216 -26.3227 0 - vertex -9.55184 -27.0667 0 - vertex -13.7062 -25.2068 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -9.55184 -27.0667 0 - vertex -15.3894 -29.1914 0 - vertex -11.5932 -32.143 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -9.55184 -27.0667 0 - vertex -13.1427 -24.3848 0 - vertex -13.7062 -25.2068 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.3894 -29.1914 0 - vertex -9.55184 -27.0667 0 - vertex -14.2216 -26.3227 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.8281 -32.7116 0 - vertex -11.5932 -32.143 0 - vertex -15.3894 -29.1914 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.5932 -32.143 0 - vertex -16.8281 -32.7116 0 - vertex -12.3385 -33.8339 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -12.3385 -33.8339 0 - vertex -16.8281 -32.7116 0 - vertex -13.0448 -35.0276 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -14.3732 -35.9691 0 - vertex -13.0448 -35.0276 0 - vertex -16.8281 -32.7116 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -13.0448 -35.0276 0 - vertex -14.3732 -35.9691 0 - vertex -13.7203 -35.7356 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -14.3732 -35.9691 0 - vertex -16.8281 -32.7116 0 - vertex -14.8949 -36.1495 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -16.5846 -36.2152 0 - vertex -14.8949 -36.1495 0 - vertex -16.8281 -32.7116 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.6989 -37.6188 0 - vertex -15.9213 -37.1689 0 - vertex -16.2226 -36.752 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -14.8949 -36.1495 0 - vertex -16.5846 -36.2152 0 - vertex -15.4682 -36.5832 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.4682 -36.5832 0 - vertex -16.2226 -36.752 0 - vertex -15.9213 -37.1689 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.4682 -36.5832 0 - vertex -16.5846 -36.2152 0 - vertex -16.2226 -36.752 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -17.7285 -35.3062 0 - vertex -16.5846 -36.2152 0 - vertex -16.8281 -32.7116 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.5846 -36.2152 0 - vertex -17.7285 -35.3062 0 - vertex -17.3742 -35.9691 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.3742 -35.9691 0 - vertex -17.7285 -35.3062 0 - vertex -17.6987 -35.8223 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -10.3766 -20.1728 0 - vertex -11.7016 -19.4898 0 - vertex -11.6824 -19.9072 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.45272 -3.03042 0 - vertex -11.9141 -19.2259 0 - vertex -11.7016 -19.4898 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.45272 -3.03042 0 - vertex -17.4385 -11.5861 0 - vertex -11.9141 -19.2259 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -17.5299 12.3491 0 - vertex -3.71458 -2.66291 0 - vertex -13.7227 13.3517 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -17.4456 -12.0833 0 - vertex -11.9141 -19.2259 0 - vertex -17.4385 -11.5861 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.9141 -19.2259 0 - vertex -17.4456 -12.0833 0 - vertex -12.3137 -19.1333 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.7993 -11.4712 0 - vertex -3.71458 -2.66291 0 - vertex -17.5299 12.3491 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.71458 -2.66291 0 - vertex -17.7993 -11.4712 0 - vertex -17.4385 -11.5861 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -20.0298 12.0063 0 - vertex -17.7993 -11.4712 0 - vertex -17.5299 12.3491 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -22.4428 11.7593 0 - vertex -17.7993 -11.4712 0 - vertex -20.0298 12.0063 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -27.1868 -11.3523 0 - vertex -22.4428 11.7593 0 - vertex -25.7097 11.6586 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.4428 11.7593 0 - vertex -27.1868 -11.3523 0 - vertex -17.7993 -11.4712 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.6588 11.7129 0 - vertex -27.1868 -11.3523 0 - vertex -25.7097 11.6586 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -34.87 -11.3196 0 - vertex -28.6588 11.7129 0 - vertex -30.1182 11.9311 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -36.792 -11.6364 0 - vertex -30.1182 11.9311 0 - vertex -30.3887 12.6783 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -35.7552 21.6337 0 - vertex -30.3887 12.6783 0 - vertex -33.0651 20.3093 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.6588 11.7129 0 - vertex -34.87 -11.3196 0 - vertex -27.1868 -11.3523 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.6991 23.0789 0 - vertex -30.3887 12.6783 0 - vertex -35.7552 21.6337 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.1182 11.9311 0 - vertex -36.1936 -11.4238 0 - vertex -34.87 -11.3196 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.1182 11.9311 0 - vertex -36.792 -11.6364 0 - vertex -36.1936 -11.4238 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.3887 12.6783 0 - vertex -37.6991 23.0789 0 - vertex -36.792 -11.6364 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -36.792 -11.6364 0 - vertex -37.6991 23.0789 0 - vertex -37.3951 -12.1929 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -38.3729 23.836 0 - vertex -37.3951 -12.1929 0 - vertex -37.6991 23.0789 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.80393 -35.193 0 - vertex -7.51249 -36.3769 0 - vertex -7.31439 -36.7536 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.99709 -33.5697 0 - vertex -8.33648 -34.384 0 - vertex -7.51249 -36.3769 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.51249 -36.3769 0 - vertex -8.33648 -34.384 0 - vertex -7.98605 -36.0592 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -8.56822 -35.3052 0 - vertex -7.98605 -36.0592 0 - vertex -8.33648 -34.384 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.98605 -36.0592 0 - vertex -8.56822 -35.3052 0 - vertex -8.51129 -35.7129 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.41055 11.926 0 - vertex 1.8467 12.7398 0 - vertex 1.50002 13.1874 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.8467 12.7398 0 - vertex 1.41055 11.926 0 - vertex 1.87173 12.344 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 0.918757 13.5702 0 - vertex 1.41055 11.926 0 - vertex 1.50002 13.1874 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 0.918757 13.5702 0 - vertex 0.535115 11.4454 0 - vertex 1.41055 11.926 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 0.918757 13.5702 0 - vertex -0.394194 11.1972 0 - vertex 0.535115 11.4454 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.928844 14.138 0 - vertex -0.394194 11.1972 0 - vertex 0.918757 13.5702 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.928844 14.138 0 - vertex -1.46211 11.1697 0 - vertex -0.394194 11.1972 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.928844 14.138 0 - vertex -2.75335 11.3511 0 - vertex -1.46211 11.1697 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.65881 14.4362 0 - vertex -2.75335 11.3511 0 - vertex -0.928844 14.138 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.65881 14.4362 0 - vertex -5.07797 11.6776 0 - vertex -2.75335 11.3511 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.23385 14.4578 0 - vertex -5.07797 11.6776 0 - vertex -3.65881 14.4362 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.07797 11.6776 0 - vertex -7.23385 14.4578 0 - vertex -5.71478 11.6495 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.71478 11.6495 0 - vertex -7.23385 14.4578 0 - vertex -5.93765 11.491 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -13.7227 13.3517 0 - vertex -5.93765 11.491 0 - vertex -10.6367 14.238 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -4.99153 10.6633 0 - vertex -13.7227 13.3517 0 - vertex -3.71458 -2.66291 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.45272 -3.03042 0 - vertex -8.78621 -19.378 0 - vertex -7.1272 -19.1706 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.45272 -3.03042 0 - vertex -11.7016 -19.4898 0 - vertex -8.78621 -19.378 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -11.7016 -19.4898 0 - vertex -10.3766 -20.1728 0 - vertex -8.78621 -19.378 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.8627 -20.4599 0 - vertex -10.3766 -20.1728 0 - vertex -11.6824 -19.9072 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -10.3766 -20.1728 0 - vertex -11.8627 -20.4599 0 - vertex -12.0544 -21.102 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -12.3137 -19.1333 0 - vertex -17.4456 -12.0833 0 - vertex -15.1553 -19.8912 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -19.3785 -17.1305 0 - vertex -15.1553 -19.8912 0 - vertex -17.4456 -12.0833 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.1553 -19.8912 0 - vertex -19.3785 -17.1305 0 - vertex -17.9982 -20.7653 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -19.683 -17.584 0 - vertex -17.9982 -20.7653 0 - vertex -19.3785 -17.1305 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -20.1126 -17.9213 0 - vertex -17.9982 -20.7653 0 - vertex -19.683 -17.584 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.9982 -20.7653 0 - vertex -20.1126 -17.9213 0 - vertex -18.4336 -21.0091 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.8179 -22.6324 0 - vertex -17.299 -23.335 0 - vertex -17.2695 -22.7276 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.3659 -22.5704 0 - vertex -17.299 -23.335 0 - vertex -17.8179 -22.6324 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.3659 -22.5704 0 - vertex -18.5428 -26.6889 0 - vertex -17.299 -23.335 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.6886 -22.3738 0 - vertex -18.5428 -26.6889 0 - vertex -18.3659 -22.5704 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.7084 -21.5139 0 - vertex -22.6991 -20.0641 0 - vertex -18.7986 -22.0269 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -20.6062 -18.108 0 - vertex -18.4336 -21.0091 0 - vertex -20.1126 -17.9213 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.4336 -21.0091 0 - vertex -20.6062 -18.108 0 - vertex -18.7084 -21.5139 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.6991 -20.0641 0 - vertex -20.6062 -18.108 0 - vertex -22.6057 -19.3555 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.6062 -18.108 0 - vertex -22.6991 -20.0641 0 - vertex -18.7084 -21.5139 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.6057 -19.3555 0 - vertex -20.6062 -18.108 0 - vertex -21.1029 -18.1093 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -23.1278 -21.2395 0 - vertex -18.7986 -22.0269 0 - vertex -22.6991 -20.0641 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.6057 -19.3555 0 - vertex -21.1029 -18.1093 0 - vertex -21.3898 -18.0171 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.8641 -19.008 0 - vertex -21.3898 -18.0171 0 - vertex -21.538 -17.8042 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -23.4908 -18.9156 0 - vertex -21.538 -17.8042 0 - vertex -21.5846 -16.4428 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.1413 -14.5577 0 - vertex -21.5846 -16.4428 0 - vertex -21.6401 -15.0493 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.1413 -14.5577 0 - vertex -21.6401 -15.0493 0 - vertex -21.8106 -14.7733 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -18.7986 -22.0269 0 - vertex -23.1278 -21.2395 0 - vertex -18.6886 -22.3738 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.5846 -16.4428 0 - vertex -22.1413 -14.5577 0 - vertex -23.3419 -14.2877 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.4076 -24.3815 0 - vertex -18.6886 -22.3738 0 - vertex -23.1278 -21.2395 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.28 -33.2523 0 - vertex -22.458 -35.4568 0 - vertex -21.9191 -34.6287 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.3898 -18.0171 0 - vertex -22.8641 -19.008 0 - vertex -22.6057 -19.3555 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.5846 -16.4428 0 - vertex -23.3419 -14.2877 0 - vertex -23.4908 -18.9156 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -21.538 -17.8042 0 - vertex -23.4908 -18.9156 0 - vertex -22.8641 -19.008 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -23.3419 -14.2877 0 - vertex -24.1111 -19.1062 0 - vertex -23.4908 -18.9156 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -26.1195 -14.1654 0 - vertex -24.1111 -19.1062 0 - vertex -23.3419 -14.2877 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.1111 -19.1062 0 - vertex -26.1195 -14.1654 0 - vertex -24.7225 -19.9745 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -30.8809 -15.6487 0 - vertex -24.7225 -19.9745 0 - vertex -26.1195 -14.1654 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.7225 -19.9745 0 - vertex -30.8809 -15.6487 0 - vertex -25.7001 -21.2849 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -32.1593 -18.5412 0 - vertex -25.7001 -21.2849 0 - vertex -30.8809 -15.6487 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.8809 -15.6487 0 - vertex -26.1195 -14.1654 0 - vertex -29.5608 -14.1906 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.3887 -14.5514 0 - vertex -29.5608 -14.1906 0 - vertex -30.2116 -14.321 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -29.5608 -14.1906 0 - vertex -30.3887 -14.5514 0 - vertex -30.8809 -15.6487 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -25.7001 -21.2849 0 - vertex -32.1593 -18.5412 0 - vertex -26.9351 -22.1109 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -26.9351 -22.1109 0 - vertex -32.1593 -18.5412 0 - vertex -28.6031 -22.5277 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.6031 -22.5277 0 - vertex -32.1593 -18.5412 0 - vertex -30.8797 -22.6102 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -33.3019 -21.4299 0 - vertex -30.8797 -22.6102 0 - vertex -32.1593 -18.5412 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -30.8797 -22.6102 0 - vertex -33.3019 -21.4299 0 - vertex -32.5249 -22.5543 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -33.3019 -21.4299 0 - vertex -33.3295 -22.4108 0 - vertex -32.5249 -22.5543 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -33.3295 -22.4108 0 - vertex -33.3019 -21.4299 0 - vertex -33.5147 -22.0719 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.2455 -2.23644 0 - vertex 14.2516 -3.15818 0 - vertex 14.333 -2.7489 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.2455 -2.23644 0 - vertex 13.8131 -3.7697 0 - vertex 14.2516 -3.15818 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.172 -4.2601 0 - vertex 14.2455 -2.23644 0 - vertex 13.5923 -0.94501 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.2455 -2.23644 0 - vertex 13.172 -4.2601 0 - vertex 13.8131 -3.7697 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.5923 -0.94501 0 - vertex 12.4032 -4.58609 0 - vertex 13.172 -4.2601 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.2758 -4.53506 0 - vertex 13.5923 -0.94501 0 - vertex 12.3489 0.629998 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.5923 -0.94501 0 - vertex 11.5814 -4.70438 0 - vertex 12.4032 -4.58609 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.74282 -3.09522 0 - vertex 12.3489 0.629998 0 - vertex 10.5724 2.40247 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.5923 -0.94501 0 - vertex 10.2758 -4.53506 0 - vertex 11.5814 -4.70438 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 6.41545 -1.76788 0 - vertex 10.5724 2.40247 0 - vertex 9.13441 3.60373 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.3489 0.629998 0 - vertex 9.01294 -4.00814 0 - vertex 10.2758 -4.53506 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.6091 0.441775 0 - vertex 9.13441 3.60373 0 - vertex 8.18559 4.25764 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.3489 0.629998 0 - vertex 7.74282 -3.09522 0 - vertex 9.01294 -4.00814 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.5724 2.40247 0 - vertex 6.41545 -1.76788 0 - vertex 7.74282 -3.09522 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.39665 0.754678 0 - vertex 8.18559 4.25764 0 - vertex 5.26682 5.76024 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.13441 3.60373 0 - vertex 4.6091 0.441775 0 - vertex 6.41545 -1.76788 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 8.18559 4.25764 0 - vertex 4.39665 0.754678 0 - vertex 4.6091 0.441775 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.66409 7.13679 0 - vertex 4.39665 0.754678 0 - vertex 5.26682 5.76024 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.39665 0.754678 0 - vertex 1.66409 7.13679 0 - vertex 4.24084 0.464987 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.55278 -2.51803 0 - vertex 4.24084 0.464987 0 - vertex 1.66409 7.13679 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.24084 0.464987 0 - vertex 1.09298 -4.60426 0 - vertex 3.9592 -5.58648 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.55278 -2.51803 0 - vertex 1.66409 7.13679 0 - vertex -0.248642 7.94666 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.24084 0.464987 0 - vertex -1.72768 -3.30659 0 - vertex 1.09298 -4.60426 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.55278 -2.51803 0 - vertex -0.248642 7.94666 0 - vertex -2.78119 9.30203 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.24084 0.464987 0 - vertex -3.55278 -2.51803 0 - vertex -1.72768 -3.30659 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -4.99153 10.6633 0 - vertex -3.55278 -2.51803 0 - vertex -2.78119 9.30203 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -1.19093 -26.1306 0 - vertex -4.26405 -24.3543 0 - vertex -2.25121 -28.0146 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -3.89417 -22.8317 0 - vertex 0.168338 -24.355 0 - vertex -3.85646 -21.6547 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.72385 -21.1527 0 - vertex -4.06681 -20.6308 0 - vertex 1.84511 -22.661 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.55278 -2.51803 0 - vertex -4.99153 10.6633 0 - vertex -3.71458 -2.66291 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -13.7227 13.3517 0 - vertex -4.99153 10.6633 0 - vertex -5.93765 11.491 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.854 -7.59505 0 - vertex -5.57075 -19.2012 0 - vertex -4.70045 -19.8327 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -10.6367 14.238 0 - vertex -5.93765 11.491 0 - vertex -7.23385 14.4578 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -2.05653 -4.03047 0 - vertex -7.1272 -19.1706 0 - vertex -5.57075 -19.2012 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.03104 -4.97268 0 - vertex 7.21237 -5.88439 0 - vertex 7.79727 -5.75259 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.81183 -5.98051 0 - vertex 7.03104 -4.97268 0 - vertex 5.97791 -3.63939 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.03104 -4.97268 0 - vertex 5.81183 -5.98051 0 - vertex 7.21237 -5.88439 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.9592 -5.58648 0 - vertex 5.97791 -3.63939 0 - vertex 5.02006 -2.01238 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.9592 -5.58648 0 - vertex 5.02006 -2.01238 0 - vertex 4.37015 -0.506109 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.97791 -3.63939 0 - vertex 3.9592 -5.58648 0 - vertex 5.81183 -5.98051 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.9592 -5.58648 0 - vertex 4.37015 -0.506109 0 - vertex 4.24084 0.464987 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.6656 -34.4466 0 - vertex 12.1385 -34.7994 0 - vertex 12.2351 -35.1874 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.7938 -32.2631 0 - vertex 11.871 -34.5351 0 - vertex 14.6656 -34.4466 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.6656 -34.4466 0 - vertex 11.871 -34.5351 0 - vertex 12.1385 -34.7994 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 10.915 -33.0747 0 - vertex 11.871 -34.5351 0 - vertex 11.4887 -31.4602 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.871 -34.5351 0 - vertex 10.915 -33.0747 0 - vertex 11.4551 -34.4353 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 10.7197 -33.9677 0 - vertex 11.4551 -34.4353 0 - vertex 10.915 -33.0747 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.4551 -34.4353 0 - vertex 10.7197 -33.9677 0 - vertex 10.9006 -34.3507 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.858 -14.1239 0 - vertex 13.2867 -16.8469 0 - vertex 14.1246 -14.3424 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.417 -13.7469 0 - vertex 13.2867 -16.8469 0 - vertex 12.858 -14.1239 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.417 -13.7469 0 - vertex 12.058 -19.7199 0 - vertex 13.2867 -16.8469 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.058 -19.7199 0 - vertex 12.417 -13.7469 0 - vertex 12.4073 -13.2773 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 11.8088 29.3224 0 - vertex 15.0577 29.0611 0 - vertex 12.0187 29.9363 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.122 28.0941 0 - vertex 11.7374 28.4518 0 - vertex 11.8052 27.5343 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.0577 29.0611 0 - vertex 11.8088 29.3224 0 - vertex 11.7374 28.4518 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.122 28.0941 0 - vertex 11.8052 27.5343 0 - vertex 12.0123 26.7794 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.122 28.0941 0 - vertex 12.0123 26.7794 0 - vertex 12.5486 25.9653 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.1542 17.4223 0 - vertex 24.7931 16.6725 0 - vertex 24.7174 17.1695 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.1542 17.4223 0 - vertex 23.3802 15.8262 0 - vertex 24.7931 16.6725 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.547 17.5015 0 - vertex 23.3802 15.8262 0 - vertex 24.1542 17.4223 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.547 17.5015 0 - vertex 21.1653 14.8489 0 - vertex 23.3802 15.8262 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.2159 17.5562 0 - vertex 21.1653 14.8489 0 - vertex 22.547 17.5015 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.2159 17.5562 0 - vertex 20.0668 14.6265 0 - vertex 21.1653 14.8489 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.4164 15.1559 0 - vertex 20.2159 17.5562 0 - vertex 19.8437 17.7553 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.5954 15.8977 0 - vertex 19.8437 17.7553 0 - vertex 19.5351 18.2611 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.2045 16.623 0 - vertex 19.5351 18.2611 0 - vertex 19.0948 20.2262 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.155 22.8321 0 - vertex 19.0948 20.2262 0 - vertex 18.6529 22.0992 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.2159 17.5562 0 - vertex 18.4164 15.1559 0 - vertex 20.0668 14.6265 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.99 17.4864 0 - vertex 19.0948 20.2262 0 - vertex 17.155 22.8321 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.8437 17.7553 0 - vertex 16.5954 15.8977 0 - vertex 18.4164 15.1559 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.6982 18.6425 0 - vertex 17.155 22.8321 0 - vertex 15.5055 23.4995 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.5351 18.2611 0 - vertex 15.2045 16.623 0 - vertex 16.5954 15.8977 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.9729 20.5521 0 - vertex 15.5055 23.4995 0 - vertex 14.0164 24.1527 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.0948 20.2262 0 - vertex 13.99 17.4864 0 - vertex 15.2045 16.623 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.9729 20.5521 0 - vertex 14.0164 24.1527 0 - vertex 13.0733 24.7212 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.155 22.8321 0 - vertex 12.6982 18.6425 0 - vertex 13.99 17.4864 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.71033 23.0922 0 - vertex 13.0733 24.7212 0 - vertex 12.1975 25.5292 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.07032 24.476 0 - vertex 12.1975 25.5292 0 - vertex 11.5037 26.4501 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 8.51885 25.3107 0 - vertex 11.5037 26.4501 0 - vertex 11.1066 27.3577 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.5055 23.4995 0 - vertex 10.9729 20.5521 0 - vertex 12.6982 18.6425 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.91411 25.7528 0 - vertex 11.1066 27.3577 0 - vertex 11.0411 28.3898 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 4.30515 36.0346 0 - vertex 12.0544 30.7144 0 - vertex 4.72188 37.0399 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.0544 30.7144 0 - vertex 4.30515 36.0346 0 - vertex 11.5971 30.3591 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 3.57109 31.3388 0 - vertex 11.5971 30.3591 0 - vertex 3.93589 34.5584 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.5971 30.3591 0 - vertex 4.30515 36.0346 0 - vertex 3.93589 34.5584 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 4.3138 28.4461 0 - vertex 11.5971 30.3591 0 - vertex 3.57109 31.3388 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.5971 30.3591 0 - vertex 4.3138 28.4461 0 - vertex 5.72413 26.6445 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.3138 28.4461 0 - vertex 3.57109 31.3388 0 - vertex 3.67763 29.7129 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.41168 -29.738 0 - vertex -2.25121 -28.0146 0 - vertex -4.26405 -24.3543 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -2.25121 -28.0146 0 - vertex -6.41168 -29.738 0 - vertex -3.14673 -30.0798 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.14673 -30.0798 0 - vertex -6.41168 -29.738 0 - vertex -3.7659 -32.0301 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 33.8444 -30.1753 0 - vertex 30.1062 -30.7807 0 - vertex 30.2029 -31.1764 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 30.7817 -27.1595 0 - vertex 29.6885 -30.4984 0 - vertex 30.1062 -30.7807 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 28.9763 -27.4135 0 - vertex 29.6885 -30.4984 0 - vertex 30.7817 -27.1595 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.6885 -30.4984 0 - vertex 28.9763 -27.4135 0 - vertex 29.2916 -30.4642 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 28.9763 -27.4135 0 - vertex 28.199 -31.2235 0 - vertex 29.2916 -30.4642 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 25.3774 -27.4375 0 - vertex 28.199 -31.2235 0 - vertex 28.9763 -27.4135 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 28.199 -31.2235 0 - vertex 25.3774 -27.4375 0 - vertex 26.4192 -32.7448 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.3774 -27.4375 0 - vertex 24.9271 -33.7368 0 - vertex 26.4192 -32.7448 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.5138 -29.5327 0 - vertex 24.9271 -33.7368 0 - vertex 25.3774 -27.4375 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.9271 -33.7368 0 - vertex 19.5138 -29.5327 0 - vertex 23.5816 -34.2758 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.3087 -31.0557 0 - vertex 23.5816 -34.2758 0 - vertex 19.5138 -29.5327 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 22.2417 -34.4379 0 - vertex 19.3087 -31.0557 0 - vertex 21.4183 -34.349 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.9054 -28.0436 0 - vertex 25.3774 -27.4375 0 - vertex 20.1129 -27.4424 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.5138 -29.5327 0 - vertex 25.3774 -27.4375 0 - vertex 19.9054 -28.0436 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.5816 -34.2758 0 - vertex 19.3087 -31.0557 0 - vertex 22.2417 -34.4379 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.3085 -32.3556 0 - vertex 21.4183 -34.349 0 - vertex 19.3087 -31.0557 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.4183 -34.349 0 - vertex 19.3085 -32.3556 0 - vertex 20.6651 -34.0963 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.6651 -34.0963 0 - vertex 19.3085 -32.3556 0 - vertex 20.0228 -33.6987 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.0228 -33.6987 0 - vertex 19.3085 -32.3556 0 - vertex 19.5322 -33.1754 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 45.3585 -24.1311 0 - vertex 37.9618 -36.3241 0 - vertex 38.113 -36.8464 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 36.8272 -33.2656 0 - vertex 37.9618 -36.3241 0 - vertex 38.2188 -29.6614 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 37.9618 -36.3241 0 - vertex 36.8272 -33.2656 0 - vertex 37.1913 -36.0604 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 36.2918 -35.0946 0 - vertex 37.1913 -36.0604 0 - vertex 36.8272 -33.2656 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 37.1913 -36.0604 0 - vertex 36.2918 -35.0946 0 - vertex 36.3972 -35.7834 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 117.5 117.5 0 - vertex 47.9875 -20.1225 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 117.5 117.5 0 - vertex 47.7267 -19.5813 0 - vertex 47.9875 -20.1225 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 27.5422 14.7505 0 - vertex 47.7267 -19.5813 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 47.7267 -19.5813 0 - vertex 27.5422 14.7505 0 - vertex 47.2139 -19.2263 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 27.6094 12.2412 0 - vertex 47.2139 -19.2263 0 - vertex 27.5422 14.7505 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 27.528 9.70386 0 - vertex 47.2139 -19.2263 0 - vertex 27.6094 12.2412 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 26.9177 3.98634 0 - vertex 47.2139 -19.2263 0 - vertex 27.528 9.70386 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 42.1032 -19.4743 0 - vertex 44.5909 -19.3768 0 - vertex 41.8934 -19.2238 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 44.5909 -19.3768 0 - vertex 42.1032 -19.4743 0 - vertex 42.943 -20.2657 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 46.2623 -19.1343 0 - vertex 41.5319 -19.1343 0 - vertex 44.5909 -19.3768 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 44.5909 -19.3768 0 - vertex 41.5319 -19.1343 0 - vertex 41.8934 -19.2238 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 47.2139 -19.2263 0 - vertex 26.953 2.16551 0 - vertex 46.2623 -19.1343 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 46.2623 -19.1343 0 - vertex 26.8464 1.29842 0 - vertex 41.5319 -19.1343 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 31.4974 -26.3899 0 - vertex 35.3305 -26.5156 0 - vertex 31.8275 -24.8188 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 31.8275 -24.8188 0 - vertex 34.62 -22.2927 0 - vertex 32.0255 -23.3848 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 31.8086 -21.404 0 - vertex 34.62 -22.2927 0 - vertex 34.9156 -21.474 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 38.4798 -20.1181 0 - vertex 30.7248 -19.9631 0 - vertex 35.5661 -21.102 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 34.62 -22.2927 0 - vertex 32.0232 -22.2828 0 - vertex 32.0255 -23.3848 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 34.62 -22.2927 0 - vertex 31.8086 -21.404 0 - vertex 32.0232 -22.2828 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 35.5661 -21.102 0 - vertex 30.7248 -19.9631 0 - vertex 35.2187 -21.2043 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 34.9156 -21.474 0 - vertex 31.3699 -20.64 0 - vertex 31.8086 -21.404 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 35.2187 -21.2043 0 - vertex 31.3699 -20.64 0 - vertex 34.9156 -21.474 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 31.3699 -20.64 0 - vertex 35.2187 -21.2043 0 - vertex 30.7248 -19.9631 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 26.8464 1.29842 0 - vertex 46.2623 -19.1343 0 - vertex 26.953 2.16551 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 41.5319 -19.1343 0 - vertex 26.8464 1.29842 0 - vertex 38.4798 -20.1181 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 30.7248 -19.9631 0 - vertex 38.4798 -20.1181 0 - vertex 29.9429 -19.4981 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 26.4742 18.624 0 - vertex 27.5422 14.7505 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 27.5422 14.7505 0 - vertex 26.4742 18.624 0 - vertex 27.1755 15.8473 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 27.1755 15.8473 0 - vertex 26.4742 18.624 0 - vertex 26.6933 17.4601 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 117.5 117.5 0 - vertex 25.9424 19.4837 0 - vertex 26.4742 18.624 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 21.2755 24.568 0 - vertex 25.9424 19.4837 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 21.8319 23.6658 0 - vertex 25.9424 19.4837 0 - vertex 21.2755 24.568 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 22.0827 22.427 0 - vertex 25.0752 20.0627 0 - vertex 21.8319 23.6658 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.0752 20.0627 0 - vertex 22.0827 22.427 0 - vertex 23.8499 20.3844 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 22.2698 21.5943 0 - vertex 23.8499 20.3844 0 - vertex 22.0827 22.427 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.1387 20.59 0 - vertex 22.2698 21.5943 0 - vertex 22.6169 20.9877 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 23.8499 20.3844 0 - vertex 22.2698 21.5943 0 - vertex 23.1387 20.59 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 25.9424 19.4837 0 - vertex 21.8319 23.6658 0 - vertex 25.0752 20.0627 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 15.3134 30.0845 0 - vertex 21.2755 24.568 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.2755 24.568 0 - vertex 15.3134 30.0845 0 - vertex 20.1819 25.3734 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.1819 25.3734 0 - vertex 15.4783 29.8698 0 - vertex 18.3193 26.3216 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 18.3193 26.3216 0 - vertex 15.4783 29.8698 0 - vertex 17.0772 26.9817 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 15.6084 29.1601 0 - vertex 17.0772 26.9817 0 - vertex 15.4783 29.8698 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 17.0772 26.9817 0 - vertex 15.6084 29.1601 0 - vertex 16.2688 27.6146 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.2688 27.6146 0 - vertex 15.6084 29.1601 0 - vertex 15.808 28.3106 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 20.1819 25.3734 0 - vertex 15.3134 30.0845 0 - vertex 15.4783 29.8698 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.2907 30.5214 0 - vertex 15.0577 29.0611 0 - vertex 15.1584 29.8123 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.122 28.0941 0 - vertex 12.5486 25.9653 0 - vertex 13.4969 25.2416 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.2907 30.5214 0 - vertex 15.1584 29.8123 0 - vertex 15.3134 30.0845 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 12.0187 29.9363 0 - vertex 15.0577 29.0611 0 - vertex 12.2907 30.5214 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.15152 38.5852 0 - vertex 15.3134 30.0845 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 5.25321 38.4452 0 - vertex 15.3134 30.0845 0 - vertex 5.15152 38.5852 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 12.0544 30.7144 0 - vertex 15.3134 30.0845 0 - vertex 5.25321 38.4452 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 13.0733 24.7212 0 - vertex 9.71033 23.0922 0 - vertex 10.9729 20.5521 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.72413 26.6445 0 - vertex 11.0411 28.3898 0 - vertex 11.2319 29.4873 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 12.1975 25.5292 0 - vertex 9.07032 24.476 0 - vertex 9.71033 23.0922 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.72413 26.6445 0 - vertex 11.2319 29.4873 0 - vertex 11.5971 30.3591 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.5037 26.4501 0 - vertex 8.51885 25.3107 0 - vertex 9.07032 24.476 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.1066 27.3577 0 - vertex 7.91411 25.7528 0 - vertex 8.51885 25.3107 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.0411 28.3898 0 - vertex 7.11433 25.9588 0 - vertex 7.91411 25.7528 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 11.0411 28.3898 0 - vertex 5.72413 26.6445 0 - vertex 7.11433 25.9588 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.19939 38.083 0 - vertex 12.0544 30.7144 0 - vertex 5.25321 38.4452 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 4.72188 37.0399 0 - vertex 12.0544 30.7144 0 - vertex 5.19939 38.083 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.11433 25.9588 0 - vertex 5.72413 26.6445 0 - vertex 6.4022 26.1795 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.3134 30.0845 0 - vertex 12.0544 30.7144 0 - vertex 12.2907 30.5214 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -1.46161 28.0795 0 - vertex 1.04836 28.6106 0 - vertex 1.1273 29.8907 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.04836 28.6106 0 - vertex -0.115935 27.2162 0 - vertex 0.858783 27.1101 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -2.77953 29.7664 0 - vertex 1.1273 29.8907 0 - vertex 1.37489 31.173 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.04836 28.6106 0 - vertex -0.786632 27.5359 0 - vertex -0.115935 27.2162 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -3.97987 32.1322 0 - vertex 1.37489 31.173 0 - vertex 2.44067 33.9939 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.04836 28.6106 0 - vertex -1.46161 28.0795 0 - vertex -0.786632 27.5359 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -5.55994 36.5001 0 - vertex 2.44067 33.9939 0 - vertex 4.08079 37.0842 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.1273 29.8907 0 - vertex -2.77953 29.7664 0 - vertex -1.46161 28.0795 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.55994 36.5001 0 - vertex 4.08079 37.0842 0 - vertex 5.15152 38.5852 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 1.37489 31.173 0 - vertex -3.97987 32.1322 0 - vertex -2.77953 29.7664 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 2.44067 33.9939 0 - vertex -4.97284 35.0324 0 - vertex -3.97987 32.1322 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -117.5 117.5 0 - vertex 5.15152 38.5852 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 2.44067 33.9939 0 - vertex -5.55994 36.5001 0 - vertex -4.97284 35.0324 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.15152 38.5852 0 - vertex -5.8163 36.5812 0 - vertex -5.55994 36.5001 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.80952 27.3973 0 - vertex -6.28322 28.2565 0 - vertex -6.22131 31.7226 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.546 27.7352 0 - vertex -6.22131 31.7226 0 - vertex -6.055 36.2349 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -7.25507 27.2437 0 - vertex -6.28322 28.2565 0 - vertex -8.80952 27.3973 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.28322 28.2565 0 - vertex -7.25507 27.2437 0 - vertex -6.38329 27.6173 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.38329 27.6173 0 - vertex -7.25507 27.2437 0 - vertex -6.55612 27.3597 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.22131 31.7226 0 - vertex -11.546 27.7352 0 - vertex -8.80952 27.3973 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.055 36.2349 0 - vertex -13.5562 27.8374 0 - vertex -11.546 27.7352 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -22.4093 27.9007 0 - vertex -6.055 36.2349 0 - vertex -5.8163 36.5812 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.055 36.2349 0 - vertex -15.2376 27.7001 0 - vertex -13.5562 27.8374 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.055 36.2349 0 - vertex -20.8096 27.6578 0 - vertex -15.2376 27.7001 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.2376 27.7001 0 - vertex -20.8096 27.6578 0 - vertex -16.9875 27.3196 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.9875 27.3196 0 - vertex -19.9485 27.2141 0 - vertex -19.335 26.703 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.9875 27.3196 0 - vertex -20.8096 27.6578 0 - vertex -19.9485 27.2141 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.15152 38.5852 0 - vertex -117.5 117.5 0 - vertex -5.8163 36.5812 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -31.2177 27.4629 0 - vertex -5.8163 36.5812 0 - vertex -117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -6.055 36.2349 0 - vertex -22.4093 27.9007 0 - vertex -20.8096 27.6578 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.3225 27.6757 0 - vertex -27.4214 26.3653 0 - vertex -24.8433 26.205 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.8163 36.5812 0 - vertex -24.3632 27.9554 0 - vertex -22.4093 27.9007 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -29.2879 26.9865 0 - vertex -24.3632 27.9554 0 - vertex -30.666 27.4912 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -24.3632 27.9554 0 - vertex -29.2879 26.9865 0 - vertex -27.4214 26.3653 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.8163 36.5812 0 - vertex -30.666 27.4912 0 - vertex -24.3632 27.9554 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.0943 24.213 0 - vertex -34.2108 23.023 0 - vertex -32.1178 22.3529 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.7877 25.1404 0 - vertex -31.2912 27.2229 0 - vertex -31.2177 27.4629 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.2912 27.2229 0 - vertex -36.1697 23.9798 0 - vertex -34.2108 23.023 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.2912 27.2229 0 - vertex -37.7877 25.1404 0 - vertex -36.1697 23.9798 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -5.8163 36.5812 0 - vertex -31.2177 27.4629 0 - vertex -30.666 27.4912 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.2177 27.4629 0 - vertex -38.5782 25.7376 0 - vertex -37.7877 25.1404 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -39.0347 25.8392 0 - vertex -31.2177 27.4629 0 - vertex -117.5 117.5 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -47.2102 -36.2359 0 - vertex -37.5366 -12.7854 0 - vertex -47.8577 -36.863 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -39.9072 -25.4747 0 - vertex -47.2102 -36.2359 0 - vertex -42.237 -30.9405 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -42.237 -30.9405 0 - vertex -47.2102 -36.2359 0 - vertex -43.2543 -33.2915 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -46.1801 -35.8499 0 - vertex -43.2543 -33.2915 0 - vertex -47.2102 -36.2359 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -44.1198 -34.7306 0 - vertex -46.1801 -35.8499 0 - vertex -45.0296 -35.5019 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -43.2543 -33.2915 0 - vertex -46.1801 -35.8499 0 - vertex -44.1198 -34.7306 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -37.5366 -12.7854 0 - vertex -47.2102 -36.2359 0 - vertex -39.9072 -25.4747 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 117.5 0 - vertex -47.8577 -36.863 0 - vertex -39.1303 25.4589 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 -117.5 0 - vertex -47.8577 -36.863 0 - vertex -117.5 117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -39.0347 25.8392 0 - vertex -117.5 117.5 0 - vertex -39.1303 25.4589 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -31.2177 27.4629 0 - vertex -39.0347 25.8392 0 - vertex -38.5782 25.7376 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 47.8425 -21.0531 0 - vertex 117.5 -117.5 0 - vertex 47.9875 -20.1225 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 47.5305 -21.9981 0 - vertex 117.5 -117.5 0 - vertex 47.8425 -21.0531 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 47.0957 -22.796 0 - vertex 117.5 -117.5 0 - vertex 47.5305 -21.9981 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 46.5684 -23.4293 0 - vertex 117.5 -117.5 0 - vertex 47.0957 -22.796 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 37.9939 -37.5705 0 - vertex 46.5684 -23.4293 0 - vertex 45.9792 -23.8802 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 38.113 -36.8464 0 - vertex 45.9792 -23.8802 0 - vertex 45.3585 -24.1311 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 38.2188 -29.6614 0 - vertex 45.3585 -24.1311 0 - vertex 44.7368 -24.1643 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 40.0289 -25.46 0 - vertex 44.7368 -24.1643 0 - vertex 44.1445 -23.9621 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 41.2986 -23.9223 0 - vertex 44.1445 -23.9621 0 - vertex 43.6122 -23.5069 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 41.2986 -23.9223 0 - vertex 43.6122 -23.5069 0 - vertex 42.7682 -22.851 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 44.1445 -23.9621 0 - vertex 41.2986 -23.9223 0 - vertex 40.5923 -24.6171 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 44.1445 -23.9621 0 - vertex 40.5923 -24.6171 0 - vertex 40.0289 -25.46 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 44.7368 -24.1643 0 - vertex 40.0289 -25.46 0 - vertex 38.2188 -29.6614 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 37.9618 -36.3241 0 - vertex 45.3585 -24.1311 0 - vertex 38.2188 -29.6614 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 45.9792 -23.8802 0 - vertex 38.113 -36.8464 0 - vertex 37.9939 -37.5705 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 46.5684 -23.4293 0 - vertex 37.9939 -37.5705 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 37.381 -37.9628 0 - vertex 117.5 -117.5 0 - vertex 37.9939 -37.5705 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 35.8907 -38.1241 0 - vertex 117.5 -117.5 0 - vertex 37.381 -37.9628 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 33.1396 -38.1555 0 - vertex 117.5 -117.5 0 - vertex 35.8907 -38.1241 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.8074 -38.0948 0 - vertex 117.5 -117.5 0 - vertex 33.1396 -38.1555 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.4079 -38.2833 0 - vertex 29.8074 -38.0948 0 - vertex 28.6431 -37.8931 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 28.553 -36.8405 0 - vertex 25.9895 -35.834 0 - vertex 28.4102 -37.3704 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 24.0601 -37.0678 0 - vertex 28.4102 -37.3704 0 - vertex 25.9895 -35.834 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 28.4102 -37.3704 0 - vertex 24.0601 -37.0678 0 - vertex 28.6431 -37.8931 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 21.4079 -38.2833 0 - vertex 28.6431 -37.8931 0 - vertex 24.0601 -37.0678 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.8074 -38.0948 0 - vertex 21.4079 -38.2833 0 - vertex 20.3084 -38.5182 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.8074 -38.0948 0 - vertex 20.3084 -38.5182 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 19.0956 -38.5852 0 - vertex 117.5 -117.5 0 - vertex 20.3084 -38.5182 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.33583 -38.4712 0 - vertex 19.0956 -38.5852 0 - vertex 17.8945 -38.4707 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.33583 -38.4712 0 - vertex 17.8945 -38.4707 0 - vertex 16.8412 -38.0675 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.519 -36.9119 0 - vertex 16.8412 -38.0675 0 - vertex 15.8953 -37.4336 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 11.871 -34.5351 0 - vertex 14.7938 -32.2631 0 - vertex 11.4887 -31.4602 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 12.2351 -35.1874 0 - vertex 14.8379 -35.6738 0 - vertex 14.6656 -34.4466 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 12.1379 -35.6584 0 - vertex 14.8379 -35.6738 0 - vertex 12.2351 -35.1874 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 14.8379 -35.6738 0 - vertex 12.1379 -35.6584 0 - vertex 15.2376 -36.6526 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 11.7916 -36.1064 0 - vertex 15.2376 -36.6526 0 - vertex 12.1379 -35.6584 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 11.1962 -36.5595 0 - vertex 15.2376 -36.6526 0 - vertex 11.7916 -36.1064 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 15.2376 -36.6526 0 - vertex 11.1962 -36.5595 0 - vertex 15.8953 -37.4336 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 10.519 -36.9119 0 - vertex 15.8953 -37.4336 0 - vertex 11.1962 -36.5595 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.8412 -38.0675 0 - vertex 10.519 -36.9119 0 - vertex 9.92719 -37.0575 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.8412 -38.0675 0 - vertex 9.92719 -37.0575 0 - vertex 8.47177 -37.477 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 16.8412 -38.0675 0 - vertex 8.47177 -37.477 0 - vertex 5.33583 -38.4712 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 19.0956 -38.5852 0 - vertex 5.33583 -38.4712 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 2.31266 -38.26 0 - vertex 5.33583 -38.4712 0 - vertex 4.84381 -38.3343 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.43985 -37.8545 0 - vertex 4.73542 -37.8041 0 - vertex 4.64415 -37.2809 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 3.43985 -37.8545 0 - vertex 4.84381 -38.3343 0 - vertex 4.73542 -37.8041 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 2.31266 -38.26 0 - vertex 4.84381 -38.3343 0 - vertex 3.43985 -37.8545 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.33583 -38.4712 0 - vertex 2.31266 -38.26 0 - vertex 0.962702 -38.4962 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.33583 -38.4712 0 - vertex 0.962702 -38.4962 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -0.366978 -38.538 0 - vertex 117.5 -117.5 0 - vertex 0.962702 -38.4962 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.66873 -38.0883 0 - vertex -0.366978 -38.538 0 - vertex -1.43333 -38.36 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -8.07933 -37.9462 0 - vertex -1.43333 -38.36 0 - vertex -2.45619 -37.7112 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.7659 -32.0301 0 - vertex -6.41168 -29.738 0 - vertex -3.99709 -33.5697 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.33648 -34.384 0 - vertex -3.99709 -33.5697 0 - vertex -6.41168 -29.738 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.51249 -36.3769 0 - vertex -3.80393 -35.193 0 - vertex -3.99709 -33.5697 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.80393 -35.193 0 - vertex -7.31439 -36.7536 0 - vertex -3.26834 -36.6145 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -7.3919 -37.1883 0 - vertex -3.26834 -36.6145 0 - vertex -7.31439 -36.7536 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -3.26834 -36.6145 0 - vertex -7.3919 -37.1883 0 - vertex -2.45619 -37.7112 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -7.74517 -37.6801 0 - vertex -2.45619 -37.7112 0 - vertex -7.3919 -37.1883 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -8.07933 -37.9462 0 - vertex -2.45619 -37.7112 0 - vertex -7.74517 -37.6801 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -1.43333 -38.36 0 - vertex -8.07933 -37.9462 0 - vertex -8.66873 -38.0883 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.366978 -38.538 0 - vertex -8.66873 -38.0883 0 - vertex -12.0013 -38.1555 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.366978 -38.538 0 - vertex -12.0013 -38.1555 0 - vertex -117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 -117.5 0 - vertex -12.0013 -38.1555 0 - vertex -15.3277 -38.0928 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -17.5781 -38.0841 0 - vertex -15.3277 -38.0928 0 - vertex -15.7983 -37.9502 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.9213 -37.1689 0 - vertex -16.6989 -37.6188 0 - vertex -15.9433 -37.6764 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.6989 -37.6188 0 - vertex -15.7983 -37.9502 0 - vertex -15.9433 -37.6764 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -17.033 -37.9274 0 - vertex -15.7983 -37.9502 0 - vertex -16.6989 -37.6188 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -17.5781 -38.0841 0 - vertex -15.7983 -37.9502 0 - vertex -17.033 -37.9274 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -15.3277 -38.0928 0 - vertex -17.5781 -38.0841 0 - vertex -117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 -117.5 0 - vertex -17.5781 -38.0841 0 - vertex -20.8226 -38.1301 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.2835 -38.1638 0 - vertex -20.8226 -38.1301 0 - vertex -24.8096 -38.0047 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -27.2791 -36.8782 0 - vertex -25.0608 -37.8416 0 - vertex -25.157 -37.5754 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -28.2835 -38.1638 0 - vertex -25.0608 -37.8416 0 - vertex -27.2791 -36.8782 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -25.0608 -37.8416 0 - vertex -28.2835 -38.1638 0 - vertex -24.8096 -38.0047 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.8226 -38.1301 0 - vertex -28.2835 -38.1638 0 - vertex -117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 -117.5 0 - vertex -28.2835 -38.1638 0 - vertex -37.632 -38.1325 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -117.5 -117.5 0 - vertex -37.632 -38.1325 0 - vertex -47.4646 -37.9547 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -0.366978 -38.538 0 - vertex -117.5 -117.5 0 - vertex 117.5 -117.5 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -47.8161 -37.7712 0 - vertex -117.5 -117.5 0 - vertex -47.4646 -37.9547 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -47.9875 -37.5097 0 - vertex -117.5 -117.5 0 - vertex -47.8161 -37.7712 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -47.8577 -36.863 0 - vertex -117.5 -117.5 0 - vertex -47.9875 -37.5097 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 42.0238 -20.3507 0 - vertex 42.943 -20.2657 0 - vertex 42.1032 -19.4743 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 42.0238 -20.3507 0 - vertex 41.971 -20.8453 0 - vertex 42.943 -20.2657 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex 41.971 -20.8453 0 - vertex 42.0238 -20.3507 0 - vertex 41.8981 -20.7296 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 36.104 -22.9178 0 - vertex 36.2859 -23.7121 0 - vertex 36.3422 -23.0402 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 35.2001 -22.9271 0 - vertex 36.2859 -23.7121 0 - vertex 36.104 -22.9178 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 36.2859 -23.7121 0 - vertex 35.2001 -22.9271 0 - vertex 35.3305 -26.5156 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 34.7441 -22.7166 0 - vertex 35.3305 -26.5156 0 - vertex 35.2001 -22.9271 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 31.8275 -24.8188 0 - vertex 34.7441 -22.7166 0 - vertex 34.62 -22.2927 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 31.8275 -24.8188 0 - vertex 35.3305 -26.5156 0 - vertex 34.7441 -22.7166 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 31.2318 -26.857 0 - vertex 35.3305 -26.5156 0 - vertex 31.4974 -26.3899 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 35.3305 -26.5156 0 - vertex 31.2318 -26.857 0 - vertex 33.8444 -30.1753 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 30.7817 -27.1595 0 - vertex 33.8444 -30.1753 0 - vertex 31.2318 -26.857 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 33.8444 -30.1753 0 - vertex 30.2029 -31.1764 0 - vertex 32.5255 -33.371 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 29.8709 -31.8517 0 - vertex 32.5255 -33.371 0 - vertex 30.2029 -31.1764 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 30.1062 -30.7807 0 - vertex 33.8444 -30.1753 0 - vertex 30.7817 -27.1595 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 32.5255 -33.371 0 - vertex 29.8709 -31.8517 0 - vertex 31.6707 -35.0376 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 31.6707 -35.0376 0 - vertex 29.8709 -31.8517 0 - vertex 30.8837 -35.7486 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 27.8442 -34.1555 0 - vertex 30.8837 -35.7486 0 - vertex 29.8709 -31.8517 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 30.8837 -35.7486 0 - vertex 27.8442 -34.1555 0 - vertex 29.7686 -36.0779 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.7686 -36.0779 0 - vertex 27.8442 -34.1555 0 - vertex 29.0223 -36.3831 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 29.0223 -36.3831 0 - vertex 27.8442 -34.1555 0 - vertex 28.553 -36.8405 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 25.9895 -35.834 0 - vertex 28.553 -36.8405 0 - vertex 27.8442 -34.1555 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.2742 24.7069 0 - vertex -10.5829 24.4 0 - vertex -10.6709 24.5009 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -14.1729 23.8467 0 - vertex -11.2742 24.7069 0 - vertex -13.9393 24.99 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -11.2742 24.7069 0 - vertex -14.1729 23.8467 0 - vertex -10.5829 24.4 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -16.6107 24.7853 0 - vertex -14.1729 23.8467 0 - vertex -13.9393 24.99 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -16.6107 24.7853 0 - vertex -19.3275 23.0662 0 - vertex -14.1729 23.8467 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex -20.4324 24.2101 0 - vertex -19.3275 23.0662 0 - vertex -16.6107 24.7853 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.4324 24.2101 0 - vertex -21.5591 22.7309 0 - vertex -19.3275 23.0662 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.4324 24.2101 0 - vertex -22.0432 22.8497 0 - vertex -21.5591 22.7309 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -20.4324 24.2101 0 - vertex -22.6641 23.2546 0 - vertex -22.0432 22.8497 0 - endloop - endfacet - facet normal 0 -0 1 - outer loop - vertex -22.6641 23.2546 0 - vertex -20.4324 24.2101 0 - vertex -23.3809 23.8604 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 8.49325 -21.5121 0 - vertex 10.169 -23.3758 0 - vertex 10.0454 -22.5812 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.169 -23.3758 0 - vertex 7.70773 -21.5983 0 - vertex 10.0775 -24.2416 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.16984 -21.6481 0 - vertex 10.0454 -22.5812 0 - vertex 9.69979 -22.0048 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.0454 -22.5812 0 - vertex 9.16984 -21.6481 0 - vertex 8.49325 -21.5121 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.169 -23.3758 0 - vertex 8.49325 -21.5121 0 - vertex 7.70773 -21.5983 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 6.85097 -21.9079 0 - vertex 10.0775 -24.2416 0 - vertex 7.70773 -21.5983 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 10.0775 -24.2416 0 - vertex 6.85097 -21.9079 0 - vertex 9.7411 -25.4359 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.96068 -22.4422 0 - vertex 9.7411 -25.4359 0 - vertex 6.85097 -21.9079 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 5.07455 -23.2024 0 - vertex 9.7411 -25.4359 0 - vertex 5.96068 -22.4422 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 3.84714 -24.6213 0 - vertex 9.7411 -25.4359 0 - vertex 5.07455 -23.2024 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.7411 -25.4359 0 - vertex 3.84714 -24.6213 0 - vertex 7.96204 -29.9101 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 2.80055 -26.1986 0 - vertex 7.96204 -29.9101 0 - vertex 3.84714 -24.6213 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 1.95873 -27.8549 0 - vertex 7.96204 -29.9101 0 - vertex 2.80055 -26.1986 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 1.3456 -29.5107 0 - vertex 7.96204 -29.9101 0 - vertex 1.95873 -27.8549 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 7.96204 -29.9101 0 - vertex 1.3456 -29.5107 0 - vertex 6.30534 -33.4759 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 0.985088 -31.0867 0 - vertex 6.30534 -33.4759 0 - vertex 1.3456 -29.5107 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 0.901133 -32.5034 0 - vertex 6.30534 -33.4759 0 - vertex 0.985088 -31.0867 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 6.30534 -33.4759 0 - vertex 0.901133 -32.5034 0 - vertex 5.71313 -34.2297 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.71313 -34.2297 0 - vertex 0.901133 -32.5034 0 - vertex 5.04571 -34.678 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 5.04571 -34.678 0 - vertex 0.901133 -32.5034 0 - vertex 4.11511 -35.011 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 4.11511 -35.011 0 - vertex 0.901133 -32.5034 0 - vertex 3.17687 -35.0966 0 - endloop - endfacet - facet normal -0 -0 1 - outer loop - vertex 1.11766 -33.6813 0 - vertex 3.17687 -35.0966 0 - vertex 0.901133 -32.5034 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 3.17687 -35.0966 0 - vertex 1.11766 -33.6813 0 - vertex 2.32628 -34.9386 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 2.32628 -34.9386 0 - vertex 1.11766 -33.6813 0 - vertex 1.65861 -34.5411 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.76373 17.1908 0 - vertex 9.72145 16.1788 0 - vertex 10.4258 16.5104 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.76373 17.1908 0 - vertex 8.86535 15.8492 0 - vertex 9.72145 16.1788 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 8.028 17.0592 0 - vertex 9.76373 17.1908 0 - vertex 8.30319 18.4459 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 9.76373 17.1908 0 - vertex 8.028 17.0592 0 - vertex 8.86535 15.8492 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 7.15178 18.7442 0 - vertex 8.30319 18.4459 0 - vertex 7.1994 19.1268 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 8.30319 18.4459 0 - vertex 7.15178 18.7442 0 - vertex 8.028 17.0592 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.0804 -21.8157 0 - vertex 27.3613 -24.0204 0 - vertex 27.3668 -22.8574 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 26.0804 -21.8157 0 - vertex 27.3668 -22.8574 0 - vertex 26.9354 -22.1189 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 27.3613 -24.0204 0 - vertex 26.0804 -21.8157 0 - vertex 24.4233 -24.8188 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.4233 -24.8188 0 - vertex 26.0804 -21.8157 0 - vertex 24.8153 -21.9586 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 27.3613 -24.0204 0 - vertex 24.4233 -24.8188 0 - vertex 27.2283 -24.8188 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 23.7526 -22.3987 0 - vertex 24.4233 -24.8188 0 - vertex 24.8153 -21.9586 0 - endloop - endfacet - facet normal -0 0 1 - outer loop - vertex 22.6861 -23.3258 0 - vertex 24.4233 -24.8188 0 - vertex 23.7526 -22.3987 0 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex 24.4233 -24.8188 0 - vertex 22.6861 -23.3258 0 - vertex 21.6183 -24.6221 0 - endloop - endfacet - facet normal 1 -0 0 - outer loop - vertex 117.5 -117.5 0 - vertex 117.5 117.5 -3 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 1 0 0 - outer loop - vertex 117.5 117.5 -3 - vertex 117.5 -117.5 0 - vertex 117.5 -117.5 -3 - endloop - endfacet - facet normal 0 1 -0 - outer loop - vertex 117.5 117.5 -3 - vertex -117.5 117.5 0 - vertex 117.5 117.5 0 - endloop - endfacet - facet normal 0 1 0 - outer loop - vertex -117.5 117.5 0 - vertex 117.5 117.5 -3 - vertex -117.5 117.5 -3 - endloop - endfacet - facet normal 0 -1 0 - outer loop - vertex -117.5 -117.5 -3 - vertex 117.5 -117.5 0 - vertex -117.5 -117.5 0 - endloop - endfacet - facet normal 0 -1 -0 - outer loop - vertex 117.5 -117.5 0 - vertex -117.5 -117.5 -3 - vertex 117.5 -117.5 -3 - endloop - endfacet -endsolid OpenSCAD_Model diff --git a/resources/meshes/imade3d_jellybox_2_platform.stl b/resources/meshes/imade3d_jellybox_2_platform.stl new file mode 100644 index 0000000000..d897e1c3e0 Binary files /dev/null and b/resources/meshes/imade3d_jellybox_2_platform.stl differ diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml index 7e76768cb4..be6d68de4f 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -100,6 +100,7 @@ Column return totalWeights + "g · " + totalLengths.toFixed(2) + "m" } source: UM.Theme.getIcon("spool") + font: UM.Theme.getFont("default") } } } diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml index 2e108b05d7..097f281946 100644 --- a/resources/qml/ActionPanel/PrintInformationWidget.qml +++ b/resources/qml/ActionPanel/PrintInformationWidget.qml @@ -37,6 +37,9 @@ UM.RecolorImage opacity: opened ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } } + contentWidth: printJobInformation.width + contentHeight: printJobInformation.implicitHeight + contentItem: PrintJobInformation { id: printJobInformation diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 71a655c664..7e6afa813d 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -65,6 +65,7 @@ Item property alias about: aboutAction; property alias toggleFullScreen: toggleFullScreenAction; + property alias exitFullScreen: exitFullScreenAction property alias configureSettingVisibility: configureSettingVisibilityAction @@ -82,10 +83,18 @@ Item Action { - id:toggleFullScreenAction - shortcut: StandardKey.FullScreen; - text: catalog.i18nc("@action:inmenu", "Toggle Full Screen"); - iconName: "view-fullscreen"; + id: toggleFullScreenAction + shortcut: StandardKey.FullScreen + text: catalog.i18nc("@action:inmenu", "Toggle Full Screen") + iconName: "view-fullscreen" + } + + Action + { + id: exitFullScreenAction + shortcut: StandardKey.Cancel + text: catalog.i18nc("@action:inmenu", "Exit Full Screen") + iconName: "view-fullscreen" } Action diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 790a522b26..4c143dcf0b 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -573,7 +573,13 @@ UM.MainWindow Connections { target: Cura.Actions.toggleFullScreen - onTriggered: base.toggleFullscreen(); + onTriggered: base.toggleFullscreen() + } + + Connections + { + target: Cura.Actions.exitFullScreen + onTriggered: base.exitFullscreen() } FileDialog @@ -585,7 +591,12 @@ UM.MainWindow modality: Qt.WindowModal selectMultiple: true nameFilters: UM.MeshFileHandler.supportedReadFileTypes; - folder: CuraApplication.getDefaultPath("dialog_load_path") + folder: + { + //Because several implementations of the file dialog only update the folder when it is explicitly set. + folder = CuraApplication.getDefaultPath("dialog_load_path"); + return CuraApplication.getDefaultPath("dialog_load_path"); + } onAccepted: { // Because several implementations of the file dialog only update the folder diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml index 2d2665373e..18255939ab 100644 --- a/resources/qml/ExpandablePopup.qml +++ b/resources/qml/ExpandablePopup.qml @@ -225,6 +225,7 @@ Item border.width: UM.Theme.getSize("default_lining").width border.color: UM.Theme.getColor("lining") radius: UM.Theme.getSize("default_radius").width + height: contentItem.implicitHeight || content.height } contentItem: Item {} diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index 43ec03d947..5d1a20c8b1 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -55,6 +55,7 @@ Item delegate: Button { + id: stageSelectorButton text: model.name.toUpperCase() checkable: true checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index 955ac89693..df58ea6636 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -29,6 +29,7 @@ Menu MenuItem { id: saveWorkspaceMenu + shortcut: StandardKey.Save text: catalog.i18nc("@title:menu menubar:file", "&Save...") onTriggered: { diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 886216dab0..3d7dd1b6c5 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -31,6 +31,7 @@ Menu return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name } exclusiveGroup: group + onTriggered: { Cura.MachineManager.setVariant(menu.extruderIndex, model.container_node); } diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index f1f594f395..28761866dd 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -15,15 +15,10 @@ Menu PrinterMenu { title: catalog.i18nc("@title:menu menubar:settings", "&Printer") } property var activeMachine: Cura.MachineManager.activeMachine - - onAboutToShow: extruderInstantiator.active = true - onAboutToHide: extruderInstantiator.active = false Instantiator { id: extruderInstantiator model: activeMachine == null ? null : activeMachine.extruderList - active: false - asynchronous: true Menu { title: modelData.name @@ -52,7 +47,7 @@ Menu MenuItem { text: catalog.i18nc("@action:inmenu", "Disable Extruder") - onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false) + onTriggered: Cura.MachineManager.setExtruderEnabled(index, false) visible: Cura.MachineManager.getExtruder(model.index).isEnabled enabled: Cura.MachineManager.numberExtrudersEnabled > 1 } diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml index 4e5545223f..a4ded0980c 100644 --- a/resources/qml/Menus/ViewMenu.qml +++ b/resources/qml/Menus/ViewMenu.qml @@ -58,11 +58,11 @@ Menu { text: catalog.i18nc("@action:inmenu menubar:view", "Orthographic") checkable: true - checked: cameraViewMenu.cameraMode == "orthogonal" + checked: cameraViewMenu.cameraMode == "orthographic" onTriggered: { - UM.Preferences.setValue("general/camera_perspective_mode", "orthogonal") - checked = cameraViewMenu.cameraMode == "orthogonal" + UM.Preferences.setValue("general/camera_perspective_mode", "orthographic") + checked = cameraViewMenu.cameraMode == "orthographic" } exclusiveGroup: group } diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml index f2e5b6e3a7..9bf0e18809 100644 --- a/resources/qml/ObjectSelector.qml +++ b/resources/qml/ObjectSelector.qml @@ -105,7 +105,12 @@ Item // We use an extra property here, since we only want to to be informed about the content size changes. onContentHeightChanged: { - scroll.height = Math.min(contentHeight, maximumHeight) + scroll.topPadding + scroll.bottomPadding + // It can sometimes happen that (due to animations / updates) the contentHeight is -1. + // This can cause a bunch of updates to trigger oneother, leading to a weird loop. + if(contentHeight >= 0) + { + scroll.height = Math.min(contentHeight, maximumHeight) + scroll.topPadding + scroll.bottomPadding + } } Component.onCompleted: @@ -116,10 +121,15 @@ Item delegate: ObjectItemButton { + id: modelButton + Binding + { + target: modelButton + property: "checked" + value: model.selected + } text: model.name width: listView.width - - checked: model.selected } } } diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 1a37e2d9cd..4adb3e72d2 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -158,7 +158,7 @@ UM.PreferencesPage append({ text: "日本語", code: "ja_JP" }) append({ text: "한국어", code: "ko_KR" }) append({ text: "Nederlands", code: "nl_NL" }) - append({ text: "Polski", code: "pl_PL" }) + //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) append({ text: "Português do Brasil", code: "pt_BR" }) append({ text: "Português", code: "pt_PT" }) append({ text: "Русский", code: "ru_RU" }) @@ -368,7 +368,7 @@ UM.PreferencesPage { width: childrenRect.width; height: childrenRect.height; - text: zoomToMouseCheckbox.enabled ? catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") : catalog.i18nc("@info:tooltip", "Zooming towards the mouse is not supported in the orthogonal perspective.") + text: zoomToMouseCheckbox.enabled ? catalog.i18nc("@info:tooltip", "Should zooming move in the direction of the mouse?") : catalog.i18nc("@info:tooltip", "Zooming towards the mouse is not supported in the orthographic perspective.") CheckBox { @@ -389,7 +389,7 @@ UM.PreferencesPage { return; } - zoomToMouseCheckbox.enabled = UM.Preferences.getValue("general/camera_perspective_mode") !== "orthogonal"; + zoomToMouseCheckbox.enabled = UM.Preferences.getValue("general/camera_perspective_mode") !== "orthographic"; zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) && zoomToMouseCheckbox.enabled; } } @@ -481,7 +481,7 @@ UM.PreferencesPage Component.onCompleted: { append({ text: catalog.i18n("Perspective"), code: "perspective" }) - append({ text: catalog.i18n("Orthogonal"), code: "orthogonal" }) + append({ text: catalog.i18n("Orthographic"), code: "orthographic" }) } } diff --git a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml index eb4a63250f..b54af103fe 100644 --- a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml +++ b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml @@ -82,6 +82,7 @@ Item } editingEnabled: currentItem != null && !currentItem.is_read_only + onResetSelectedMaterial: base.resetExpandedActiveMaterial() properties: materialProperties containerId: currentItem != null ? currentItem.id : "" diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml index fa7c4b86cb..96f6730029 100644 --- a/resources/qml/Preferences/Materials/MaterialsList.qml +++ b/resources/qml/Preferences/Materials/MaterialsList.qml @@ -102,6 +102,7 @@ Item } } } + base.currentItem = null return false } diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index ea24051e40..a0ce3c4b49 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -13,7 +13,6 @@ Item { id: base - property QtObject materialManager: CuraApplication.getMaterialManager() // Keep PreferencesDialog happy property var resetEnabled: false property var currentItem: null @@ -41,14 +40,29 @@ Item name: "cura" } + function resetExpandedActiveMaterial() + { + materialListView.expandActiveMaterial(active_root_material_id) + } + + function setExpandedActiveMaterial(root_material_id) + { + materialListView.expandActiveMaterial(root_material_id) + } + // When loaded, try to select the active material in the tree - Component.onCompleted: materialListView.expandActiveMaterial(active_root_material_id) + Component.onCompleted: resetExpandedActiveMaterial() // Every time the selected item has changed, notify to the details panel onCurrentItemChanged: { forceActiveFocus() materialDetailsPanel.currentItem = currentItem + // CURA-6679 If the current item is gone after the model update, reset the current item to the active material. + if (currentItem == null) + { + resetExpandedActiveMaterial() + } } // Main layout @@ -105,7 +119,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = base.materialManager.createMaterial(); + base.newRootMaterialIdToSwitchTo = CuraApplication.getMaterialManager().createMaterial(); base.toActivateNewMaterial = true; } } @@ -120,7 +134,7 @@ Item onClicked: { forceActiveFocus(); - base.newRootMaterialIdToSwitchTo = base.materialManager.duplicateMaterial(base.currentItem.container_node); + base.newRootMaterialIdToSwitchTo = CuraApplication.getMaterialManager().duplicateMaterial(base.currentItem.container_node); base.toActivateNewMaterial = true; } } @@ -131,7 +145,7 @@ Item id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" - enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManager.canMaterialBeRemoved(base.currentItem.container_node) + enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && CuraApplication.getMaterialManager().canMaterialBeRemoved(base.currentItem.container_node) onClicked: { forceActiveFocus(); @@ -280,7 +294,7 @@ Item { // Set the active material as the fallback. It will be selected when the current material is deleted base.newRootMaterialIdToSwitchTo = base.active_root_material_id - base.materialManager.removeMaterial(base.currentItem.container_node); + CuraApplication.getMaterialManager().removeMaterial(base.currentItem.container_node); } } diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index 5a44fb49cc..0e60bb6558 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -51,7 +51,7 @@ Rectangle anchors.left: swatch.right anchors.verticalCenter: materialSlot.verticalCenter anchors.leftMargin: UM.Theme.getSize("narrow_margin").width - font.italic: Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id + font.italic: material != null && Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id } MouseArea { @@ -60,7 +60,7 @@ Rectangle { materialList.currentBrand = material.brand materialList.currentType = material.brand + "_" + material.material - base.currentItem = material + base.setExpandedActiveMaterial(material.root_material_id) } hoverEnabled: true onEntered: { materialSlot.hovered = true } @@ -82,10 +82,10 @@ Rectangle { if (materialSlot.is_favorite) { - base.materialManager.removeFavorite(material.root_material_id) + CuraApplication.getMaterialManager().removeFavorite(material.root_material_id) return } - base.materialManager.addFavorite(material.root_material_id) + CuraApplication.getMaterialManager().addFavorite(material.root_material_id) return } style: ButtonStyle diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index ea0957fe3f..30b2474e09 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -14,8 +14,6 @@ TabView { id: base - property QtObject materialManager: CuraApplication.getMaterialManager() - property QtObject properties property var currentMaterialNode: null @@ -29,6 +27,8 @@ TabView property double spoolLength: calculateSpoolLength() property real costPerMeter: calculateCostPerMeter() + signal resetSelectedMaterial() + property bool reevaluateLinkedMaterials: false property string linkedMaterialNames: { @@ -105,29 +105,21 @@ TabView property var new_diameter_value: null; property var old_diameter_value: null; property var old_approximate_diameter_value: null; - property bool keyPressed: false onYes: { base.setMetaDataEntry("approximate_diameter", old_approximate_diameter_value, getApproximateDiameter(new_diameter_value).toString()); base.setMetaDataEntry("properties/diameter", properties.diameter, new_diameter_value); + base.resetSelectedMaterial() } onNo: { - properties.diameter = old_diameter_value; - diameterSpinBox.value = properties.diameter; + base.properties.diameter = old_diameter_value; + diameterSpinBox.value = Qt.binding(function() { return base.properties.diameter }) } - onVisibilityChanged: - { - if (!visible && !keyPressed) - { - // If the user closes this dialog without clicking on any button, it's the same as clicking "No". - no(); - } - keyPressed = false; - } + onRejected: no() } Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") } @@ -573,7 +565,7 @@ TabView } // update the values - base.materialManager.setMaterialName(base.currentMaterialNode, new_name) + CuraApplication.getMaterialManager().setMaterialName(base.currentMaterialNode, new_name) properties.name = new_name } diff --git a/resources/qml/Preferences/ReadOnlySpinBox.qml b/resources/qml/Preferences/ReadOnlySpinBox.qml index 1bbef82b1e..11e47b38b2 100644 --- a/resources/qml/Preferences/ReadOnlySpinBox.qml +++ b/resources/qml/Preferences/ReadOnlySpinBox.qml @@ -34,8 +34,8 @@ Item anchors.fill: parent onEditingFinished: base.editingFinished() - Keys.onEnterPressed: base.editingFinished() - Keys.onReturnPressed: base.editingFinished() + Keys.onEnterPressed: spinBox.focus = false + Keys.onReturnPressed: spinBox.focus = false } Label diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml index a19c02b0dd..9825c705d5 100644 --- a/resources/qml/PrinterOutput/ExtruderBox.qml +++ b/resources/qml/PrinterOutput/ExtruderBox.qml @@ -1,3 +1,6 @@ +//Copyright (c) 2019 Ultimaker B.V. +//Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 @@ -35,7 +38,7 @@ Item Label //Extruder name. { - text: Cura.ExtruderManager.getExtruderName(position) != "" ? Cura.ExtruderManager.getExtruderName(position) : catalog.i18nc("@label", "Extruder") + text: Cura.MachineManager.activeMachine.extruders[position].name !== "" ? Cura.MachineManager.activeMachine.extruders[position].name : catalog.i18nc("@label", "Extruder") color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") anchors.left: parent.left diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 3dd9e86ee9..6b074d2d8e 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -22,9 +22,12 @@ Item ? machineList.model.getItem(machineList.currentIndex) : null // The currently active (expanded) section/category, where section/category is the grouping of local machine items. - property string currentSection: preferredCategory + property string currentSection: "Ultimaker B.V." // By default (when this list shows up) we always expand the "Ultimaker" section. - property string preferredCategory: "Ultimaker" + property var preferredCategories: { + "Ultimaker B.V.": -2, + "Custom": -1 + } property int maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll. @@ -89,8 +92,8 @@ Item { id: machineDefinitionsModel filter: { "visible": true } - sectionProperty: "category" - preferredSectionValue: preferredCategory + sectionProperty: "manufacturer" + preferredSections: preferredCategories } section.property: "section" diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index 4fd0d37843..2ca7c0b6d7 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 7c5443f4a8..9623551128 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index ce48504d2a..bbcdfa97aa 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index 11f2b8dbeb..4147d60e1c 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index 78a5f5c1db..5783b20b31 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index 9e4bf3be40..39e115d3da 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg index 8917f911f1..a594a764c7 100644 --- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg index d35771555b..2779bd53f3 100644 --- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_titan [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg index e77254a716..a4ea654594 100644 --- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg index 86244ce968..fa6862885b 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg index fa2a387f56..43a3548526 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg index 955a67990a..2b38d44054 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg index 5086988bf8..a3b11b1e91 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg index 20a3a4a0a7..b4b3681802 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg index e9317e2d4a..c084e52c9e 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg index 760ed8cfb4..ab53c04167 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg index ef93a3de2a..7521270faa 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg index 3ca6397d14..7158673a3f 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg index d0409e68d8..b0e80ce9ee 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg index 6f6f90206c..6502ad1d70 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg index d0c9e938d5..7882d7958a 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg index 975a1d2ce5..d012aa332c 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg index 776c68b7e5..451a52b3f7 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg index 9ac6fd8750..3ebbcfd64e 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index b0360687ae..13dc0f8600 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_chiron [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index 9e89872863..48fa2bc2e7 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_chiron [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index 028161509f..b02480505c 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_chiron [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index dbfacf5030..eed1cbffe9 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_i3_mega [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index d2790f4ae4..82317f6bb4 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_i3_mega [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index 54900b6831..866891ea85 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_i3_mega [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg index cfab5f1bd1..49e2aeb145 100644 --- a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg index 4776253c82..15ce598763 100644 --- a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg index 321eacb822..e9a69ac6ff 100644 --- a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg index a46adb3c24..474a98dc18 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg index b2b18b071b..c1ae131dbc 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg index 5f0569a8dc..3e8ca2b314 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg index 423d592bcd..af127370d1 100644 --- a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg index 68668232fd..bfae50684f 100644 --- a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg index 292b5fc80f..db31cf210d 100644 --- a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg index 2831a3688b..14144796cb 100644 --- a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg index 3a7f3160ca..54d015f5a3 100644 --- a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg index e21b00ed40..d922092f5b 100644 --- a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg index d62d3dd3a4..35e2239b1d 100644 --- a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg index b203a971fd..0d53bb78f5 100644 --- a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg index b1923142e4..30fa35fc5f 100644 --- a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg index 3f997f9918..d89cb9ee0d 100644 --- a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg index 5abdb52da6..c55028e720 100644 --- a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg index 66ffe98b37..b3b376557e 100644 --- a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index e16169a93f..ec0ebfe2e0 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index ec7f744ba7..7fb32a60e0 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 9f7447c322..36def6424b 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 106920be27..8145cf1b22 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 5a57ea9d17..e0d0478176 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index 3a6e1e710f..9a88468b1e 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index db5ae120bf..7b26e214ea 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index d605204b23..62e7f4434f 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index f20b2d7f74..40f0cc7afd 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index 4aea066431..b6c345df82 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg index fa4d7c0f92..61c9f5ca83 100644 --- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg index 33c38f540e..e85786a130 100644 --- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg index 6f9c4097be..bcc8e0846e 100644 --- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg index 1b4f52d659..e49859f0af 100644 --- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index f0126728b9..0324fc1e1a 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index fc42e08147..aee9c45898 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index a413cb141d..86ce246b86 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index 3453a10edf..bccaa9c3f1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index 07ad83f14e..75caa2bac9 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 26778286e7..72d1bd42bc 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index 4658e8cc63..fa270fc75e 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index 34ad4f24f2..6c2dfba7c1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index 202924b8ee..f097fa2bfa 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index 377857f46e..9378ad27d2 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index 97f81a87bb..bd6bfd1d2b 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index 2baca379fd..d0e760cfb7 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index a13d0d0a03..093d13f519 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 990a0cb3b8..639dd5de2d 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index 848ac1162c..8203c00403 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 3a4573794a..ffb0326274 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 01963ba62c..8085eb713e 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 0d802d6d20..070d80df41 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index f242efb71f..a6f9618621 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index 691e67dca4..0fde39c50f 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 8d1e405a4c..539bf2db1c 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index c7f4c7d9a5..a762d4c202 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index 3e9e2ab689..b3d8f45432 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index a69026b4f6..68c0a0b912 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 20e57d7449..a8e2430287 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index 52ce3677c8..da853b248b 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index 9c460f325d..acfe3be51d 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index ff16610093..fd6310cb54 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index 9aae7982fb..5cbf7947d6 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index 094a43138e..e3cc50a79a 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 259365ad0f..fc4bdab4ac 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index b4c00dff86..466431b4ca 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index 3bca431d2e..a589cc595e 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 5357f9d4cd..274bd91b81 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 072537c810..8cf24dd647 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index 5a2136e007..24400a2cc9 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index 1928ea199d..1972a2f53a 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index b1d5693e28..f30fa5e1a4 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index 5406e1a1f3..cc4198e0bd 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 8da7261b9a..af2d18dd04 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index 320bfcd9be..7101f93035 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 963e3040b4..4c819fe22b 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index b4a864902d..3a041bfff1 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index 2111db37ab..483b40ac2e 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 1e9c2ffecc..73a1a22b26 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index ee41c320fb..ac26639ccd 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index bcc2ec247b..8708ebf478 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index 0ffed04529..c749b5916c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg index 3461b05104..9421d321a9 100644 --- a/resources/quality/coarse.inst.cfg +++ b/resources/quality/coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..0d9df28874 --- /dev/null +++ b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..281c5da5c5 --- /dev/null +++ b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..4d797a3f4d --- /dev/null +++ b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..07edee6785 --- /dev/null +++ b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Ultra Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..fae4d02aa0 --- /dev/null +++ b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..dae6ebd759 --- /dev/null +++ b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..99a4e8356b --- /dev/null +++ b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..7fa4a6a1ea --- /dev/null +++ b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..219a345608 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..6876e65168 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..d715d56cbc --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..b5ba1504c4 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..2d3ff53fc3 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..c0eb63514b --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..9bfaf8895e --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..ab940a2526 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..53978da83f --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..1b7254bd2f --- /dev/null +++ b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..9e034e8cca --- /dev/null +++ b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..4852bf69a6 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..2bfde0efa9 --- /dev/null +++ b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..520275a0f5 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..89bdccd629 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..055b848cd3 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..f52aa88990 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..6849aa5a13 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..2783001e7b --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..7cbacaf204 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..b6635e6ff6 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..944d51bdd2 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..43def887b2 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..99d45f4876 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..436a879a1c --- /dev/null +++ b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..acdc698d35 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..97a9b538f0 --- /dev/null +++ b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..789f77a99a --- /dev/null +++ b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..1fdfef8207 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..a9badeaef6 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..03c2793dee --- /dev/null +++ b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..7c60e021a1 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..4a5ca2d240 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..d01d1f1278 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..d9686737d6 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..c3e616189c --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..68d503a42e --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..ea37a110b7 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..074435a1c4 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..8166732cfe --- /dev/null +++ b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..de5cc38668 --- /dev/null +++ b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..4ed89a6a9b --- /dev/null +++ b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..add52cbc4b --- /dev/null +++ b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..387875783a --- /dev/null +++ b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..0584060a13 --- /dev/null +++ b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..7def6c01bb --- /dev/null +++ b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..02089f67e3 --- /dev/null +++ b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..3f3ad9b04f --- /dev/null +++ b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..39e49a0860 --- /dev/null +++ b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..95a3614d64 --- /dev/null +++ b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..a8f1d1de33 --- /dev/null +++ b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..78518402fa --- /dev/null +++ b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..c717e9a965 --- /dev/null +++ b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..0f255362a2 --- /dev/null +++ b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..20a7a9c5f1 --- /dev/null +++ b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..d0fd7efa50 --- /dev/null +++ b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..60a1a3aff4 --- /dev/null +++ b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/creality/base/base_global_adaptive.inst.cfg b/resources/quality/creality/base/base_global_adaptive.inst.cfg new file mode 100644 index 0000000000..28a4584aed --- /dev/null +++ b/resources/quality/creality/base/base_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/creality/base/base_global_draft.inst.cfg b/resources/quality/creality/base/base_global_draft.inst.cfg new file mode 100644 index 0000000000..9a1e46ec4b --- /dev/null +++ b/resources/quality/creality/base/base_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/creality/base/base_global_low.inst.cfg b/resources/quality/creality/base/base_global_low.inst.cfg new file mode 100644 index 0000000000..b028efad1f --- /dev/null +++ b/resources/quality/creality/base/base_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg new file mode 100644 index 0000000000..ad6baa215e --- /dev/null +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*5 diff --git a/resources/quality/creality/base/base_global_super.inst.cfg b/resources/quality/creality/base/base_global_super.inst.cfg new file mode 100644 index 0000000000..c16c810f20 --- /dev/null +++ b/resources/quality/creality/base/base_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/creality/base/base_global_ultra.inst.cfg b/resources/quality/creality/base/base_global_ultra.inst.cfg new file mode 100644 index 0000000000..a8b374e289 --- /dev/null +++ b/resources/quality/creality/base/base_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = creality_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index b35305429f..cc8e2783d4 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 740c4d01d1..bf91cf5acc 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 23e6570a52..0f628f0556 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_global_fast.inst.cfg b/resources/quality/dagoma/dagoma_global_fast.inst.cfg index 77850326f6..0b56f82a33 100644 --- a/resources/quality/dagoma/dagoma_global_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_global_fine.inst.cfg b/resources/quality/dagoma/dagoma_global_fine.inst.cfg index f1fabf02b1..b85ed05034 100644 --- a/resources/quality/dagoma/dagoma_global_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_global_standard.inst.cfg b/resources/quality/dagoma/dagoma_global_standard.inst.cfg index abddde5034..1245e8a9b0 100644 --- a/resources/quality/dagoma/dagoma_global_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index accde0143a..dbbb076b77 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_magis [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index a70f5ad097..7cc4a03c31 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_magis [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 45243c4b6e..bb11395237 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_magis [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 6a55b480e5..617b001154 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 08025cdea4..93894e1c29 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 39f8b31aab..8c536f6d43 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg index 762d1306fb..a0f3a96176 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast (beta) definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg index abd7662e09..bba51d78b7 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal (beta) definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg index 00a8ff539d..2035282415 100755 --- a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine (beta) definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg index 8d41e225a9..188fe95fa1 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine (beta) definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg index f891018ecb..feda2686af 100755 --- a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast (beta) definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg index 168638ed48..39151cb3c5 100755 --- a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg index 408470424a..a55b20247d 100755 --- a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg index 859e88954b..c6e41e9f13 100755 --- a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg index 062b16a166..0d085013cd 100755 --- a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg index e90794ca9b..38fb251367 100755 --- a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg index 281e9f867b..59ba1e4bb0 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg index abd76df7a7..044ec574d6 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg index 92240d0de6..4a790faa72 100644 --- a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg index 5877862fd1..184958e807 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg index e39f3fa567..3246c4c690 100644 --- a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg index 959eefc279..64a92f92c0 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg index d6587a2921..cf28144e18 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg index db41d92a34..626757c3a6 100755 --- a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg index fcdd5d3b45..e1754f53cd 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg index afab336b90..c8a58e412d 100755 --- a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg index 502b62c4c7..7d471f2ae1 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg index e3bd317dd8..f713578e81 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg index 59ab165dfe..0e261b9b86 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg index 4af778b279..fde2e6474b 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg index aca3ea47e9..1a553d744e 100755 --- a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = deltacomb [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg index 504c77305c..6383f80278 100644 --- a/resources/quality/draft.inst.cfg +++ b/resources/quality/draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg index 11aa19ebdd..27fc02e44f 100644 --- a/resources/quality/extra_coarse.inst.cfg +++ b/resources/quality/extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/extra_fast.inst.cfg b/resources/quality/extra_fast.inst.cfg index aaab3519ee..8a89f1d7e1 100644 --- a/resources/quality/extra_fast.inst.cfg +++ b/resources/quality/extra_fast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index 36e35bbd65..62335375a6 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index 7857de387a..2dccb4c78a 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index fb78aa8452..84d0f05e70 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index 2ad61b9820..69ddd80c5c 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = fabtotum [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index ca30707227..f21aa081a8 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fabtotum [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index 1501813cd9..0a88cea8ba 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fabtotum [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index 98d759bb0a..c10ab08d63 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index e48e1f1503..cfb0077d36 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index 46fd611743..3c8368edb5 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index f782b460c8..34edc97d5d 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality [metadata] type = quality -setting_version = 8 +setting_version = 9 material = generic_tpu quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 6aef7353e0..6525305b3d 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -5,7 +5,7 @@ name = High Quality [metadata] type = quality -setting_version = 8 +setting_version = 9 material = generic_tpu quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index c9eea45160..9dbb57d404 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -5,7 +5,7 @@ name = Normal Quality [metadata] type = quality -setting_version = 8 +setting_version = 9 material = generic_tpu quality_type = normal weight = 0 diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg index e00dcb75ce..ef70ea8cf0 100644 --- a/resources/quality/fast.inst.cfg +++ b/resources/quality/fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 62e4e08882..81f21a988c 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Normal Layers definition = gmax15plus_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index d18f0fd152..e48eb9ae38 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index 2d0ae60a28..4e2cf13d14 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thin Layers definition = gmax15plus_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index 056d21c2f8..5b322f1625 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Very Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg index 4c4a9ec07b..02c24fd592 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Normal Layers definition = gmax15plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg index 6441fece7a..1a7791b62c 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thick Layers definition = gmax15plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg index 4368ab3606..b961802830 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thin Layers definition = gmax15plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg index 451f023df1..6ba235c50c 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Very Thick Layers definition = gmax15plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index da6460b2ac..32f6f9d303 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg index 3ba64af91c..ba64a34080 100644 --- a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg index 0eff8641be..5a8e69e28a 100644 --- a/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg index cfce55b179..f1ec57356e 100644 --- a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg index b074276cde..be9f94467a 100644 --- a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg index 33de94b38d..6fb5f5d269 100644 --- a/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Super Coarse definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = super coarse weight = -4 diff --git a/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg index 82c8dc3780..e57b5847a5 100644 --- a/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra coarse weight = -4 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg similarity index 54% rename from resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg rename to resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg index 793e68142b..c6487f8aa5 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] version = 4 name = Coarse -definition = tizyx_evy +definition = imade3d_jellybox [metadata] setting_version = 8 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_petg -variant = 0.6mm +variant = 0.4 mm [values] - +speed_print = 45 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg new file mode 100644 index 0000000000..d625fb86db --- /dev/null +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = imade3d_jellybox + +[metadata] +setting_version = 8 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = 0.4 mm + +[values] +speed_print = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg new file mode 100644 index 0000000000..cb308dd5c2 --- /dev/null +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Medium +definition = imade3d_jellybox + +[metadata] +setting_version = 8 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = 0.4 mm + +[values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg similarity index 54% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg rename to resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg index 698a2aff87..1968297bf9 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] version = 4 name = Coarse -definition = tizyx_evy +definition = imade3d_jellybox [metadata] setting_version = 8 type = quality -quality_type = coarse -weight = -3 +quality_type = fast +weight = -1 material = generic_pla -variant = 0.8mm +variant = 0.4 mm [values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg new file mode 100644 index 0000000000..300036d1af --- /dev/null +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = imade3d_jellybox + +[metadata] +setting_version = 8 +type = quality +quality_type = high +weight = 1 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg new file mode 100644 index 0000000000..20d6efbdc2 --- /dev/null +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Medium +definition = imade3d_jellybox + +[metadata] +setting_version = 8 +type = quality +quality_type = normal +weight = 0 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg new file mode 100644 index 0000000000..6ec63159d9 --- /dev/null +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = UltraFine +definition = imade3d_jellybox + +[metadata] +setting_version = 8 +type = quality +quality_type = ultrahigh +weight = 2 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg deleted file mode 100644 index 26dc153acc..0000000000 --- a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = fast -weight = -1 -material = generic_petg -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 1.2 -cool_fan_speed_max = 60 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_bed_temperature = 50 -material_bed_temperature_layer_0 = 55 -material_flow = 100 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 25 -retraction_retract_speed = 35 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 25 -skirt_line_count = 2 -speed_layer_0 = =math.ceil(speed_print * 14 / 40) -speed_print = 40 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 20 / 40) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 40) -speed_wall_x = =math.ceil(speed_print * 35 / 40) -top_thickness = =top_bottom_thickness -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg deleted file mode 100644 index 2b4fa56e77..0000000000 --- a/resources/quality/imade3d_jellybox/generic_petg_0.4_coarse_2-fans.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = fast -weight = -1 -material = generic_petg -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 1.2 -cool_fan_speed_max = 40 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_bed_temperature = 50 -material_bed_temperature_layer_0 = 55 -material_flow = 100 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 25 -retraction_retract_speed = 35 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 25 -skirt_line_count = 2 -speed_layer_0 = =math.ceil(speed_print * 14 / 40) -speed_print = 40 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 20 / 40) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 40) -speed_wall_x = =math.ceil(speed_print * 35 / 40) -top_thickness = =top_bottom_thickness -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg deleted file mode 100644 index 4bfaecdd15..0000000000 --- a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Medium -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = normal -weight = 0 -material = generic_petg -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 1.2 -cool_fan_speed_max = 60 -cool_fan_speed_min = 20 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_bed_temperature = 50 -material_bed_temperature_layer_0 = 55 -material_flow = 100 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 25 -retraction_retract_speed = 35 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 25 -skirt_line_count = 2 -speed_layer_0 = =math.ceil(speed_print * 14 / 40) -speed_print = 40 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 20 / 40) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 40) -speed_wall_x = =math.ceil(speed_print * 35 / 40) -top_thickness = =top_bottom_thickness -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg deleted file mode 100644 index bdc6c90b34..0000000000 --- a/resources/quality/imade3d_jellybox/generic_petg_0.4_medium_2-fans.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = Medium -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = normal -weight = 0 -material = generic_petg -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 1.2 -cool_fan_speed_max = 40 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_bed_temperature = 50 -material_bed_temperature_layer_0 = 55 -material_flow = 100 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 25 -retraction_retract_speed = 35 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 25 -skirt_line_count = 2 -speed_layer_0 = =math.ceil(speed_print * 14 / 40) -speed_print = 40 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 20 / 40) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 40) -speed_wall_x = =math.ceil(speed_print * 35 / 40) -top_thickness = =top_bottom_thickness -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg deleted file mode 100644 index d7cc2a796b..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse.inst.cfg +++ /dev/null @@ -1,53 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = fast -weight = -1 -material = generic_pla -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 50 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg deleted file mode 100644 index e248c0f689..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_coarse_2-fans.inst.cfg +++ /dev/null @@ -1,53 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = fast -weight = -1 -material = generic_pla -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg deleted file mode 100644 index 6f755afd57..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine.inst.cfg +++ /dev/null @@ -1,54 +0,0 @@ -[general] -version = 4 -name = Fine -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = high -weight = 1 -material = generic_pla -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -material_print_temperature = 205 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg deleted file mode 100644 index 92f761833d..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_fine_2-fans.inst.cfg +++ /dev/null @@ -1,54 +0,0 @@ -[general] -version = 4 -name = Fine -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = high -weight = 1 -material = generic_pla -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -material_print_temperature = 205 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg deleted file mode 100644 index 22e9f018cc..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium.inst.cfg +++ /dev/null @@ -1,53 +0,0 @@ -[general] -version = 4 -name = Medium -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = normal -weight = 0 -material = generic_pla -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 50 -cool_min_layer_time = 7 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg deleted file mode 100644 index 30d15dc4e4..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_medium_2-fans.inst.cfg +++ /dev/null @@ -1,53 +0,0 @@ -[general] -version = 4 -name = Medium -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = normal -weight = 0 -material = generic_pla -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 20 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg deleted file mode 100644 index c3a35dd2cb..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = UltraFine -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = ultrahigh -weight = 2 -material = generic_pla -variant = 0.4 mm - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -material_print_temperature = 202 -material_print_temperature_layer_0 = 210 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg b/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg deleted file mode 100644 index c9a31ef531..0000000000 --- a/resources/quality/imade3d_jellybox/generic_pla_0.4_ultrafine_2-fans.inst.cfg +++ /dev/null @@ -1,55 +0,0 @@ -[general] -version = 4 -name = UltraFine -definition = imade3d_jellybox - -[metadata] -setting_version = 8 -type = quality -quality_type = ultrahigh -weight = 2 -material = generic_pla -variant = 0.4 mm 2-fans - -[values] -adhesion_type = skirt -bottom_thickness = 0.6 -coasting_enable = True -coasting_speed = 95 -cool_fan_full_at_height = 0.65 -cool_fan_speed_max = 100 -cool_fan_speed_min = 20 -cool_min_layer_time = 4 -cool_min_layer_time_fan_speed_max = 10 -cool_min_speed = 10 -infill_before_walls = False -infill_line_width = 0.6 -infill_overlap = 15 -infill_pattern = zigzag -infill_sparse_density = 20 -line_width = 0.4 -material_flow = 90 -material_print_temperature = 202 -material_print_temperature_layer_0 = 210 -meshfix_union_all = False -retraction_amount = 1.3 -retraction_combing = all -retraction_hop_enabled = 0.1 -retraction_min_travel = 1.2 -retraction_prime_speed = 30 -retraction_retract_speed = 70 -retraction_speed = 70 -skin_no_small_gaps_heuristic = False -skirt_brim_minimal_length = 100 -skirt_brim_speed = 20 -skirt_line_count = 3 -speed_layer_0 = =math.ceil(speed_print * 20 / 45) -speed_print = 45 -speed_slowdown_layers = 1 -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel = 120 -speed_travel_layer_0 = 60 -speed_wall = =math.ceil(speed_print * 25 / 45) -speed_wall_x = =math.ceil(speed_print * 35 / 45) -top_thickness = 0.8 -wall_thickness = 0.8 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index 35ae151dbf..9601b2ed19 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -14,3 +14,65 @@ global_quality = True adhesion_type = skirt layer_height = 0.3 layer_height_0 = 0.3 +retraction_hop = 0.2 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index fe9ecd3326..a99e2d656c 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -14,3 +14,65 @@ global_quality = True adhesion_type = skirt layer_height = 0.1 layer_height_0 = 0.3 +retraction_hop = 0.1 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index 380c3ad8c2..af86a797f7 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -14,3 +14,65 @@ global_quality = True adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.3 +retraction_hop = 0.2 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index a19a90a694..3edc3bba17 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -14,3 +14,65 @@ global_quality = True adhesion_type = skirt layer_height = 0.05 layer_height_0 = 0.3 +retraction_hop = 0.1 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg new file mode 100644 index 0000000000..e3e29c421f --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = 0.4 mm + +[values] +speed_print = 45 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg new file mode 100644 index 0000000000..b9843f18e9 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = 0.4 mm + +[values] +speed_print = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg new file mode 100644 index 0000000000..46e79a191d --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Medium +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = 0.4 mm + +[values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg new file mode 100644 index 0000000000..cde1df2fbc --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = fast +weight = -1 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg new file mode 100644 index 0000000000..ec35ca9ec6 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = high +weight = 1 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg new file mode 100644 index 0000000000..abc1bf4115 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Medium +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg new file mode 100644 index 0000000000..a16b3c94ac --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = UltraFine +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = ultrahigh +weight = 2 +material = generic_pla +variant = 0.4 mm + +[values] +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg new file mode 100644 index 0000000000..6c3df6024d --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -0,0 +1,78 @@ +[general] +version = 4 +name = Coarse +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +adhesion_type = skirt +layer_height = 0.3 +layer_height_0 = 0.3 +retraction_hop = 0.2 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg new file mode 100644 index 0000000000..68d5ad4e42 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -0,0 +1,78 @@ +[general] +version = 4 +name = Fine +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +adhesion_type = skirt +layer_height = 0.1 +layer_height_0 = 0.3 +retraction_hop = 0.1 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg new file mode 100644 index 0000000000..f40027b7c7 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -0,0 +1,78 @@ +[general] +version = 4 +name = Medium +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +adhesion_type = skirt +layer_height = 0.2 +layer_height_0 = 0.3 +retraction_hop = 0.2 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg new file mode 100644 index 0000000000..27a0ccd2f2 --- /dev/null +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -0,0 +1,78 @@ +[general] +version = 4 +name = UltraFine +definition = imade3d_jellybox_2 + +[metadata] +setting_version = 9 +type = quality +quality_type = ultrahigh +weight = 2 +global_quality = True + +[values] +adhesion_type = skirt +layer_height = 0.05 +layer_height_0 = 0.3 +retraction_hop = 0.1 +bottom_thickness = =top_bottom_thickness +coasting_enable = True +coasting_min_volume = 2 +coasting_volume = 0.032 +cool_fan_speed_max = =cool_fan_speed +infill_before_walls = False +infill_line_width = =round(line_width * 1.5, 2) +infill_pattern = zigzag +infill_sparse_density = 25 +line_width = =machine_nozzle_size +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +print_sequence = all_at_once +retract_at_layer_change = True +retraction_combing = noskin +retraction_hop_enabled = True +retraction_min_travel = =machine_nozzle_size * 3 +retraction_retract_speed = =retraction_speed +retraction_prime_speed = =retraction_speed - 30 +roofing_layer_count = 1 +skin_line_width = =line_width * 1.2 +skin_outline_count = 2 +skirt_brim_minimal_length = 100 +skirt_brim_speed = =speed_layer_0 +skirt_gap = 5 +skirt_line_count = 1 +speed_layer_0 = 20 +speed_roofing = 20 +speed_topbottom = 25 +speed_travel = =speed_print if magic_spiralize else 120 +speed_travel_layer_0 = 60 +support_angle = 60 +support_bottom_enable = False +support_bottom_height = 0 +support_connect_zigzags = False +support_enable = False +support_infill_rate = 20 +support_interface_density = 70 +support_interface_enable = True +support_interface_height = 2 +support_interface_pattern = concentric +support_interface_skip_height = 0.1 +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.8 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_z_distance = 0.2 +travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled +travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled +travel_retract_before_outer_wall = True +wall_0_wipe_dist = =round(line_width * 1.2,1) +bridge_settings_enabled = True +bridge_enable_more_layers = False +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 +infill_enable_travel_optimization = True +retraction_combing_max_distance = 50 \ No newline at end of file diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg index fbb93e29ea..14fcb0bb51 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg index 1e6884f024..85f9da8623 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg index 12be5b2977..68e18e08dc 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg index f6b63319d3..1af16453d3 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg index 7fb5ba0f62..044a82b2ec 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg index e1c92323d9..92de43f8b5 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg index b7efffdf50..53f31364d5 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg index bdf92d1e7d..2b0b33a502 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg index 7a6d267fa7..609359774e 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg index 1746bd7973..e3fa16be48 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg index f0004dd015..613f653d25 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_gama [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg index 749bd923d2..b7bc069f4a 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_gama [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg index 3e2fa743f8..823728f70d 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_gama [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg index 3132081ae0..5b0ae3fef7 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_gama [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg index ee20add7bd..91cef5bc9d 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_gama [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg index 823a949b1f..b8e862362c 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg index d13148308f..6671f81d70 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg index b687ee9752..b934f65a22 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg index 048bfcf1e5..48884cbdc1 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg index 4f8c402c41..1b7459fe1b 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg index e94571ab93..ebd2f01faf 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg index 5e759fd641..16b310bbdf 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg index e8da7254da..701f3e8831 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg index 46211cae47..fb05c245e0 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg index 22c8fcc51d..be5328c48a 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg index bcab094aa5..aef00ac069 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg index eddff4d918..3d101d3370 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg index 631c6733e5..a0da95299d 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg index a24159ae68..8ced1ea9d2 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg index 166dbbf0a0..0c4daaf4e9 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg index 43c13789a6..41f9e7070f 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg index 8dac05b971..3802d5a659 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg index 652f53f766..6c17331b26 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg index b0051a4dc9..302d82b922 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg index c19c6c2102..82aa3a03df 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg index 4f89b3fcc8..a2f804454e 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg index e44ced759e..3843210efa 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg index 26f1e7dcaa..151dcbb90f 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg index f5bbf76a12..518f90ed5a 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg index 4b7dd634e2..aa4960f413 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg index d62678cdc8..7990ce5b52 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg index 5acb7485f8..58b1a63d0a 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg index 385a1030fc..af8ed66005 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg index 0f6675193b..299ff39d4f 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg index bb5a0df5bd..e44ea7afab 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg index e2f7c742e3..4424cd046c 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg index 00dbf09b24..487248f5d1 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg index 3793d12b62..aa9cae9e68 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg index 69dae50856..6ff65500c0 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg index e62fd4a8b9..c80526b130 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg index 357f2eb411..ae73f0f486 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg index b4be722d90..0381f10f30 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg index 4faf34d208..64753f31bc 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg index 3a0cf8fc73..d406a1a940 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg index b5a069d7ee..bd52990afb 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg index ae80117da4..5978bcf77c 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg index e829c868a8..edda3ca5a4 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg index 1bb46da007..1e6754dde3 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg index 84b661ac9e..138e1af7f2 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg index 1708c89ecb..c82ac1a84e 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg index 6594bbd52f..7f69af7485 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg index 0a3f771db8..65ca72e91d 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg index d281fce668..3a40d52ee9 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg index 35f4e9d37c..e204b3c4ba 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg index 5a08f9d4d7..036edddbe8 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg index 81443d56fc..0e51d209bf 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg index 1b03151a40..bd6cf24330 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg index 41e58b7b1c..7d8ede0b68 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg index 3b94062e58..b561280140 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg index 20005dfa2a..65080eadce 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg index 91e4f55a83..ad0d21c1a9 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg index f117a9e684..30f9130f73 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg index 90f5859478..c4f822eda6 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg index ac07bc889b..6232403d13 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg index d761de9f5c..e21822e2ce 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg index eeac19d8ae..13667ce4ca 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg index 1cdd56f59d..fb26970ca7 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg index 580333433b..bdeec6b14f 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg index 6c85dcd59c..7cff35e02a 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg index 659178b061..e7ee01f721 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg index 3079901261..1113a5697d 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg index 7cb1636adf..44c604ab3f 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg index 4d7f61c961..760e080e8f 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg index 0967cafeef..1dba41d5b6 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg index 5e029cc6d1..7a404d9dc2 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg index d33494811d..daeb36e1a6 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg index e27a1ae939..62d06c79db 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg index 4bd3d05b99..c28f9f7512 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg index 2f534240d0..7e44c68e4c 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg index 570ca5912f..240e8d3246 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg index f2e29efb2b..949b3c23ce 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg index 8de09f491f..99cb16b348 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg index e8cf041245..938482178c 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg index 075fcb0293..a51342f350 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg index 14d40d1377..de08b5d49a 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 8 +setting_version = 9 type = quality material = generic_pla weight = 0 diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index 1f305d0433..ced09abe89 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fdmprinter [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg new file mode 100644 index 0000000000..d3df09871e --- /dev/null +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -0,0 +1,128 @@ + +[general] +version = 4 +name = Best Quality +definition = nwa3d_a31 + +[metadata] +setting_version = 9 +type = quality +quality_type = best +weight = 1 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.24 +line_width = 0.4 +wall_line_width_0 = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 20 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 50 +material_bed_temperature = 50 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 30 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.24 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.2 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg new file mode 100644 index 0000000000..566d375156 --- /dev/null +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -0,0 +1,124 @@ +[general] +version = 4 +name = 0.6 Engineering Quality +definition = nwa3d_a31 + +[metadata] +setting_version = 9 +type = quality +quality_type = Engineering +weight = -2 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.4 +line_width = 0.6 +wall_line_width_0 = 0.6 +initial_layer_line_width_factor = 100 +wall_thickness = 1.2 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 1.2 +top_layers = 5 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 15 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.15 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 50 +material_bed_temperature = 50 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 1.2 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 40 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 40 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_layer = 3 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.34 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = .45 +support_roof_density = 45 +support_roof_pattern = grid +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg new file mode 100644 index 0000000000..3661fcee06 --- /dev/null +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -0,0 +1,128 @@ + +[general] +version = 4 +name = Fast Quality +definition = nwa3d_a31 + +[metadata] +setting_version = 9 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +layer_height = 0.24 +layer_height_0 = 0.24 +line_width = 0.4 +wall_line_width_0 = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 15 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 50 +material_bed_temperature = 50 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 60 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.48 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.3 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg new file mode 100644 index 0000000000..7929fb8a46 --- /dev/null +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -0,0 +1,127 @@ +[general] +version = 4 +name = Normal Quality +definition = nwa3d_a31 + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.24 +line_width = 0.4 +wall_line_width_0 = 0.4 +initial_layer_line_width_factor = 100 +wall_thickness = 0.8 +wall_0_wipe_dist = 0.2 +roofing_layer_count = 1 +top_bottom_thickness = 0.6 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.6 +bottom_layers = 3 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +wall_0_inset = 0 +optimize_wall_printing_order = False +outer_inset_first = False +alternate_extra_perimeter = False +travel_compensate_overlapping_walls_enabled = True +travel_compensate_overlapping_walls_0_enabled = True +travel_compensate_overlapping_walls_x_enabled = True +wall_min_flow = 0 +fill_perimeter_gaps = everywhere +filter_out_tiny_gaps = True +fill_outline_gaps = True +xy_offset = 0 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +ironing_enabled = False +infill_sparse_density = 20 +zig_zaggify_infill = False +infill_multiplier = 1 +infill_wall_line_count = 0 +infill_overlap = 10 +skin_overlap = 5 +infill_wipe_dist = 0.1 +gradual_infill_steps = 0 +infill_before_walls = False +infill_support_enabled = False +max_skin_angle_for_expansion = 90 +material_diameter = 1.75 +default_material_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +material_initial_print_temperature = 220 +material_final_print_temperature = 220 +default_material_bed_temperature = 50 +material_bed_temperature = 50 +material_flow = 100 +retraction_enable = True +retract_at_layer_change = False +retraction_amount = 5 +retraction_speed = 45 +retraction_extra_prime_amount = 0 +retraction_min_travel = 0.8 +retraction_count_max = 90 +retraction_extrusion_window = 5 +limit_support_retractions = True +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +speed_print = 50 +speed_travel = 150 +speed_layer_0 = 10 +speed_travel_layer_0 = 50 +speed_slowdown_layers = 2 +speed_equalize_flow_enabled = False +acceleration_enabled = False +acceleration_roofing = 3000 +jerk_enabled = False +retraction_combing = off +travel_retract_before_outer_wall = False +retraction_hop_enabled = False +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_full_at_height = 0.32 +cool_lift_head = False +support_enable = True +support_type = everywhere +support_angle = 50 +support_pattern = grid +support_wall_count = 0 +zig_zaggify_support = False +support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_angles = [0] +support_brim_enable = True +support_brim_line_count = 5 +support_z_distance = 0.21 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_join_distance = 2.0 +support_offset = 0.2 +gradual_support_infill_steps = 0 +support_roof_enable = True +support_bottom_enable = False +support_roof_height = 0.45 +support_roof_density = 45 +support_roof_pattern = lines +support_fan_enable = False +support_use_towers = True +support_tower_diameter = 3 +support_tower_roof_angle = 65 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 3 +meshfix_union_all = True +meshfix_union_all_remove_holes = False +meshfix_extensive_stitching = False +meshfix_keep_open_polygons = False +multiple_mesh_overlap = 0.16 +carve_multiple_volumes = False diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 219cf36b70..0cd5c17d27 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = nwa3d_a5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = best weight = 1 @@ -75,7 +75,6 @@ speed_print = 30 speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 -max_feedrate_z_override = 0 speed_slowdown_layers = 2 speed_equalize_flow_enabled = False acceleration_enabled = False @@ -96,7 +95,7 @@ support_pattern = grid support_wall_count = 0 zig_zaggify_support = False support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 -support_infill_angle = 0 +support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 support_z_distance = 0.18 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 3ac7b5cda5..ae37eec499 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = nwa3d_a5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 @@ -75,7 +75,6 @@ speed_print = 60 speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 -max_feedrate_z_override = 0 speed_slowdown_layers = 2 speed_equalize_flow_enabled = False acceleration_enabled = False @@ -96,7 +95,7 @@ support_pattern = grid support_wall_count = 0 zig_zaggify_support = False support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15 -support_infill_angle = 0 +support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 support_z_distance = 0.3 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 2eed28a5b2..530794f569 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -75,7 +75,6 @@ speed_print = 50 speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 -max_feedrate_z_override = 0 speed_slowdown_layers = 2 speed_equalize_flow_enabled = False acceleration_enabled = False @@ -96,7 +95,7 @@ support_pattern = grid support_wall_count = 0 zig_zaggify_support = False support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 -support_infill_angle = 0 +support_infill_angles = [0] support_brim_enable = True support_brim_line_count = 5 support_z_distance = 0.21 diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index 7dabf8c754..50b8b32f3c 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = peopoly_moai [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index a4891d2f01..b3dffcf059 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = peopoly_moai [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index d7c1ccfaad..d5fcfcc98e 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra High definition = peopoly_moai [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra_high weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 8db1378e6c..2a1ab44912 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = peopoly_moai [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 9a9c75e1df..41fcfd67e6 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = peopoly_moai [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg new file mode 100644 index 0000000000..5bce2647db --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = generic_abs +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg new file mode 100644 index 0000000000..538a87c045 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = generic_abs +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg new file mode 100644 index 0000000000..3184be82fd --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = generic_abs +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 65 +speed_wall = =math.ceil(speed_print * 45/65) +speed_wall_0 = =math.ceil(speed_wall * 35/45) +speed_topbottom = =math.ceil(speed_print * 40/65) +speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg new file mode 100644 index 0000000000..f70131cd97 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = generic_petg +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 25/40) +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg new file mode 100644 index 0000000000..e86f7e34ff --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = generic_petg +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 27/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg new file mode 100644 index 0000000000..c03fb21cbe --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = generic_petg +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 65 +speed_wall = =math.ceil(speed_print * 45/65) +speed_wall_0 = =math.ceil(speed_wall * 30/45) +speed_topbottom = =math.ceil(speed_print * 40/65) +speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 91 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg new file mode 100644 index 0000000000..29b655c91b --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = generic_pla +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_layer_0 = =math.ceil(speed_print * 20/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature -5 +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg new file mode 100644 index 0000000000..bf655b4944 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = generic_pla +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg new file mode 100644 index 0000000000..fa81422998 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = generic_pla +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 65 +speed_wall = =math.ceil(speed_print * 45/65) +speed_wall_0 = =math.ceil(speed_wall * 35/45) +speed_topbottom = =math.ceil(speed_print * 40/65) +speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg new file mode 100644 index 0000000000..8fb7ba8ed5 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -0,0 +1,49 @@ + [general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pva-m +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg new file mode 100644 index 0000000000..28ad37478e --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pva-m +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = ==line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg new file mode 100644 index 0000000000..544ba3b0bf --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pva-m +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg new file mode 100644 index 0000000000..f86140b415 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pva-oks +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg new file mode 100644 index 0000000000..3036cbc215 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pva-oks +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = ==line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg new file mode 100644 index 0000000000..dd2a2f0c94 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pva-oks +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg new file mode 100644 index 0000000000..39fb0ba390 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pva-s +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg new file mode 100644 index 0000000000..3a6babd860 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pva-s +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = ==line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg new file mode 100644 index 0000000000..bd418bccd6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pva-s +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg new file mode 100644 index 0000000000..896c44ea06 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 1 +material = emotiontech_tpu98a +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature - 3 +material_flow = 107 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg new file mode 100644 index 0000000000..7c8aa8553a --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +material = emotiontech_tpu98a +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg new file mode 100644 index 0000000000..e1fc3c9935 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = -1 +material = emotiontech_tpu98a +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 101 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg new file mode 100644 index 0000000000..c5a7407387 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = generic_abs +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 27/43) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg new file mode 100644 index 0000000000..6f72a40983 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = generic_abs +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_layer_0 = =math.ceil(speed_print * 23/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg new file mode 100644 index 0000000000..4d23e09d72 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = generic_abs +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg new file mode 100644 index 0000000000..698feba6d5 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = emotiontech_asax +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg new file mode 100644 index 0000000000..c3a1ff764a --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_asax +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 27/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 2 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg new file mode 100644 index 0000000000..3f2c6a8617 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = emotiontech_asax +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 65 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 3/4) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 30/65) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 8 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg new file mode 100644 index 0000000000..faf731cabd --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_nylon_1030 +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_layer_0 = =math.ceil(speed_print * 23/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 93 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 30 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg new file mode 100644 index 0000000000..dc5afdb463 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = generic_petg +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg new file mode 100644 index 0000000000..eacda2df9b --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = generic_petg +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 92 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg new file mode 100644 index 0000000000..4a22a7de29 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = generic_petg +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 91 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg new file mode 100644 index 0000000000..dd1de2b731 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = generic_pla +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg new file mode 100644 index 0000000000..d359b712db --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = generic_pla +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 8 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg new file mode 100644 index 0000000000..49dd435cb7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = generic_pla +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.47 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.53 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.45 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 65 +speed_wall = =math.ceil(speed_print * 3/4) +speed_wall_0 = =math.ceil(speed_wall * 2/3) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg new file mode 100644 index 0000000000..1caddc5543 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = emotiontech_pva-m +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg new file mode 100644 index 0000000000..f4b98ed47c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_pva-m +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg new file mode 100644 index 0000000000..ffe642001e --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = emotiontech_pva-m +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg new file mode 100644 index 0000000000..ecdcfa2b49 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = emotiontech_pva-oks +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg new file mode 100644 index 0000000000..6d719613f1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_pva-oks +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg new file mode 100644 index 0000000000..a30598c298 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = emotiontech_pva-oks +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg new file mode 100644 index 0000000000..95fc12cacb --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = emotiontech_pva-s +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg new file mode 100644 index 0000000000..190d73029a --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_pva-s +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg new file mode 100644 index 0000000000..53d2e8b1da --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = emotiontech_pva-s +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2.5 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg new file mode 100644 index 0000000000..b80711fe8d --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 1 +material = emotiontech_tpu98a +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.59 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 4/4) +speed_wall_0 = =math.ceil(speed_wall * 3/4) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_support = =speed_wall_0 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature - 2 +material_flow = 105 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg new file mode 100644 index 0000000000..69db96ff85 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +material = emotiontech_tpu98a +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.59 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 40 +speed_wall = =math.ceil(speed_print * 4/4) +speed_wall_0 = =math.ceil(speed_wall * 3/4) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_support = =speed_wall_0 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg new file mode 100644 index 0000000000..a0a90933e2 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = -1 +material = emotiontech_tpu98a +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.59 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.49 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.54 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 45 +speed_wall = =math.ceil(speed_print * 4/4) +speed_wall_0 = =math.ceil(speed_wall * 3/4) +speed_topbottom = =math.ceil(speed_print * 2/3) +speed_layer_0 = =math.ceil(speed_print * 20/45) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 101 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg new file mode 100644 index 0000000000..8013c76be8 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 1 +material = generic_abs +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg new file mode 100644 index 0000000000..ca86b5fce6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +material = generic_abs +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg new file mode 100644 index 0000000000..92acfc67d8 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = -1 +material = generic_abs +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg new file mode 100644 index 0000000000..6d81b07329 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 1 +material = generic_petg +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg new file mode 100644 index 0000000000..3ebe7fc050 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +material = generic_petg +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg new file mode 100644 index 0000000000..3840c6414c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = -1 +material = generic_petg +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 93 +retraction_extra_prime_amount = 0 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg new file mode 100644 index 0000000000..9701fef992 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 1 +material = generic_pla +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg new file mode 100644 index 0000000000..7ed36d9d67 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +material = generic_pla +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +3 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg new file mode 100644 index 0000000000..2d44c9d084 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = -1 +material = generic_pla +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg new file mode 100644 index 0000000000..80e9934540 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 1 +material = emotiontech_pvaoks +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg new file mode 100644 index 0000000000..c597412185 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +material = emotiontech_pvaoks +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg new file mode 100644 index 0000000000..def6799406 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -0,0 +1,49 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = -1 +material = emotiontech_pvaoks +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 2 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg new file mode 100644 index 0000000000..569188ff3c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 1 +material = emotiontech_tpu +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg new file mode 100644 index 0000000000..b83b16b3ff --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +material = emotiontech_tpu +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg new file mode 100644 index 0000000000..368cbf59f0 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = -1 +material = emotiontech_tpu +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature +3 +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg new file mode 100644 index 0000000000..28bc40a7f7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = h +weight = -1 +material = generic_pla +variant = Standard 1.2 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +infill_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +support_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg new file mode 100644 index 0000000000..36765ea8cf --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = a +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = =10*layer_height \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg new file mode 100644 index 0000000000..afb61bb3b3 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = b +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = =7*layer_height \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg new file mode 100644 index 0000000000..a0db1a5af4 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = High Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = c +weight = 0 +global_quality = True + +[values] +layer_height = 0.3 +top_bottom_thickness = =5*layer_height \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg new file mode 100644 index 0000000000..3d52f5d331 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Medium Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = d +weight = 0 +global_quality = True + +[values] +layer_height = 0.4 +top_bottom_thickness = =5*layer_height \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg new file mode 100644 index 0000000000..d3ce741a0d --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = e +weight = 0 +global_quality = True + +[values] +layer_height = 0.5 +top_bottom_thickness = =4*layer_height \ No newline at end of file diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg new file mode 100644 index 0000000000..842e579f73 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = f +weight = 0 +global_quality = True + +[values] +layer_height = 0.6 +top_bottom_thickness = =4*layer_height diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg new file mode 100644 index 0000000000..a5dcd8c000 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Extra Coarse Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = g +weight = 0 +global_quality = True + +[values] +layer_height = 0.7 +top_bottom_thickness = =3*layer_height diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg new file mode 100644 index 0000000000..273ab89ba9 --- /dev/null +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Ultra Coarse Quality +definition = strateo3d + +[metadata] +setting_version = 9 +type = quality +quality_type = h +weight = 0 +global_quality = True + +[values] +layer_height = 0.8 +top_bottom_thickness = =3*layer_height diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index 4be60871d5..47524c598f 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tevo_blackwidow [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 62bc784048..8e343cee1b 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tevo_blackwidow [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index e2c5fe9b27..7a357f52e6 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tevo_blackwidow [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg index a656111625..83ac9ec272 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg index 358e7ee647..5219e96d29 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg index 8c8e1c1f5d..816ef254a8 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg index 5d3920a4bf..c0eb46043c 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg index 8a54712eea..423e309953 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg index 86dc4fda63..d76ef22999 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg index a8227e88c0..f9633339b1 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg index 54b4aaaf4b..882d0c70f7 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg @@ -4,10 +4,10 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse -weight = -3 +weight = -2 material = generic_abs variant = 0.6mm diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg index 1cde65460d..086e3128f9 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg index 75df8719fd..9e8fff9320 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg similarity index 83% rename from resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_coarse.inst.cfg rename to resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg index 2924388383..5dc2810b2c 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg @@ -4,10 +4,10 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse -weight = -3 +weight = -2 material = generic_abs variant = 0.8mm diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg index 6de8bccccb..f392c387b3 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg index 5cebeb82b4..db8f07520a 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg deleted file mode 100644 index ae596bdd21..0000000000 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = coarse -weight = -3 -material = generic_abs -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg deleted file mode 100644 index 563910fa32..0000000000 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = draft -weight = -2 -material = generic_abs -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg deleted file mode 100644 index 8bdb7c3ae9..0000000000 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Extra Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = extra coarse -weight = -4 -material = generic_abs -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg new file mode 100644 index 0000000000..b9dc375d5c --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.2mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg new file mode 100644 index 0000000000..1d6b876e7c --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.3mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg new file mode 100644 index 0000000000..b43df0dd6d --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.4mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg new file mode 100644 index 0000000000..91b3fd4af8 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_flex +variant = 0.4mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg new file mode 100644 index 0000000000..a2163b4b9c --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Draft +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_flex +variant = 0.5mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg new file mode 100644 index 0000000000..5d20e723f5 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.5mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg new file mode 100644 index 0000000000..0bce28b960 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_flex +variant = 0.5mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg new file mode 100644 index 0000000000..7df01e2780 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Draft +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = coarse +weight = -2 +material = tizyx_flex +variant = 0.6mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg new file mode 100644 index 0000000000..23373fe772 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.6mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg new file mode 100644 index 0000000000..33b77ad3a5 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_flex +variant = 0.6mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg new file mode 100644 index 0000000000..b3729e0768 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Draft +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = extra coarse +weight = -2 +material = tizyx_flex +variant = 0.8mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg new file mode 100644 index 0000000000..78777e60b8 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_flex +variant = 0.8mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg new file mode 100644 index 0000000000..d8f8581f2c --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_flex +variant = 0.8mm + +[values] +speed_infill = 25 +speed_layer_0 = 15 +speed_print = 30 +speed_topbottom = 25 +speed_wall_0 = 20 +speed_wall_x = 20 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg index afa670ac0a..1ccbc7a6b8 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg index 1845278b90..3b07d8a368 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg index 58e74b5f11..49bc34f08d 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg index 9b84448ccf..7183af5988 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg index c7c674a2e0..3b8112a811 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg index 8203af52eb..4d03dffbde 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg index 37f51a0484..859a323e5c 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg index bf5c5a6836..280b15f6c4 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg @@ -4,10 +4,10 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse -weight = -3 +weight = -2 material = generic_petg variant = 0.6mm diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg index 8f8045d7a5..33c07215f8 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg index 4d42241792..0c508a3f08 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_coarse.inst.cfg deleted file mode 100644 index 35b57754c9..0000000000 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_coarse.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = coarse -weight = -3 -material = generic_petg -variant = 0.8mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg similarity index 75% rename from resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg index dd1eb13498..21dddc3464 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg @@ -4,9 +4,9 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality -quality_type = draft +quality_type = extra coarse weight = -2 material = generic_petg variant = 0.8mm diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg index 070031a417..63165e7273 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg index b310ea8738..84b97a64f8 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg deleted file mode 100644 index 58b9b215b8..0000000000 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = coarse -weight = -3 -material = generic_petg -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg deleted file mode 100644 index a945a7bd87..0000000000 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = draft -weight = -2 -material = generic_petg -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg deleted file mode 100644 index d9166cf4f4..0000000000 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Extra Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = extra coarse -weight = -4 -material = generic_petg -variant = 1.0mm - -[values] - diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg index 00c9e6fe21..0cb8a48a4c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg index 8d88e07ea8..a9eecdd2d0 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg index 3b9517ff54..0f29add9a6 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg index e700b97589..ebe60424c5 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg index dc92ab42fc..def2c9f040 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg index 60897908a2..84e900cfb2 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg index 90ae46213d..c3c39e5583 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg similarity index 77% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg index cb1be9530d..3609c38e36 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg @@ -4,9 +4,9 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality -quality_type = draft +quality_type = coarse weight = -2 material = generic_pla variant = 0.6mm diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg index ac437a2e0a..21c1fa40e9 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg index c9daa755f7..4bf94b62c7 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg similarity index 74% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg index ecc354bf1d..9fd80a1cf2 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg @@ -4,11 +4,12 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality -quality_type = draft +quality_type = extra coarse weight = -2 material = generic_pla variant = 0.8mm [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg index 74faeb259f..1f8446eddf 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg index ce9f608fbb..5c54c953f0 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg deleted file mode 100644 index 82cb63a0bf..0000000000 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = coarse -weight = -3 -material = generic_pla -variant = 1.0mm - -[values] diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg deleted file mode 100644 index 11be293c09..0000000000 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Extra Coarse -definition = tizyx_evy - -[metadata] -setting_version = 8 -type = quality -quality_type = extra coarse -weight = -4 -material = generic_pla -variant = 1.0mm - -[values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg similarity index 66% rename from resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_high.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg index d77772f2d3..665bc386d8 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg @@ -4,12 +4,11 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 -material = generic_petg -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.2mm [values] - diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg similarity index 66% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_high.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg index 835a223577..267fba612a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg @@ -4,11 +4,11 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 -material = generic_pla -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.3mm [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg similarity index 66% rename from resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_high.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg index 2de3a28d20..e694648f8b 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg @@ -4,12 +4,11 @@ name = High definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 -material = generic_abs -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.4mm [values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg similarity index 67% rename from resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_normal.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg index c320397423..86c8285f3c 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg @@ -4,12 +4,11 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 -material = generic_abs -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.4mm [values] - diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg similarity index 67% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg index 6920051f27..3a7bc21add 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg @@ -4,11 +4,12 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 -material = generic_pla -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.5mm [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg new file mode 100644 index 0000000000..653bcc6025 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_pla_bois +variant = 0.5mm + +[values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg similarity index 67% rename from resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_normal.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg index 13a031f55c..069c4f294a 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg @@ -4,12 +4,11 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 -material = generic_petg -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.5mm [values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg similarity index 57% rename from resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg index d26b965cc3..748fb91ef6 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg @@ -1,15 +1,14 @@ [general] version = 4 -name = Coarse +name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality -quality_type = draft +quality_type = coarse weight = -2 -material = generic_abs +material = tizyx_pla_bois variant = 0.6mm [values] - diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg new file mode 100644 index 0000000000..4070bebb23 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_pla_bois +variant = 0.6mm + +[values] diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg similarity index 67% rename from resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_normal.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg index 86f16ae55e..a6e78ed4d0 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg @@ -4,11 +4,11 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 -material = generic_pla -variant = 1.0mm +material = tizyx_pla_bois +variant = 0.6mm [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg similarity index 56% rename from resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_draft.inst.cfg rename to resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg index c2d75e37e0..a3fdb5af86 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg @@ -1,14 +1,14 @@ [general] version = 4 -name = Coarse +name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality -quality_type = draft +quality_type = extra coarse weight = -2 -material = generic_abs +material = tizyx_pla_bois variant = 0.8mm [values] diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg new file mode 100644 index 0000000000..9dc8af8161 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = tizyx_evy + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_pla_bois +variant = 0.8mm + +[values] diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg new file mode 100644 index 0000000000..fa0ef9e6ec --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy + +[metadata] +setting_version = 9 +type = quality +quality_type = normal +weight = 0 +material = tizyx_pla_bois +variant = 0.8mm + +[values] diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg index 381a5cc025..b454801a5d 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg @@ -1,15 +1,45 @@ [general] version = 4 -name = Coarse +name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse -weight = -3 +weight = -2 global_quality = True [values] -layer_height = 0.4 -layer_height_0 = =layer_height \ No newline at end of file +layer_height = 0.3 +layer_height_0 = =layer_height +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg index 984325d87a..dc759418d6 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 @@ -12,4 +12,34 @@ global_quality = True [values] layer_height = 0.25 -layer_height_0 = =layer_height \ No newline at end of file +layer_height_0 = =layer_height +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg index a6a7508b54..c07ffc43ba 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg @@ -1,15 +1,45 @@ [general] version = 4 -name = Extra Coarse +name = Draft definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse -weight = -4 +weight = -2 global_quality = True [values] -layer_height = 0.5 -layer_height_0 = =layer_height \ No newline at end of file +layer_height = 0.4 +layer_height_0 = =layer_height +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg index 160af128ce..0549e622a7 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg @@ -12,4 +12,34 @@ global_quality = True [values] layer_height = 0.1 -layer_height_0 = 0.1 \ No newline at end of file +layer_height_0 = 0.1 +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg index 2c895e772c..1337dd5e6a 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -12,4 +12,34 @@ global_quality = True [values] layer_height = 0.2 -layer_height_0 = 0.25 \ No newline at end of file +layer_height_0 = 0.25 +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg index 0cdc6c69fd..a86c15ef18 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg index 0e8638abc1..ce36003c4a 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg index 3a367705ac..2414be591b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg index f2b67c36a0..eb5ddb9234 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg new file mode 100644 index 0000000000..6cd279dae0 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = Flex and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_flex +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg new file mode 100644 index 0000000000..35525ef307 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Flex Only +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = coarse +weight = -3 +material = tizyx_flex +variant = Classic Extruder + +[values] +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg new file mode 100644 index 0000000000..ac2d2fe4f1 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Flex and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_flex +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +speed_print = 30 +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg new file mode 100644 index 0000000000..dd66277727 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Flex Only +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = coarse +weight = -3 +material = tizyx_flex +variant = Direct Drive + +[values] +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg index b6e4136fb9..efe3f70e6e 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg index bc921926ac..9df30cb367 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg index 1113092627..392e5a5675 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg index 6145ef18d1..be28af0c05 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg index c49bb850da..05d8b25bbd 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg index 9e40da3d24..ccb384568d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg index 652cc8542a..ecbddfd8b7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg index b41c2d175c..09b6402b55 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -25,18 +25,16 @@ prime_tower_flow = 100 prime_tower_min_volume = 80 prime_tower_wipe_enabled = False retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_hop_enabled = True retraction_hop_only_when_collides = False retraction_min_travel = 2 -retraction_speed = 30 skin_angles = [] skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 top_layers = 4 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg new file mode 100644 index 0000000000..791bbed462 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = PVA and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = generic_pla +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg index b5e3c52a20..0d5b0891a6 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 @@ -21,13 +21,11 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 speed_print = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg index 4088e0a965..dd59bbc714 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg index 1716034fcc..d0a0ebd93e 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg index 6667660d2a..c7c1f97868 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -21,12 +21,10 @@ prime_tower_flow = 110 prime_tower_min_volume = 50 prime_tower_wipe_enabled = True retract_at_layer_change = True -retraction_amount = 2.5 retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -retraction_speed = 30 skirt_brim_minimal_length = 100 -switch_extruder_retraction_amount = 0 -switch_extruder_retraction_speeds = 40 \ No newline at end of file +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg new file mode 100644 index 0000000000..e9986eb2fd --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = PVA and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = generic_pla +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +speed_print = 30 +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg new file mode 100644 index 0000000000..198f2403a3 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = Flex and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_pla_bois +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg new file mode 100644 index 0000000000..bc07b48393 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = High +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_pla_bois +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg new file mode 100644 index 0000000000..5c1fe91ca3 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_pla_bois +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg new file mode 100644 index 0000000000..6152b0377e --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Flex and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_pla_bois +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +speed_print = 30 +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg new file mode 100644 index 0000000000..cadd4eb584 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = High +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = high +weight = 1 +material = tizyx_pla_bois +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg new file mode 100644 index 0000000000..3ba5b74e13 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Normal +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = normal +weight = 0 +material = tizyx_pla_bois +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg new file mode 100644 index 0000000000..a9433d33c0 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = PVA and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_pva +variant = Classic Extruder + +[values] +cool_fan_speed_0 = 100 +cool_min_layer_time = 10 +default_material_print_temperature = 210 +fill_outline_gaps = True +infill_angles = [] +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 100 +prime_tower_min_volume = 80 +prime_tower_wipe_enabled = False +retract_at_layer_change = True +retraction_enable = True +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +retraction_min_travel = 2 +skin_angles = [] +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 50 +speed_wall_0 = 40 +top_layers = 4 +wall_line_count = 2 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg new file mode 100644 index 0000000000..b9002fa1b3 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = PVA and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +material = tizyx_pva +variant = Direct Drive + +[values] +default_material_print_temperature = 210 +infill_angles = [] +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_standby_temperature = 210 +prime_tower_flow = 110 +prime_tower_min_volume = 50 +prime_tower_wipe_enabled = True +retract_at_layer_change = True +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_enabled = True +retraction_hop_only_when_collides = False +speed_print = 30 +skirt_brim_minimal_length = 100 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG index 5d50a74010..5fe7ca919d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.CFG @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 @@ -19,12 +19,21 @@ skirt_line_count = 2 skirt_gap = 2 fill_outline_gaps = True infill_sparse_density = 15 -retraction_amount = 2.5 retraction_min_travel = 2 -retraction_speed = 30 speed_print = 30 speed_topbottom = 50 speed_wall_0 = 40 top_layers = 4 wall_line_count = 2 -cool_min_layer_time = 11 \ No newline at end of file +cool_min_layer_time = 11 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +support_enable = True +prime_tower_enable = True +prime_tower_position_x = 127.5 +prime_tower_position_y = =math.ceil(250-prime_tower_size) +prime_tower_size = 35 +prime_tower_flow = 110 +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index bcd2ef12c9..131e30dc2c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 @@ -16,6 +16,14 @@ adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.25 prime_tower_enable = True -prime_tower_position_x = 180 -prime_tower_position_y = 180 -prime_tower_size = 29 +prime_tower_position_x = 127.5 +prime_tower_position_y = =math.ceil(250-prime_tower_size) +prime_tower_size = 35 +prime_tower_flow = 110 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +support_enable = True +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True +retraction_hop_enabled = False diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index eb34569fec..7e8bb6cded 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 @@ -16,6 +16,38 @@ adhesion_type = skirt layer_height = 0.1 layer_height_0 = 0.1 prime_tower_enable = True -prime_tower_position_x = 180 -prime_tower_position_y = 180 -prime_tower_size = 29 +prime_tower_position_x = 127.5 +prime_tower_position_y = =math.ceil(250-prime_tower_size) +prime_tower_size = 35 +prime_tower_flow = 110 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +support_enable = True +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_angle = 70 +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +top_layers = 4 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True +retraction_hop_enabled = False \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index f78e75f40a..616717008c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 @@ -16,6 +16,38 @@ adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.25 prime_tower_enable = True -prime_tower_position_x = 180 -prime_tower_position_y = 180 -prime_tower_size = 29 +prime_tower_position_x = 127.5 +prime_tower_position_y = =math.ceil(250-prime_tower_size) +prime_tower_size = 35 +prime_tower_flow = 110 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +support_enable = True +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +retraction_amount = 5 +retraction_speed = 60 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_angle = 70 +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +top_layers = 4 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True +retraction_hop_enabled = False \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg new file mode 100644 index 0000000000..298f94deb9 --- /dev/null +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -0,0 +1,29 @@ +[general] +version = 4 +name = PVA and PLA +definition = tizyx_evy_dual + +[metadata] +setting_version = 7 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +adhesion_extruder_nr = 0 +adhesion_type = skirt +layer_height = 0.2 +layer_height_0 = 0.25 +prime_tower_enable = True +prime_tower_position_x = 127.5 +prime_tower_position_y = =math.ceil(250-prime_tower_size) +prime_tower_size = 35 +prime_tower_flow = 110 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +support_enable = True +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True +retraction_hop_enabled = False \ No newline at end of file diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg new file mode 100644 index 0000000000..d7600f847b --- /dev/null +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = High +definition = tizyx_k25 + +[metadata] +quality_type = draft +setting_version = 7 +type = quality +global_quality = True + +[values] +layer_height = 0.1 +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 2 +fill_outline_gaps = True +infill_sparse_density = 15 +material_diameter = 1.75 +retraction_min_travel = 2 +speed_print = 60 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False +wall_line_count = 2 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg index 482b709670..b93f2fb1b2 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -1,27 +1,41 @@ [general] version = 4 -name = TiZYX K25 Normal +name = Normal definition = tizyx_k25 [metadata] quality_type = normal -setting_version = 8 +setting_version = 9 type = quality global_quality = True [values] +layer_height = 0.2 +initial_layer_line_width_factor = 90 +infill_overlap = 15 +material_flow_layer_0 = 93 +material_flow = 99 +speed_wall_0 = 45 +speed_wall_x = 50 +speed_topbottom = 45 +support_enable= True +support_angle = 70 adhesion_type = skirt skirt_line_count = 2 skirt_gap = 2 fill_outline_gaps = True infill_sparse_density = 15 material_diameter = 1.75 -retraction_amount = 2.5 retraction_min_travel = 2 -retraction_speed = 30 speed_print = 60 -speed_topbottom = 50 -speed_wall_0 = 40 -top_layers = 4 +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +layer_start_x = 250 +layer_start_y = 250 +coasting_enable = False wall_line_count = 2 -cool_min_layer_time = 11 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature +z_seam_corner = z_seam_corner_none +optimize_wall_printing_order = True diff --git a/resources/quality/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg index cda876ff8e..3a9315d2b0 100644 --- a/resources/quality/ultimaker2/um2_draft.inst.cfg +++ b/resources/quality/ultimaker2/um2_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index 2f1acc4f3b..be71e79f21 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index 07bfd4781d..e0b962365a 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index 7637f9a800..f5ebe09cc9 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index e1629a767f..904b7717a9 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index ff165f8b41..54bcb0e820 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index 1f93d9545a..7351f481ff 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index e3c87e466d..ca99d9cb70 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index d1844a1d85..ad7a8486c4 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index a36a5aaa4c..1c03350940 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index 00e1ef8d95..6ec591f7d3 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index fbe6f4c012..bf4ffd0ddd 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index e209c9b4f2..9676a5d9c6 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index 4010bee857..b4057c5163 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index 28790f8cc2..d1e75bf63c 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index 73f2053962..e1ec57db9d 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index cc50454680..ee531a6010 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index ac7b9de859..da1d5c061f 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index 8703ef5c61..8319b00199 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index 9473741a31..b67b75fa8b 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 666e4ee007..1a5958a844 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 38dc1e4261..210566c967 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index ddecd5ab9b..984f82f484 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 7564575bc6..ea19bd0da5 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index f1df574985..07ad20c568 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index 4a09fc784d..a1a58e4c94 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index c627aa4e0f..d3940b42bf 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index 7045e57377..11e9baedc5 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index 6b65593eae..484ecbdc3d 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index 208ae858a7..b8e4f3920d 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index 3faf2c1624..84c537e026 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extracoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg index 5978057b0e..d71185bf6d 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg index 1fb6ae3e16..65bdbd53da 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg index 9332539ccb..118bad3a2e 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg index e6f38579d4..eb85e5352f 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index def62910b1..d69ace8ade 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index cf437b0f56..7f6e500b8e 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index 8b9d5c91d4..29fa32fd8c 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index 8cd9d352cd..627e9fe4c5 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 7187ded786..55f0b56f19 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index f55693cf9f..4fe20aff63 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 147b550b08..b1d5f45802 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index 8e7ae0627f..d7f8426e4b 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index d8f77cdbca..5f1128d8f3 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index c8d52f6672..02d8af13a1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index 2bea74a18d..73d6e5b906 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 25da9be380..1b033c5452 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index ebccbcdf62..292820ac2f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index e846824ad7..fb9e8b9186 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 5f7b0dd6fd..16fe3acbf9 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extracoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index 657f87c42e..814fa8aa90 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 23139c14a6..0ca13860a1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index 01d3f42f4d..1b94a84263 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index 436b5b1ff0..f8736a57ef 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index 1c75959f1b..6c9601f83c 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index c9b971c823..cb9324a8bc 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index 424013d3e6..c171538e81 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = slightlycoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 13e69d410a..ad36195c46 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index bf31aa0230..1ca9cf3986 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 6402acb68a..a325f9c19b 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg index 2c0dfbb96e..29376b44bd 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index e32da66280..1e7f093e99 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg index 881e30cd1a..388560565b 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index 89a3a843de..45f69966fb 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg index 0601c0886b..18bcf7dda2 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index f9cf3b5c52..955dfe762e 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index d4c8f069e9..1b1e2eb6e2 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index d0c8a4fd5a..3bbd48ef7a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index 017c7ba418..5e19a029c8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index d0a8d9a53c..4698f39137 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index df3c4f07a6..81855408da 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 177fd499cc..48b62db6da 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 5c8f73bdfb..62f189d7e8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index eec1c77373..b5be92f483 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 267f19bd69..5844ea869c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index 313ac990b2..9746160ed0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 821eba5653..c67ae2b1b7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 16a55ad9d5..1396cbd999 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index 2611c89b46..b50a47a541 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index 73a686a3a9..dbd0959dba 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index cef2675acd..e4bac861aa 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index 4906da074e..f87342ebaf 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg index d85d9c9c83..6627ca84c5 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg index fb369ff4ce..bd8d07372d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg index 9db59c7216..d55b81bbfd 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg index 3876680150..bd0e2992ba 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index efbed80592..3b00f6f734 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index e0277bc49e..37f32031d1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 4970df2dd0..89c61cd46d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index e733e199a4..16e82835cd 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index 307c123300..eb91e8b510 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index abd7af5eb4..c88f90d9ac 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index 6ed0bdf114..f3ccc5be03 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index bc8689cd87..a99cc80fb0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index 6ffa12674b..c82f6bd352 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index 3ceb4e60e9..f7a61111d3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index f1eb450343..a3273ae754 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index e329d77fdf..62ac3d8431 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 6edbb84dfa..193a7486c3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index f06384e028..00d075dcca 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index ad19aa54c7..bdd6f1b783 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 41fafd5f37..a36d6610ca 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index 3c788cfa49..f188a539f7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg index 5a0e26659a..f604198f35 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg index d4827b3b44..f39a988729 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg index 14c95af531..6f69ffe06d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index 98f3694cd4..ad76f0e0fb 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 8433aaa87c..042d192884 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index ea203a24b4..9deca9d86c 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index 43d10b491a..2e6c308ec5 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index 0897a0c23d..d9e26a3457 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index 32063fe99d..34b75c2489 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index b6cd98490c..80c52719c4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 7a588abef4..47ec05541d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 95fc1e7257..bc5b366d2b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 7b3c616524..571d7307e4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg index 2d7cef0eb0..f1a329653d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index 7f9982c44c..bd4aabb31d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index 0958f46a99..f6d6bc620b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 4d8c72dd88..61dfee972b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index b347a9f55f..e197ff962e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 3b419b34ab..a803521095 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index 45c8504d5b..e7ea5cd3d5 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index b79f0650ab..f9011adf6e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index 8c2405434e..c34b290829 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 541cb55c5b..c4e2b64222 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 883fc64629..f9a27a686f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index e11625f1e5..a35d202b18 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index d4ab0d80c0..f79525f474 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 33d003e2d0..7c16dd48dc 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index e17cb9eb80..68322afcac 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 97b9a2ab0e..6a3e774bdd 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 4716fa8dc5..ba81b5eea5 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 2b64f51d79..ffcb251487 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 30f0c2e80d..7455df0e00 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index 5acd6df344..c7f99d543f 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index cfbe66d83e..a3abfb4da1 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg index 2bf09a7dce..8d05bc1573 100644 --- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index d3bde09657..635cdd6bc4 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index ff7bfcb2e5..2850b3b5b2 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 406c93c1fa..972c1226c0 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg index 981f554b05..420ac87f2b 100644 --- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg index a33d80f779..901cb96c08 100644 --- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 1c1e4e19c1..1cbfa37232 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index 4afd54ee84..72d532927c 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 1466c6905d..78d803d83e 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg index 8899d051dc..56c32c3e61 100644 --- a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index b3fdb8cdd0..1cac6cdff7 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg index e534d8babc..79bb37e301 100644 --- a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_original [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index c9d89e61c5..f0b961aba2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index 07ad80b729..92eed71043 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index d25a6c80c2..58e480f991 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index d2f377c7b1..10d08f4c8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 7a95e43c3d..5c64c46cd2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 8e12940b1b..65d11cfe80 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 7f492e2930..b21230c5c8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 13c7d121f5..29a2905370 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index def7e3b152..cf4f7eaa49 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index b0c3aeb48a..7125c6a4dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 94a3b03872..16050dac07 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 6b22335cb9..fa5c2beee0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 0a39fc61ae..d17c7f81d2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index feec3c87fc..cd7ac0ee60 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 3a2c038ab5..1112e84381 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index f29f86c572..cbf0abf7dd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index 5b01a23e54..62e122afb2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index b2f9b44be0..5f27043e05 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index b91dbdb578..4fe16c838c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index 1847b038d0..ff07e497e3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 45d4f3be8f..3ba2542c60 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 66d75e856c..8c9d4f1c0f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index 613d2bea33..f8b3cf19f6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 0d19952664..d8ea67b6a6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 26a103ac91..ec833e9a34 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 325ae4a966..72a458abd4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index 8a670fc07b..db69d87ed5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index f87de5574c..32a63855c3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index cef2e92526..5d06a8adaf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index fa5199d415..147a0ecb17 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 9fd1630fc5..c1cffb3380 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index e880adf2ee..2c21449983 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 8f2a2ed8cc..30484b2352 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 250953df36..9a46bc2714 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index eee130cfa5..ac331659c1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index 28b69ea7f7..003e5b4c04 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index cfd229e06a..32de8ebfbd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index f701a4b724..9a9c642bae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index 906b5a66a9..7c52a95e05 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index d34d4ad4b8..8e698c0fa0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 3f4cc80df0..714cf0e203 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index 88e12fdc76..a9e718157a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index a5bd140dc1..50693b036c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 2a6954b536..99a702e382 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg index dba3ca3128..b4d23b1aa0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg index 423c688eeb..97674c7ad2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg index 6808d287d0..5f9bb496e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg index 12974cdcbd..8edf7fb757 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg index aa60bb64c7..74405b7b73 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg index d1af6f4173..99aea4e0b1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg index bbaedf153e..51ff55809a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg index 66bd30cc91..203fdb1c22 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg index f397e491a6..b10a899f11 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg index 3695256cd0..14b7749857 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg index aafac8de09..0d5106fe97 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg index 49646ed865..cb2d43a14f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg index 4fb111f1b9..7384d71110 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg index 6da8f5f3a3..a8c0d0fe1c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg index b15de3ca17..6856f7c38e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg index a6c1728850..0923d26b41 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg index d980d3ffa4..23fa918a33 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg index 6f4f211bb0..0ffc46daf0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg index df9a637b8c..40da2d84ae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 2c46f4b388..2429490e4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 8cd4348ead..4aa5d702ed 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index a24bf900bc..40b58d873c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 7f9faeb1c6..41508dfe6a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index 8e50c00aee..02fdb0700c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 1a98121f21..6b0e439dbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index dbc0ebcdbb..4c4ee4171a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 12fe033f78..bf93a6ba11 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 2aa54ea020..ab0ed26a3b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg index 8e37522e6f..65fd34985f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index 4a5609eb1c..516442778f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 76cd72d9fe..2fa1ab9107 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 830d53bc38..1e1a99c545 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index db96b33609..457b8b4c5d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index 912a801180..6918c26882 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 1a98b2b545..f9c548c7f8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 0c0395237d..efb8189acd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index ba064e8a66..0299255155 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 5d4a3fd135..ac8c2d9190 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 56596b775e..a986d199e3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index eac1c82318..1bf8b4b9a9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index 9ca4b84c3f..b0c627e746 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index 83b272edc6..c0081916c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 8aaa780569..c246963763 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 9c3829d969..372829bb04 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index da200f0860..9347331b67 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 5cd7b2fb76..f75aed9bf1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg index b571411e4a..94c1df7ff3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg index 122a5ad17a..f1580c1723 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg index 85bd71fb9e..fa5d5af7a2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg index dd214bd2a0..7333ecc637 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg index 68753ac4f6..8821ca6e05 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg index b422d71647..b5d07757f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg index 978540d706..07485b146d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg index 268b6a9677..4a1f125733 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg index c8cb4a5b8b..0c9aedf895 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg index c8787686d9..55cdba5d2f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg index 8f0492880a..d656c7696d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg index faaa93f29c..a534ad0a71 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg index 8d58358b87..d07b85016d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg index 48a7a7c184..7619423618 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg index 338263f9ce..dcba5cc7e4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index 7c518530d5..2734c80920 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index b91335e9f2..d8c4d0409b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 6e1b1fab2e..39f7098128 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 6c861bace3..1a9a6bd3f0 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index db13c5a545..06700548c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index 2f26b5c429..89b41cb17e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index 9c0f79e309..635d8a216a 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index d2ff75f6fc..6529d6d9d5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index d3eaaae97e..1a8ea47fd9 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index a107aef788..ad4c342b74 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index e5f09ad78b..4df36638d9 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index d8efd4288d..e11e599094 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index ecbd57ab48..0aa2055a6b 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg index 64052b9ce7..7e306460f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index f92b7e0a89..5e9755b22a 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index a9dd9e8768..c0bc38fe37 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index a2cdf45d6c..270d03f953 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg index 9e97f55559..3920ec3110 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg index 2aa5469a72..2b6fc62a8b 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg index eec9d407c5..16b7d16cff 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg index cf81d1305f..9214a3d87b 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg index 13c75ef86b..a196259df1 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg index 4addd9a6f7..194508422c 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg index 1bb0fa3d0b..5338c64f2d 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg index 16dbde3c17..9e1381620f 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg index 1e81f1139d..c702f93ce3 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg index 35fa1e2903..958f718a45 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg index d0c27d0671..4492c3cb57 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg index 931de127de..62c78aeb7b 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg index f552db5fa8..1f22c073a2 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg index 2648ac36d5..4759be9be5 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg index 41d1d4c300..6ed5bba32e 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg index 11af4ba3d5..0ab58926ce 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg index 02745aa2da..3d0700dc82 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg index cd4f79636b..3eebce23f8 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg index 6a117446fa..237345b588 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg index e2bdb1facf..7ff29e4259 100644 --- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg index 938bab9060..56867e8d23 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg index db3b018d58..90f140bbb6 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg index f597a5a802..9d0d537a12 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg index 5b7a0f78e2..829ef579a5 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg index f0245fd106..c6582c7b35 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg index 607f08b3e0..e58143750f 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 8 +setting_version = 9 type = quality quality_type = normal weight = 0 diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 3f28f5d48d..dd257669fe 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -99,6 +99,7 @@ top_skin_expand_distance bottom_skin_expand_distance max_skin_angle_for_expansion min_skin_width_for_expansion +infill_randomize_start_location [material] default_material_print_temperature @@ -159,7 +160,6 @@ speed_layer_0 speed_print_layer_0 speed_travel_layer_0 skirt_brim_speed -max_feedrate_z_override speed_slowdown_layers speed_equalize_flow_enabled speed_equalize_flow_max @@ -204,7 +204,6 @@ travel_retract_before_outer_wall travel_avoid_other_parts travel_avoid_supports travel_avoid_distance -start_layers_at_same_position layer_start_x layer_start_y retraction_hop_enabled @@ -409,3 +408,7 @@ wipe_hop_speed wipe_brush_pos_x wipe_repeat_count wipe_move_distance +small_hole_max_size +small_feature_max_length +small_feature_speed_factor +small_feature_speed_factor_0 diff --git a/resources/shaders/striped.shader b/resources/shaders/striped.shader index 9da921a629..71b1f7b0fa 100644 --- a/resources/shaders/striped.shader +++ b/resources/shaders/striped.shader @@ -45,7 +45,7 @@ fragment = mediump vec4 finalColor = vec4(0.0); mediump vec4 diffuseColor = u_vertical_stripes ? (((mod(v_vertex.x, u_width) < (u_width / 2.)) ^^ (mod(v_vertex.z, u_width) < (u_width / 2.))) ? u_diffuseColor1 : u_diffuseColor2) : - ((mod((-v_position.x + v_position.y), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2); + ((mod(((-v_vertex.x + v_vertex.y + v_vertex.z) * 4.), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2); /* Ambient Component */ finalColor += u_ambientColor; @@ -118,7 +118,7 @@ fragment41core = mediump vec4 finalColor = vec4(0.0); mediump vec4 diffuseColor = u_vertical_stripes ? (((mod(v_vertex.x, u_width) < (u_width / 2.)) ^^ (mod(v_vertex.z, u_width) < (u_width / 2.))) ? u_diffuseColor1 : u_diffuseColor2) : - ((mod((-v_position.x + v_position.y), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2); + ((mod(((-v_vertex.x + v_vertex.y + v_vertex.z) * 4.), u_width) < (u_width / 2.)) ? u_diffuseColor1 : u_diffuseColor2); /* Ambient Component */ finalColor += u_ambientColor; diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index b8528ea1fa..efc476f606 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,66 @@ +[4.2.0] +*Orthographic view. +When preparing prints, professional users wanted more control over the 3D view type, so this version introduces an orthographic view, which is the same view type used by most professional CAD software packages. Find the orthographic view in View > Camera view > Orthographic, and compare the dimensions of your model to your CAD design with ease. + +*Object list. +Easily identify corresponding filenames and models with this new popup list. Click a model in the viewport and its filename will highlight, or click a filename in the list and the corresponding model will highlight. The open or hidden state of the list will persist between sessions. How convenient. + +*Print previews. +Some improvements have been made to print previews displayed in the monitor tab, Ultimaker Connect, or the Ultimaker S5 interface. In some instances, previews were clipped at the bottom or side, and sometimes models outside of the build plate area were visible. This is all fixed now. + +*AMF file compatibility. +Ultimaker Cura now supports AMF (Additive manufacturing file format) files out-of-the-box, thanks to an AMF file reader contributed by fieldOfView. + +*Slice button delay. +After clicking ‘Slice’, a lack of response could lead to frustrated buttonclicking. This version changes the button text to read ‘Processing’ during any pre-slicing delay. + +*Layer view line type. +The line type color scheme in the layer view has been tweaked with new colors for infill and support interfaces so that they can be distinguished better. + +*Nozzle switch prime distance. +Certain materials “ooze” more than others during retraction and long moves. Vgribinchuk has contributed a new setting that lets you finetune the restart distance, so that the full extrusion width is achieved when resuming a print. + +*Smart Z seam. +A new option to increase the aesthetic quality of your prints has been added to custom mode, under Z seam settings. Smart Z seam works by analyzing your model’s geometry and automatically choosing when to hide or expose the seam, so that visible seams on outer walls are kept to a minimum. + +*Separate Z axis movements. +Z axis movement handling has been improved to reduce the chance of print head collisions with prints. + +*Flow per feature. +You can now adjust material flow for specific features of your print, such as walls, infill, support, prime towers, and adhesion. This allows line spacing to be controlled separately from flow settings. + +*Merge infill lines. +We did some finetuning of the CuraEngine to improve print quality by filling thin infill areas more precisely and efficiently, and reducing movements that caused excessive gantry vibration. + +*Z hop speed. +The Z hop speed for printers with no specific speed value would default to ‘299792458000’ (light speed!) The new Z hop speed setting ensures that all Z hops are performed at a more sensible speed, which you can control. + +*Support tower diameter. +The ‘Minimum diameter’ setting for support towers has been renamed to ‘Maximum Tower-Supported Diameter’, which is more accurate and more specific because it mentions towers. + +*Square prime towers. +Circular prime towers are now the default option. Square prime towers have been eradicated forever. + +*Third-party printer order. +The ‘add printer’ menu now includes third-party printers that are ordered by manufacturer, so that specific machines can be found easily. Printer definitions. New machine definitions added for: +- Anet A6 contributed by markbernard +- Stereotech ST320 and START contributed by frylock34 +- Erzay3D contributed by Robokinetics +- FL Sun QQ contributed by curso007 +- GeeTech A30 contributed by curso007 + +*Creawsome mod. +This version has pulled the Creawsome mod, made by trouch, which adds a lot of print profiles for Creality printers. It includes definitions for Creality CR10 Mini, CR10s, CR10s Pro, CR20, CR20 Pro, Ender 2, Ender 4 and Ender 5, and updates the definitions for CR10, CR10s4, CR10s5 and Ender3. The CRX is untouched. Pull requests are now submitted that merge the mod into mainline Cura. + +* Bug fixes +- Noto Sans. Noto Sans was introduced as the default font in Ultimaker Cura some versions ago, but until now it wouldn’t render properly in the application unless already installed on your computer. This release forces the application to render Noto Sans even when it’s not installed as a font on your computer. Fun fact: Ultimaker recently rebranded, and we made Noto Sans our corporate font as well. +- Reslice with per-model settings. When slicing a model with per-model settings, a change of one of the per model settings would not trigger a reslice. This has been fixed. Serial port interruptions. This version adds a way to stop serial connections if you add command line parameters. +- Print one-at-a-time blob. In print-one-at-a-time mode, prime blobs could cause obstructions and cause prints to fail. This has been fixed. +- Prime tower brim overlap fix. Fixed an issue where models on the build plate could overlap with brims of other models. +- Wrong printer name. Fixed an issue where Ultimaker 3D printers that are synchronized over the network would display ‘Extruder 1’ in place of the printer’s hostname. +- Unnecessary travel at print start. Fixed an issue where printing without a prime blob would cause the print head to make a 10 mm travel move for no reason. +- Stair step height. This version fixes support stair step height, which influences the adhesion between the model and support printed on top (supports everywhere). For now, this bug has had no influence on PVA supported prints. + [4.1.0] *Draggable settings panels There was a lot of feedback from the 4.0 release about the collapsible settings panels. Based on this feedback, we decided to make them completely draggable. The print settings panel (prepare stage) and the color scheme panel (preview stage) can now be dragged and positioned anywhere in the 3D viewer. A double click of the header will reset each to their default position. diff --git a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg new file mode 100644 index 0000000000..09ba300b6a --- /dev/null +++ b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg @@ -0,0 +1,16 @@ + + + + Group-cloud Copy + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-dark-colorblind/theme.json b/resources/themes/cura-dark-colorblind/theme.json new file mode 100644 index 0000000000..9559101d24 --- /dev/null +++ b/resources/themes/cura-dark-colorblind/theme.json @@ -0,0 +1,28 @@ +{ + "metadata": { + "name": "Colorblind Assist Dark", + "inherits": "cura-dark" + }, + + "colors": { + "x_axis": [212, 0, 0, 255], + "y_axis": [64, 64, 255, 255], + + "model_default": [156, 201, 36, 255], + "model_overhang": [200, 0, 255, 255], + + + "xray": [26, 26, 62, 255], + "xray_error": [255, 0, 0, 255], + + "layerview_inset_0": [255, 64, 0, 255], + "layerview_inset_x": [0, 156, 128, 255], + "layerview_skin": [255, 255, 86, 255], + "layerview_support": [255, 255, 0, 255], + + "layerview_infill": [0, 255, 255, 255], + "layerview_support_infill": [0, 200, 200, 255], + + "layerview_move_retraction": [0, 100, 255, 255] + } +} diff --git a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg new file mode 100644 index 0000000000..09ba300b6a --- /dev/null +++ b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg @@ -0,0 +1,16 @@ + + + + Group-cloud Copy + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light-colorblind/theme.json b/resources/themes/cura-light-colorblind/theme.json new file mode 100644 index 0000000000..10349acbfd --- /dev/null +++ b/resources/themes/cura-light-colorblind/theme.json @@ -0,0 +1,29 @@ +{ + "metadata": { + "name": "Colorblind Assist Light", + "inherits": "cura-light" + }, + + "colors": { + + "x_axis": [200, 0, 0, 255], + "y_axis": [64, 64, 255, 255], + "model_default": [156, 201, 36, 255], + "model_overhang": [200, 0, 255, 255], + + "model_selection_outline": [12, 169, 227, 255], + + "xray": [26, 26, 62, 255], + "xray_error": [255, 0, 0, 255], + + "layerview_inset_0": [255, 64, 0, 255], + "layerview_inset_x": [0, 156, 128, 255], + "layerview_skin": [255, 255, 86, 255], + "layerview_support": [255, 255, 0, 255], + + "layerview_infill": [0, 255, 255, 255], + "layerview_support_infill": [0, 200, 200, 255], + + "layerview_move_retraction": [0, 100, 255, 255] + } +} diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg index 752a234877..bfda21cb24 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg index 728402c1b1..c50056fb22 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg index f6b880db25..bde776a567 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg index 539e5dbaca..82a5cb099b 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 7029d9d89b..9cf5e9dd76 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 70e0ed8a3f..7e70c98d17 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index ccb399e9ec..2fcbf16010 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.2.inst.cfg b/resources/variants/creality_base_0.2.inst.cfg new file mode 100644 index 0000000000..004cb95cd3 --- /dev/null +++ b/resources/variants/creality_base_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_base_0.3.inst.cfg b/resources/variants/creality_base_0.3.inst.cfg new file mode 100644 index 0000000000..7fc9fc9082 --- /dev/null +++ b/resources/variants/creality_base_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_base_0.4.inst.cfg b/resources/variants/creality_base_0.4.inst.cfg new file mode 100644 index 0000000000..37560b64cf --- /dev/null +++ b/resources/variants/creality_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_base_0.5.inst.cfg b/resources/variants/creality_base_0.5.inst.cfg new file mode 100644 index 0000000000..59ea6335c8 --- /dev/null +++ b/resources/variants/creality_base_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_base_0.6.inst.cfg b/resources/variants/creality_base_0.6.inst.cfg new file mode 100644 index 0000000000..5b6115a08e --- /dev/null +++ b/resources/variants/creality_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_base_0.8.inst.cfg b/resources/variants/creality_base_0.8.inst.cfg new file mode 100644 index 0000000000..37dddf4865 --- /dev/null +++ b/resources/variants/creality_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_base_1.0.inst.cfg b/resources/variants/creality_base_1.0.inst.cfg new file mode 100644 index 0000000000..284ca1b729 --- /dev/null +++ b/resources/variants/creality_base_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_base + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10_0.2.inst.cfg b/resources/variants/creality_cr10_0.2.inst.cfg new file mode 100644 index 0000000000..7370b87c53 --- /dev/null +++ b/resources/variants/creality_cr10_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10_0.3.inst.cfg b/resources/variants/creality_cr10_0.3.inst.cfg new file mode 100644 index 0000000000..19dcf0a144 --- /dev/null +++ b/resources/variants/creality_cr10_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10_0.4.inst.cfg b/resources/variants/creality_cr10_0.4.inst.cfg new file mode 100644 index 0000000000..01b8427464 --- /dev/null +++ b/resources/variants/creality_cr10_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10_0.5.inst.cfg b/resources/variants/creality_cr10_0.5.inst.cfg new file mode 100644 index 0000000000..879796b96a --- /dev/null +++ b/resources/variants/creality_cr10_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10_0.6.inst.cfg b/resources/variants/creality_cr10_0.6.inst.cfg new file mode 100644 index 0000000000..fa294fd501 --- /dev/null +++ b/resources/variants/creality_cr10_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10_0.8.inst.cfg b/resources/variants/creality_cr10_0.8.inst.cfg new file mode 100644 index 0000000000..5fe5e1a062 --- /dev/null +++ b/resources/variants/creality_cr10_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10_1.0.inst.cfg b/resources/variants/creality_cr10_1.0.inst.cfg new file mode 100644 index 0000000000..9cb78d057f --- /dev/null +++ b/resources/variants/creality_cr10_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10mini_0.2.inst.cfg b/resources/variants/creality_cr10mini_0.2.inst.cfg new file mode 100644 index 0000000000..0a3681a7bc --- /dev/null +++ b/resources/variants/creality_cr10mini_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10mini_0.3.inst.cfg b/resources/variants/creality_cr10mini_0.3.inst.cfg new file mode 100644 index 0000000000..6175b15f63 --- /dev/null +++ b/resources/variants/creality_cr10mini_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10mini_0.4.inst.cfg b/resources/variants/creality_cr10mini_0.4.inst.cfg new file mode 100644 index 0000000000..216458761a --- /dev/null +++ b/resources/variants/creality_cr10mini_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10mini_0.5.inst.cfg b/resources/variants/creality_cr10mini_0.5.inst.cfg new file mode 100644 index 0000000000..0459d56dd9 --- /dev/null +++ b/resources/variants/creality_cr10mini_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10mini_0.6.inst.cfg b/resources/variants/creality_cr10mini_0.6.inst.cfg new file mode 100644 index 0000000000..59610caaa9 --- /dev/null +++ b/resources/variants/creality_cr10mini_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10mini_0.8.inst.cfg b/resources/variants/creality_cr10mini_0.8.inst.cfg new file mode 100644 index 0000000000..d075f36947 --- /dev/null +++ b/resources/variants/creality_cr10mini_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10mini_1.0.inst.cfg b/resources/variants/creality_cr10mini_1.0.inst.cfg new file mode 100644 index 0000000000..a03b63c400 --- /dev/null +++ b/resources/variants/creality_cr10mini_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10mini + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10s4_0.2.inst.cfg b/resources/variants/creality_cr10s4_0.2.inst.cfg new file mode 100644 index 0000000000..b87abc3174 --- /dev/null +++ b/resources/variants/creality_cr10s4_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10s4_0.3.inst.cfg b/resources/variants/creality_cr10s4_0.3.inst.cfg new file mode 100644 index 0000000000..af7c52d188 --- /dev/null +++ b/resources/variants/creality_cr10s4_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10s4_0.4.inst.cfg b/resources/variants/creality_cr10s4_0.4.inst.cfg new file mode 100644 index 0000000000..8f31497fa4 --- /dev/null +++ b/resources/variants/creality_cr10s4_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10s4_0.5.inst.cfg b/resources/variants/creality_cr10s4_0.5.inst.cfg new file mode 100644 index 0000000000..7e2a44acf6 --- /dev/null +++ b/resources/variants/creality_cr10s4_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10s4_0.6.inst.cfg b/resources/variants/creality_cr10s4_0.6.inst.cfg new file mode 100644 index 0000000000..fd6de6f22c --- /dev/null +++ b/resources/variants/creality_cr10s4_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10s4_0.8.inst.cfg b/resources/variants/creality_cr10s4_0.8.inst.cfg new file mode 100644 index 0000000000..a0db55ea6d --- /dev/null +++ b/resources/variants/creality_cr10s4_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10s4_1.0.inst.cfg b/resources/variants/creality_cr10s4_1.0.inst.cfg new file mode 100644 index 0000000000..5dded00f79 --- /dev/null +++ b/resources/variants/creality_cr10s4_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10s4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10s5_0.2.inst.cfg b/resources/variants/creality_cr10s5_0.2.inst.cfg new file mode 100644 index 0000000000..a2fe050993 --- /dev/null +++ b/resources/variants/creality_cr10s5_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10s5_0.3.inst.cfg b/resources/variants/creality_cr10s5_0.3.inst.cfg new file mode 100644 index 0000000000..f4e2c282e7 --- /dev/null +++ b/resources/variants/creality_cr10s5_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10s5_0.4.inst.cfg b/resources/variants/creality_cr10s5_0.4.inst.cfg new file mode 100644 index 0000000000..5702aad829 --- /dev/null +++ b/resources/variants/creality_cr10s5_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10s5_0.5.inst.cfg b/resources/variants/creality_cr10s5_0.5.inst.cfg new file mode 100644 index 0000000000..cf7a0816be --- /dev/null +++ b/resources/variants/creality_cr10s5_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10s5_0.6.inst.cfg b/resources/variants/creality_cr10s5_0.6.inst.cfg new file mode 100644 index 0000000000..e30af712cd --- /dev/null +++ b/resources/variants/creality_cr10s5_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10s5_0.8.inst.cfg b/resources/variants/creality_cr10s5_0.8.inst.cfg new file mode 100644 index 0000000000..2a473e4e01 --- /dev/null +++ b/resources/variants/creality_cr10s5_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10s5_1.0.inst.cfg b/resources/variants/creality_cr10s5_1.0.inst.cfg new file mode 100644 index 0000000000..b3fab2d1c8 --- /dev/null +++ b/resources/variants/creality_cr10s5_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10s5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10s_0.2.inst.cfg b/resources/variants/creality_cr10s_0.2.inst.cfg new file mode 100644 index 0000000000..4990ad0f9c --- /dev/null +++ b/resources/variants/creality_cr10s_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10s_0.3.inst.cfg b/resources/variants/creality_cr10s_0.3.inst.cfg new file mode 100644 index 0000000000..bc3c2a0103 --- /dev/null +++ b/resources/variants/creality_cr10s_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10s_0.4.inst.cfg b/resources/variants/creality_cr10s_0.4.inst.cfg new file mode 100644 index 0000000000..e77e645d65 --- /dev/null +++ b/resources/variants/creality_cr10s_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10s_0.5.inst.cfg b/resources/variants/creality_cr10s_0.5.inst.cfg new file mode 100644 index 0000000000..14b2741598 --- /dev/null +++ b/resources/variants/creality_cr10s_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10s_0.6.inst.cfg b/resources/variants/creality_cr10s_0.6.inst.cfg new file mode 100644 index 0000000000..ac862aa537 --- /dev/null +++ b/resources/variants/creality_cr10s_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10s_0.8.inst.cfg b/resources/variants/creality_cr10s_0.8.inst.cfg new file mode 100644 index 0000000000..fceeee72af --- /dev/null +++ b/resources/variants/creality_cr10s_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10s_1.0.inst.cfg b/resources/variants/creality_cr10s_1.0.inst.cfg new file mode 100644 index 0000000000..d687825610 --- /dev/null +++ b/resources/variants/creality_cr10s_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10s + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr10spro_0.2.inst.cfg b/resources/variants/creality_cr10spro_0.2.inst.cfg new file mode 100644 index 0000000000..8b868d9bd3 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr10spro_0.3.inst.cfg b/resources/variants/creality_cr10spro_0.3.inst.cfg new file mode 100644 index 0000000000..8c59109a89 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr10spro_0.4.inst.cfg b/resources/variants/creality_cr10spro_0.4.inst.cfg new file mode 100644 index 0000000000..48b7ebcff5 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr10spro_0.5.inst.cfg b/resources/variants/creality_cr10spro_0.5.inst.cfg new file mode 100644 index 0000000000..40730dc887 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr10spro_0.6.inst.cfg b/resources/variants/creality_cr10spro_0.6.inst.cfg new file mode 100644 index 0000000000..d2d5718878 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr10spro_0.8.inst.cfg b/resources/variants/creality_cr10spro_0.8.inst.cfg new file mode 100644 index 0000000000..5547858975 --- /dev/null +++ b/resources/variants/creality_cr10spro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr10spro_1.0.inst.cfg b/resources/variants/creality_cr10spro_1.0.inst.cfg new file mode 100644 index 0000000000..24216c0623 --- /dev/null +++ b/resources/variants/creality_cr10spro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr10spro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr20_0.2.inst.cfg b/resources/variants/creality_cr20_0.2.inst.cfg new file mode 100644 index 0000000000..96d9ae77bd --- /dev/null +++ b/resources/variants/creality_cr20_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr20_0.3.inst.cfg b/resources/variants/creality_cr20_0.3.inst.cfg new file mode 100644 index 0000000000..e01be6ad6c --- /dev/null +++ b/resources/variants/creality_cr20_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr20_0.4.inst.cfg b/resources/variants/creality_cr20_0.4.inst.cfg new file mode 100644 index 0000000000..bddd6189c3 --- /dev/null +++ b/resources/variants/creality_cr20_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr20_0.5.inst.cfg b/resources/variants/creality_cr20_0.5.inst.cfg new file mode 100644 index 0000000000..134c910551 --- /dev/null +++ b/resources/variants/creality_cr20_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr20_0.6.inst.cfg b/resources/variants/creality_cr20_0.6.inst.cfg new file mode 100644 index 0000000000..ee941a58a1 --- /dev/null +++ b/resources/variants/creality_cr20_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr20_0.8.inst.cfg b/resources/variants/creality_cr20_0.8.inst.cfg new file mode 100644 index 0000000000..5cee2fe2f6 --- /dev/null +++ b/resources/variants/creality_cr20_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr20_1.0.inst.cfg b/resources/variants/creality_cr20_1.0.inst.cfg new file mode 100644 index 0000000000..e54a553b67 --- /dev/null +++ b/resources/variants/creality_cr20_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr20 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_cr20pro_0.2.inst.cfg b/resources/variants/creality_cr20pro_0.2.inst.cfg new file mode 100644 index 0000000000..90fd1f9b54 --- /dev/null +++ b/resources/variants/creality_cr20pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr20pro_0.3.inst.cfg b/resources/variants/creality_cr20pro_0.3.inst.cfg new file mode 100644 index 0000000000..384fb557ad --- /dev/null +++ b/resources/variants/creality_cr20pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr20pro_0.4.inst.cfg b/resources/variants/creality_cr20pro_0.4.inst.cfg new file mode 100644 index 0000000000..6d54a45c53 --- /dev/null +++ b/resources/variants/creality_cr20pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr20pro_0.5.inst.cfg b/resources/variants/creality_cr20pro_0.5.inst.cfg new file mode 100644 index 0000000000..042795a675 --- /dev/null +++ b/resources/variants/creality_cr20pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr20pro_0.6.inst.cfg b/resources/variants/creality_cr20pro_0.6.inst.cfg new file mode 100644 index 0000000000..a04b4180bf --- /dev/null +++ b/resources/variants/creality_cr20pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr20pro_0.8.inst.cfg b/resources/variants/creality_cr20pro_0.8.inst.cfg new file mode 100644 index 0000000000..fc6c24f9af --- /dev/null +++ b/resources/variants/creality_cr20pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr20pro_1.0.inst.cfg b/resources/variants/creality_cr20pro_1.0.inst.cfg new file mode 100644 index 0000000000..8a038ec80e --- /dev/null +++ b/resources/variants/creality_cr20pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr20pro + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_ender2_0.2.inst.cfg b/resources/variants/creality_ender2_0.2.inst.cfg new file mode 100644 index 0000000000..0170b6b05f --- /dev/null +++ b/resources/variants/creality_ender2_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender2_0.3.inst.cfg b/resources/variants/creality_ender2_0.3.inst.cfg new file mode 100644 index 0000000000..3a5c1429e8 --- /dev/null +++ b/resources/variants/creality_ender2_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender2_0.4.inst.cfg b/resources/variants/creality_ender2_0.4.inst.cfg new file mode 100644 index 0000000000..1d6b9d5574 --- /dev/null +++ b/resources/variants/creality_ender2_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender2_0.5.inst.cfg b/resources/variants/creality_ender2_0.5.inst.cfg new file mode 100644 index 0000000000..514f505cba --- /dev/null +++ b/resources/variants/creality_ender2_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender2_0.6.inst.cfg b/resources/variants/creality_ender2_0.6.inst.cfg new file mode 100644 index 0000000000..e59a2915a5 --- /dev/null +++ b/resources/variants/creality_ender2_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender2_0.8.inst.cfg b/resources/variants/creality_ender2_0.8.inst.cfg new file mode 100644 index 0000000000..9fa11776d9 --- /dev/null +++ b/resources/variants/creality_ender2_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender2_1.0.inst.cfg b/resources/variants/creality_ender2_1.0.inst.cfg new file mode 100644 index 0000000000..d4d369cbd3 --- /dev/null +++ b/resources/variants/creality_ender2_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender2 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_ender3_0.2.inst.cfg b/resources/variants/creality_ender3_0.2.inst.cfg new file mode 100644 index 0000000000..3edd719430 --- /dev/null +++ b/resources/variants/creality_ender3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender3_0.3.inst.cfg b/resources/variants/creality_ender3_0.3.inst.cfg new file mode 100644 index 0000000000..d6912da402 --- /dev/null +++ b/resources/variants/creality_ender3_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender3_0.4.inst.cfg b/resources/variants/creality_ender3_0.4.inst.cfg new file mode 100644 index 0000000000..5d203983a8 --- /dev/null +++ b/resources/variants/creality_ender3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender3_0.5.inst.cfg b/resources/variants/creality_ender3_0.5.inst.cfg new file mode 100644 index 0000000000..c662924f9f --- /dev/null +++ b/resources/variants/creality_ender3_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender3_0.6.inst.cfg b/resources/variants/creality_ender3_0.6.inst.cfg new file mode 100644 index 0000000000..d43d774a5e --- /dev/null +++ b/resources/variants/creality_ender3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender3_0.8.inst.cfg b/resources/variants/creality_ender3_0.8.inst.cfg new file mode 100644 index 0000000000..8880e0cd52 --- /dev/null +++ b/resources/variants/creality_ender3_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender3_1.0.inst.cfg b/resources/variants/creality_ender3_1.0.inst.cfg new file mode 100644 index 0000000000..8a623b6ccd --- /dev/null +++ b/resources/variants/creality_ender3_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender3 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_ender4_0.2.inst.cfg b/resources/variants/creality_ender4_0.2.inst.cfg new file mode 100644 index 0000000000..67ad758196 --- /dev/null +++ b/resources/variants/creality_ender4_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender4_0.3.inst.cfg b/resources/variants/creality_ender4_0.3.inst.cfg new file mode 100644 index 0000000000..a8052a2cfd --- /dev/null +++ b/resources/variants/creality_ender4_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender4_0.4.inst.cfg b/resources/variants/creality_ender4_0.4.inst.cfg new file mode 100644 index 0000000000..779ddab657 --- /dev/null +++ b/resources/variants/creality_ender4_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender4_0.5.inst.cfg b/resources/variants/creality_ender4_0.5.inst.cfg new file mode 100644 index 0000000000..9a24bd1971 --- /dev/null +++ b/resources/variants/creality_ender4_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender4_0.6.inst.cfg b/resources/variants/creality_ender4_0.6.inst.cfg new file mode 100644 index 0000000000..93ff84b362 --- /dev/null +++ b/resources/variants/creality_ender4_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender4_0.8.inst.cfg b/resources/variants/creality_ender4_0.8.inst.cfg new file mode 100644 index 0000000000..1a9218426b --- /dev/null +++ b/resources/variants/creality_ender4_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender4_1.0.inst.cfg b/resources/variants/creality_ender4_1.0.inst.cfg new file mode 100644 index 0000000000..a21a9c9c90 --- /dev/null +++ b/resources/variants/creality_ender4_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender4 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_ender5_0.2.inst.cfg b/resources/variants/creality_ender5_0.2.inst.cfg new file mode 100644 index 0000000000..da77f28389 --- /dev/null +++ b/resources/variants/creality_ender5_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender5_0.3.inst.cfg b/resources/variants/creality_ender5_0.3.inst.cfg new file mode 100644 index 0000000000..82672c5074 --- /dev/null +++ b/resources/variants/creality_ender5_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender5_0.4.inst.cfg b/resources/variants/creality_ender5_0.4.inst.cfg new file mode 100644 index 0000000000..4b5046eb15 --- /dev/null +++ b/resources/variants/creality_ender5_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender5_0.5.inst.cfg b/resources/variants/creality_ender5_0.5.inst.cfg new file mode 100644 index 0000000000..635bc95139 --- /dev/null +++ b/resources/variants/creality_ender5_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender5_0.6.inst.cfg b/resources/variants/creality_ender5_0.6.inst.cfg new file mode 100644 index 0000000000..601682ee2d --- /dev/null +++ b/resources/variants/creality_ender5_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender5_0.8.inst.cfg b/resources/variants/creality_ender5_0.8.inst.cfg new file mode 100644 index 0000000000..f9b684d87f --- /dev/null +++ b/resources/variants/creality_ender5_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender5_1.0.inst.cfg b/resources/variants/creality_ender5_1.0.inst.cfg new file mode 100644 index 0000000000..0da86b8aea --- /dev/null +++ b/resources/variants/creality_ender5_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender5 + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/deltacomb_025_e3d.inst.cfg b/resources/variants/deltacomb_025_e3d.inst.cfg index 31b8e8f102..54e21992db 100755 --- a/resources/variants/deltacomb_025_e3d.inst.cfg +++ b/resources/variants/deltacomb_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_040_e3d.inst.cfg b/resources/variants/deltacomb_040_e3d.inst.cfg index 6114ee3e08..ab6a6eeb3f 100755 --- a/resources/variants/deltacomb_040_e3d.inst.cfg +++ b/resources/variants/deltacomb_040_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb_080_e3d.inst.cfg b/resources/variants/deltacomb_080_e3d.inst.cfg index d4f0b1d208..367256cd5f 100755 --- a/resources/variants/deltacomb_080_e3d.inst.cfg +++ b/resources/variants/deltacomb_080_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb [metadata] author = Deltacomb 3D -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg index 7d362a3c5d..ca1a24cc79 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum_hyb35.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg index d8b0c362d9..fddbd77db8 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum_lite04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg index 4972ce4fe9..000ae9d463 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum_lite06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg index 7efc96b6cc..f1bb4b076f 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum_pro02.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg index c0cd6311c0..dca6a813a7 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum_pro04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg index 6f2586726a..dd642e7228 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum_pro06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg index b082083cc2..a1bda5a50b 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum_pro08.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/felixpro2_0.25.inst.cfg b/resources/variants/felixpro2_0.25.inst.cfg new file mode 100644 index 0000000000..9eb89502b6 --- /dev/null +++ b/resources/variants/felixpro2_0.25.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.25 mm +version = 4 +definition = felixpro2dual + +[metadata] +author = pnks +type = variant +setting_version = 9 +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 +layer_height_0 = 0.15 diff --git a/resources/variants/felixpro2_0.35.inst.cfg b/resources/variants/felixpro2_0.35.inst.cfg new file mode 100644 index 0000000000..a4d0848f63 --- /dev/null +++ b/resources/variants/felixpro2_0.35.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.35 mm +version = 4 +definition = felixpro2dual + +[metadata] +author = pnks +type = variant +setting_version = 9 +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.35 +layer_height_0 = 0.2 diff --git a/resources/variants/felixpro2_0.50.inst.cfg b/resources/variants/felixpro2_0.50.inst.cfg new file mode 100644 index 0000000000..2c7ff3bb6c --- /dev/null +++ b/resources/variants/felixpro2_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.50 mm +version = 4 +definition = felixpro2dual + +[metadata] +author = pnks +type = variant +setting_version = 9 +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/felixpro2_0.70.inst.cfg b/resources/variants/felixpro2_0.70.inst.cfg new file mode 100644 index 0000000000..b5de103f9d --- /dev/null +++ b/resources/variants/felixpro2_0.70.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.70 mm +version = 4 +definition = felixpro2dual + +[metadata] +author = pnks +type = variant +setting_version = 9 +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.70 +layer_height_0 = 0.4 diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felixtec4_0.25.inst.cfg index 576470db7d..f49119f0e6 100644 --- a/resources/variants/felixtec4_0.25.inst.cfg +++ b/resources/variants/felixtec4_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 8 +setting_version = 9 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felixtec4_0.35.inst.cfg index 80475d5686..f65128f518 100644 --- a/resources/variants/felixtec4_0.35.inst.cfg +++ b/resources/variants/felixtec4_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 8 +setting_version = 9 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felixtec4_0.50.inst.cfg index 39221e8755..e17abdc704 100644 --- a/resources/variants/felixtec4_0.50.inst.cfg +++ b/resources/variants/felixtec4_0.50.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 8 +setting_version = 9 [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felixtec4_0.70.inst.cfg index 0eea83d268..ecd61db3d1 100644 --- a/resources/variants/felixtec4_0.70.inst.cfg +++ b/resources/variants/felixtec4_0.70.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 8 +setting_version = 9 [values] machine_nozzle_size = 0.70 diff --git a/resources/variants/gmax15plus_025_e3d.inst.cfg b/resources/variants/gmax15plus_025_e3d.inst.cfg index ba391409f5..cdef6f5b53 100644 --- a/resources/variants/gmax15plus_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_04_e3d.inst.cfg b/resources/variants/gmax15plus_04_e3d.inst.cfg index 63772912ef..0b059c4789 100644 --- a/resources/variants/gmax15plus_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_e3d.inst.cfg b/resources/variants/gmax15plus_05_e3d.inst.cfg index 9bad89d815..311901cf67 100644 --- a/resources/variants/gmax15plus_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_jhead.inst.cfg b/resources/variants/gmax15plus_05_jhead.inst.cfg index dca8cadba7..c992bc1f4a 100644 --- a/resources/variants/gmax15plus_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_06_e3d.inst.cfg b/resources/variants/gmax15plus_06_e3d.inst.cfg index 9c3156e41b..10a2669565 100644 --- a/resources/variants/gmax15plus_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_08_e3d.inst.cfg b/resources/variants/gmax15plus_08_e3d.inst.cfg index 53f655c63b..0138e70b29 100644 --- a/resources/variants/gmax15plus_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_10_jhead.inst.cfg b/resources/variants/gmax15plus_10_jhead.inst.cfg index 6e315864b7..8ba03ec144 100644 --- a/resources/variants/gmax15plus_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_12_e3d.inst.cfg b/resources/variants/gmax15plus_12_e3d.inst.cfg index d582252270..bc178ec11d 100644 --- a/resources/variants/gmax15plus_12_e3d.inst.cfg +++ b/resources/variants/gmax15plus_12_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg index 9b94722797..322558033c 100644 --- a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg index 8efcfb5aa3..35cf37b345 100644 --- a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg index d002285bac..39a060108d 100644 --- a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg index 0a97761828..fdd41236ee 100644 --- a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg index 1cdb779a7e..8de26fb19e 100644 --- a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg index f895f5a99f..df315665dc 100644 --- a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg index 20798f4ede..bfd8c8cadf 100644 --- a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.25tpnozzle.inst.cfg b/resources/variants/hms434_0.25tpnozzle.inst.cfg index 0a64259a2c..d405652432 100644 --- a/resources/variants/hms434_0.25tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.25tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434_0.4tpnozzle.inst.cfg index ca57178750..3ec9bd00d1 100644 --- a/resources/variants/hms434_0.4tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.4tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.6tpnozzle.inst.cfg b/resources/variants/hms434_0.6tpnozzle.inst.cfg index 7b8bb1e3b3..48e0e1017c 100644 --- a/resources/variants/hms434_0.6tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.6tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434_0.8tpnozzle.inst.cfg index 66f4db23a4..d11eb0959a 100644 --- a/resources/variants/hms434_0.8tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.8tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_1.2tpnozzle.inst.cfg b/resources/variants/hms434_1.2tpnozzle.inst.cfg index 2f206687a5..0e0bca7bd5 100644 --- a/resources/variants/hms434_1.2tpnozzle.inst.cfg +++ b/resources/variants/hms434_1.2tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_1.5tpnozzle.inst.cfg b/resources/variants/hms434_1.5tpnozzle.inst.cfg index d46c864348..290a968cd4 100644 --- a/resources/variants/hms434_1.5tpnozzle.inst.cfg +++ b/resources/variants/hms434_1.5tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg index 5c8db9d6c2..3ab33b561e 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox [metadata] author = IMADE3D -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg similarity index 63% rename from resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg rename to resources/variants/imade3d_jellybox_2_0.4.inst.cfg index 4da62245d0..f9e09beabe 100644 --- a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg +++ b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg @@ -1,11 +1,11 @@ [general] -name = 0.4 mm 2-fans +name = 0.4 mm version = 4 -definition = imade3d_jellybox +definition = imade3d_jellybox_2 [metadata] author = IMADE3D -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d_a31_04.inst.cfg new file mode 100644 index 0000000000..7a6544200a --- /dev/null +++ b/resources/variants/nwa3d_a31_04.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = Standard 0.4mm +version = 4 +definition = nwa3d_a31 + +[metadata] +author = DragonJe +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d_a31_06.inst.cfg new file mode 100644 index 0000000000..afbece180a --- /dev/null +++ b/resources/variants/nwa3d_a31_06.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = Engineering 0.6mm +version = 4 +definition = nwa3d_a31 + +[metadata] +author = DragonJe +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg new file mode 100644 index 0000000000..ee249049d8 --- /dev/null +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = Standard 0.4 +version = 4 +definition = strateo3d + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = Standard 0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +layer_height = 0.2 +layer_height_0 = 0.3 +prime_tower_enable = True +retract_at_layer_change = False +support_angle = 60 +support_use_towers = True \ No newline at end of file diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg new file mode 100644 index 0000000000..5458f1f7cb --- /dev/null +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = Standard 0.6 +version = 4 +definition = strateo3d + +[metadata] +setting_version = 9 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = Standard 0.6 +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.5 +layer_height = 0.3 +layer_height_0 = 0.4 +prime_tower_enable = True +retract_at_layer_change = False +support_angle = 55 +support_use_towers = True \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index 761d28660f..5425f0a762 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index 4678d3b00e..f4cb256bb0 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index 564f957170..5b14aaa5dc 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index 10283a2e51..cffbffd9c9 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index e053ef671b..0726cf860a 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index 392c87fee1..240568ad9a 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index ab3e9cf9f8..3c6d63219c 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.2.inst.cfg b/resources/variants/tizyx_evy_0.2.inst.cfg index 6f06752f6f..b9ec0434b4 100644 --- a/resources/variants/tizyx_evy_0.2.inst.cfg +++ b/resources/variants/tizyx_evy_0.2.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.3.inst.cfg b/resources/variants/tizyx_evy_0.3.inst.cfg index 8d632043b1..9f84898897 100644 --- a/resources/variants/tizyx_evy_0.3.inst.cfg +++ b/resources/variants/tizyx_evy_0.3.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.4.inst.cfg b/resources/variants/tizyx_evy_0.4.inst.cfg index 1f006cf0c1..7499a20f27 100644 --- a/resources/variants/tizyx_evy_0.4.inst.cfg +++ b/resources/variants/tizyx_evy_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.5.inst.cfg b/resources/variants/tizyx_evy_0.5.inst.cfg index 76c839747d..095b67615d 100644 --- a/resources/variants/tizyx_evy_0.5.inst.cfg +++ b/resources/variants/tizyx_evy_0.5.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.6.inst.cfg b/resources/variants/tizyx_evy_0.6.inst.cfg index 7424f057fe..badb7a5089 100644 --- a/resources/variants/tizyx_evy_0.6.inst.cfg +++ b/resources/variants/tizyx_evy_0.6.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.8.inst.cfg b/resources/variants/tizyx_evy_0.8.inst.cfg index 89b4f5ef77..7ec7779605 100644 --- a/resources/variants/tizyx_evy_0.8.inst.cfg +++ b/resources/variants/tizyx_evy_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_1.0.inst.cfg b/resources/variants/tizyx_evy_1.0.inst.cfg index da452a7d97..f5e18bb63d 100644 --- a/resources/variants/tizyx_evy_1.0.inst.cfg +++ b/resources/variants/tizyx_evy_1.0.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_classic.inst.cfg b/resources/variants/tizyx_evy_dual_classic.inst.cfg index ddd01f6d7e..85ed07f803 100644 --- a/resources/variants/tizyx_evy_dual_classic.inst.cfg +++ b/resources/variants/tizyx_evy_dual_classic.inst.cfg @@ -5,9 +5,11 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg index 020eb0d5d3..58633891a9 100644 --- a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg +++ b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg @@ -5,9 +5,11 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 +switch_extruder_retraction_amount = 72 +switch_extruder_retraction_speeds = 70 \ No newline at end of file diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx_k25_0.2.inst.cfg index 07ccc70b8a..159423a0ad 100644 --- a/resources/variants/tizyx_k25_0.2.inst.cfg +++ b/resources/variants/tizyx_k25_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx_k25_0.3.inst.cfg index 8815c7b40a..8689aedd23 100644 --- a/resources/variants/tizyx_k25_0.3.inst.cfg +++ b/resources/variants/tizyx_k25_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx_k25_0.4.inst.cfg index b4df91b569..c923013ea6 100644 --- a/resources/variants/tizyx_k25_0.4.inst.cfg +++ b/resources/variants/tizyx_k25_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx_k25_0.5.inst.cfg index 57455e4fda..de563f5983 100644 --- a/resources/variants/tizyx_k25_0.5.inst.cfg +++ b/resources/variants/tizyx_k25_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx_k25_0.6.inst.cfg index 7dc71367d7..0f4dac9152 100644 --- a/resources/variants/tizyx_k25_0.6.inst.cfg +++ b/resources/variants/tizyx_k25_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx_k25_0.8.inst.cfg index 43fdc27ba9..64053da2b8 100644 --- a/resources/variants/tizyx_k25_0.8.inst.cfg +++ b/resources/variants/tizyx_k25_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx_k25_1.0.inst.cfg index af7ddd99da..6b32885c0c 100644 --- a/resources/variants/tizyx_k25_1.0.inst.cfg +++ b/resources/variants/tizyx_k25_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_0.25.inst.cfg index ad527eceed..a844b28ad7 100644 --- a/resources/variants/ultimaker2_0.25.inst.cfg +++ b/resources/variants/ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_0.4.inst.cfg index e9b3f6643b..4f66962a7c 100644 --- a/resources/variants/ultimaker2_0.4.inst.cfg +++ b/resources/variants/ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_0.6.inst.cfg index fabe536cac..2b73baf1ad 100644 --- a/resources/variants/ultimaker2_0.6.inst.cfg +++ b/resources/variants/ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_0.8.inst.cfg index f10be5266b..70bdc42b35 100644 --- a/resources/variants/ultimaker2_0.8.inst.cfg +++ b/resources/variants/ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.25.inst.cfg b/resources/variants/ultimaker2_extended_0.25.inst.cfg index 99d3c4f910..bbf48cd4a9 100644 --- a/resources/variants/ultimaker2_extended_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.4.inst.cfg b/resources/variants/ultimaker2_extended_0.4.inst.cfg index 2e4ff6ac5e..18a42a6348 100644 --- a/resources/variants/ultimaker2_extended_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.6.inst.cfg b/resources/variants/ultimaker2_extended_0.6.inst.cfg index add131aa15..25e5b07239 100644 --- a/resources/variants/ultimaker2_extended_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_0.8.inst.cfg b/resources/variants/ultimaker2_extended_0.8.inst.cfg index 86e86526aa..4cfae93064 100644 --- a/resources/variants/ultimaker2_extended_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index ad2f3a7687..6942ea9258 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index 9d9f628dd7..c7c2b8a0d7 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index f2af5986ff..ca167687a8 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index f53319ca8a..e398d30afb 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index fc858e7e6d..bbb9e2557c 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index ecaf481928..596954f9b2 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index c4e8c557ce..d930c1ccdb 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index b7cf6e7f26..e07db58e75 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index d113b3833c..61b0be3943 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 27cd958c85..2d1547bc43 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 3164e8e31f..68edd4dbe7 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index a150da6a54..7ad1cef66a 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index bff0f5097a..0e06101c2a 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 7e058f95a9..b85e4d6211 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 41201cf79c..9813695402 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index e08022ce61..22db68acba 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 65e0e32c7c..fd596bec60 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index e77eb63bbd..75d9655eb2 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 857e0e7cdf..6238c92b6c 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 30962de5aa..8fa9158310 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index a8d8e4b411..b9c4f32afb 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aluminum.inst.cfg b/resources/variants/ultimaker_s5_aluminum.inst.cfg index 0fcbb206ab..fd712935e7 100644 --- a/resources/variants/ultimaker_s5_aluminum.inst.cfg +++ b/resources/variants/ultimaker_s5_aluminum.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = buildplate diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 5f3eb6349f..e8bc4f1523 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index d99e2d2673..754b681138 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index 4bb99acdd6..b252f1e12f 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg index 9bcb2bedb4..7cf673cb57 100644 --- a/resources/variants/ultimaker_s5_glass.inst.cfg +++ b/resources/variants/ultimaker_s5_glass.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 8 +setting_version = 9 type = variant hardware_type = buildplate diff --git a/scripts/lionbridge_import.py b/scripts/lionbridge_import.py new file mode 100644 index 0000000000..0c2c132216 --- /dev/null +++ b/scripts/lionbridge_import.py @@ -0,0 +1,180 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import argparse #To get the source directory from command line arguments. +import io # To fix encoding issues in Windows +import os #To find files from the source. +import os.path #To find files from the source and the destination path. + +cura_files = {"cura", "fdmprinter.def.json", "fdmextruder.def.json"} +uranium_files = {"uranium"} + +## Imports translation files from Lionbridge. +# +# Lionbridge has a bit of a weird export feature. It exports it to the same +# file type as what we imported, so that's a .pot file. However this .pot file +# only contains the translations, so the header is completely empty. We need +# to merge those translations into our existing files so that the header is +# preserved. +def lionbridge_import(source: str) -> None: + print("Importing from:", source) + print("Importing to Cura:", destination_cura()) + print("Importing to Uranium:", destination_uranium()) + + for language in (directory for directory in os.listdir(source) if os.path.isdir(os.path.join(source, directory))): + print("================ Processing language:", language, "================") + directory = os.path.join(source, language) + for file_pot in (file for file in os.listdir(directory) if file.endswith(".pot")): + source_file = file_pot[:-4] #Strip extension. + if source_file in cura_files: + destination_file = os.path.join(destination_cura(), language.replace("-", "_"), source_file + ".po") + print("Merging", source_file, "(Cura) into", destination_file) + elif source_file in uranium_files: + destination_file = os.path.join(destination_uranium(), language.replace("-", "_"), source_file + ".po") + print("Merging", source_file, "(Uranium) into", destination_file) + else: + raise Exception("Unknown file: " + source_file + "... Is this Cura or Uranium?") + + with io.open(os.path.join(directory, file_pot), encoding = "utf8") as f: + source_str = f.read() + with io.open(destination_file, encoding = "utf8") as f: + destination_str = f.read() + result = merge(source_str, destination_str) + with io.open(destination_file, "w", encoding = "utf8") as f: + f.write(result) + +## Gets the destination path to copy the translations for Cura to. +# \return Destination path for Cura. +def destination_cura() -> str: + return os.path.abspath(os.path.join(__file__, "..", "..", "resources", "i18n")) + +## Gets the destination path to copy the translations for Uranium to. +# \return Destination path for Uranium. +def destination_uranium() -> str: + try: + import UM + except ImportError: + relative_path = os.path.join(__file__, "..", "..", "..", "Uranium", "resources", "i18n", "uranium.pot") + print(os.path.abspath(relative_path)) + if os.path.exists(relative_path): + return os.path.abspath(relative_path) + else: + raise Exception("Can't find Uranium. Please put UM on the PYTHONPATH or put the Uranium folder next to the Cura folder.") + return os.path.abspath(os.path.join(UM.__file__, "..", "..", "resources", "i18n")) + +## Merges translations from the source file into the destination file if they +# were missing in the destination file. +# \param source The contents of the source .po file. +# \param destination The contents of the destination .po file. +def merge(source: str, destination: str) -> str: + result_lines = [] + last_destination = { + "msgctxt": "\"\"\n", + "msgid": "\"\"\n", + "msgstr": "\"\"\n", + "msgid_plural": "\"\"\n" + } + + current_state = "none" + for line in destination.split("\n"): + if line.startswith("msgctxt \""): + current_state = "msgctxt" + line = line[8:] + last_destination[current_state] = "" + elif line.startswith("msgid \""): + current_state = "msgid" + line = line[6:] + last_destination[current_state] = "" + elif line.startswith("msgstr \""): + current_state = "msgstr" + line = line[7:] + last_destination[current_state] = "" + elif line.startswith("msgid_plural \""): + current_state = "msgid_plural" + line = line[13:] + last_destination[current_state] = "" + + if line.startswith("\"") and line.endswith("\""): + last_destination[current_state] += line + "\n" + else: #White lines or comment lines trigger us to search for the translation in the source file. + if last_destination["msgstr"] == "\"\"\n" and last_destination["msgid"] != "\"\"\n": #No translation for this yet! + last_destination["msgstr"] = find_translation(source, last_destination["msgctxt"], last_destination["msgid"]) #Actually place the translation in. + if last_destination["msgctxt"] != "\"\"\n" or last_destination["msgid"] != "\"\"\n" or last_destination["msgid_plural"] != "\"\"\n" or last_destination["msgstr"] != "\"\"\n": + if last_destination["msgctxt"] != "\"\"\n": + result_lines.append("msgctxt {msgctxt}".format(msgctxt = last_destination["msgctxt"][:-1])) #The [:-1] to strip the last newline. + result_lines.append("msgid {msgid}".format(msgid = last_destination["msgid"][:-1])) + if last_destination["msgid_plural"] != "\"\"\n": + result_lines.append("msgid_plural {msgid_plural}".format(msgid_plural = last_destination["msgid_plural"][:-1])) + else: + result_lines.append("msgstr {msgstr}".format(msgstr = last_destination["msgstr"][:-1])) + last_destination = { + "msgctxt": "\"\"\n", + "msgid": "\"\"\n", + "msgstr": "\"\"\n", + "msgid_plural": "\"\"\n" + } + + result_lines.append(line) #This line itself. + return "\n".join(result_lines) + +## Finds a translation in the source file. +# \param source The contents of the source .po file. +# \param msgctxt The ctxt of the translation to find. +# \param msgid The id of the translation to find. +def find_translation(source: str, msgctxt: str, msgid: str) -> str: + last_source = { + "msgctxt": "\"\"\n", + "msgid": "\"\"\n", + "msgstr": "\"\"\n", + "msgid_plural": "\"\"\n" + } + + current_state = "none" + for line in source.split("\n"): + if line.startswith("msgctxt \""): + current_state = "msgctxt" + line = line[8:] + last_source[current_state] = "" + elif line.startswith("msgid \""): + current_state = "msgid" + line = line[6:] + last_source[current_state] = "" + elif line.startswith("msgstr \""): + current_state = "msgstr" + line = line[7:] + last_source[current_state] = "" + elif line.startswith("msgid_plural \""): + current_state = "msgid_plural" + line = line[13:] + last_source[current_state] = "" + + if line.startswith("\"") and line.endswith("\""): + last_source[current_state] += line + "\n" + else: #White lines trigger us to process this translation. Is it the correct one? + #Process the source and destination keys for comparison independent of newline technique. + source_ctxt = "".join((line.strip()[1:-1] for line in last_source["msgctxt"].split("\n"))) + source_id = "".join((line.strip()[1:-1] for line in last_source["msgid"].split("\n"))) + dest_ctxt = "".join((line.strip()[1:-1] for line in msgctxt.split("\n"))) + dest_id = "".join((line.strip()[1:-1] for line in msgid.split("\n"))) + + if source_ctxt == dest_ctxt and source_id == dest_id: + if last_source["msgstr"] == "\"\"\n" and last_source["msgid_plural"] == "\"\"\n": + print("!!! Empty translation for {" + dest_ctxt + "}", dest_id, "!!!") + return last_source["msgstr"] + + last_source = { + "msgctxt": "\"\"\n", + "msgid": "\"\"\n", + "msgstr": "\"\"\n", + "msgid_plural": "\"\"\n" + } + + #Still here? Then the entire msgctxt+msgid combination was not found at all. + print("!!! Missing translation for {" + msgctxt.strip() + "}", msgid.strip(), "!!!") + return "\"\"\n" + +if __name__ == "__main__": + argparser = argparse.ArgumentParser(description = "Import translation files from Lionbridge.") + argparser.add_argument("source") + args = argparser.parse_args() + lionbridge_import(args.source) \ No newline at end of file diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py index 2bbc42e0a1..a0c183c329 100644 --- a/tests/Settings/TestCuraContainerRegistry.py +++ b/tests/Settings/TestCuraContainerRegistry.py @@ -12,7 +12,7 @@ from cura.Settings.GlobalStack import GlobalStack #Testing for returning the cor import UM.Settings.InstanceContainer #Creating instance containers to register. import UM.Settings.ContainerRegistry #Making empty container stacks. import UM.Settings.ContainerStack #Setting the container registry here properly. - +import cura.CuraApplication def teardown(): #If the temporary file for the legacy file rename test still exists, remove it. @@ -299,4 +299,20 @@ class TestImportProfile: with unittest.mock.patch.object(container_registry, "createUniqueName", return_value="derp"): with unittest.mock.patch.object(container_registry, "_configureProfile", return_value=None): result = container_registry.importProfile("test.zomg") - assert result["status"] == "ok" \ No newline at end of file + assert result["status"] == "ok" + + +@pytest.mark.parametrize("metadata,result", [(None, False), + ({}, False), + ({"setting_version": cura.CuraApplication.CuraApplication.SettingVersion}, True), + ({"setting_version": 0}, False)]) +def test_isMetaDataValid(container_registry, metadata, result): + assert container_registry._isMetadataValid(metadata) == result + + +def test_getIOPlugins(container_registry): + plugin_registry = unittest.mock.MagicMock() + plugin_registry.getActivePlugins = unittest.mock.MagicMock(return_value = ["lizard"]) + plugin_registry.getMetaData = unittest.mock.MagicMock(return_value = {"zomg": {"test": "test"}}) + with unittest.mock.patch("UM.PluginRegistry.PluginRegistry.getInstance", unittest.mock.MagicMock(return_value = plugin_registry)): + assert container_registry._getIOPlugins("zomg") == [("lizard", {"zomg": {"test": "test"}})] \ No newline at end of file diff --git a/tests/TestCuraSceneNode.py b/tests/TestCuraSceneNode.py new file mode 100644 index 0000000000..47a4dc3cb0 --- /dev/null +++ b/tests/TestCuraSceneNode.py @@ -0,0 +1,54 @@ +from UM.Math.Polygon import Polygon +from UM.Scene.SceneNodeDecorator import SceneNodeDecorator +from cura.Scene.CuraSceneNode import CuraSceneNode +import pytest + +from unittest.mock import patch + + +class MockedConvexHullDecorator(SceneNodeDecorator): + def __init__(self): + super().__init__() + + def getConvexHull(self): + return Polygon([[5, 5], [-5, 5], [-5, -5], [5, -5]]) + + +class InvalidConvexHullDecorator(SceneNodeDecorator): + def __init__(self): + super().__init__() + + def getConvexHull(self): + return Polygon() + + +@pytest.fixture() +def cura_scene_node(): + # Replace the SettingOverrideDecorator with an empty decorator + with patch("cura.Scene.CuraSceneNode.SettingOverrideDecorator", SceneNodeDecorator): + return CuraSceneNode() + + +class TestCollidesWithAreas: + def test_noConvexHull(self, cura_scene_node): + assert not cura_scene_node.collidesWithAreas([Polygon([[10, 10], [-10, 10], [-10, -10], [10, -10]])]) + + def test_convexHullIntersects(self, cura_scene_node): + cura_scene_node.addDecorator(MockedConvexHullDecorator()) + assert cura_scene_node.collidesWithAreas([Polygon([[10, 10], [-10, 10], [-10, -10], [10, -10]])]) + + def test_convexHullNoIntersection(self, cura_scene_node): + cura_scene_node.addDecorator(MockedConvexHullDecorator()) + + assert not cura_scene_node.collidesWithAreas([Polygon([[60, 60], [40, 60], [40, 40], [60, 40]])]) + + def test_invalidConvexHull(self, cura_scene_node): + cura_scene_node.addDecorator(InvalidConvexHullDecorator()) + assert not cura_scene_node.collidesWithAreas([Polygon([[10, 10], [-10, 10], [-10, -10], [10, -10]])]) + + +def test_outsideBuildArea(cura_scene_node): + cura_scene_node.setOutsideBuildArea(True) + assert cura_scene_node.isOutsideBuildArea + + diff --git a/tests/TestExtruderManager.py b/tests/TestExtruderManager.py new file mode 100644 index 0000000000..4ad75989de --- /dev/null +++ b/tests/TestExtruderManager.py @@ -0,0 +1,31 @@ + +from unittest.mock import MagicMock, patch + + +def createMockedExtruder(extruder_id): + extruder = MagicMock() + extruder.getId = MagicMock(return_value = extruder_id) + return extruder + + +def test_getAllExtruderSettings(extruder_manager): + extruder_1 = createMockedExtruder("extruder_1") + extruder_1.getProperty = MagicMock(return_value ="beep") + extruder_2 = createMockedExtruder("extruder_2") + extruder_2.getProperty = MagicMock(return_value="zomg") + extruder_manager.getActiveExtruderStacks = MagicMock(return_value = [extruder_1, extruder_2]) + assert extruder_manager.getAllExtruderSettings("whatever", "value") == ["beep", "zomg"] + + +def test_registerExtruder(extruder_manager): + extruder = createMockedExtruder("beep") + extruder.getMetaDataEntry = MagicMock(return_value = "0") # because the extruder position gets called + + extruder_manager.extrudersChanged = MagicMock() + extruder_manager.registerExtruder(extruder, "zomg") + + assert extruder_manager.extrudersChanged.emit.call_count == 1 + + # Doing it again should not trigger anything + extruder_manager.registerExtruder(extruder, "zomg") + assert extruder_manager.extrudersChanged.emit.call_count == 1 diff --git a/tests/TestLayer.py b/tests/TestLayer.py new file mode 100644 index 0000000000..f8183437d6 --- /dev/null +++ b/tests/TestLayer.py @@ -0,0 +1,39 @@ +from cura.Layer import Layer +from unittest.mock import MagicMock + + +def test_lineMeshVertexCount(): + layer = Layer(1) + layer_polygon = MagicMock() + layer_polygon.lineMeshVertexCount = MagicMock(return_value = 9001) + layer.polygons.append(layer_polygon) + assert layer.lineMeshVertexCount() == 9001 + + +def test_lineMeshElementCount(): + layer = Layer(1) + layer_polygon = MagicMock() + layer_polygon.lineMeshElementCount = MagicMock(return_value = 9001) + layer.polygons.append(layer_polygon) + assert layer.lineMeshElementCount() == 9001 + + +def test_getAndSet(): + layer = Layer(0) + + layer.setThickness(12) + assert layer.thickness == 12 + + layer.setHeight(0.1) + assert layer.height == 0.1 + + +def test_elementCount(): + layer = Layer(1) + layer_polygon = MagicMock() + layer_polygon.lineMeshElementCount = MagicMock(return_value=9002) + layer_polygon.lineMeshVertexCount = MagicMock(return_value=9001) + layer_polygon.elementCount = 12 + layer.polygons.append(layer_polygon) + assert layer.build(0, 0, [], [], [], [], [] ,[] , []) == (9001, 9002) + assert layer.elementCount == 12 \ No newline at end of file diff --git a/tests/TestMachineManager.py b/tests/TestMachineManager.py index 2b68b824da..65c581ac34 100644 --- a/tests/TestMachineManager.py +++ b/tests/TestMachineManager.py @@ -1,7 +1,23 @@ from unittest.mock import MagicMock, patch - import pytest +from cura.Settings.MachineManager import MachineManager + +@pytest.fixture() +def global_stack(): + stack = MagicMock(name = "Global Stack") + stack.getId = MagicMock(return_value = "GlobalStack") + return stack + +@pytest.fixture() +def machine_manager(application, extruder_manager, container_registry, global_stack) -> MachineManager: + application.getExtruderManager = MagicMock(return_value = extruder_manager) + application.getGlobalContainerStack = MagicMock(return_value = global_stack) + with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=container_registry)): + manager = MachineManager(application) + + return manager + @pytest.mark.skip(reason = "Outdated test") def test_setActiveMachine(machine_manager): registry = MagicMock() @@ -18,6 +34,29 @@ def test_setActiveMachine(machine_manager): machine_manager._application.setGlobalContainerStack.assert_called_with(mocked_global_stack) +def test_getMachine(): + registry = MagicMock() + mocked_global_stack = MagicMock() + mocked_global_stack.getId = MagicMock(return_value="test_machine") + mocked_global_stack.definition.getId = MagicMock(return_value = "test") + registry.findContainerStacks = MagicMock(return_value=[mocked_global_stack]) + with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=registry)): + assert MachineManager.getMachine("test") == mocked_global_stack + + +def test_addMachine(machine_manager): + registry = MagicMock() + + mocked_stack = MagicMock() + mocked_stack.getId = MagicMock(return_value="newlyCreatedStack") + mocked_create_machine = MagicMock(name="createMachine", return_value = mocked_stack) + machine_manager.setActiveMachine = MagicMock() + with patch("cura.Settings.CuraStackBuilder.CuraStackBuilder.createMachine", mocked_create_machine): + with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=registry)): + machine_manager.addMachine("derp") + machine_manager.setActiveMachine.assert_called_with("newlyCreatedStack") + + def test_hasUserSettings(machine_manager, application): mocked_stack = application.getGlobalContainerStack() @@ -36,3 +75,73 @@ def test_totalNumberOfSettings(machine_manager): registry.findDefinitionContainers = MagicMock(return_value = [mocked_definition]) with patch("cura.Settings.CuraContainerRegistry.CuraContainerRegistry.getInstance", MagicMock(return_value=registry)): assert machine_manager.totalNumberOfSettings == 3 + + +def createMockedExtruder(extruder_id): + extruder = MagicMock() + extruder.getId = MagicMock(return_value = extruder_id) + return extruder + + +def createMockedInstanceContainer(instance_id, name = ""): + instance = MagicMock() + instance.getName = MagicMock(return_value = name) + instance.getId = MagicMock(return_value=instance_id) + return instance + + +def test_allActiveMaterialIds(machine_manager, extruder_manager): + extruder_1 = createMockedExtruder("extruder_1") + extruder_2 = createMockedExtruder("extruder_2") + extruder_1.material = createMockedInstanceContainer("material_1") + extruder_2.material = createMockedInstanceContainer("material_2") + extruder_manager.getActiveExtruderStacks = MagicMock(return_value = [extruder_1, extruder_2]) + assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"} + + +def test_activeVariantNames(machine_manager, extruder_manager): + extruder_1 = createMockedExtruder("extruder_1") + extruder_2 = createMockedExtruder("extruder_2") + extruder_1.getMetaDataEntry = MagicMock(return_value = "0") + extruder_2.getMetaDataEntry = MagicMock(return_value= "2") + extruder_1.variant = createMockedInstanceContainer("variant_1", "variant_name_1") + extruder_2.variant = createMockedInstanceContainer("variant_2", "variant_name_2") + extruder_manager.getActiveExtruderStacks = MagicMock(return_value=[extruder_1, extruder_2]) + + assert machine_manager.activeVariantNames == {"0": "variant_name_1", "2": "variant_name_2"} + + +def test_globalVariantName(machine_manager, application): + global_stack = application.getGlobalContainerStack() + global_stack.variant = createMockedInstanceContainer("beep", "zomg") + assert machine_manager.globalVariantName == "zomg" + + +def test_activeMachineDefinitionName(machine_manager): + global_stack = machine_manager.activeMachine + global_stack.definition = createMockedInstanceContainer("beep", "zomg") + assert machine_manager.activeMachineDefinitionName == "zomg" + + +def test_activeMachineId(machine_manager): + assert machine_manager.activeMachineId == "GlobalStack" + + +def test_activeVariantBuildplateName(machine_manager): + global_stack = machine_manager.activeMachine + global_stack.variant = createMockedInstanceContainer("beep", "zomg") + assert machine_manager.activeVariantBuildplateName == "zomg" + + +def test_resetSettingForAllExtruders(machine_manager): + global_stack = machine_manager.activeMachine + extruder_1 = createMockedExtruder("extruder_1") + extruder_2 = createMockedExtruder("extruder_2") + extruder_1.userChanges = createMockedInstanceContainer("settings_1") + extruder_2.userChanges = createMockedInstanceContainer("settings_2") + global_stack.extruders = {"1": extruder_1, "2": extruder_2} + + machine_manager.resetSettingForAllExtruders("whatever") + + extruder_1.userChanges.removeInstance.assert_called_once_with("whatever") + extruder_2.userChanges.removeInstance.assert_called_once_with("whatever") \ No newline at end of file diff --git a/tests/TestMaterialManager.py b/tests/TestMaterialManager.py index e0569196f1..21ec44972c 100644 --- a/tests/TestMaterialManager.py +++ b/tests/TestMaterialManager.py @@ -4,8 +4,8 @@ from cura.Machines.MaterialManager import MaterialManager mocked_registry = MagicMock() -material_1 = {"id": "test", "GUID":"TEST!", "base_file": "base_material", "definition": "fdmmachine", "approximate_diameter": 3, "brand": "generic"} -material_2 = {"id": "base_material", "GUID": "TEST2!", "base_file": "test", "definition": "fdmmachine", "approximate_diameter": 3} +material_1 = {"id": "test", "GUID":"TEST!", "base_file": "base_material", "definition": "fdmmachine", "approximate_diameter": "3", "brand": "generic", "material": "pla"} +material_2 = {"id": "base_material", "GUID": "TEST2!", "base_file": "test", "definition": "fdmmachine", "approximate_diameter": "3", "material": "pla"} mocked_registry.findContainersMetadata = MagicMock(return_value = [material_1, material_2]) @@ -26,21 +26,116 @@ def test_initialize(application): assert manager.getMaterialGroup("test").name == "test" -def test_getAvailableMaterials(application): +def test_getMaterialGroupListByGUID(application): with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): manager = MaterialManager(mocked_registry) manager.initialize() - available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 3) + assert manager.getMaterialGroupListByGUID("TEST!")[0].name == "test" + assert manager.getMaterialGroupListByGUID("TEST2!")[0].name == "base_material" - assert "base_material" in available_materials - assert "test" in available_materials + +def test_getRootMaterialIDforDiameter(application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + assert manager.getRootMaterialIDForDiameter("base_material", "3") == "base_material" + + +def test_getMaterialNodeByTypeMachineHasNoMaterials(application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + mocked_stack = MagicMock() + assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "") is None + + +def test_getMaterialNodeByTypeMachineHasMaterialsButNoMaterialFound(application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + mocked_stack = MagicMock() + mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = True) # For the "has_materials" metadata + + assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "") is None + + +def test_getMaterialNodeByTypeMachineHasMaterialsAndMaterialExists(application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + mocked_result = MagicMock() + manager.getMaterialNode = MagicMock(return_value = mocked_result) + mocked_stack = MagicMock() + mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = True) # For the "has_materials" metadata + + assert manager.getMaterialNodeByType(mocked_stack, "0", "nozzle", "", "TEST!") is mocked_result + + +def test_getAllMaterialGroups(application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + material_groups = manager.getAllMaterialGroups() + + assert "base_material" in material_groups + assert "test" in material_groups + assert material_groups["base_material"].name == "base_material" + assert material_groups["test"].name == "test" + + +class TestAvailableMaterials: + def test_happy(self, application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 3) + + assert "base_material" in available_materials + assert "test" in available_materials + + def test_wrongDiameter(self, application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 200) + assert available_materials == {} # Nothing found. + + def test_excludedMaterials(self, application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + with patch.object(mocked_definition, "getMetaDataEntry", MagicMock(return_value = ["test"])): + available_materials = manager.getAvailableMaterials(mocked_definition, None, None, 3) + assert "base_material" in available_materials + assert "test" not in available_materials + + +class Test_getFallbackMaterialIdByMaterialType: + def test_happyFlow(self, application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + + assert manager.getFallbackMaterialIdByMaterialType("pla") == "test" + + def test_unknownMaterial(self, application): + with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): + manager = MaterialManager(mocked_registry) + manager.initialize() + assert manager.getFallbackMaterialIdByMaterialType("OMGZOMG") is None def test_getMaterialNode(application): with patch("UM.Application.Application.getInstance", MagicMock(return_value=application)): manager = MaterialManager(mocked_registry) - manager.initialize() + manager._updateMaps() assert manager.getMaterialNode("fdmmachine", None, None, 3, "base_material").getMetaDataEntry("id") == "test" diff --git a/tests/TestQualityManager.py b/tests/TestQualityManager.py index f7c54202e0..ef3e9fa6bc 100644 --- a/tests/TestQualityManager.py +++ b/tests/TestQualityManager.py @@ -1,11 +1,10 @@ -from unittest.mock import MagicMock +from unittest.mock import MagicMock, patch import pytest +from cura.Machines.QualityChangesGroup import QualityChangesGroup from cura.Machines.QualityManager import QualityManager - - mocked_stack = MagicMock() mocked_extruder = MagicMock() @@ -31,6 +30,8 @@ def container_registry(): {"id": "test_material", "definition": "fdmprinter", "quality_type": "normal", "name": "test_name_material", "material": "base_material", "type": "quality"}, {"id": "quality_changes_id", "definition": "fdmprinter", "type": "quality_changes", "quality_type": "amazing!", "name": "herp"}] result.findContainersMetadata = MagicMock(return_value = mocked_metadata) + + result.uniqueName = MagicMock(return_value = "uniqueName") return result @@ -61,3 +62,73 @@ def test_getQualityChangesGroup(quality_mocked_application): manager.initialize() assert "herp" in manager.getQualityChangesGroups(mocked_stack) + + +@pytest.mark.skip("Doesn't work on remote") +def test_getDefaultQualityType(quality_mocked_application): + manager = QualityManager(quality_mocked_application) + manager.initialize() + mocked_stack = MagicMock() + mocked_stack.definition.getMetaDataEntry = MagicMock(return_value = "normal") + assert manager.getDefaultQualityType(mocked_stack).quality_type == "normal" + + +def test_createQualityChanges(quality_mocked_application): + manager = QualityManager(quality_mocked_application) + mocked_quality_changes = MagicMock() + manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes) + manager.initialize() + container_manager = MagicMock() + + manager._container_registry.addContainer = MagicMock() # Side effect we want to check. + with patch("cura.Settings.ContainerManager.ContainerManager.getInstance", container_manager): + manager.createQualityChanges("derp") + assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) + + +def test_renameQualityChangesGroup(quality_mocked_application): + manager = QualityManager(quality_mocked_application) + manager.initialize() + + mocked_container = MagicMock() + + quality_changes_group = QualityChangesGroup("zomg", "beep") + quality_changes_group.getAllNodes = MagicMock(return_value = [mocked_container]) + + # We need to check for "uniqueName" instead of "NEWRANDOMNAMEYAY" because the mocked registry always returns + # "uniqueName" when attempting to generate an unique name. + assert manager.renameQualityChangesGroup(quality_changes_group, "NEWRANDOMNAMEYAY") == "uniqueName" + assert mocked_container.setName.called_once_with("uniqueName") + + +def test_duplicateQualityChangesQualityOnly(quality_mocked_application): + manager = QualityManager(quality_mocked_application) + manager.initialize() + mocked_quality = MagicMock() + quality_group = MagicMock() + quality_group.getAllNodes = MagicMock(return_value = mocked_quality) + mocked_quality_changes = MagicMock() + + # Isolate what we want to test (in this case, we're not interested if createQualityChanges does it's job!) + manager._createQualityChanges = MagicMock(return_value = mocked_quality_changes) + manager._container_registry.addContainer = MagicMock() # Side effect we want to check. + + manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": None}) + assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) + + +def test_duplicateQualityChanges(quality_mocked_application): + manager = QualityManager(quality_mocked_application) + manager.initialize() + mocked_quality = MagicMock() + quality_group = MagicMock() + quality_group.getAllNodes = MagicMock(return_value = mocked_quality) + quality_changes_group = MagicMock() + mocked_quality_changes = MagicMock() + quality_changes_group.getAllNodes = MagicMock(return_value=[mocked_quality_changes]) + mocked_quality_changes.duplicate = MagicMock(return_value = mocked_quality_changes) + + manager._container_registry.addContainer = MagicMock() # Side effect we want to check. + + manager.duplicateQualityChanges("zomg", {"quality_group": quality_group, "quality_changes_group": quality_changes_group}) + assert manager._container_registry.addContainer.called_once_with(mocked_quality_changes) \ No newline at end of file