diff --git a/Jenkinsfile b/Jenkinsfile index 8837fdf487..f9a3a9864a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,11 @@ -parallel_nodes(['linux && cura', 'windows && cura']) { - timeout(time: 2, unit: "HOURS") { +parallel_nodes(['linux && cura', 'windows && cura']) +{ + timeout(time: 2, unit: "HOURS") + { // Prepare building - stage('Prepare') { + stage('Prepare') + { // Ensure we start with a clean build directory. step([$class: 'WsCleanup']) @@ -11,26 +14,17 @@ parallel_nodes(['linux && cura', 'windows && cura']) { } // If any error occurs during building, we want to catch it and continue with the "finale" stage. - catchError { - stage('Pre Checks') { - if (isUnix()) { - try { - sh """ - echo 'Check for duplicate shortcut keys in all translation files.' - ${env.CURA_ENVIRONMENT_PATH}/master/bin/python3 scripts/check_shortcut_keys.py - """ - } catch(e) { - currentBuild.result = "UNSTABLE" - } - } - } - + catchError + { // Building and testing should happen in a subdirectory. - dir('build') { + dir('build') + { // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup. - stage('Build') { + stage('Build') + { def branch = env.BRANCH_NAME - if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) { + if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) + { branch = "master" } @@ -40,18 +34,76 @@ parallel_nodes(['linux && cura', 'windows && cura']) { } // Try and run the unit tests. If this stage fails, we consider the build to be "unstable". - stage('Unit Test') { - try { - make('test') - } catch(e) { - currentBuild.result = "UNSTABLE" + stage('Unit Test') + { + if (isUnix()) + { + // For Linux to show everything + def branch = env.BRANCH_NAME + if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) + { + branch = "master" + } + def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") + + try { + sh """ + cd .. + export PYTHONPATH=.:"${uranium_dir}" + ${env.CURA_ENVIRONMENT_PATH}/${branch}/bin/pytest -x --verbose --full-trace --capture=no ./tests + """ + } catch(e) + { + currentBuild.result = "UNSTABLE" + } + } + else + { + // For Windows + try + { + // This also does code style checks. + bat 'ctest -V' + } catch(e) + { + currentBuild.result = "UNSTABLE" + } + } + } + + stage('Code Style') + { + if (isUnix()) + { + // For Linux to show everything. + // CMake also runs this test, but if it fails then the test just shows "failed" without details of what exactly failed. + def branch = env.BRANCH_NAME + if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) + { + branch = "master" + } + def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") + + try + { + sh """ + cd .. + export PYTHONPATH=.:"${uranium_dir}" + ${env.CURA_ENVIRONMENT_PATH}/${branch}/bin/python3 run_mypy.py + """ + } + catch(e) + { + currentBuild.result = "UNSTABLE" + } } } } } // Perform any post-build actions like notification and publishing of unit tests. - stage('Finalize') { + stage('Finalize') + { // Publish the test results to Jenkins. junit allowEmptyResults: true, testResults: 'build/junit*.xml' diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 801f054bc3..f2ee92d65b 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -34,7 +34,7 @@ function(cura_add_test) if (NOT ${test_exists}) add_test( NAME ${_NAME} - COMMAND ${PYTHON_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} + COMMAND ${PYTHON_EXECUTABLE} -m pytest --verbose --full-trace --capture=no --no-print-log --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} ) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C) set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}") @@ -57,5 +57,13 @@ endforeach() #Add code style test. add_test( NAME "code-style" - COMMAND ${PYTHON_EXECUTABLE} run_mypy.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${PYTHON_EXECUTABLE} run_mypy.py + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) + +#Add test for whether the shortcut alt-keys are unique in every translation. +add_test( + NAME "shortcut-keys" + COMMAND ${PYTHON_EXECUTABLE} scripts/check_shortcut_keys.py + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) \ No newline at end of file diff --git a/cura.desktop.in b/cura.desktop.in index fe61b47217..fbe8b30fed 100644 --- a/cura.desktop.in +++ b/cura.desktop.in @@ -13,6 +13,6 @@ TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura Icon=cura-icon Terminal=false Type=Application -MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;model/x3d+xml; +MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;model/x3d+xml; Categories=Graphics; Keywords=3D;Printing;Slicer; diff --git a/cura.sharedmimeinfo b/cura.sharedmimeinfo index 9629aef5df..23d38795eb 100644 --- a/cura.sharedmimeinfo +++ b/cura.sharedmimeinfo @@ -6,7 +6,7 @@ - + Computer-aided design and manufacturing format diff --git a/cura/API/Account.py b/cura/API/Account.py new file mode 100644 index 0000000000..397e220478 --- /dev/null +++ b/cura/API/Account.py @@ -0,0 +1,117 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, Dict, TYPE_CHECKING + +from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty + +from UM.i18n import i18nCatalog +from UM.Message import Message + +from cura.OAuth2.AuthorizationService import AuthorizationService +from cura.OAuth2.Models import OAuth2Settings + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + +i18n_catalog = i18nCatalog("cura") + + +## The account API provides a version-proof bridge to use Ultimaker Accounts +# +# Usage: +# ``from cura.API import CuraAPI +# api = CuraAPI() +# api.account.login() +# api.account.logout() +# api.account.userProfile # Who is logged in`` +# +class Account(QObject): + # Signal emitted when user logged in or out. + loginStateChanged = pyqtSignal(bool) + + def __init__(self, application: "CuraApplication", parent = None) -> None: + super().__init__(parent) + self._application = application + + self._error_message = None # type: Optional[Message] + self._logged_in = False + + self._callback_port = 32118 + self._oauth_root = "https://account.ultimaker.com" + self._cloud_api_root = "https://api.ultimaker.com" + + self._oauth_settings = OAuth2Settings( + OAUTH_SERVER_URL= self._oauth_root, + CALLBACK_PORT=self._callback_port, + CALLBACK_URL="http://localhost:{}/callback".format(self._callback_port), + CLIENT_ID="um---------------ultimaker_cura_drive_plugin", + CLIENT_SCOPES="account.user.read drive.backup.read drive.backup.write packages.download packages.rating.read packages.rating.write", + AUTH_DATA_PREFERENCE_KEY="general/ultimaker_auth_data", + AUTH_SUCCESS_REDIRECT="{}/app/auth-success".format(self._oauth_root), + AUTH_FAILED_REDIRECT="{}/app/auth-error".format(self._oauth_root) + ) + + self._authorization_service = AuthorizationService(self._oauth_settings) + + def initialize(self) -> None: + self._authorization_service.initialize(self._application.getPreferences()) + + self._authorization_service.onAuthStateChanged.connect(self._onLoginStateChanged) + self._authorization_service.onAuthenticationError.connect(self._onLoginStateChanged) + self._authorization_service.loadAuthDataFromPreferences() + + @pyqtProperty(bool, notify=loginStateChanged) + def isLoggedIn(self) -> bool: + return self._logged_in + + def _onLoginStateChanged(self, logged_in: bool = False, error_message: Optional[str] = None) -> None: + if error_message: + if self._error_message: + self._error_message.hide() + self._error_message = Message(error_message, title = i18n_catalog.i18nc("@info:title", "Login failed")) + self._error_message.show() + + if self._logged_in != logged_in: + self._logged_in = logged_in + self.loginStateChanged.emit(logged_in) + + @pyqtSlot() + def login(self) -> None: + if self._logged_in: + # Nothing to do, user already logged in. + return + self._authorization_service.startAuthorizationFlow() + + @pyqtProperty(str, notify=loginStateChanged) + def userName(self): + user_profile = self._authorization_service.getUserProfile() + if not user_profile: + return None + return user_profile.username + + @pyqtProperty(str, notify = loginStateChanged) + def profileImageUrl(self): + user_profile = self._authorization_service.getUserProfile() + if not user_profile: + return None + return user_profile.profile_image_url + + @pyqtProperty(str, notify=loginStateChanged) + def accessToken(self) -> Optional[str]: + return self._authorization_service.getAccessToken() + + # Get the profile of the logged in user + # @returns None if no user is logged in, a dict containing user_id, username and profile_image_url + @pyqtProperty("QVariantMap", notify = loginStateChanged) + def userProfile(self) -> Optional[Dict[str, Optional[str]]]: + user_profile = self._authorization_service.getUserProfile() + if not user_profile: + return None + return user_profile.__dict__ + + @pyqtSlot() + def logout(self) -> None: + if not self._logged_in: + return # Nothing to do, user isn't logged in. + + self._authorization_service.deleteAuthData() diff --git a/cura/API/Backups.py b/cura/API/Backups.py index f31933c844..8e5cd7b83a 100644 --- a/cura/API/Backups.py +++ b/cura/API/Backups.py @@ -1,9 +1,12 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Tuple, Optional +from typing import Tuple, Optional, TYPE_CHECKING from cura.Backups.BackupsManager import BackupsManager +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + ## The back-ups API provides a version-proof bridge between Cura's # BackupManager and plug-ins that hook into it. @@ -13,9 +16,10 @@ from cura.Backups.BackupsManager import BackupsManager # api = CuraAPI() # api.backups.createBackup() # api.backups.restoreBackup(my_zip_file, {"cura_release": "3.1"})`` - class Backups: - manager = BackupsManager() # Re-used instance of the backups manager. + + def __init__(self, application: "CuraApplication") -> None: + self.manager = BackupsManager(application) ## Create a new back-up using the BackupsManager. # \return Tuple containing a ZIP file with the back-up data and a dict diff --git a/cura/API/Interface/Settings.py b/cura/API/Interface/Settings.py index 2889db7022..371c40c14c 100644 --- a/cura/API/Interface/Settings.py +++ b/cura/API/Interface/Settings.py @@ -1,7 +1,11 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from cura.CuraApplication import CuraApplication +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + ## The Interface.Settings API provides a version-proof bridge between Cura's # (currently) sidebar UI and plug-ins that hook into it. @@ -19,8 +23,9 @@ from cura.CuraApplication import CuraApplication # api.interface.settings.addContextMenuItem(data)`` class Settings: - # Re-used instance of Cura: - application = CuraApplication.getInstance() # type: CuraApplication + + def __init__(self, application: "CuraApplication") -> None: + self.application = application ## Add items to the sidebar context menu. # \param menu_item dict containing the menu item to add. @@ -30,4 +35,4 @@ class Settings: ## Get all custom items currently added to the sidebar context menu. # \return List containing all custom context menu items. def getContextMenuItems(self) -> list: - return self.application.getSidebarCustomMenuItems() \ No newline at end of file + return self.application.getSidebarCustomMenuItems() diff --git a/cura/API/Interface/__init__.py b/cura/API/Interface/__init__.py index b38118949b..742254a1a4 100644 --- a/cura/API/Interface/__init__.py +++ b/cura/API/Interface/__init__.py @@ -1,9 +1,15 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import TYPE_CHECKING + from UM.PluginRegistry import PluginRegistry from cura.API.Interface.Settings import Settings +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + + ## The Interface class serves as a common root for the specific API # methods for each interface element. # @@ -20,5 +26,6 @@ class Interface: # For now we use the same API version to be consistent. VERSION = PluginRegistry.APIVersion - # API methods specific to the settings portion of the UI - settings = Settings() + def __init__(self, application: "CuraApplication") -> None: + # API methods specific to the settings portion of the UI + self.settings = Settings(application) diff --git a/cura/API/__init__.py b/cura/API/__init__.py index 64d636903d..ad07452c1a 100644 --- a/cura/API/__init__.py +++ b/cura/API/__init__.py @@ -1,8 +1,17 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, TYPE_CHECKING + +from PyQt5.QtCore import QObject, pyqtProperty + from UM.PluginRegistry import PluginRegistry from cura.API.Backups import Backups from cura.API.Interface import Interface +from cura.API.Account import Account + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + ## The official Cura API that plug-ins can use to interact with Cura. # @@ -10,14 +19,47 @@ from cura.API.Interface import Interface # this API provides a version-safe interface with proper deprecation warnings # etc. Usage of any other methods than the ones provided in this API can cause # plug-ins to be unstable. - -class CuraAPI: +class CuraAPI(QObject): # For now we use the same API version to be consistent. VERSION = PluginRegistry.APIVersion + __instance = None # type: "CuraAPI" + _application = None # type: CuraApplication - # Backups API - backups = Backups() + # This is done to ensure that the first time an instance is created, it's forced that the application is set. + # The main reason for this is that we want to prevent consumers of API to have a dependency on CuraApplication. + # Since the API is intended to be used by plugins, the cura application should have already created this. + def __new__(cls, application: Optional["CuraApplication"] = None): + if cls.__instance is None: + if application is None: + raise Exception("Upon first time creation, the application must be set.") + cls.__instance = super(CuraAPI, cls).__new__(cls) + cls._application = application + return cls.__instance - # Interface API - interface = Interface() + def __init__(self, application: Optional["CuraApplication"] = None) -> None: + super().__init__(parent = CuraAPI._application) + + # Accounts API + self._account = Account(self._application) + + # Backups API + self._backups = Backups(self._application) + + # Interface API + self._interface = Interface(self._application) + + def initialize(self) -> None: + self._account.initialize() + + @pyqtProperty(QObject, constant = True) + def account(self) -> "Account": + return self._account + + @property + def backups(self) -> "Backups": + return self._backups + + @property + def interface(self) -> "Interface": + return self._interface \ No newline at end of file diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index cc47df770e..897d5fa979 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -4,18 +4,18 @@ import io import os import re - import shutil - -from typing import Dict, Optional from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile +from typing import Dict, Optional, TYPE_CHECKING from UM import i18nCatalog from UM.Logger import Logger from UM.Message import Message from UM.Platform import Platform from UM.Resources import Resources -from cura.CuraApplication import CuraApplication + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication ## The back-up class holds all data about a back-up. @@ -29,24 +29,25 @@ class Backup: # Re-use translation catalog. catalog = i18nCatalog("cura") - def __init__(self, zip_file: bytes = None, meta_data: Dict[str, str] = None) -> None: + def __init__(self, application: "CuraApplication", zip_file: bytes = None, meta_data: Dict[str, str] = None) -> None: + self._application = application self.zip_file = zip_file # type: Optional[bytes] self.meta_data = meta_data # type: Optional[Dict[str, str]] ## Create a back-up from the current user config folder. def makeFromCurrent(self) -> None: - cura_release = CuraApplication.getInstance().getVersion() + cura_release = self._application.getVersion() version_data_dir = Resources.getDataStoragePath() Logger.log("d", "Creating backup for Cura %s, using folder %s", cura_release, version_data_dir) # Ensure all current settings are saved. - CuraApplication.getInstance().saveSettings() + self._application.saveSettings() # We copy the preferences file to the user data directory in Linux as it's in a different location there. # When restoring a backup on Linux, we move it back. if Platform.isLinux(): - preferences_file_name = CuraApplication.getInstance().getApplicationName() + preferences_file_name = self._application.getApplicationName() preferences_file = Resources.getPath(Resources.Preferences, "{}.cfg".format(preferences_file_name)) backup_preferences_file = os.path.join(version_data_dir, "{}.cfg".format(preferences_file_name)) Logger.log("d", "Copying preferences file from %s to %s", preferences_file, backup_preferences_file) @@ -58,7 +59,7 @@ class Backup: if archive is None: return files = archive.namelist() - + # Count the metadata items. We do this in a rather naive way at the moment. machine_count = len([s for s in files if "machine_instances/" in s]) - 1 material_count = len([s for s in files if "materials/" in s]) - 1 @@ -112,7 +113,7 @@ class Backup: "Tried to restore a Cura backup without having proper data or meta data.")) return False - current_version = CuraApplication.getInstance().getVersion() + current_version = self._application.getVersion() version_to_restore = self.meta_data.get("cura_release", "master") if current_version != version_to_restore: # Cannot restore version older or newer than current because settings might have changed. @@ -128,7 +129,7 @@ class Backup: # Under Linux, preferences are stored elsewhere, so we copy the file to there. if Platform.isLinux(): - preferences_file_name = CuraApplication.getInstance().getApplicationName() + preferences_file_name = self._application.getApplicationName() preferences_file = Resources.getPath(Resources.Preferences, "{}.cfg".format(preferences_file_name)) backup_preferences_file = os.path.join(version_data_dir, "{}.cfg".format(preferences_file_name)) Logger.log("d", "Moving preferences file from %s to %s", backup_preferences_file, preferences_file) diff --git a/cura/Backups/BackupsManager.py b/cura/Backups/BackupsManager.py index 67e2a222f1..a0d3881209 100644 --- a/cura/Backups/BackupsManager.py +++ b/cura/Backups/BackupsManager.py @@ -1,11 +1,13 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Dict, Optional, Tuple +from typing import Dict, Optional, Tuple, TYPE_CHECKING from UM.Logger import Logger from cura.Backups.Backup import Backup -from cura.CuraApplication import CuraApplication + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication ## The BackupsManager is responsible for managing the creating and restoring of @@ -13,15 +15,15 @@ from cura.CuraApplication import CuraApplication # # Back-ups themselves are represented in a different class. class BackupsManager: - def __init__(self): - self._application = CuraApplication.getInstance() + def __init__(self, application: "CuraApplication") -> None: + self._application = application ## Get a back-up of the current configuration. # \return A tuple containing a ZipFile (the actual back-up) and a dict # containing some metadata (like version). def createBackup(self) -> Tuple[Optional[bytes], Optional[Dict[str, str]]]: self._disableAutoSave() - backup = Backup() + backup = Backup(self._application) backup.makeFromCurrent() self._enableAutoSave() # We don't return a Backup here because we want plugins only to interact with our API and not full objects. @@ -39,7 +41,7 @@ class BackupsManager: self._disableAutoSave() - backup = Backup(zip_file = zip_file, meta_data = meta_data) + backup = Backup(self._application, zip_file = zip_file, meta_data = meta_data) restored = backup.restore() if restored: # At this point, Cura will need to restart for the changes to take effect. diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 10ae8bb87a..547c3dae71 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -28,7 +28,7 @@ import copy from typing import List, Optional -# Setting for clearance around the prime +# Radius of disallowed area in mm around prime. I.e. how much distance to keep from prime position. PRIME_CLEARANCE = 6.5 @@ -479,8 +479,6 @@ class BuildVolume(SceneNode): maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - disallowed_area_size + bed_adhesion_size - 1) ) - self._application.getController().getScene()._maximum_bounds = scale_to_max_bounds - self.updateNodeBoundaryCheck() def getBoundingBox(self) -> AxisAlignedBox: @@ -720,21 +718,23 @@ class BuildVolume(SceneNode): # Add prime tower location as disallowed area. if len(used_extruders) > 1: #No prime tower in single-extrusion. - prime_tower_collision = False - prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders) - for extruder_id in prime_tower_areas: - for prime_tower_area in prime_tower_areas[extruder_id]: - for area in result_areas[extruder_id]: - if prime_tower_area.intersectsPolygon(area) is not None: - prime_tower_collision = True + + if len([x for x in used_extruders if x.isEnabled == True]) > 1: #No prime tower if only one extruder is enabled + prime_tower_collision = False + prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders) + for extruder_id in prime_tower_areas: + for prime_tower_area in prime_tower_areas[extruder_id]: + for area in result_areas[extruder_id]: + if prime_tower_area.intersectsPolygon(area) is not None: + prime_tower_collision = True + break + if prime_tower_collision: #Already found a collision. break - if prime_tower_collision: #Already found a collision. - break - if not prime_tower_collision: - result_areas[extruder_id].extend(prime_tower_areas[extruder_id]) - result_areas_no_brim[extruder_id].extend(prime_tower_areas[extruder_id]) - else: - self._error_areas.extend(prime_tower_areas[extruder_id]) + if not prime_tower_collision: + result_areas[extruder_id].extend(prime_tower_areas[extruder_id]) + result_areas_no_brim[extruder_id].extend(prime_tower_areas[extruder_id]) + else: + self._error_areas.extend(prime_tower_areas[extruder_id]) self._has_errors = len(self._error_areas) > 0 diff --git a/cura/CameraImageProvider.py b/cura/CameraImageProvider.py deleted file mode 100644 index 6a07f6b029..0000000000 --- a/cura/CameraImageProvider.py +++ /dev/null @@ -1,29 +0,0 @@ -from PyQt5.QtGui import QImage -from PyQt5.QtQuick import QQuickImageProvider -from PyQt5.QtCore import QSize - -from UM.Application import Application - - -class CameraImageProvider(QQuickImageProvider): - def __init__(self): - super().__init__(QQuickImageProvider.Image) - - ## Request a new image. - def requestImage(self, id, size): - for output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices(): - try: - image = output_device.activePrinter.camera.getImage() - if image.isNull(): - image = QImage() - - return image, QSize(15, 15) - except AttributeError: - try: - image = output_device.activeCamera.getImage() - - return image, QSize(15, 15) - except AttributeError: - pass - - return QImage(), QSize(15, 15) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e5b24f71d3..0610d8da86 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -4,7 +4,7 @@ import os import sys import time -from typing import cast, TYPE_CHECKING +from typing import cast, TYPE_CHECKING, Optional, Callable import numpy @@ -13,6 +13,7 @@ from PyQt5.QtGui import QColor, QIcon from PyQt5.QtWidgets import QMessageBox from PyQt5.QtQml import qmlRegisterUncreatableType, qmlRegisterSingletonType, qmlRegisterType +from UM.Application import Application from UM.PluginError import PluginNotFoundError from UM.Scene.SceneNode import SceneNode from UM.Scene.Camera import Camera @@ -44,6 +45,7 @@ from UM.Operations.RemoveSceneNodeOperation import RemoveSceneNodeOperation from UM.Operations.GroupedOperation import GroupedOperation from UM.Operations.SetTransformOperation import SetTransformOperation +from cura.API import CuraAPI from cura.Arranging.Arrange import Arrange from cura.Arranging.ArrangeObjectsJob import ArrangeObjectsJob from cura.Arranging.ArrangeObjectsAllBuildPlatesJob import ArrangeObjectsAllBuildPlatesJob @@ -61,6 +63,7 @@ from cura.Scene.CuraSceneController import CuraSceneController from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyType from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.SettingFunction import SettingFunction +from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.MachineNameValidator import MachineNameValidator from cura.Machines.Models.BuildPlateModel import BuildPlateModel @@ -93,7 +96,6 @@ from . import PrintInformation from . import CuraActions from cura.Scene import ZOffsetDecorator from . import CuraSplashScreen -from . import CameraImageProvider from . import PrintJobPreviewImageProvider from . import MachineActionManager @@ -107,16 +109,26 @@ from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisi from cura.Settings.ContainerManager import ContainerManager from cura.Settings.SidebarCustomMenuItemsModel import SidebarCustomMenuItemsModel import cura.Settings.cura_empty_instance_containers +from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions from cura.ObjectsModel import ObjectsModel +from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage + from UM.FlameProfiler import pyqtSlot +from UM.Decorators import override + +if TYPE_CHECKING: + from cura.Machines.MaterialManager import MaterialManager + from cura.Machines.QualityManager import QualityManager + from UM.Settings.EmptyInstanceContainer import EmptyInstanceContainer + from cura.Settings.GlobalStack import GlobalStack numpy.seterr(all = "ignore") try: - from cura.CuraVersion import CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion + from cura.CuraVersion import CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion # type: ignore except ImportError: CuraVersion = "master" # [CodeStyle: Reflecting imported value] CuraBuildType = "" @@ -157,6 +169,8 @@ class CuraApplication(QtApplication): self.default_theme = "cura-light" + self.change_log_url = "https://ultimaker.com/ultimaker-cura-latest-features" + self._boot_loading_time = time.time() self._on_exit_callback_manager = OnExitCallbackManager(self) @@ -168,16 +182,18 @@ class CuraApplication(QtApplication): self._single_instance = None + self._cura_formula_functions = None # type: Optional[CuraFormulaFunctions] + self._cura_package_manager = None self._machine_action_manager = None - self.empty_container = None - self.empty_definition_changes_container = None - self.empty_variant_container = None - self.empty_material_container = None - self.empty_quality_container = None - self.empty_quality_changes_container = None + self.empty_container = None # type: EmptyInstanceContainer + self.empty_definition_changes_container = None # type: EmptyInstanceContainer + self.empty_variant_container = None # type: EmptyInstanceContainer + self.empty_material_container = None # type: EmptyInstanceContainer + self.empty_quality_container = None # type: EmptyInstanceContainer + self.empty_quality_changes_container = None # type: EmptyInstanceContainer self._variant_manager = None self._material_manager = None @@ -197,6 +213,7 @@ class CuraApplication(QtApplication): self._quality_profile_drop_down_menu_model = None self._custom_quality_profile_drop_down_menu_model = None + self._cura_API = CuraAPI(self) self._physics = None self._volume = None @@ -235,6 +252,8 @@ class CuraApplication(QtApplication): from cura.Settings.CuraContainerRegistry import CuraContainerRegistry self._container_registry_class = CuraContainerRegistry + # Redefined here in order to please the typing. + self._container_registry = None # type: CuraContainerRegistry from cura.CuraPackageManager import CuraPackageManager self._package_manager_class = CuraPackageManager @@ -259,6 +278,9 @@ class CuraApplication(QtApplication): help = "FOR TESTING ONLY. Trigger an early crash to show the crash dialog.") self._cli_parser.add_argument("file", nargs = "*", help = "Files to load after starting the application.") + def getContainerRegistry(self) -> "CuraContainerRegistry": + return self._container_registry + def parseCliOptions(self): super().parseCliOptions() @@ -285,8 +307,6 @@ class CuraApplication(QtApplication): self._machine_action_manager = MachineActionManager.MachineActionManager(self) self._machine_action_manager.initialize() - self.change_log_url = "https://ultimaker.com/ultimaker-cura-latest-features" - def __sendCommandToSingleInstance(self): self._single_instance = SingleInstance(self, self._files_to_open) @@ -311,6 +331,8 @@ class CuraApplication(QtApplication): # Adds custom property types, settings types, and extra operators (functions) that need to be registered in # SettingDefinition and SettingFunction. def __initializeSettingDefinitionsAndFunctions(self): + self._cura_formula_functions = CuraFormulaFunctions(self) + # Need to do this before ContainerRegistry tries to load the machines SettingDefinition.addSupportedProperty("settable_per_mesh", DefinitionPropertyType.Any, default = True, read_only = True) SettingDefinition.addSupportedProperty("settable_per_extruder", DefinitionPropertyType.Any, default = True, read_only = True) @@ -331,10 +353,10 @@ class CuraApplication(QtApplication): SettingDefinition.addSettingType("optional_extruder", None, str, None) SettingDefinition.addSettingType("[int]", None, str, None) - SettingFunction.registerOperator("extruderValues", ExtruderManager.getExtruderValues) - SettingFunction.registerOperator("extruderValue", ExtruderManager.getExtruderValue) - SettingFunction.registerOperator("resolveOrValue", ExtruderManager.getResolveOrValue) - SettingFunction.registerOperator("defaultExtruderPosition", ExtruderManager.getDefaultExtruderPosition) + SettingFunction.registerOperator("extruderValue", self._cura_formula_functions.getValueInExtruder) + SettingFunction.registerOperator("extruderValues", self._cura_formula_functions.getValuesInAllExtruders) + SettingFunction.registerOperator("resolveOrValue", self._cura_formula_functions.getResolveOrValue) + SettingFunction.registerOperator("defaultExtruderPosition", self._cura_formula_functions.getDefaultExtruderPosition) # Adds all resources and container related resources. def __addAllResourcesAndContainerResources(self) -> None: @@ -365,7 +387,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 + self.empty_container = cura.Settings.cura_empty_instance_containers.empty_container # type: EmptyInstanceContainer self._container_registry.addContainer( cura.Settings.cura_empty_instance_containers.empty_definition_changes_container) @@ -400,7 +422,7 @@ class CuraApplication(QtApplication): ) # Runs preparations that needs to be done before the starting process. - def startSplashWindowPhase(self): + def startSplashWindowPhase(self) -> None: super().startSplashWindowPhase() self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) @@ -502,19 +524,18 @@ class CuraApplication(QtApplication): CuraApplication.Created = True def _onEngineCreated(self): - self._qml_engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider()) self._qml_engine.addImageProvider("print_job_preview", PrintJobPreviewImageProvider.PrintJobPreviewImageProvider()) @pyqtProperty(bool) - def needToShowUserAgreement(self): + def needToShowUserAgreement(self) -> bool: return self._need_to_show_user_agreement - def setNeedToShowUserAgreement(self, set_value = True): + def setNeedToShowUserAgreement(self, set_value = True) -> None: self._need_to_show_user_agreement = set_value # DO NOT call this function to close the application, use checkAndExitApplication() instead which will perform # pre-exit checks such as checking for in-progress USB printing, etc. - def closeApplication(self): + def closeApplication(self) -> None: Logger.log("i", "Close application") main_window = self.getMainWindow() if main_window is not None: @@ -541,11 +562,11 @@ class CuraApplication(QtApplication): showConfirmExitDialog = pyqtSignal(str, arguments = ["message"]) - def setConfirmExitDialogCallback(self, callback): + def setConfirmExitDialogCallback(self, callback: Callable) -> None: self._confirm_exit_dialog_callback = callback @pyqtSlot(bool) - def callConfirmExitDialogCallback(self, yes_or_no: bool): + def callConfirmExitDialogCallback(self, yes_or_no: bool) -> None: self._confirm_exit_dialog_callback(yes_or_no) ## Signal to connect preferences action in QML @@ -553,9 +574,17 @@ class CuraApplication(QtApplication): ## Show the preferences window @pyqtSlot() - def showPreferences(self): + def showPreferences(self) -> None: self.showPreferencesWindow.emit() + @override(Application) + def getGlobalContainerStack(self) -> Optional["GlobalStack"]: + return self._global_container_stack + + @override(Application) + def setGlobalContainerStack(self, stack: "GlobalStack") -> None: + super().setGlobalContainerStack(stack) + ## A reusable dialogbox # showMessageBox = pyqtSignal(str, str, str, str, int, int, arguments = ["title", "text", "informativeText", "detailedText", "buttons", "icon"]) @@ -567,7 +596,7 @@ class CuraApplication(QtApplication): showDiscardOrKeepProfileChanges = pyqtSignal() - def discardOrKeepProfileChanges(self): + def discardOrKeepProfileChanges(self) -> bool: has_user_interaction = False choice = self.getPreferences().getValue("cura/choice_on_profile_override") if choice == "always_discard": @@ -583,7 +612,7 @@ class CuraApplication(QtApplication): return has_user_interaction @pyqtSlot(str) - def discardOrKeepProfileChangesClosed(self, option): + def discardOrKeepProfileChangesClosed(self, option: str) -> None: global_stack = self.getGlobalContainerStack() if option == "discard": for extruder in global_stack.extruders.values(): @@ -668,11 +697,11 @@ class CuraApplication(QtApplication): Logger.log("i", "Initializing quality manager") from cura.Machines.QualityManager import QualityManager - self._quality_manager = QualityManager(container_registry, parent = self) + self._quality_manager = QualityManager(self, parent = self) self._quality_manager.initialize() Logger.log("i", "Initializing machine manager") - self._machine_manager = MachineManager(self) + self._machine_manager = MachineManager(self, parent = self) Logger.log("i", "Initializing container manager") self._container_manager = ContainerManager(self) @@ -695,10 +724,11 @@ class CuraApplication(QtApplication): self._print_information = PrintInformation.PrintInformation(self) self._cura_actions = CuraActions.CuraActions(self) - # Initialize setting visibility presets model - self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self) - default_visibility_profile = self._setting_visibility_presets_model.getItem(0) - self.getPreferences().setDefault("general/visible_settings", ";".join(default_visibility_profile["settings"])) + # Initialize setting visibility presets model. + self._setting_visibility_presets_model = SettingVisibilityPresetsModel(self.getPreferences(), parent = self) + + # Initialize Cura API + self._cura_API.initialize() # Detect in which mode to run and execute that mode if self._is_headless: @@ -798,6 +828,11 @@ class CuraApplication(QtApplication): def getSettingVisibilityPresetsModel(self, *args) -> SettingVisibilityPresetsModel: return self._setting_visibility_presets_model + def getCuraFormulaFunctions(self, *args) -> "CuraFormulaFunctions": + if self._cura_formula_functions is None: + self._cura_formula_functions = CuraFormulaFunctions(self) + return self._cura_formula_functions + def getMachineErrorChecker(self, *args) -> MachineErrorChecker: return self._machine_error_checker @@ -806,20 +841,20 @@ class CuraApplication(QtApplication): self._machine_manager = MachineManager(self) return self._machine_manager - def getExtruderManager(self, *args): + def getExtruderManager(self, *args) -> ExtruderManager: if self._extruder_manager is None: self._extruder_manager = ExtruderManager() return self._extruder_manager - def getVariantManager(self, *args): + def getVariantManager(self, *args) -> VariantManager: return self._variant_manager @pyqtSlot(result = QObject) - def getMaterialManager(self, *args): + def getMaterialManager(self, *args) -> "MaterialManager": return self._material_manager @pyqtSlot(result = QObject) - def getQualityManager(self, *args): + def getQualityManager(self, *args) -> "QualityManager": return self._quality_manager def getObjectsModel(self, *args): @@ -828,23 +863,23 @@ class CuraApplication(QtApplication): return self._object_manager @pyqtSlot(result = QObject) - def getMultiBuildPlateModel(self, *args): + def getMultiBuildPlateModel(self, *args) -> MultiBuildPlateModel: if self._multi_build_plate_model is None: self._multi_build_plate_model = MultiBuildPlateModel(self) return self._multi_build_plate_model @pyqtSlot(result = QObject) - def getBuildPlateModel(self, *args): + def getBuildPlateModel(self, *args) -> BuildPlateModel: if self._build_plate_model is None: self._build_plate_model = BuildPlateModel(self) return self._build_plate_model - def getCuraSceneController(self, *args): + def getCuraSceneController(self, *args) -> CuraSceneController: if self._cura_scene_controller is None: self._cura_scene_controller = CuraSceneController.createCuraSceneController() return self._cura_scene_controller - def getSettingInheritanceManager(self, *args): + def getSettingInheritanceManager(self, *args) -> SettingInheritanceManager: if self._setting_inheritance_manager is None: self._setting_inheritance_manager = SettingInheritanceManager.createSettingInheritanceManager() return self._setting_inheritance_manager @@ -887,6 +922,9 @@ class CuraApplication(QtApplication): self._custom_quality_profile_drop_down_menu_model = CustomQualityProfilesDropDownMenuModel(self) return self._custom_quality_profile_drop_down_menu_model + def getCuraAPI(self, *args, **kwargs) -> "CuraAPI": + return self._cura_API + ## Registers objects for the QML engine to use. # # \param engine The QML engine. @@ -909,6 +947,8 @@ class CuraApplication(QtApplication): qmlRegisterSingletonType(SimpleModeSettingsManager, "Cura", 1, 0, "SimpleModeSettingsManager", self.getSimpleModeSettingsManager) qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, "MachineActionManager", self.getMachineActionManager) + qmlRegisterType(NetworkMJPGImage, "Cura", 1, 0, "NetworkMJPGImage") + qmlRegisterSingletonType(ObjectsModel, "Cura", 1, 0, "ObjectsModel", self.getObjectsModel) qmlRegisterType(BuildPlateModel, "Cura", 1, 0, "BuildPlateModel") qmlRegisterType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel") @@ -935,6 +975,9 @@ class CuraApplication(QtApplication): qmlRegisterSingletonType(ContainerManager, "Cura", 1, 0, "ContainerManager", ContainerManager.getInstance) qmlRegisterType(SidebarCustomMenuItemsModel, "Cura", 1, 0, "SidebarCustomMenuItemsModel") + from cura.API import CuraAPI + qmlRegisterSingletonType(CuraAPI, "Cura", 1, 1, "API", self.getCuraAPI) + # As of Qt5.7, it is necessary to get rid of any ".." in the path for the singleton to work. actions_url = QUrl.fromLocalFile(os.path.abspath(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Actions.qml"))) qmlRegisterSingletonType(actions_url, "Cura", 1, 0, "Actions") @@ -1574,6 +1617,11 @@ class CuraApplication(QtApplication): job.start() def _readMeshFinished(self, job): + global_container_stack = self.getGlobalContainerStack() + if not global_container_stack: + Logger.log("w", "Can't load meshes before a printer is added.") + return + nodes = job.getResult() file_name = job.getFileName() file_name_lower = file_name.lower() @@ -1588,7 +1636,6 @@ class CuraApplication(QtApplication): for node_ in DepthFirstIterator(root): if node_.callDecoration("isSliceable") and node_.callDecoration("getBuildPlateNumber") == target_build_plate: fixed_nodes.append(node_) - global_container_stack = self.getGlobalContainerStack() machine_width = global_container_stack.getProperty("machine_width", "value") machine_depth = global_container_stack.getProperty("machine_depth", "value") arranger = Arrange.create(x = machine_width, y = machine_depth, fixed_nodes = fixed_nodes) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index 969fef0edf..94b096f9c1 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -1,13 +1,13 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import os + from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal +from UM.Logger import Logger from UM.PluginObject import PluginObject from UM.PluginRegistry import PluginRegistry -from UM.Application import Application - -import os ## Machine actions are actions that are added to a specific machine type. Examples of such actions are @@ -19,7 +19,7 @@ class MachineAction(QObject, PluginObject): ## Create a new Machine action. # \param key unique key of the machine action # \param label Human readable label used to identify the machine action. - def __init__(self, key, label = ""): + def __init__(self, key: str, label: str = "") -> None: super().__init__() self._key = key self._label = label @@ -30,14 +30,14 @@ class MachineAction(QObject, PluginObject): labelChanged = pyqtSignal() onFinished = pyqtSignal() - def getKey(self): + def getKey(self) -> str: return self._key @pyqtProperty(str, notify = labelChanged) - def label(self): + def label(self) -> str: return self._label - def setLabel(self, label): + def setLabel(self, label: str) -> None: if self._label != label: self._label = label self.labelChanged.emit() @@ -46,29 +46,35 @@ class MachineAction(QObject, PluginObject): # This should not be re-implemented by child classes, instead re-implement _reset. # /sa _reset @pyqtSlot() - def reset(self): + def reset(self) -> None: self._finished = False self._reset() ## Protected implementation of reset. # /sa reset() - def _reset(self): + def _reset(self) -> None: pass @pyqtSlot() - def setFinished(self): + def setFinished(self) -> None: self._finished = True self._reset() self.onFinished.emit() @pyqtProperty(bool, notify = onFinished) - def finished(self): + def finished(self) -> bool: return self._finished ## Protected helper to create a view object based on provided QML. - def _createViewFromQML(self): - path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), self._qml_url) - self._view = Application.getInstance().createQmlComponent(path, {"manager": self}) + def _createViewFromQML(self) -> None: + plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId()) + if plugin_path is None: + Logger.log("e", "Cannot create QML view: cannot find plugin path for plugin [%s]", self.getPluginId()) + return + path = os.path.join(plugin_path, self._qml_url) + + from cura.CuraApplication import CuraApplication + self._view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self}) @pyqtProperty(QObject, constant = True) def displayItem(self): diff --git a/cura/MachineActionManager.py b/cura/MachineActionManager.py index 65eb33b54c..db0f7bfbff 100644 --- a/cura/MachineActionManager.py +++ b/cura/MachineActionManager.py @@ -1,12 +1,18 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import TYPE_CHECKING, Optional, List, Set, Dict + from PyQt5.QtCore import QObject from UM.FlameProfiler import pyqtSlot from UM.Logger import Logger from UM.PluginRegistry import PluginRegistry # So MachineAction can be added as plugin type -from UM.Settings.DefinitionContainer import DefinitionContainer + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + from cura.Settings.GlobalStack import GlobalStack + from .MachineAction import MachineAction ## Raised when trying to add an unknown machine action as a required action @@ -20,46 +26,54 @@ class NotUniqueMachineActionError(Exception): class MachineActionManager(QObject): - def __init__(self, application, parent = None): - super().__init__(parent) + def __init__(self, application: "CuraApplication", parent: Optional["QObject"] = None) -> None: + super().__init__(parent = parent) self._application = application + self._container_registry = self._application.getContainerRegistry() - self._machine_actions = {} # Dict of all known machine actions - self._required_actions = {} # Dict of all required actions by definition ID - self._supported_actions = {} # Dict of all supported actions by definition ID - self._first_start_actions = {} # Dict of all actions that need to be done when first added by definition ID + # Keeps track of which machines have already been processed so we don't do that again. + self._definition_ids_with_default_actions_added = set() # type: Set[str] + + # Dict of all known machine actions + self._machine_actions = {} # type: Dict[str, MachineAction] + # Dict of all required actions by definition ID + self._required_actions = {} # type: Dict[str, List[MachineAction]] + # Dict of all supported actions by definition ID + self._supported_actions = {} # type: Dict[str, List[MachineAction]] + # Dict of all actions that need to be done when first added by definition ID + self._first_start_actions = {} # type: Dict[str, List[MachineAction]] def initialize(self): - container_registry = self._application.getContainerRegistry() - # Add machine_action as plugin type PluginRegistry.addType("machine_action", self.addMachineAction) - # Ensure that all containers that were registered before creation of this registry are also handled. - # This should not have any effect, but it makes it safer if we ever refactor the order of things. - for container in container_registry.findDefinitionContainers(): - self._onContainerAdded(container) + # Adds all default machine actions that are defined in the machine definition for the given machine. + def addDefaultMachineActions(self, global_stack: "GlobalStack") -> None: + definition_id = global_stack.definition.getId() - container_registry.containerAdded.connect(self._onContainerAdded) + if definition_id in self._definition_ids_with_default_actions_added: + Logger.log("i", "Default machine actions have been added for machine definition [%s], do nothing.", + definition_id) + return - def _onContainerAdded(self, container): - ## Ensure that the actions are added to this manager - if isinstance(container, DefinitionContainer): - supported_actions = container.getMetaDataEntry("supported_actions", []) - for action in supported_actions: - self.addSupportedAction(container.getId(), action) + supported_actions = global_stack.getMetaDataEntry("supported_actions", []) + for action_key in supported_actions: + self.addSupportedAction(definition_id, action_key) - required_actions = container.getMetaDataEntry("required_actions", []) - for action in required_actions: - self.addRequiredAction(container.getId(), action) + required_actions = global_stack.getMetaDataEntry("required_actions", []) + for action_key in required_actions: + self.addRequiredAction(definition_id, action_key) - first_start_actions = container.getMetaDataEntry("first_start_actions", []) - for action in first_start_actions: - self.addFirstStartAction(container.getId(), action) + first_start_actions = global_stack.getMetaDataEntry("first_start_actions", []) + for action_key in first_start_actions: + self.addFirstStartAction(definition_id, action_key) + + self._definition_ids_with_default_actions_added.add(definition_id) + Logger.log("i", "Default machine actions added for machine definition [%s]", definition_id) ## Add a required action to a machine # Raises an exception when the action is not recognised. - def addRequiredAction(self, definition_id, action_key): + def addRequiredAction(self, definition_id: str, action_key: str) -> None: if action_key in self._machine_actions: if definition_id in self._required_actions: if self._machine_actions[action_key] not in self._required_actions[definition_id]: @@ -70,7 +84,7 @@ class MachineActionManager(QObject): raise UnknownMachineActionError("Action %s, which is required for %s is not known." % (action_key, definition_id)) ## Add a supported action to a machine. - def addSupportedAction(self, definition_id, action_key): + def addSupportedAction(self, definition_id: str, action_key: str) -> None: if action_key in self._machine_actions: if definition_id in self._supported_actions: if self._machine_actions[action_key] not in self._supported_actions[definition_id]: @@ -81,13 +95,10 @@ class MachineActionManager(QObject): Logger.log("w", "Unable to add %s to %s, as the action is not recognised", action_key, definition_id) ## Add an action to the first start list of a machine. - def addFirstStartAction(self, definition_id, action_key, index = None): + def addFirstStartAction(self, definition_id: str, action_key: str) -> None: if action_key in self._machine_actions: if definition_id in self._first_start_actions: - if index is not None: - self._first_start_actions[definition_id].insert(index, self._machine_actions[action_key]) - else: - self._first_start_actions[definition_id].append(self._machine_actions[action_key]) + self._first_start_actions[definition_id].append(self._machine_actions[action_key]) else: self._first_start_actions[definition_id] = [self._machine_actions[action_key]] else: @@ -95,7 +106,7 @@ class MachineActionManager(QObject): ## Add a (unique) MachineAction # if the Key of the action is not unique, an exception is raised. - def addMachineAction(self, action): + def addMachineAction(self, action: "MachineAction") -> None: if action.getKey() not in self._machine_actions: self._machine_actions[action.getKey()] = action else: @@ -105,7 +116,7 @@ class MachineActionManager(QObject): # \param definition_id The ID of the definition you want the supported actions of # \returns set of supported actions. @pyqtSlot(str, result = "QVariantList") - def getSupportedActions(self, definition_id): + def getSupportedActions(self, definition_id: str) -> List["MachineAction"]: if definition_id in self._supported_actions: return list(self._supported_actions[definition_id]) else: @@ -114,11 +125,11 @@ class MachineActionManager(QObject): ## Get all actions required by given machine # \param definition_id The ID of the definition you want the required actions of # \returns set of required actions. - def getRequiredActions(self, definition_id): + def getRequiredActions(self, definition_id: str) -> List["MachineAction"]: if definition_id in self._required_actions: return self._required_actions[definition_id] else: - return set() + return list() ## Get all actions that need to be performed upon first start of a given machine. # Note that contrary to required / supported actions a list is returned (as it could be required to run the same @@ -126,7 +137,7 @@ class MachineActionManager(QObject): # \param definition_id The ID of the definition that you want to get the "on added" actions for. # \returns List of actions. @pyqtSlot(str, result="QVariantList") - def getFirstStartActions(self, definition_id): + def getFirstStartActions(self, definition_id: str) -> List["MachineAction"]: if definition_id in self._first_start_actions: return self._first_start_actions[definition_id] else: @@ -134,7 +145,7 @@ class MachineActionManager(QObject): ## Remove Machine action from manager # \param action to remove - def removeMachineAction(self, action): + def removeMachineAction(self, action: "MachineAction") -> None: try: del self._machine_actions[action.getKey()] except KeyError: @@ -143,7 +154,7 @@ class MachineActionManager(QObject): ## Get MachineAction by key # \param key String of key to select # \return Machine action if found, None otherwise - def getMachineAction(self, key): + def getMachineAction(self, key: str) -> Optional["MachineAction"]: if key in self._machine_actions: return self._machine_actions[key] else: diff --git a/cura/Machines/ContainerNode.py b/cura/Machines/ContainerNode.py index 944579e354..eef1c63127 100644 --- a/cura/Machines/ContainerNode.py +++ b/cura/Machines/ContainerNode.py @@ -9,9 +9,6 @@ from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger from UM.Settings.InstanceContainer import InstanceContainer -if TYPE_CHECKING: - from cura.Machines.QualityGroup import QualityGroup - ## # A metadata / container combination. Use getContainer() to get the container corresponding to the metadata. @@ -24,29 +21,34 @@ if TYPE_CHECKING: # This is used in Variant, Material, and Quality Managers. # class ContainerNode: - __slots__ = ("metadata", "container", "children_map") + __slots__ = ("_metadata", "_container", "children_map") def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: - self.metadata = metadata - self.container = None - self.children_map = OrderedDict() #type: OrderedDict[str, Union[QualityGroup, ContainerNode]] + self._metadata = metadata + self._container = None # type: Optional[InstanceContainer] + self.children_map = OrderedDict() # type: ignore # This is because it's children are supposed to override it. ## Get an entry value from the metadata def getMetaDataEntry(self, entry: str, default: Any = None) -> Any: - if self.metadata is None: + if self._metadata is None: return default - return self.metadata.get(entry, default) + return self._metadata.get(entry, default) + + def getMetadata(self) -> Dict[str, Any]: + if self._metadata is None: + return {} + return self._metadata def getChildNode(self, child_key: str) -> Optional["ContainerNode"]: return self.children_map.get(child_key) def getContainer(self) -> Optional["InstanceContainer"]: - if self.metadata is None: + if self._metadata is None: Logger.log("e", "Cannot get container for a ContainerNode without metadata.") return None - if self.container is None: - container_id = self.metadata["id"] + if self._container is None: + container_id = self._metadata["id"] from UM.Settings.ContainerRegistry import ContainerRegistry container_list = ContainerRegistry.getInstance().findInstanceContainers(id = container_id) if not container_list: @@ -54,9 +56,9 @@ class ContainerNode: error_message = ConfigurationErrorMessage.getInstance() error_message.addFaultyContainers(container_id) return None - self.container = container_list[0] + self._container = container_list[0] - return self.container + return self._container def __str__(self) -> str: return "%s[%s]" % (self.__class__.__name__, self.getMetaDataEntry("id")) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index 37de4f30ce..06f064315b 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -50,7 +50,7 @@ class MachineErrorChecker(QObject): self._error_check_timer.setInterval(100) self._error_check_timer.setSingleShot(True) - def initialize(self): + def initialize(self) -> None: self._error_check_timer.timeout.connect(self._rescheduleCheck) # Reconnect all signals when the active machine gets changed. @@ -62,7 +62,7 @@ class MachineErrorChecker(QObject): self._onMachineChanged() - def _onMachineChanged(self): + def _onMachineChanged(self) -> None: if self._global_stack: self._global_stack.propertyChanged.disconnect(self.startErrorCheck) self._global_stack.containersChanged.disconnect(self.startErrorCheck) @@ -94,7 +94,7 @@ class MachineErrorChecker(QObject): return self._need_to_check or self._check_in_progress # Starts the error check timer to schedule a new error check. - def startErrorCheck(self, *args): + def startErrorCheck(self, *args) -> None: if not self._check_in_progress: self._need_to_check = True self.needToWaitForResultChanged.emit() @@ -103,7 +103,7 @@ class MachineErrorChecker(QObject): # This function is called by the timer to reschedule a new error check. # If there is no check in progress, it will start a new one. If there is any, it sets the "_need_to_check" flag # to notify the current check to stop and start a new one. - def _rescheduleCheck(self): + def _rescheduleCheck(self) -> None: if self._check_in_progress and not self._need_to_check: self._need_to_check = True self.needToWaitForResultChanged.emit() @@ -128,7 +128,7 @@ class MachineErrorChecker(QObject): self._start_time = time.time() Logger.log("d", "New error check scheduled.") - def _checkStack(self): + def _checkStack(self) -> None: if self._need_to_check: Logger.log("d", "Need to check for errors again. Discard the current progress and reschedule a check.") self._check_in_progress = False @@ -169,7 +169,7 @@ class MachineErrorChecker(QObject): # Schedule the check for the next key self._application.callLater(self._checkStack) - def _setResult(self, result: bool): + def _setResult(self, result: bool) -> None: if result != self._has_errors: self._has_errors = result self.hasErrorUpdated.emit() diff --git a/cura/Machines/MaterialGroup.py b/cura/Machines/MaterialGroup.py index 8a73796a7a..e05647e674 100644 --- a/cura/Machines/MaterialGroup.py +++ b/cura/Machines/MaterialGroup.py @@ -24,8 +24,8 @@ class MaterialGroup: def __init__(self, name: str, root_material_node: "MaterialNode") -> None: self.name = name self.is_read_only = False - self.root_material_node = root_material_node # type: MaterialNode - self.derived_material_node_list = [] # type: List[MaterialNode] + self.root_material_node = root_material_node # type: MaterialNode + self.derived_material_node_list = [] # type: List[MaterialNode] def __str__(self) -> str: return "%s[%s]" % (self.__class__.__name__, self.name) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 7075eaa004..2b41718975 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -4,8 +4,7 @@ from collections import defaultdict, OrderedDict import copy import uuid -import json -from typing import Dict, Optional, TYPE_CHECKING +from typing import Dict, Optional, TYPE_CHECKING, Any, Set, List, cast, Tuple from PyQt5.Qt import QTimer, QObject, pyqtSignal, pyqtSlot @@ -39,25 +38,35 @@ if TYPE_CHECKING: # class MaterialManager(QObject): - materialsUpdated = pyqtSignal() # Emitted whenever the material lookup tables are updated. + materialsUpdated = pyqtSignal() # Emitted whenever the material lookup tables are updated. + favoritesUpdated = pyqtSignal() # Emitted whenever the favorites are changed def __init__(self, container_registry, parent = None): super().__init__(parent) self._application = Application.getInstance() self._container_registry = container_registry # type: ContainerRegistry - self._fallback_materials_map = dict() # material_type -> generic material metadata - self._material_group_map = dict() # root_material_id -> MaterialGroup - self._diameter_machine_nozzle_buildplate_material_map = dict() # approximate diameter str -> dict(machine_definition_id -> MaterialNode) + # Material_type -> generic material metadata + self._fallback_materials_map = dict() # type: Dict[str, Dict[str, Any]] + + # Root_material_id -> MaterialGroup + self._material_group_map = dict() # type: Dict[str, MaterialGroup] + + # Approximate diameter str + self._diameter_machine_nozzle_buildplate_material_map = dict() # type: Dict[str, Dict[str, MaterialNode]] # We're using these two maps to convert between the specific diameter material id and the generic material id # because the generic material ids are used in qualities and definitions, while the specific diameter material is meant # i.e. generic_pla -> generic_pla_175 - self._material_diameter_map = defaultdict(dict) # root_material_id -> approximate diameter str -> root_material_id for that diameter - self._diameter_material_map = dict() # material id including diameter (generic_pla_175) -> material root id (generic_pla) + # root_material_id -> approximate diameter str -> root_material_id for that diameter + self._material_diameter_map = defaultdict(dict) # type: Dict[str, Dict[str, str]] + + # Material id including diameter (generic_pla_175) -> material root id (generic_pla) + self._diameter_material_map = dict() # type: Dict[str, str] # This is used in Legacy UM3 send material function and the material management page. - self._guid_material_groups_map = defaultdict(list) # GUID -> a list of material_groups + # GUID -> a list of material_groups + self._guid_material_groups_map = defaultdict(list) # type: Dict[str, List[MaterialGroup]] # The machine definition ID for the non-machine-specific materials. # This is used as the last fallback option if the given machine-specific material(s) cannot be found. @@ -76,15 +85,15 @@ class MaterialManager(QObject): self._container_registry.containerAdded.connect(self._onContainerMetadataChanged) self._container_registry.containerRemoved.connect(self._onContainerMetadataChanged) - self._favorites = set() + self._favorites = set() # type: Set[str] - def initialize(self): + def initialize(self) -> None: # Find all materials and put them in a matrix for quick search. material_metadatas = {metadata["id"]: metadata for metadata in self._container_registry.findContainersMetadata(type = "material") if - metadata.get("GUID")} + metadata.get("GUID")} # type: Dict[str, Dict[str, Any]] - self._material_group_map = dict() + self._material_group_map = dict() # type: Dict[str, MaterialGroup] # Map #1 # root_material_id -> MaterialGroup @@ -93,7 +102,7 @@ class MaterialManager(QObject): if material_id == "empty_material": continue - root_material_id = material_metadata.get("base_file") + root_material_id = material_metadata.get("base_file", "") if root_material_id not in self._material_group_map: self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id])) self._material_group_map[root_material_id].is_read_only = self._container_registry.isReadOnly(root_material_id) @@ -109,26 +118,26 @@ class MaterialManager(QObject): # Map #1.5 # GUID -> material group list - self._guid_material_groups_map = defaultdict(list) + self._guid_material_groups_map = defaultdict(list) # type: Dict[str, List[MaterialGroup]] for root_material_id, material_group in self._material_group_map.items(): - guid = material_group.root_material_node.metadata["GUID"] + guid = material_group.root_material_node.getMetaDataEntry("GUID", "") self._guid_material_groups_map[guid].append(material_group) # Map #2 # Lookup table for material type -> fallback material metadata, only for read-only materials - grouped_by_type_dict = dict() + grouped_by_type_dict = dict() # type: Dict[str, Any] material_types_without_fallback = set() for root_material_id, material_node in self._material_group_map.items(): - material_type = material_node.root_material_node.metadata["material"] + material_type = material_node.root_material_node.getMetaDataEntry("material", "") if material_type not in grouped_by_type_dict: grouped_by_type_dict[material_type] = {"generic": None, "others": []} material_types_without_fallback.add(material_type) - brand = material_node.root_material_node.metadata["brand"] + brand = material_node.root_material_node.getMetaDataEntry("brand", "") if brand.lower() == "generic": to_add = True if material_type in grouped_by_type_dict: - diameter = material_node.root_material_node.metadata.get("approximate_diameter") + diameter = material_node.root_material_node.getMetaDataEntry("approximate_diameter", "") if diameter != self._default_approximate_diameter_for_quality_search: to_add = False # don't add if it's not the default diameter @@ -137,7 +146,7 @@ class MaterialManager(QObject): # - if it's in the list, it means that is a new material without fallback # - if it is not, then it is a custom material with a fallback material (parent) if material_type in material_types_without_fallback: - grouped_by_type_dict[material_type] = material_node.root_material_node.metadata + grouped_by_type_dict[material_type] = material_node.root_material_node._metadata material_types_without_fallback.remove(material_type) # Remove the materials that have no fallback materials @@ -154,15 +163,15 @@ class MaterialManager(QObject): self._diameter_material_map = dict() # Group the material IDs by the same name, material, brand, and color but with different diameters. - material_group_dict = dict() + material_group_dict = dict() # type: Dict[Tuple[Any], Dict[str, str]] keys_to_fetch = ("name", "material", "brand", "color") for root_material_id, machine_node in self._material_group_map.items(): - root_material_metadata = machine_node.root_material_node.metadata + root_material_metadata = machine_node.root_material_node._metadata - key_data = [] + key_data_list = [] # type: List[Any] for key in keys_to_fetch: - key_data.append(root_material_metadata.get(key)) - key_data = tuple(key_data) + key_data_list.append(machine_node.root_material_node.getMetaDataEntry(key)) + key_data = cast(Tuple[Any], tuple(key_data_list)) # type: Tuple[Any] # If the key_data doesn't exist, it doesn't matter if the material is read only... if key_data not in material_group_dict: @@ -171,8 +180,8 @@ class MaterialManager(QObject): # ...but if key_data exists, we just overwrite it if the material is read only, otherwise we skip it if not machine_node.is_read_only: continue - approximate_diameter = root_material_metadata.get("approximate_diameter") - material_group_dict[key_data][approximate_diameter] = root_material_metadata["id"] + approximate_diameter = machine_node.root_material_node.getMetaDataEntry("approximate_diameter", "") + material_group_dict[key_data][approximate_diameter] = machine_node.root_material_node.getMetaDataEntry("id", "") # Map [root_material_id][diameter] -> root_material_id for this diameter for data_dict in material_group_dict.values(): @@ -191,7 +200,7 @@ class MaterialManager(QObject): # Map #4 # "machine" -> "nozzle name" -> "buildplate name" -> "root material ID" -> specific material InstanceContainer - self._diameter_machine_nozzle_buildplate_material_map = dict() + self._diameter_machine_nozzle_buildplate_material_map = dict() # type: Dict[str, Dict[str, MaterialNode]] for material_metadata in material_metadatas.values(): self.__addMaterialMetadataIntoLookupTree(material_metadata) @@ -201,7 +210,7 @@ class MaterialManager(QObject): self.materialsUpdated.emit() - def __addMaterialMetadataIntoLookupTree(self, material_metadata: dict) -> None: + def __addMaterialMetadataIntoLookupTree(self, material_metadata: Dict[str, Any]) -> None: material_id = material_metadata["id"] # We don't store empty material in the lookup tables @@ -288,9 +297,9 @@ class MaterialManager(QObject): return self._material_diameter_map.get(root_material_id, {}).get(approximate_diameter, root_material_id) def getRootMaterialIDWithoutDiameter(self, root_material_id: str) -> str: - return self._diameter_material_map.get(root_material_id) + return self._diameter_material_map.get(root_material_id, "") - def getMaterialGroupListByGUID(self, guid: str) -> Optional[list]: + def getMaterialGroupListByGUID(self, guid: str) -> Optional[List[MaterialGroup]]: return self._guid_material_groups_map.get(guid) # @@ -328,6 +337,7 @@ class MaterialManager(QObject): machine_exclude_materials = machine_definition.getMetaDataEntry("exclude_materials", []) material_id_metadata_dict = dict() # type: Dict[str, MaterialNode] + excluded_materials = set() for current_node in nodes_to_check: if current_node is None: continue @@ -336,25 +346,27 @@ class MaterialManager(QObject): # Do not exclude other materials that are of the same type. for material_id, node in current_node.material_map.items(): if material_id in machine_exclude_materials: - Logger.log("d", "Exclude material [%s] for machine [%s]", - material_id, machine_definition.getId()) + excluded_materials.add(material_id) continue if material_id not in material_id_metadata_dict: material_id_metadata_dict[material_id] = node + if excluded_materials: + Logger.log("d", "Exclude materials {excluded_materials} for machine {machine_definition_id}".format(excluded_materials = ", ".join(excluded_materials), machine_definition_id = machine_definition_id)) + return material_id_metadata_dict # # A convenience function to get available materials for the given machine with the extruder position. # def getAvailableMaterialsForMachineExtruder(self, machine: "GlobalStack", - extruder_stack: "ExtruderStack") -> Optional[dict]: + extruder_stack: "ExtruderStack") -> Optional[Dict[str, MaterialNode]]: buildplate_name = machine.getBuildplateName() nozzle_name = None if extruder_stack.variant.getId() != "empty_variant": nozzle_name = extruder_stack.variant.getName() - diameter = extruder_stack.approximateMaterialDiameter + diameter = extruder_stack.getApproximateMaterialDiameter() # Fetch the available materials (ContainerNode) for the current active machine and extruder setup. return self.getAvailableMaterials(machine.definition, nozzle_name, buildplate_name, diameter) @@ -366,7 +378,7 @@ class MaterialManager(QObject): # 2. cannot find any material InstanceContainers with the given settings. # def getMaterialNode(self, machine_definition_id: str, nozzle_name: Optional[str], - buildplate_name: Optional[str], diameter: float, root_material_id: str) -> Optional["InstanceContainer"]: + buildplate_name: Optional[str], diameter: float, root_material_id: str) -> Optional["MaterialNode"]: # round the diameter to get the approximate diameter rounded_diameter = str(round(diameter)) if rounded_diameter not in self._diameter_machine_nozzle_buildplate_material_map: @@ -375,7 +387,7 @@ class MaterialManager(QObject): return None # If there are nozzle materials, get the nozzle-specific material - machine_nozzle_buildplate_material_map = self._diameter_machine_nozzle_buildplate_material_map[rounded_diameter] + machine_nozzle_buildplate_material_map = self._diameter_machine_nozzle_buildplate_material_map[rounded_diameter] # type: Dict[str, MaterialNode] machine_node = machine_nozzle_buildplate_material_map.get(machine_definition_id) nozzle_node = None buildplate_node = None @@ -424,7 +436,7 @@ class MaterialManager(QObject): # Look at the guid to material dictionary root_material_id = None for material_group in self._guid_material_groups_map[material_guid]: - root_material_id = material_group.root_material_node.metadata["id"] + root_material_id = cast(str, material_group.root_material_node.getMetaDataEntry("id", "")) break if not root_material_id: @@ -435,6 +447,28 @@ class MaterialManager(QObject): material_diameter, root_material_id) return node + # There are 2 ways to get fallback materials; + # - A fallback by type (@sa getFallbackMaterialIdByMaterialType), which adds the generic version of this material + # - A fallback by GUID; If a material has been duplicated, it should also check if the original materials do have + # a GUID. This should only be done if the material itself does not have a quality just yet. + def getFallBackMaterialIdsByMaterial(self, material: "InstanceContainer") -> List[str]: + results = [] # type: List[str] + + material_groups = self.getMaterialGroupListByGUID(material.getMetaDataEntry("GUID")) + for material_group in material_groups: # type: ignore + if material_group.name != material.getId(): + # If the material in the group is read only, put it at the front of the list (since that is the most + # likely one to get a result) + if material_group.is_read_only: + results.insert(0, material_group.name) + else: + results.append(material_group.name) + + fallback = self.getFallbackMaterialIdByMaterialType(material.getMetaDataEntry("material")) + if fallback is not None: + results.append(fallback) + return results + # # Used by QualityManager. Built-in quality profiles may be based on generic material IDs such as "generic_pla". # For materials such as ultimaker_pla_orange, no quality profiles may be found, so we should fall back to use @@ -467,12 +501,22 @@ class MaterialManager(QObject): buildplate_name = global_stack.getBuildplateName() machine_definition = global_stack.definition - if extruder_definition is None: - extruder_definition = global_stack.extruders[position].definition - if extruder_definition and parseBool(global_stack.getMetaDataEntry("has_materials", False)): - # At this point the extruder_definition is not None - material_diameter = extruder_definition.getProperty("material_diameter", "value") + # The extruder-compatible material diameter in the extruder definition may not be the correct value because + # the user can change it in the definition_changes container. + if extruder_definition is None: + extruder_stack_or_definition = global_stack.extruders[position] + is_extruder_stack = True + else: + extruder_stack_or_definition = extruder_definition + is_extruder_stack = False + + if extruder_stack_or_definition and parseBool(global_stack.getMetaDataEntry("has_materials", False)): + if is_extruder_stack: + material_diameter = extruder_stack_or_definition.getCompatibleMaterialDiameter() + else: + material_diameter = extruder_stack_or_definition.getProperty("material_diameter", "value") + if isinstance(material_diameter, SettingFunction): material_diameter = material_diameter(global_stack) approximate_material_diameter = str(round(material_diameter)) @@ -500,7 +544,7 @@ class MaterialManager(QObject): # Sets the new name for the given material. # @pyqtSlot("QVariant", str) - def setMaterialName(self, material_node: "MaterialNode", name: str): + def setMaterialName(self, material_node: "MaterialNode", name: str) -> None: root_material_id = material_node.getMetaDataEntry("base_file") if root_material_id is None: return @@ -518,7 +562,7 @@ class MaterialManager(QObject): # Removes the given material. # @pyqtSlot("QVariant") - def removeMaterial(self, material_node: "MaterialNode"): + def removeMaterial(self, material_node: "MaterialNode") -> None: root_material_id = material_node.getMetaDataEntry("base_file") if root_material_id is not None: self.removeMaterialByRootId(root_material_id) @@ -528,8 +572,8 @@ class MaterialManager(QObject): # Returns the root material ID of the duplicated material if successful. # @pyqtSlot("QVariant", result = str) - def duplicateMaterial(self, material_node, new_base_id = None, new_metadata = None) -> Optional[str]: - root_material_id = material_node.metadata["base_file"] + def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]: + root_material_id = cast(str, material_node.getMetaDataEntry("base_file", "")) material_group = self.getMaterialGroup(root_material_id) if not material_group: @@ -580,11 +624,16 @@ class MaterialManager(QObject): for container_to_add in new_containers: container_to_add.setDirty(True) self._container_registry.addContainer(container_to_add) + + # if the duplicated material was favorite then the new material should also be added to favorite. + if root_material_id in self.getFavorites(): + self.addFavorite(new_base_id) + return new_base_id # # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. - # + # Returns the ID of the newly created material. @pyqtSlot(result = str) def createMaterial(self) -> str: from UM.i18n import i18nCatalog @@ -617,7 +666,7 @@ class MaterialManager(QObject): return new_id @pyqtSlot(str) - def addFavorite(self, root_material_id: str): + def addFavorite(self, root_material_id: str) -> None: self._favorites.add(root_material_id) self.materialsUpdated.emit() @@ -626,7 +675,7 @@ class MaterialManager(QObject): self._application.saveSettings() @pyqtSlot(str) - def removeFavorite(self, root_material_id: str): + def removeFavorite(self, root_material_id: str) -> None: self._favorites.remove(root_material_id) self.materialsUpdated.emit() diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 04423d7b2c..a4dcb0564f 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict - +from typing import Optional, Dict, Any +from collections import OrderedDict from .ContainerNode import ContainerNode @@ -14,6 +14,12 @@ from .ContainerNode import ContainerNode class MaterialNode(ContainerNode): __slots__ = ("material_map", "children_map") - def __init__(self, metadata: Optional[dict] = None) -> None: + def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: super().__init__(metadata = metadata) self.material_map = {} # type: Dict[str, MaterialNode] # material_root_id -> material_node + + # We overide this as we want to indicate that MaterialNodes can only contain other material nodes. + self.children_map = OrderedDict() # type: OrderedDict[str, "MaterialNode"] + + def getChildNode(self, child_key: str) -> Optional["MaterialNode"]: + return self.children_map.get(child_key) \ No newline at end of file diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index c08013566b..ef2e760330 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -64,9 +64,11 @@ class BaseMaterialsModel(ListModel): if self._extruder_stack is not None: self._extruder_stack.pyqtContainersChanged.disconnect(self._update) + self._extruder_stack.approximateMaterialDiameterChanged.disconnect(self._update) self._extruder_stack = global_stack.extruders.get(str(self._extruder_position)) if self._extruder_stack is not None: self._extruder_stack.pyqtContainersChanged.connect(self._update) + self._extruder_stack.approximateMaterialDiameterChanged.connect(self._update) # Force update the model when the extruder stack changes self._update() @@ -110,7 +112,7 @@ class BaseMaterialsModel(ListModel): ## This is another convenience function which is shared by all material # models so it's put here to avoid having so much duplicated code. def _createMaterialItem(self, root_material_id, container_node): - metadata = container_node.metadata + metadata = container_node.getMetadata() item = { "root_material_id": root_material_id, "id": metadata["id"], diff --git a/cura/Machines/Models/FavoriteMaterialsModel.py b/cura/Machines/Models/FavoriteMaterialsModel.py index be3f0f605f..18fe310c44 100644 --- a/cura/Machines/Models/FavoriteMaterialsModel.py +++ b/cura/Machines/Models/FavoriteMaterialsModel.py @@ -23,7 +23,7 @@ class FavoriteMaterialsModel(BaseMaterialsModel): item_list = [] for root_material_id, container_node in self._available_materials.items(): - metadata = container_node.metadata + metadata = container_node.getMetadata() # Do not include the materials from a to-be-removed package if bool(metadata.get("removed", False)): diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index 27e6fdfd7c..c276b865bf 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -23,7 +23,7 @@ class GenericMaterialsModel(BaseMaterialsModel): item_list = [] for root_material_id, container_node in self._available_materials.items(): - metadata = container_node.metadata + metadata = container_node.getMetadata() # Do not include the materials from a to-be-removed package if bool(metadata.get("removed", False)): diff --git a/cura/Machines/Models/MaterialBrandsModel.py b/cura/Machines/Models/MaterialBrandsModel.py index 2e2232c2dc..458e4d9b47 100644 --- a/cura/Machines/Models/MaterialBrandsModel.py +++ b/cura/Machines/Models/MaterialBrandsModel.py @@ -42,21 +42,19 @@ class MaterialBrandsModel(BaseMaterialsModel): # Part 1: Generate the entire tree of brands -> material types -> spcific materials for root_material_id, container_node in self._available_materials.items(): - metadata = container_node.metadata - # Do not include the materials from a to-be-removed package - if bool(metadata.get("removed", False)): + if bool(container_node.getMetaDataEntry("removed", False)): continue # Add brands we haven't seen yet to the dict, skipping generics - brand = metadata["brand"] + brand = container_node.getMetaDataEntry("brand", "") if brand.lower() == "generic": continue if brand not in brand_group_dict: brand_group_dict[brand] = {} # Add material types we haven't seen yet to the dict - material_type = metadata["material"] + material_type = container_node.getMetaDataEntry("material", "") if material_type not in brand_group_dict[brand]: brand_group_dict[brand][material_type] = [] diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/Machines/Models/SettingVisibilityPresetsModel.py index 3062e83889..79131521f2 100644 --- a/cura/Machines/Models/SettingVisibilityPresetsModel.py +++ b/cura/Machines/Models/SettingVisibilityPresetsModel.py @@ -1,135 +1,109 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional -import os -import urllib.parse -from configparser import ConfigParser +from typing import Optional, List -from PyQt5.QtCore import pyqtProperty, Qt, pyqtSignal, pyqtSlot +from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from UM.Application import Application from UM.Logger import Logger -from UM.Qt.ListModel import ListModel from UM.Resources import Resources -from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError from UM.i18n import i18nCatalog +from cura.Settings.SettingVisibilityPreset import SettingVisibilityPreset + catalog = i18nCatalog("cura") -class SettingVisibilityPresetsModel(ListModel): - IdRole = Qt.UserRole + 1 - NameRole = Qt.UserRole + 2 - SettingsRole = Qt.UserRole + 3 +class SettingVisibilityPresetsModel(QObject): + onItemsChanged = pyqtSignal() + activePresetChanged = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, preferences, parent = None): super().__init__(parent) - self.addRoleName(self.IdRole, "id") - self.addRoleName(self.NameRole, "name") - self.addRoleName(self.SettingsRole, "settings") + self._items = [] # type: List[SettingVisibilityPreset] self._populate() - basic_item = self.items[1] - basic_visibile_settings = ";".join(basic_item["settings"]) - self._preferences = Application.getInstance().getPreferences() + basic_item = self.getVisibilityPresetById("basic") + basic_visibile_settings = ";".join(basic_item.settings) + + self._preferences = preferences + # Preference to store which preset is currently selected self._preferences.addPreference("cura/active_setting_visibility_preset", "basic") + # Preference that stores the "custom" set so it can always be restored (even after a restart) self._preferences.addPreference("cura/custom_visible_settings", basic_visibile_settings) self._preferences.preferenceChanged.connect(self._onPreferencesChanged) - self._active_preset_item = self._getItem(self._preferences.getValue("cura/active_setting_visibility_preset")) + self._active_preset_item = self.getVisibilityPresetById(self._preferences.getValue("cura/active_setting_visibility_preset")) + # Initialize visible settings if it is not done yet visible_settings = self._preferences.getValue("general/visible_settings") + if not visible_settings: - self._preferences.setValue("general/visible_settings", ";".join(self._active_preset_item["settings"])) + self._preferences.setValue("general/visible_settings", ";".join(self._active_preset_item.settings)) else: self._onPreferencesChanged("general/visible_settings") self.activePresetChanged.emit() - def _getItem(self, item_id: str) -> Optional[dict]: + def getVisibilityPresetById(self, item_id: str) -> Optional[SettingVisibilityPreset]: result = None - for item in self.items: - if item["id"] == item_id: + for item in self._items: + if item.presetId == item_id: result = item break return result - def _populate(self): + def _populate(self) -> None: from cura.CuraApplication import CuraApplication - items = [] + items = [] # type: List[SettingVisibilityPreset] + + custom_preset = SettingVisibilityPreset(preset_id="custom", name ="Custom selection", weight = -100) + items.append(custom_preset) for file_path in Resources.getAllResourcesOfType(CuraApplication.ResourceTypes.SettingVisibilityPreset): + setting_visibility_preset = SettingVisibilityPreset() try: - mime_type = MimeTypeDatabase.getMimeTypeForFile(file_path) - except MimeTypeNotFoundError: - Logger.log("e", "Could not determine mime type of file %s", file_path) - continue - - item_id = urllib.parse.unquote_plus(mime_type.stripExtension(os.path.basename(file_path))) - if not os.path.isfile(file_path): - Logger.log("e", "[%s] is not a file", file_path) - continue - - parser = ConfigParser(allow_no_value = True) # accept options without any value, - try: - parser.read([file_path]) - if not parser.has_option("general", "name") or not parser.has_option("general", "weight"): - continue - - settings = [] - for section in parser.sections(): - if section == 'general': - continue - - settings.append(section) - for option in parser[section].keys(): - settings.append(option) - - items.append({ - "id": item_id, - "name": catalog.i18nc("@action:inmenu", parser["general"]["name"]), - "weight": parser["general"]["weight"], - "settings": settings, - }) - + setting_visibility_preset.loadFromFile(file_path) except Exception: Logger.logException("e", "Failed to load setting preset %s", file_path) - items.sort(key = lambda k: (int(k["weight"]), k["id"])) - # Put "custom" at the top - items.insert(0, {"id": "custom", - "name": "Custom selection", - "weight": -100, - "settings": []}) + items.append(setting_visibility_preset) + + # Sort them on weight (and if that fails, use ID) + items.sort(key = lambda k: (int(k.weight), k.presetId)) self.setItems(items) + @pyqtProperty("QVariantList", notify = onItemsChanged) + def items(self): + return self._items + + def setItems(self, items: List[SettingVisibilityPreset]) -> None: + if self._items != items: + self._items = items + self.onItemsChanged.emit() + @pyqtSlot(str) - def setActivePreset(self, preset_id: str): - if preset_id == self._active_preset_item["id"]: + def setActivePreset(self, preset_id: str) -> None: + if preset_id == self._active_preset_item.presetId: Logger.log("d", "Same setting visibility preset [%s] selected, do nothing.", preset_id) return - preset_item = None - for item in self.items: - if item["id"] == preset_id: - preset_item = item - break + preset_item = self.getVisibilityPresetById(preset_id) if preset_item is None: Logger.log("w", "Tried to set active preset to unknown id [%s]", preset_id) return - need_to_save_to_custom = self._active_preset_item["id"] == "custom" and preset_id != "custom" + need_to_save_to_custom = self._active_preset_item.presetId == "custom" and preset_id != "custom" if need_to_save_to_custom: # Save the current visibility settings to custom current_visibility_string = self._preferences.getValue("general/visible_settings") if current_visibility_string: self._preferences.setValue("cura/custom_visible_settings", current_visibility_string) - new_visibility_string = ";".join(preset_item["settings"]) + new_visibility_string = ";".join(preset_item.settings) if preset_id == "custom": # Get settings from the stored custom data new_visibility_string = self._preferences.getValue("cura/custom_visible_settings") @@ -141,13 +115,11 @@ class SettingVisibilityPresetsModel(ListModel): self._active_preset_item = preset_item self.activePresetChanged.emit() - activePresetChanged = pyqtSignal() - @pyqtProperty(str, notify = activePresetChanged) def activePreset(self) -> str: - return self._active_preset_item["id"] + return self._active_preset_item.presetId - def _onPreferencesChanged(self, name: str): + def _onPreferencesChanged(self, name: str) -> None: if name != "general/visible_settings": return @@ -158,25 +130,26 @@ class SettingVisibilityPresetsModel(ListModel): visibility_set = set(visibility_string.split(";")) matching_preset_item = None - for item in self.items: - if item["id"] == "custom": + for item in self._items: + if item.presetId == "custom": continue - if set(item["settings"]) == visibility_set: + if set(item.settings) == visibility_set: matching_preset_item = item break item_to_set = self._active_preset_item if matching_preset_item is None: # The new visibility setup is "custom" should be custom - if self._active_preset_item["id"] == "custom": + if self._active_preset_item is None or self._active_preset_item.presetId == "custom": # We are already in custom, just save the settings self._preferences.setValue("cura/custom_visible_settings", visibility_string) else: - item_to_set = self.items[0] # 0 is custom + # We need to move to custom preset. + item_to_set = self.getVisibilityPresetById("custom") else: item_to_set = matching_preset_item - if self._active_preset_item is None or self._active_preset_item["id"] != item_to_set["id"]: + if self._active_preset_item is None or self._active_preset_item.presetId != item_to_set.presetId: self._active_preset_item = item_to_set - self._preferences.setValue("cura/active_setting_visibility_preset", self._active_preset_item["id"]) + self._preferences.setValue("cura/active_setting_visibility_preset", self._active_preset_item.presetId) self.activePresetChanged.emit() diff --git a/cura/Machines/QualityChangesGroup.py b/cura/Machines/QualityChangesGroup.py index 2d0e655ed8..7844b935dc 100644 --- a/cura/Machines/QualityChangesGroup.py +++ b/cura/Machines/QualityChangesGroup.py @@ -17,16 +17,16 @@ class QualityChangesGroup(QualityGroup): super().__init__(name, quality_type, parent) self._container_registry = Application.getInstance().getContainerRegistry() - def addNode(self, node: "QualityNode"): + def addNode(self, node: "QualityNode") -> None: extruder_position = node.getMetaDataEntry("position") if extruder_position is None and self.node_for_global is not None or extruder_position in self.nodes_for_extruders: #We would be overwriting another node. ConfigurationErrorMessage.getInstance().addFaultyContainers(node.getMetaDataEntry("id")) return - if extruder_position is None: #Then we're a global quality changes profile. + if extruder_position is None: # Then we're a global quality changes profile. self.node_for_global = node - else: #This is an extruder's quality changes profile. + else: # This is an extruder's quality changes profile. self.nodes_for_extruders[extruder_position] = node def __str__(self) -> str: diff --git a/cura/Machines/QualityGroup.py b/cura/Machines/QualityGroup.py index 90ef63af51..535ba453f8 100644 --- a/cura/Machines/QualityGroup.py +++ b/cura/Machines/QualityGroup.py @@ -6,6 +6,7 @@ from typing import Dict, Optional, List, Set from PyQt5.QtCore import QObject, pyqtSlot from cura.Machines.ContainerNode import ContainerNode + # # A QualityGroup represents a group of containers that must be applied to each ContainerStack when it's used. # Some concrete examples are Quality and QualityChanges: when we select quality type "normal", this quality type @@ -34,7 +35,7 @@ class QualityGroup(QObject): return self.name def getAllKeys(self) -> Set[str]: - result = set() #type: Set[str] + result = set() # type: Set[str] for node in [self.node_for_global] + list(self.nodes_for_extruders.values()): if node is None: continue diff --git a/cura/Machines/QualityManager.py b/cura/Machines/QualityManager.py index 4ae58a71b2..fc8262de52 100644 --- a/cura/Machines/QualityManager.py +++ b/cura/Machines/QualityManager.py @@ -1,11 +1,10 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING, Optional, cast +from typing import TYPE_CHECKING, Optional, cast, Dict, List, Set from PyQt5.QtCore import QObject, QTimer, pyqtSignal, pyqtSlot -from UM.Application import Application from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger from UM.Util import parseBool @@ -20,6 +19,7 @@ if TYPE_CHECKING: from UM.Settings.DefinitionContainer import DefinitionContainer from cura.Settings.GlobalStack import GlobalStack from .QualityChangesGroup import QualityChangesGroup + from cura.CuraApplication import CuraApplication # @@ -36,17 +36,20 @@ class QualityManager(QObject): qualitiesUpdated = pyqtSignal() - def __init__(self, container_registry, parent = None): + def __init__(self, application: "CuraApplication", parent = None) -> None: super().__init__(parent) - self._application = Application.getInstance() + self._application = application self._material_manager = self._application.getMaterialManager() - self._container_registry = container_registry + self._container_registry = self._application.getContainerRegistry() self._empty_quality_container = self._application.empty_quality_container self._empty_quality_changes_container = self._application.empty_quality_changes_container - self._machine_nozzle_buildplate_material_quality_type_to_quality_dict = {} # for quality lookup - self._machine_quality_type_to_quality_changes_dict = {} # for quality_changes lookup + # For quality lookup + self._machine_nozzle_buildplate_material_quality_type_to_quality_dict = {} # type: Dict[str, QualityNode] + + # For quality_changes lookup + self._machine_quality_type_to_quality_changes_dict = {} # type: Dict[str, QualityNode] self._default_machine_definition_id = "fdmprinter" @@ -62,7 +65,7 @@ class QualityManager(QObject): self._update_timer.setSingleShot(True) self._update_timer.timeout.connect(self._updateMaps) - def initialize(self): + def initialize(self) -> None: # Initialize the lookup tree for quality profiles with following structure: # -> -> -> # -> @@ -133,13 +136,13 @@ class QualityManager(QObject): Logger.log("d", "Lookup tables updated.") self.qualitiesUpdated.emit() - def _updateMaps(self): + def _updateMaps(self) -> None: self.initialize() - def _onContainerMetadataChanged(self, container): + def _onContainerMetadataChanged(self, container: InstanceContainer) -> None: self._onContainerChanged(container) - def _onContainerChanged(self, container): + def _onContainerChanged(self, container: InstanceContainer) -> None: container_type = container.getMetaDataEntry("type") if container_type not in ("quality", "quality_changes"): return @@ -148,7 +151,7 @@ class QualityManager(QObject): self._update_timer.start() # Updates the given quality groups' availabilities according to which extruders are being used/ enabled. - def _updateQualityGroupsAvailability(self, machine: "GlobalStack", quality_group_list): + def _updateQualityGroupsAvailability(self, machine: "GlobalStack", quality_group_list) -> None: used_extruders = set() for i in range(machine.getProperty("machine_extruder_count", "value")): if str(i) in machine.extruders and machine.extruders[str(i)].isEnabled: @@ -196,7 +199,7 @@ class QualityManager(QObject): # Whether a QualityGroup is available can be unknown via the field QualityGroup.is_available. # For more details, see QualityGroup. # - def getQualityGroups(self, machine: "GlobalStack") -> dict: + def getQualityGroups(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) # This determines if we should only get the global qualities for the global stack and skip the global qualities for the extruder stacks @@ -214,19 +217,24 @@ class QualityManager(QObject): has_extruder_specific_qualities = True default_machine_node = self._machine_nozzle_buildplate_material_quality_type_to_quality_dict.get(self._default_machine_definition_id) - nodes_to_check = [machine_node, default_machine_node] + + nodes_to_check = [] # type: List[QualityNode] + if machine_node is not None: + nodes_to_check.append(machine_node) + if default_machine_node is not None: + nodes_to_check.append(default_machine_node) # Iterate over all quality_types in the machine node quality_group_dict = {} for node in nodes_to_check: if node and node.quality_type_map: quality_node = list(node.quality_type_map.values())[0] - is_global_quality = parseBool(quality_node.metadata.get("global_quality", False)) + is_global_quality = parseBool(quality_node.getMetaDataEntry("global_quality", False)) if not is_global_quality: continue for quality_type, quality_node in node.quality_type_map.items(): - quality_group = QualityGroup(quality_node.metadata["name"], quality_type) + quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) quality_group.node_for_global = quality_node quality_group_dict[quality_type] = quality_group break @@ -251,11 +259,15 @@ class QualityManager(QObject): root_material_id = self._material_manager.getRootMaterialIDWithoutDiameter(root_material_id) root_material_id_list.append(root_material_id) - # Also try to get the fallback material - material_type = extruder.material.getMetaDataEntry("material") - fallback_root_material_id = self._material_manager.getFallbackMaterialIdByMaterialType(material_type) - if fallback_root_material_id: - root_material_id_list.append(fallback_root_material_id) + # Also try to get the fallback materials + fallback_ids = self._material_manager.getFallBackMaterialIdsByMaterial(extruder.material) + + if fallback_ids: + root_material_id_list.extend(fallback_ids) + + # Weed out duplicates while preserving the order. + seen = set() # type: Set[str] + root_material_id_list = [x for x in root_material_id_list if x not in seen and not seen.add(x)] # type: ignore # Here we construct a list of nodes we want to look for qualities with the highest priority first. # The use case is that, when we look for qualities for a machine, we first want to search in the following @@ -273,13 +285,16 @@ class QualityManager(QObject): # Each points above can be represented as a node in the lookup tree, so here we simply put those nodes into # the list with priorities as the order. Later, we just need to loop over each node in this list and fetch # qualities from there. - node_info_list_0 = [nozzle_name, buildplate_name, root_material_id] + node_info_list_0 = [nozzle_name, buildplate_name, root_material_id] # type: List[Optional[str]] nodes_to_check = [] # This function tries to recursively find the deepest (the most specific) branch and add those nodes to # the search list in the order described above. So, by iterating over that search node list, we first look # in the more specific branches and then the less specific (generic) ones. - def addNodesToCheck(node, nodes_to_check_list, node_info_list, node_info_idx): + def addNodesToCheck(node: Optional[QualityNode], nodes_to_check_list: List[QualityNode], node_info_list, node_info_idx: int) -> None: + if node is None: + return + if node_info_idx < len(node_info_list): node_name = node_info_list[node_info_idx] if node_name is not None: @@ -300,9 +315,10 @@ class QualityManager(QObject): # The last fall back will be the global qualities (either from the machine-specific node or the generic # node), but we only use one. For details see the overview comments above. - if machine_node.quality_type_map: + + if machine_node is not None and machine_node.quality_type_map: nodes_to_check += [machine_node] - else: + elif default_machine_node is not None: nodes_to_check += [default_machine_node] for node_idx, node in enumerate(nodes_to_check): @@ -310,13 +326,13 @@ class QualityManager(QObject): if has_extruder_specific_qualities: # Only include variant qualities; skip non global qualities quality_node = list(node.quality_type_map.values())[0] - is_global_quality = parseBool(quality_node.metadata.get("global_quality", False)) + is_global_quality = parseBool(quality_node.getMetaDataEntry("global_quality", False)) if is_global_quality: continue for quality_type, quality_node in node.quality_type_map.items(): if quality_type not in quality_group_dict: - quality_group = QualityGroup(quality_node.metadata["name"], quality_type) + quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) quality_group_dict[quality_type] = quality_group quality_group = quality_group_dict[quality_type] @@ -334,7 +350,7 @@ class QualityManager(QObject): return quality_group_dict - def getQualityGroupsForMachineDefinition(self, machine: "GlobalStack") -> dict: + def getQualityGroupsForMachineDefinition(self, machine: "GlobalStack") -> Dict[str, QualityGroup]: machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition) # To find the quality container for the GlobalStack, check in the following fall-back manner: @@ -350,7 +366,7 @@ class QualityManager(QObject): for node in nodes_to_check: if node and node.quality_type_map: for quality_type, quality_node in node.quality_type_map.items(): - quality_group = QualityGroup(quality_node.metadata["name"], quality_type) + quality_group = QualityGroup(quality_node.getMetaDataEntry("name", ""), quality_type) quality_group.node_for_global = quality_node quality_group_dict[quality_type] = quality_group break @@ -372,7 +388,7 @@ class QualityManager(QObject): # Remove the given quality changes group. # @pyqtSlot(QObject) - def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup"): + def removeQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup") -> None: Logger.log("i", "Removing quality changes group [%s]", quality_changes_group.name) removed_quality_changes_ids = set() for node in quality_changes_group.getAllNodes(): @@ -415,7 +431,7 @@ class QualityManager(QObject): # Duplicates the given quality. # @pyqtSlot(str, "QVariantMap") - def duplicateQualityChanges(self, quality_changes_name, quality_model_item): + def duplicateQualityChanges(self, quality_changes_name: str, quality_model_item) -> None: global_stack = self._application.getGlobalContainerStack() if not global_stack: Logger.log("i", "No active global stack, cannot duplicate quality changes.") @@ -443,8 +459,8 @@ class QualityManager(QObject): # the user containers in each stack. These then replace the quality_changes containers in the # stack and clear the user settings. @pyqtSlot(str) - def createQualityChanges(self, base_name): - machine_manager = Application.getInstance().getMachineManager() + def createQualityChanges(self, base_name: str) -> None: + machine_manager = self._application.getMachineManager() global_stack = machine_manager.activeMachine if not global_stack: diff --git a/cura/Machines/QualityNode.py b/cura/Machines/QualityNode.py index f384ee7825..991388a4bd 100644 --- a/cura/Machines/QualityNode.py +++ b/cura/Machines/QualityNode.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict, cast +from typing import Optional, Dict, cast, Any from .ContainerNode import ContainerNode from .QualityChangesGroup import QualityChangesGroup @@ -12,18 +12,21 @@ from .QualityChangesGroup import QualityChangesGroup # class QualityNode(ContainerNode): - def __init__(self, metadata: Optional[dict] = None) -> None: + def __init__(self, metadata: Optional[Dict[str, Any]] = None) -> None: super().__init__(metadata = metadata) self.quality_type_map = {} # type: Dict[str, QualityNode] # quality_type -> QualityNode for InstanceContainer - def addQualityMetadata(self, quality_type: str, metadata: dict): + def getChildNode(self, child_key: str) -> Optional["QualityNode"]: + return self.children_map.get(child_key) + + def addQualityMetadata(self, quality_type: str, metadata: Dict[str, Any]): if quality_type not in self.quality_type_map: self.quality_type_map[quality_type] = QualityNode(metadata) def getQualityNode(self, quality_type: str) -> Optional["QualityNode"]: return self.quality_type_map.get(quality_type) - def addQualityChangesMetadata(self, quality_type: str, metadata: dict): + def addQualityChangesMetadata(self, quality_type: str, metadata: Dict[str, Any]): if quality_type not in self.quality_type_map: self.quality_type_map[quality_type] = QualityNode() quality_type_node = self.quality_type_map[quality_type] diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 0d497de51e..f6feb70e09 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. from collections import OrderedDict -from typing import Optional, TYPE_CHECKING +from typing import Optional, TYPE_CHECKING, Dict from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger @@ -36,11 +36,11 @@ if TYPE_CHECKING: # class VariantManager: - def __init__(self, container_registry): - self._container_registry = container_registry # type: ContainerRegistry + def __init__(self, container_registry: ContainerRegistry) -> None: + self._container_registry = container_registry - self._machine_to_variant_dict_map = dict() # -> - self._machine_to_buildplate_dict_map = dict() + self._machine_to_variant_dict_map = dict() # type: Dict[str, Dict["VariantType", Dict[str, ContainerNode]]] + self._machine_to_buildplate_dict_map = dict() # type: Dict[str, Dict[str, ContainerNode]] self._exclude_variant_id_list = ["empty_variant"] @@ -48,7 +48,7 @@ class VariantManager: # Initializes the VariantManager including: # - initializing the variant lookup table based on the metadata in ContainerRegistry. # - def initialize(self): + def initialize(self) -> None: self._machine_to_variant_dict_map = OrderedDict() self._machine_to_buildplate_dict_map = OrderedDict() @@ -106,10 +106,10 @@ class VariantManager: variant_node = variant_dict[variant_name] break return variant_node + return self._machine_to_variant_dict_map[machine_definition_id].get(variant_type, {}).get(variant_name) - def getVariantNodes(self, machine: "GlobalStack", - variant_type: Optional["VariantType"] = None) -> dict: + def getVariantNodes(self, machine: "GlobalStack", variant_type: "VariantType") -> Dict[str, ContainerNode]: machine_definition_id = machine.definition.getId() return self._machine_to_variant_dict_map.get(machine_definition_id, {}).get(variant_type, {}) diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py new file mode 100644 index 0000000000..f75ad9c9f9 --- /dev/null +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -0,0 +1,112 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import json +import random +from hashlib import sha512 +from base64 import b64encode +from typing import Dict, Optional + +import requests + +from UM.Logger import Logger + +from cura.OAuth2.Models import AuthenticationResponse, UserProfile, OAuth2Settings + + +# Class containing several helpers to deal with the authorization flow. +class AuthorizationHelpers: + def __init__(self, settings: "OAuth2Settings") -> None: + self._settings = settings + self._token_url = "{}/token".format(self._settings.OAUTH_SERVER_URL) + + @property + # The OAuth2 settings object. + def settings(self) -> "OAuth2Settings": + return self._settings + + # Request the access token from the authorization server. + # \param authorization_code: The authorization code from the 1st step. + # \param verification_code: The verification code needed for the PKCE extension. + # \return: An AuthenticationResponse object. + def getAccessTokenUsingAuthorizationCode(self, authorization_code: str, verification_code: str) -> "AuthenticationResponse": + data = { + "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "", + "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "", + "grant_type": "authorization_code", + "code": authorization_code, + "code_verifier": verification_code, + "scope": self._settings.CLIENT_SCOPES if self._settings.CLIENT_SCOPES is not None else "", + } + return self.parseTokenResponse(requests.post(self._token_url, data = data)) # type: ignore + + # Request the access token from the authorization server using a refresh token. + # \param refresh_token: + # \return: An AuthenticationResponse object. + def getAccessTokenUsingRefreshToken(self, refresh_token: str) -> "AuthenticationResponse": + data = { + "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "", + "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "", + "grant_type": "refresh_token", + "refresh_token": refresh_token, + "scope": self._settings.CLIENT_SCOPES if self._settings.CLIENT_SCOPES is not None else "", + } + return self.parseTokenResponse(requests.post(self._token_url, data = data)) # type: ignore + + @staticmethod + # Parse the token response from the authorization server into an AuthenticationResponse object. + # \param token_response: The JSON string data response from the authorization server. + # \return: An AuthenticationResponse object. + def parseTokenResponse(token_response: requests.models.Response) -> "AuthenticationResponse": + token_data = None + + try: + token_data = json.loads(token_response.text) + except ValueError: + Logger.log("w", "Could not parse token response data: %s", token_response.text) + + if not token_data: + return AuthenticationResponse(success=False, err_message="Could not read response.") + + if token_response.status_code not in (200, 201): + return AuthenticationResponse(success=False, err_message=token_data["error_description"]) + + return AuthenticationResponse(success=True, + token_type=token_data["token_type"], + access_token=token_data["access_token"], + refresh_token=token_data["refresh_token"], + expires_in=token_data["expires_in"], + scope=token_data["scope"]) + + # Calls the authentication API endpoint to get the token data. + # \param access_token: The encoded JWT token. + # \return: Dict containing some profile data. + def parseJWT(self, access_token: str) -> Optional["UserProfile"]: + token_request = requests.get("{}/check-token".format(self._settings.OAUTH_SERVER_URL), headers = { + "Authorization": "Bearer {}".format(access_token) + }) + if token_request.status_code not in (200, 201): + Logger.log("w", "Could not retrieve token data from auth server: %s", token_request.text) + return None + user_data = token_request.json().get("data") + if not user_data or not isinstance(user_data, dict): + Logger.log("w", "Could not parse user data from token: %s", user_data) + return None + return UserProfile( + user_id = user_data["user_id"], + username = user_data["username"], + profile_image_url = user_data.get("profile_image_url", "") + ) + + @staticmethod + # Generate a 16-character verification code. + # \param code_length: How long should the code be? + def generateVerificationCode(code_length: int = 16) -> str: + return "".join(random.choice("0123456789ABCDEF") for i in range(code_length)) + + @staticmethod + # Generates a base64 encoded sha512 encrypted version of a given string. + # \param verification_code: + # \return: The encrypted code in base64 format. + def generateVerificationCodeChallenge(verification_code: str) -> str: + encoded = sha512(verification_code.encode()).digest() + return b64encode(encoded, altchars = b"_-").decode() diff --git a/cura/OAuth2/AuthorizationRequestHandler.py b/cura/OAuth2/AuthorizationRequestHandler.py new file mode 100644 index 0000000000..7e0a659a56 --- /dev/null +++ b/cura/OAuth2/AuthorizationRequestHandler.py @@ -0,0 +1,101 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, Callable, Tuple, Dict, Any, List, TYPE_CHECKING + +from http.server import BaseHTTPRequestHandler +from urllib.parse import parse_qs, urlparse + +from cura.OAuth2.Models import AuthenticationResponse, ResponseData, HTTP_STATUS + +if TYPE_CHECKING: + from cura.OAuth2.Models import ResponseStatus + from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers + + +# This handler handles all HTTP requests on the local web server. +# It also requests the access token for the 2nd stage of the OAuth flow. +class AuthorizationRequestHandler(BaseHTTPRequestHandler): + def __init__(self, request, client_address, server) -> None: + super().__init__(request, client_address, server) + + # These values will be injected by the HTTPServer that this handler belongs to. + self.authorization_helpers = None # type: Optional["AuthorizationHelpers"] + self.authorization_callback = None # type: Optional[Callable[[AuthenticationResponse], None]] + self.verification_code = None # type: Optional[str] + + def do_GET(self) -> None: + # Extract values from the query string. + parsed_url = urlparse(self.path) + query = parse_qs(parsed_url.query) + + # Handle the possible requests + if parsed_url.path == "/callback": + server_response, token_response = self._handleCallback(query) + else: + server_response = self._handleNotFound() + token_response = None + + # Send the data to the browser. + self._sendHeaders(server_response.status, server_response.content_type, server_response.redirect_uri) + + if server_response.data_stream: + # If there is data in the response, we send it. + self._sendData(server_response.data_stream) + + if token_response and self.authorization_callback is not None: + # Trigger the callback if we got a response. + # This will cause the server to shut down, so we do it at the very end of the request handling. + self.authorization_callback(token_response) + + # Handler for the callback URL redirect. + # \param query: Dict containing the HTTP query parameters. + # \return: HTTP ResponseData containing a success page to show to the user. + def _handleCallback(self, query: Dict[Any, List]) -> Tuple[ResponseData, Optional[AuthenticationResponse]]: + code = self._queryGet(query, "code") + if code and self.authorization_helpers is not None and self.verification_code is not None: + # If the code was returned we get the access token. + token_response = self.authorization_helpers.getAccessTokenUsingAuthorizationCode( + code, self.verification_code) + + elif self._queryGet(query, "error_code") == "user_denied": + # Otherwise we show an error message (probably the user clicked "Deny" in the auth dialog). + token_response = AuthenticationResponse( + success=False, + err_message="Please give the required permissions when authorizing this application." + ) + + else: + # We don't know what went wrong here, so instruct the user to check the logs. + token_response = AuthenticationResponse( + success=False, + error_message="Something unexpected happened when trying to log in, please try again." + ) + if self.authorization_helpers is None: + return ResponseData(), token_response + + return ResponseData( + status=HTTP_STATUS["REDIRECT"], + data_stream=b"Redirecting...", + redirect_uri=self.authorization_helpers.settings.AUTH_SUCCESS_REDIRECT if token_response.success else + self.authorization_helpers.settings.AUTH_FAILED_REDIRECT + ), token_response + + @staticmethod + # Handle all other non-existing server calls. + def _handleNotFound() -> ResponseData: + return ResponseData(status=HTTP_STATUS["NOT_FOUND"], content_type="text/html", data_stream=b"Not found.") + + def _sendHeaders(self, status: "ResponseStatus", content_type: str, redirect_uri: str = None) -> None: + self.send_response(status.code, status.message) + self.send_header("Content-type", content_type) + if redirect_uri: + self.send_header("Location", redirect_uri) + self.end_headers() + + def _sendData(self, data: bytes) -> None: + self.wfile.write(data) + + @staticmethod + # Convenience Helper for getting values from a pre-parsed query string + def _queryGet(query_data: Dict[Any, List], key: str, default: Optional[str]=None) -> Optional[str]: + return query_data.get(key, [default])[0] diff --git a/cura/OAuth2/AuthorizationRequestServer.py b/cura/OAuth2/AuthorizationRequestServer.py new file mode 100644 index 0000000000..288e348ea9 --- /dev/null +++ b/cura/OAuth2/AuthorizationRequestServer.py @@ -0,0 +1,26 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from http.server import HTTPServer +from typing import Callable, Any, TYPE_CHECKING + +if TYPE_CHECKING: + from cura.OAuth2.Models import AuthenticationResponse + from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers + + +# The authorization request callback handler server. +# This subclass is needed to be able to pass some data to the request handler. +# This cannot be done on the request handler directly as the HTTPServer creates an instance of the handler after +# init. +class AuthorizationRequestServer(HTTPServer): + # Set the authorization helpers instance on the request handler. + def setAuthorizationHelpers(self, authorization_helpers: "AuthorizationHelpers") -> None: + self.RequestHandlerClass.authorization_helpers = authorization_helpers # type: ignore + + # Set the authorization callback on the request handler. + def setAuthorizationCallback(self, authorization_callback: Callable[["AuthenticationResponse"], Any]) -> None: + self.RequestHandlerClass.authorization_callback = authorization_callback # type: ignore + + # Set the verification code on the request handler. + def setVerificationCode(self, verification_code: str) -> None: + self.RequestHandlerClass.verification_code = verification_code # type: ignore diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py new file mode 100644 index 0000000000..65b31f1ed7 --- /dev/null +++ b/cura/OAuth2/AuthorizationService.py @@ -0,0 +1,168 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import json +import webbrowser +from typing import Optional, TYPE_CHECKING +from urllib.parse import urlencode + +from UM.Logger import Logger +from UM.Signal import Signal + +from cura.OAuth2.LocalAuthorizationServer import LocalAuthorizationServer +from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers +from cura.OAuth2.Models import AuthenticationResponse + +if TYPE_CHECKING: + from cura.OAuth2.Models import UserProfile, OAuth2Settings + from UM.Preferences import Preferences + + +class AuthorizationService: + """ + The authorization service is responsible for handling the login flow, + storing user credentials and providing account information. + """ + + # Emit signal when authentication is completed. + onAuthStateChanged = Signal() + + # Emit signal when authentication failed. + onAuthenticationError = Signal() + + def __init__(self, settings: "OAuth2Settings", preferences: Optional["Preferences"] = None) -> None: + self._settings = settings + self._auth_helpers = AuthorizationHelpers(settings) + self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL) + self._auth_data = None # type: Optional[AuthenticationResponse] + self._user_profile = None # type: Optional["UserProfile"] + self._preferences = preferences + self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True) + + def initialize(self, preferences: Optional["Preferences"] = None) -> None: + if preferences is not None: + self._preferences = preferences + if self._preferences: + self._preferences.addPreference(self._settings.AUTH_DATA_PREFERENCE_KEY, "{}") + + # Get the user profile as obtained from the JWT (JSON Web Token). + # If the JWT is not yet parsed, calling this will take care of that. + # \return UserProfile if a user is logged in, None otherwise. + # \sa _parseJWT + def getUserProfile(self) -> Optional["UserProfile"]: + if not self._user_profile: + # If no user profile was stored locally, we try to get it from JWT. + self._user_profile = self._parseJWT() + if not self._user_profile: + # If there is still no user profile from the JWT, we have to log in again. + return None + + return self._user_profile + + # Tries to parse the JWT (JSON Web Token) data, which it does if all the needed data is there. + # \return UserProfile if it was able to parse, None otherwise. + def _parseJWT(self) -> Optional["UserProfile"]: + if not self._auth_data or self._auth_data.access_token is None: + # If no auth data exists, we should always log in again. + return None + user_data = self._auth_helpers.parseJWT(self._auth_data.access_token) + if user_data: + # If the profile was found, we return it immediately. + return user_data + # The JWT was expired or invalid and we should request a new one. + if self._auth_data.refresh_token is None: + return None + self._auth_data = self._auth_helpers.getAccessTokenUsingRefreshToken(self._auth_data.refresh_token) + if not self._auth_data or self._auth_data.access_token is None: + # The token could not be refreshed using the refresh token. We should login again. + return None + + return self._auth_helpers.parseJWT(self._auth_data.access_token) + + # Get the access token as provided by the repsonse data. + def getAccessToken(self) -> Optional[str]: + if not self.getUserProfile(): + # We check if we can get the user profile. + # If we can't get it, that means the access token (JWT) was invalid or expired. + return None + + if self._auth_data is None: + return None + + return self._auth_data.access_token + + # Try to refresh the access token. This should be used when it has expired. + def refreshAccessToken(self) -> None: + if self._auth_data is None or self._auth_data.refresh_token is None: + Logger.log("w", "Unable to refresh access token, since there is no refresh token.") + return + self._storeAuthData(self._auth_helpers.getAccessTokenUsingRefreshToken(self._auth_data.refresh_token)) + self.onAuthStateChanged.emit(logged_in=True) + + # Delete the authentication data that we have stored locally (eg; logout) + def deleteAuthData(self) -> None: + if self._auth_data is not None: + self._storeAuthData() + self.onAuthStateChanged.emit(logged_in=False) + + # Start the flow to become authenticated. This will start a new webbrowser tap, prompting the user to login. + def startAuthorizationFlow(self) -> None: + Logger.log("d", "Starting new OAuth2 flow...") + + # Create the tokens needed for the code challenge (PKCE) extension for OAuth2. + # This is needed because the CuraDrivePlugin is a untrusted (open source) client. + # More details can be found at https://tools.ietf.org/html/rfc7636. + verification_code = self._auth_helpers.generateVerificationCode() + challenge_code = self._auth_helpers.generateVerificationCodeChallenge(verification_code) + + # Create the query string needed for the OAuth2 flow. + query_string = urlencode({ + "client_id": self._settings.CLIENT_ID, + "redirect_uri": self._settings.CALLBACK_URL, + "scope": self._settings.CLIENT_SCOPES, + "response_type": "code", + "state": "CuraDriveIsAwesome", + "code_challenge": challenge_code, + "code_challenge_method": "S512" + }) + + # Open the authorization page in a new browser window. + webbrowser.open_new("{}?{}".format(self._auth_url, query_string)) + + # Start a local web server to receive the callback URL on. + self._server.start(verification_code) + + # Callback method for the authentication flow. + def _onAuthStateChanged(self, auth_response: AuthenticationResponse) -> None: + if auth_response.success: + self._storeAuthData(auth_response) + self.onAuthStateChanged.emit(logged_in=True) + else: + self.onAuthenticationError.emit(logged_in=False, error_message=auth_response.err_message) + self._server.stop() # Stop the web server at all times. + + # Load authentication data from preferences. + def loadAuthDataFromPreferences(self) -> None: + if self._preferences is None: + Logger.log("e", "Unable to load authentication data, since no preference has been set!") + return + try: + preferences_data = json.loads(self._preferences.getValue(self._settings.AUTH_DATA_PREFERENCE_KEY)) + if preferences_data: + self._auth_data = AuthenticationResponse(**preferences_data) + self.onAuthStateChanged.emit(logged_in=True) + except ValueError: + Logger.logException("w", "Could not load auth data from preferences") + + # Store authentication data in preferences. + def _storeAuthData(self, auth_data: Optional[AuthenticationResponse] = None) -> None: + if self._preferences is None: + Logger.log("e", "Unable to save authentication data, since no preference has been set!") + return + + self._auth_data = auth_data + if auth_data: + self._user_profile = self.getUserProfile() + self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(vars(auth_data))) + else: + self._user_profile = None + self._preferences.resetPreference(self._settings.AUTH_DATA_PREFERENCE_KEY) diff --git a/cura/OAuth2/LocalAuthorizationServer.py b/cura/OAuth2/LocalAuthorizationServer.py new file mode 100644 index 0000000000..5a282d8135 --- /dev/null +++ b/cura/OAuth2/LocalAuthorizationServer.py @@ -0,0 +1,64 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import threading +from typing import Optional, Callable, Any, TYPE_CHECKING + +from UM.Logger import Logger + +from cura.OAuth2.AuthorizationRequestServer import AuthorizationRequestServer +from cura.OAuth2.AuthorizationRequestHandler import AuthorizationRequestHandler + +if TYPE_CHECKING: + from cura.OAuth2.Models import AuthenticationResponse + from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers + + +class LocalAuthorizationServer: + # The local LocalAuthorizationServer takes care of the oauth2 callbacks. + # Once the flow is completed, this server should be closed down again by calling stop() + # \param auth_helpers: An instance of the authorization helpers class. + # \param auth_state_changed_callback: A callback function to be called when the authorization state changes. + # \param daemon: Whether the server thread should be run in daemon mode. Note: Daemon threads are abruptly stopped + # at shutdown. Their resources (e.g. open files) may never be released. + def __init__(self, auth_helpers: "AuthorizationHelpers", + auth_state_changed_callback: Callable[["AuthenticationResponse"], Any], + daemon: bool) -> None: + self._web_server = None # type: Optional[AuthorizationRequestServer] + self._web_server_thread = None # type: Optional[threading.Thread] + self._web_server_port = auth_helpers.settings.CALLBACK_PORT + self._auth_helpers = auth_helpers + self._auth_state_changed_callback = auth_state_changed_callback + self._daemon = daemon + + # Starts the local web server to handle the authorization callback. + # \param verification_code: The verification code part of the OAuth2 client identification. + def start(self, verification_code: str) -> None: + if self._web_server: + # If the server is already running (because of a previously aborted auth flow), we don't have to start it. + # We still inject the new verification code though. + self._web_server.setVerificationCode(verification_code) + return + + if self._web_server_port is None: + raise Exception("Unable to start server without specifying the port.") + + Logger.log("d", "Starting local web server to handle authorization callback on port %s", self._web_server_port) + + # Create the server and inject the callback and code. + self._web_server = AuthorizationRequestServer(("0.0.0.0", self._web_server_port), AuthorizationRequestHandler) + self._web_server.setAuthorizationHelpers(self._auth_helpers) + self._web_server.setAuthorizationCallback(self._auth_state_changed_callback) + self._web_server.setVerificationCode(verification_code) + + # Start the server on a new thread. + self._web_server_thread = threading.Thread(None, self._web_server.serve_forever, daemon = self._daemon) + self._web_server_thread.start() + + # Stops the web server if it was running. It also does some cleanup. + def stop(self) -> None: + Logger.log("d", "Stopping local oauth2 web server...") + + if self._web_server: + self._web_server.server_close() + self._web_server = None + self._web_server_thread = None diff --git a/cura/OAuth2/Models.py b/cura/OAuth2/Models.py new file mode 100644 index 0000000000..83fc22554f --- /dev/null +++ b/cura/OAuth2/Models.py @@ -0,0 +1,60 @@ +# Copyright (c) 2018 Ultimaker B.V. +from typing import Optional + + +class BaseModel: + def __init__(self, **kwargs): + self.__dict__.update(kwargs) + + +# OAuth OAuth2Settings data template. +class OAuth2Settings(BaseModel): + CALLBACK_PORT = None # type: Optional[int] + OAUTH_SERVER_URL = None # type: Optional[str] + CLIENT_ID = None # type: Optional[str] + CLIENT_SCOPES = None # type: Optional[str] + CALLBACK_URL = None # type: Optional[str] + AUTH_DATA_PREFERENCE_KEY = "" # type: str + AUTH_SUCCESS_REDIRECT = "https://ultimaker.com" # type: str + AUTH_FAILED_REDIRECT = "https://ultimaker.com" # type: str + + +# User profile data template. +class UserProfile(BaseModel): + user_id = None # type: Optional[str] + username = None # type: Optional[str] + profile_image_url = None # type: Optional[str] + + +# Authentication data template. +class AuthenticationResponse(BaseModel): + """Data comes from the token response with success flag and error message added.""" + success = True # type: bool + token_type = None # type: Optional[str] + access_token = None # type: Optional[str] + refresh_token = None # type: Optional[str] + expires_in = None # type: Optional[str] + scope = None # type: Optional[str] + err_message = None # type: Optional[str] + + +# Response status template. +class ResponseStatus(BaseModel): + code = 200 # type: int + message = "" # type str + + +# Response data template. +class ResponseData(BaseModel): + status = None # type: ResponseStatus + data_stream = None # type: Optional[bytes] + redirect_uri = None # type: Optional[str] + content_type = "text/html" # type: str + + +# Possible HTTP responses. +HTTP_STATUS = { + "OK": ResponseStatus(code=200, message="OK"), + "NOT_FOUND": ResponseStatus(code=404, message="NOT FOUND"), + "REDIRECT": ResponseStatus(code=302, message="REDIRECT") +} diff --git a/cura/OAuth2/__init__.py b/cura/OAuth2/__init__.py new file mode 100644 index 0000000000..f3f6970c54 --- /dev/null +++ b/cura/OAuth2/__init__.py @@ -0,0 +1,2 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. diff --git a/cura/ObjectsModel.py b/cura/ObjectsModel.py index f3c703d424..8354540783 100644 --- a/cura/ObjectsModel.py +++ b/cura/ObjectsModel.py @@ -9,6 +9,7 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.SceneNode import SceneNode from UM.Scene.Selection import Selection from UM.i18n import i18nCatalog +from collections import defaultdict catalog = i18nCatalog("cura") @@ -40,6 +41,8 @@ class ObjectsModel(ListModel): filter_current_build_plate = Application.getInstance().getPreferences().getValue("view/filter_current_build_plate") active_build_plate_number = self._build_plate_number group_nr = 1 + name_count_dict = defaultdict(int) + for node in DepthFirstIterator(Application.getInstance().getController().getScene().getRoot()): if not isinstance(node, SceneNode): continue @@ -55,6 +58,7 @@ class ObjectsModel(ListModel): if not node.callDecoration("isGroup"): name = node.getName() + else: name = catalog.i18nc("@label", "Group #{group_nr}").format(group_nr = str(group_nr)) group_nr += 1 @@ -63,6 +67,14 @@ class ObjectsModel(ListModel): is_outside_build_area = node.isOutsideBuildArea() else: is_outside_build_area = False + + #check if we already have an instance of the object based on name + name_count_dict[name] += 1 + name_count = name_count_dict[name] + + if name_count > 1: + name = "{0}({1})".format(name, name_count-1) + node.setName(name) nodes.append({ "name": name, @@ -71,6 +83,7 @@ class ObjectsModel(ListModel): "buildPlateNumber": node_build_plate_number, "node": node }) + nodes = sorted(nodes, key=lambda n: n["name"]) self.setItems(nodes) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 8527da1b8a..e11f70a54c 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -6,73 +6,59 @@ import math import os import unicodedata import re # To create abbreviations for printer names. -from typing import Dict +from typing import Dict, List, Optional from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot -from UM.i18n import i18nCatalog from UM.Logger import Logger from UM.Qt.Duration import Duration from UM.Scene.SceneNode import SceneNode from UM.i18n import i18nCatalog from UM.MimeTypeDatabase import MimeTypeDatabase + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + catalog = i18nCatalog("cura") -## A class for processing and calculating minimum, current and maximum print time as well as managing the job name -# -# This class contains all the logic relating to calculation and slicing for the -# time/quality slider concept. It is a rather tricky combination of event handling -# and state management. The logic behind this is as follows: -# -# - A scene change or setting change event happens. -# We track what the source was of the change, either a scene change, a setting change, an active machine change or something else. -# - This triggers a new slice with the current settings - this is the "current settings pass". -# - When the slice is done, we update the current print time and material amount. -# - If the source of the slice was not a Setting change, we start the second slice pass, the "low quality settings pass". Otherwise we stop here. -# - When that is done, we update the minimum print time and start the final slice pass, the "Extra Fine settings pass". -# - When the Extra Fine pass is done, we update the maximum print time. +## A class for processing and the print times per build plate as well as managing the job name # # This class also mangles the current machine name and the filename of the first loaded mesh into a job name. # This job name is requested by the JobSpecs qml file. class PrintInformation(QObject): - class SlicePass: - CurrentSettings = 1 - LowQualitySettings = 2 - HighQualitySettings = 3 - class SliceReason: - SceneChanged = 1 - SettingChanged = 2 - ActiveMachineChanged = 3 - Other = 4 + UNTITLED_JOB_NAME = "Untitled" - def __init__(self, application, parent = None): + def __init__(self, application: "CuraApplication", parent = None) -> None: super().__init__(parent) self._application = application self.initializeCuraMessagePrintTimeProperties() - self._material_lengths = {} # indexed by build plate number - self._material_weights = {} - self._material_costs = {} - self._material_names = {} + # Indexed by build plate number + self._material_lengths = {} # type: Dict[int, List[float]] + self._material_weights = {} # type: Dict[int, List[float]] + self._material_costs = {} # type: Dict[int, List[float]] + self._material_names = {} # type: Dict[int, List[str]] self._pre_sliced = False self._backend = self._application.getBackend() if self._backend: self._backend.printDurationMessage.connect(self._onPrintDurationMessage) + self._application.getController().getScene().sceneChanged.connect(self._onSceneChanged) self._is_user_specified_job_name = False self._base_name = "" self._abbr_machine = "" self._job_name = "" - self._project_name = "" self._active_build_plate = 0 - self._initVariablesWithBuildPlate(self._active_build_plate) + self._initVariablesByBuildPlate(self._active_build_plate) self._multi_build_plate_model = self._application.getMultiBuildPlateModel() @@ -80,19 +66,17 @@ class PrintInformation(QObject): self._application.globalContainerStackChanged.connect(self.setToZeroPrintInformation) self._application.fileLoaded.connect(self.setBaseName) self._application.workspaceLoaded.connect(self.setProjectName) - self._multi_build_plate_model.activeBuildPlateChanged.connect(self._onActiveBuildPlateChanged) - + self._application.getMachineManager().rootMaterialChanged.connect(self._onActiveMaterialsChanged) self._application.getInstance().getPreferences().preferenceChanged.connect(self._onPreferencesChanged) - self._application.getMachineManager().rootMaterialChanged.connect(self._onActiveMaterialsChanged) + self._multi_build_plate_model.activeBuildPlateChanged.connect(self._onActiveBuildPlateChanged) + self._onActiveMaterialsChanged() - self._material_amounts = [] + self._material_amounts = [] # type: List[float] - # Crate cura message translations and using translation keys initialize empty time Duration object for total time - # and time for each feature - def initializeCuraMessagePrintTimeProperties(self): - self._current_print_time = {} # Duration(None, self) + def initializeCuraMessagePrintTimeProperties(self) -> None: + self._current_print_time = {} # type: Dict[int, Duration] self._print_time_message_translations = { "inset_0": catalog.i18nc("@tooltip", "Outer Wall"), @@ -108,17 +92,17 @@ class PrintInformation(QObject): "none": catalog.i18nc("@tooltip", "Other") } - self._print_time_message_values = {} + self._print_times_per_feature = {} # type: Dict[int, Dict[str, Duration]] - def _initPrintTimeMessageValues(self, build_plate_number): + def _initPrintTimesPerFeature(self, build_plate_number: int) -> None: # Full fill message values using keys from _print_time_message_translations - self._print_time_message_values[build_plate_number] = {} + self._print_times_per_feature[build_plate_number] = {} for key in self._print_time_message_translations.keys(): - self._print_time_message_values[build_plate_number][key] = Duration(None, self) + self._print_times_per_feature[build_plate_number][key] = Duration(None, self) - def _initVariablesWithBuildPlate(self, build_plate_number): - if build_plate_number not in self._print_time_message_values: - self._initPrintTimeMessageValues(build_plate_number) + def _initVariablesByBuildPlate(self, build_plate_number: int) -> None: + if build_plate_number not in self._print_times_per_feature: + self._initPrintTimesPerFeature(build_plate_number) if self._active_build_plate not in self._material_lengths: self._material_lengths[self._active_build_plate] = [] if self._active_build_plate not in self._material_weights: @@ -128,23 +112,24 @@ class PrintInformation(QObject): if self._active_build_plate not in self._material_names: self._material_names[self._active_build_plate] = [] if self._active_build_plate not in self._current_print_time: - self._current_print_time[self._active_build_plate] = Duration(None, self) + self._current_print_time[self._active_build_plate] = Duration(parent = self) currentPrintTimeChanged = pyqtSignal() preSlicedChanged = pyqtSignal() @pyqtProperty(bool, notify=preSlicedChanged) - def preSliced(self): + def preSliced(self) -> bool: return self._pre_sliced - def setPreSliced(self, pre_sliced): - self._pre_sliced = pre_sliced - self._updateJobName() - self.preSlicedChanged.emit() + def setPreSliced(self, pre_sliced: bool) -> None: + if self._pre_sliced != pre_sliced: + self._pre_sliced = pre_sliced + self._updateJobName() + self.preSlicedChanged.emit() @pyqtProperty(Duration, notify = currentPrintTimeChanged) - def currentPrintTime(self): + def currentPrintTime(self) -> Duration: return self._current_print_time[self._active_build_plate] materialLengthsChanged = pyqtSignal() @@ -171,36 +156,41 @@ class PrintInformation(QObject): def materialNames(self): return self._material_names[self._active_build_plate] - def printTimes(self): - return self._print_time_message_values[self._active_build_plate] + # Get all print times (by feature) of the active buildplate. + def printTimes(self) -> Dict[str, Duration]: + return self._print_times_per_feature[self._active_build_plate] - def _onPrintDurationMessage(self, build_plate_number, print_time: Dict[str, int], material_amounts: list): - self._updateTotalPrintTimePerFeature(build_plate_number, print_time) + def _onPrintDurationMessage(self, build_plate_number: int, print_times_per_feature: Dict[str, int], material_amounts: List[float]) -> None: + self._updateTotalPrintTimePerFeature(build_plate_number, print_times_per_feature) self.currentPrintTimeChanged.emit() self._material_amounts = material_amounts self._calculateInformation(build_plate_number) - def _updateTotalPrintTimePerFeature(self, build_plate_number, print_time: Dict[str, int]): + def _updateTotalPrintTimePerFeature(self, build_plate_number: int, print_times_per_feature: Dict[str, int]) -> None: total_estimated_time = 0 - if build_plate_number not in self._print_time_message_values: - self._initPrintTimeMessageValues(build_plate_number) + if build_plate_number not in self._print_times_per_feature: + self._initPrintTimesPerFeature(build_plate_number) + + for feature, time in print_times_per_feature.items(): + if feature not in self._print_times_per_feature[build_plate_number]: + self._print_times_per_feature[build_plate_number][feature] = Duration(parent=self) + duration = self._print_times_per_feature[build_plate_number][feature] - for feature, time in print_time.items(): if time != time: # Check for NaN. Engine can sometimes give us weird values. - self._print_time_message_values[build_plate_number].get(feature).setDuration(0) + duration.setDuration(0) Logger.log("w", "Received NaN for print duration message") continue total_estimated_time += time - self._print_time_message_values[build_plate_number].get(feature).setDuration(time) + duration.setDuration(time) if build_plate_number not in self._current_print_time: self._current_print_time[build_plate_number] = Duration(None, self) self._current_print_time[build_plate_number].setDuration(total_estimated_time) - def _calculateInformation(self, build_plate_number): + def _calculateInformation(self, build_plate_number: int) -> None: global_stack = self._application.getGlobalContainerStack() if global_stack is None: return @@ -213,39 +203,45 @@ class PrintInformation(QObject): material_preference_values = json.loads(self._application.getInstance().getPreferences().getValue("cura/material_settings")) extruder_stacks = global_stack.extruders - for position, extruder_stack in extruder_stacks.items(): + + for position in extruder_stacks: + extruder_stack = extruder_stacks[position] index = int(position) if index >= len(self._material_amounts): continue amount = self._material_amounts[index] - ## Find the right extruder stack. As the list isn't sorted because it's a annoying generator, we do some - # list comprehension filtering to solve this for us. + # Find the right extruder stack. As the list isn't sorted because it's a annoying generator, we do some + # list comprehension filtering to solve this for us. density = extruder_stack.getMetaDataEntry("properties", {}).get("density", 0) - material = extruder_stack.findContainer({"type": "material"}) + material = extruder_stack.material radius = extruder_stack.getProperty("material_diameter", "value") / 2 weight = float(amount) * float(density) / 1000 - cost = 0 - material_name = catalog.i18nc("@label unknown material", "Unknown") - if material: - material_guid = material.getMetaDataEntry("GUID") - material_name = material.getName() - if material_guid in material_preference_values: - material_values = material_preference_values[material_guid] + cost = 0. - weight_per_spool = float(material_values["spool_weight"] if material_values and "spool_weight" in material_values else 0) - cost_per_spool = float(material_values["spool_cost"] if material_values and "spool_cost" in material_values else 0) + material_guid = material.getMetaDataEntry("GUID") + material_name = material.getName() + if material_guid in material_preference_values: + material_values = material_preference_values[material_guid] - if weight_per_spool != 0: - cost = cost_per_spool * weight / weight_per_spool - else: - cost = 0 + if material_values and "spool_weight" in material_values: + weight_per_spool = float(material_values["spool_weight"]) + else: + weight_per_spool = float(extruder_stack.getMetaDataEntry("properties", {}).get("weight", 0)) + + cost_per_spool = float(material_values["spool_cost"] if material_values and "spool_cost" in material_values else 0) + + if weight_per_spool != 0: + cost = cost_per_spool * weight / weight_per_spool + else: + cost = 0 # Material amount is sent as an amount of mm^3, so calculate length from that if radius != 0: length = round((amount / (math.pi * radius ** 2)) / 1000, 2) else: length = 0 + self._material_weights[build_plate_number].append(weight) self._material_lengths[build_plate_number].append(length) self._material_costs[build_plate_number].append(cost) @@ -256,20 +252,20 @@ class PrintInformation(QObject): self.materialCostsChanged.emit() self.materialNamesChanged.emit() - def _onPreferencesChanged(self, preference): + def _onPreferencesChanged(self, preference: str) -> None: if preference != "cura/material_settings": return for build_plate_number in range(self._multi_build_plate_model.maxBuildPlate + 1): self._calculateInformation(build_plate_number) - def _onActiveBuildPlateChanged(self): + def _onActiveBuildPlateChanged(self) -> None: new_active_build_plate = self._multi_build_plate_model.activeBuildPlate if new_active_build_plate != self._active_build_plate: self._active_build_plate = new_active_build_plate self._updateJobName() - self._initVariablesWithBuildPlate(self._active_build_plate) + self._initVariablesByBuildPlate(self._active_build_plate) self.materialLengthsChanged.emit() self.materialWeightsChanged.emit() @@ -277,14 +273,14 @@ class PrintInformation(QObject): self.materialNamesChanged.emit() self.currentPrintTimeChanged.emit() - def _onActiveMaterialsChanged(self, *args, **kwargs): + def _onActiveMaterialsChanged(self, *args, **kwargs) -> None: for build_plate_number in range(self._multi_build_plate_model.maxBuildPlate + 1): self._calculateInformation(build_plate_number) # Manual override of job name should also set the base name so that when the printer prefix is updated, it the # prefix can be added to the manually added name, not the old base name @pyqtSlot(str, bool) - def setJobName(self, name, is_user_specified_job_name = False): + def setJobName(self, name: str, is_user_specified_job_name = False) -> None: self._is_user_specified_job_name = is_user_specified_job_name self._job_name = name self._base_name = name.replace(self._abbr_machine + "_", "") @@ -298,15 +294,15 @@ class PrintInformation(QObject): def jobName(self): return self._job_name - def _updateJobName(self): + def _updateJobName(self) -> None: if self._base_name == "": - self._job_name = "Untitled" + self._job_name = self.UNTITLED_JOB_NAME self._is_user_specified_job_name = False self.jobNameChanged.emit() return base_name = self._stripAccents(self._base_name) - self._setAbbreviatedMachineName() + self._defineAbbreviatedMachineName() # Only update the job name when it's not user-specified. if not self._is_user_specified_job_name: @@ -333,12 +329,12 @@ class PrintInformation(QObject): self.jobNameChanged.emit() @pyqtSlot(str) - def setProjectName(self, name): + def setProjectName(self, name: str) -> None: self.setBaseName(name, is_project_file = True) baseNameChanged = pyqtSignal() - def setBaseName(self, base_name: str, is_project_file: bool = False): + def setBaseName(self, base_name: str, is_project_file: bool = False) -> None: self._is_user_specified_job_name = False # Ensure that we don't use entire path but only filename @@ -373,6 +369,16 @@ class PrintInformation(QObject): else: self._base_name = "" + # Strip the old "curaproject" extension from the name + OLD_CURA_PROJECT_EXT = ".curaproject" + if self._base_name.lower().endswith(OLD_CURA_PROJECT_EXT): + self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_EXT)] + + # CURA-5896 Try to strip extra extensions with an infinite amount of ".curaproject.3mf". + OLD_CURA_PROJECT_3MF_EXT = ".curaproject.3mf" + while self._base_name.lower().endswith(OLD_CURA_PROJECT_3MF_EXT): + self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_3MF_EXT)] + self._updateJobName() @pyqtProperty(str, fset = setBaseName, notify = baseNameChanged) @@ -382,7 +388,7 @@ class PrintInformation(QObject): ## Created an acronym-like abbreviated machine name from the currently # active machine name. # Called each time the global stack is switched. - def _setAbbreviatedMachineName(self): + def _defineAbbreviatedMachineName(self) -> None: global_container_stack = self._application.getGlobalContainerStack() if not global_container_stack: self._abbr_machine = "" @@ -406,15 +412,15 @@ class PrintInformation(QObject): self._abbr_machine = abbr_machine ## Utility method that strips accents from characters (eg: â -> a) - def _stripAccents(self, str): - return ''.join(char for char in unicodedata.normalize('NFD', str) if unicodedata.category(char) != 'Mn') + def _stripAccents(self, to_strip: str) -> str: + return ''.join(char for char in unicodedata.normalize('NFD', to_strip) if unicodedata.category(char) != 'Mn') @pyqtSlot(result = "QVariantMap") def getFeaturePrintTimes(self): result = {} - if self._active_build_plate not in self._print_time_message_values: - self._initPrintTimeMessageValues(self._active_build_plate) - for feature, time in self._print_time_message_values[self._active_build_plate].items(): + if self._active_build_plate not in self._print_times_per_feature: + self._initPrintTimesPerFeature(self._active_build_plate) + for feature, time in self._print_times_per_feature[self._active_build_plate].items(): if feature in self._print_time_message_translations: result[self._print_time_message_translations[feature]] = time else: @@ -422,22 +428,22 @@ class PrintInformation(QObject): return result # Simulate message with zero time duration - def setToZeroPrintInformation(self, build_plate = None): + def setToZeroPrintInformation(self, build_plate: Optional[int] = None) -> None: if build_plate is None: build_plate = self._active_build_plate # Construct the 0-time message temp_message = {} - if build_plate not in self._print_time_message_values: - self._print_time_message_values[build_plate] = {} - for key in self._print_time_message_values[build_plate].keys(): + if build_plate not in self._print_times_per_feature: + self._print_times_per_feature[build_plate] = {} + for key in self._print_times_per_feature[build_plate].keys(): temp_message[key] = 0 - temp_material_amounts = [0] + temp_material_amounts = [0.] self._onPrintDurationMessage(build_plate, temp_message, temp_material_amounts) ## Listen to scene changes to check if we need to reset the print information - def _onSceneChanged(self, scene_node): + def _onSceneChanged(self, scene_node: SceneNode) -> None: # Ignore any changes that are not related to sliceable objects if not isinstance(scene_node, SceneNode)\ or not scene_node.callDecoration("isSliceable")\ diff --git a/cura/PrinterOutput/ConfigurationModel.py b/cura/PrinterOutput/ConfigurationModel.py index a3d6afd01d..89e609c913 100644 --- a/cura/PrinterOutput/ConfigurationModel.py +++ b/cura/PrinterOutput/ConfigurationModel.py @@ -13,20 +13,20 @@ class ConfigurationModel(QObject): configurationChanged = pyqtSignal() - def __init__(self): + def __init__(self) -> None: super().__init__() - self._printer_type = None + self._printer_type = "" self._extruder_configurations = [] # type: List[ExtruderConfigurationModel] - self._buildplate_configuration = None + self._buildplate_configuration = "" def setPrinterType(self, printer_type): self._printer_type = printer_type @pyqtProperty(str, fset = setPrinterType, notify = configurationChanged) - def printerType(self): + def printerType(self) -> str: return self._printer_type - def setExtruderConfigurations(self, extruder_configurations): + def setExtruderConfigurations(self, extruder_configurations: List["ExtruderConfigurationModel"]): if self._extruder_configurations != extruder_configurations: self._extruder_configurations = extruder_configurations @@ -39,16 +39,16 @@ class ConfigurationModel(QObject): def extruderConfigurations(self): return self._extruder_configurations - def setBuildplateConfiguration(self, buildplate_configuration): + def setBuildplateConfiguration(self, buildplate_configuration: str) -> None: self._buildplate_configuration = buildplate_configuration @pyqtProperty(str, fset = setBuildplateConfiguration, notify = configurationChanged) - def buildplateConfiguration(self): + def buildplateConfiguration(self) -> str: return self._buildplate_configuration ## This method is intended to indicate whether the configuration is valid or not. # The method checks if the mandatory fields are or not set - def isValid(self): + def isValid(self) -> bool: if not self._extruder_configurations: return False for configuration in self._extruder_configurations: diff --git a/cura/PrinterOutput/FirmwareUpdater.py b/cura/PrinterOutput/FirmwareUpdater.py new file mode 100644 index 0000000000..c6d9513ee0 --- /dev/null +++ b/cura/PrinterOutput/FirmwareUpdater.py @@ -0,0 +1,78 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import QObject, QUrl, pyqtSignal, pyqtProperty + +from enum import IntEnum +from threading import Thread +from typing import Union + +MYPY = False +if MYPY: + from cura.PrinterOutputDevice import PrinterOutputDevice + +class FirmwareUpdater(QObject): + firmwareProgressChanged = pyqtSignal() + firmwareUpdateStateChanged = pyqtSignal() + + def __init__(self, output_device: "PrinterOutputDevice") -> None: + super().__init__() + + self._output_device = output_device + + self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True) + + self._firmware_file = "" + self._firmware_progress = 0 + self._firmware_update_state = FirmwareUpdateState.idle + + def updateFirmware(self, firmware_file: Union[str, QUrl]) -> None: + # the file path could be url-encoded. + if firmware_file.startswith("file://"): + self._firmware_file = QUrl(firmware_file).toLocalFile() + else: + self._firmware_file = firmware_file + + self._setFirmwareUpdateState(FirmwareUpdateState.updating) + + self._update_firmware_thread.start() + + def _updateFirmware(self) -> None: + raise NotImplementedError("_updateFirmware needs to be implemented") + + ## Cleanup after a succesful update + def _cleanupAfterUpdate(self) -> None: + # Clean up for next attempt. + self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True) + self._firmware_file = "" + self._onFirmwareProgress(100) + self._setFirmwareUpdateState(FirmwareUpdateState.completed) + + @pyqtProperty(int, notify = firmwareProgressChanged) + def firmwareProgress(self) -> int: + return self._firmware_progress + + @pyqtProperty(int, notify=firmwareUpdateStateChanged) + def firmwareUpdateState(self) -> "FirmwareUpdateState": + return self._firmware_update_state + + def _setFirmwareUpdateState(self, state: "FirmwareUpdateState") -> None: + if self._firmware_update_state != state: + self._firmware_update_state = state + self.firmwareUpdateStateChanged.emit() + + # Callback function for firmware update progress. + def _onFirmwareProgress(self, progress: int, max_progress: int = 100) -> None: + self._firmware_progress = int(progress * 100 / max_progress) # Convert to scale of 0-100 + self.firmwareProgressChanged.emit() + + +class FirmwareUpdateState(IntEnum): + idle = 0 + updating = 1 + completed = 2 + unknown_error = 3 + communication_error = 4 + io_error = 5 + firmware_not_found_error = 6 + diff --git a/cura/PrinterOutput/GenericOutputController.py b/cura/PrinterOutput/GenericOutputController.py index e6310e5bff..c538ae79f8 100644 --- a/cura/PrinterOutput/GenericOutputController.py +++ b/cura/PrinterOutput/GenericOutputController.py @@ -1,7 +1,7 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Set, Union, Optional from cura.PrinterOutput.PrinterOutputController import PrinterOutputController from PyQt5.QtCore import QTimer @@ -9,27 +9,28 @@ from PyQt5.QtCore import QTimer if TYPE_CHECKING: from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel + from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel class GenericOutputController(PrinterOutputController): - def __init__(self, output_device): + def __init__(self, output_device: "PrinterOutputDevice") -> None: 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._preheat_printer = None # type: Optional[PrinterOutputModel] self._preheat_hotends_timer = QTimer() self._preheat_hotends_timer.setSingleShot(True) self._preheat_hotends_timer.timeout.connect(self._onPreheatHotendsTimerFinished) - self._preheat_hotends = set() + self._preheat_hotends = set() # type: Set[ExtruderOutputModel] self._output_device.printersChanged.connect(self._onPrintersChanged) - self._active_printer = None + self._active_printer = None # type: Optional[PrinterOutputModel] - def _onPrintersChanged(self): + def _onPrintersChanged(self) -> None: if self._active_printer: self._active_printer.stateChanged.disconnect(self._onPrinterStateChanged) self._active_printer.targetBedTemperatureChanged.disconnect(self._onTargetBedTemperatureChanged) @@ -43,32 +44,33 @@ class GenericOutputController(PrinterOutputController): for extruder in self._active_printer.extruders: extruder.targetHotendTemperatureChanged.connect(self._onTargetHotendTemperatureChanged) - def _onPrinterStateChanged(self): - if self._active_printer.state != "idle": + def _onPrinterStateChanged(self) -> None: + if self._active_printer and self._active_printer.state != "idle": if self._preheat_bed_timer.isActive(): self._preheat_bed_timer.stop() - self._preheat_printer.updateIsPreheating(False) + if self._preheat_printer: + self._preheat_printer.updateIsPreheating(False) if self._preheat_hotends_timer.isActive(): self._preheat_hotends_timer.stop() for extruder in self._preheat_hotends: extruder.updateIsPreheating(False) - self._preheat_hotends = set() + self._preheat_hotends = set() # type: Set[ExtruderOutputModel] - def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed): + def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed) -> None: self._output_device.sendCommand("G91") self._output_device.sendCommand("G0 X%s Y%s Z%s F%s" % (x, y, z, speed)) self._output_device.sendCommand("G90") - def homeHead(self, printer): + def homeHead(self, printer: "PrinterOutputModel") -> None: self._output_device.sendCommand("G28 X Y") - def homeBed(self, printer): + def homeBed(self, printer: "PrinterOutputModel") -> None: self._output_device.sendCommand("G28 Z") - def sendRawCommand(self, printer: "PrinterOutputModel", command: str): - self._output_device.sendCommand(command) + def sendRawCommand(self, printer: "PrinterOutputModel", command: str) -> None: + self._output_device.sendCommand(command.upper()) #Most printers only understand uppercase g-code commands. - def setJobState(self, job: "PrintJobOutputModel", state: str): + def setJobState(self, job: "PrintJobOutputModel", state: str) -> None: if state == "pause": self._output_device.pausePrint() job.updateState("paused") @@ -79,15 +81,15 @@ class GenericOutputController(PrinterOutputController): self._output_device.cancelPrint() pass - def setTargetBedTemperature(self, printer: "PrinterOutputModel", temperature: int): + def setTargetBedTemperature(self, printer: "PrinterOutputModel", temperature: int) -> None: self._output_device.sendCommand("M140 S%s" % temperature) - def _onTargetBedTemperatureChanged(self): - if self._preheat_bed_timer.isActive() and self._preheat_printer.targetBedTemperature == 0: + def _onTargetBedTemperatureChanged(self) -> None: + if self._preheat_bed_timer.isActive() and self._preheat_printer and self._preheat_printer.targetBedTemperature == 0: self._preheat_bed_timer.stop() self._preheat_printer.updateIsPreheating(False) - def preheatBed(self, printer: "PrinterOutputModel", temperature, duration): + def preheatBed(self, printer: "PrinterOutputModel", temperature, duration) -> None: try: temperature = round(temperature) # The API doesn't allow floating point. duration = round(duration) @@ -100,21 +102,25 @@ class GenericOutputController(PrinterOutputController): self._preheat_printer = printer printer.updateIsPreheating(True) - def cancelPreheatBed(self, printer: "PrinterOutputModel"): + def cancelPreheatBed(self, printer: "PrinterOutputModel") -> None: self.setTargetBedTemperature(printer, temperature=0) self._preheat_bed_timer.stop() printer.updateIsPreheating(False) - def _onPreheatBedTimerFinished(self): + def _onPreheatBedTimerFinished(self) -> None: + if not self._preheat_printer: + return self.setTargetBedTemperature(self._preheat_printer, 0) self._preheat_printer.updateIsPreheating(False) - def setTargetHotendTemperature(self, printer: "PrinterOutputModel", position: int, temperature: int): + def setTargetHotendTemperature(self, printer: "PrinterOutputModel", position: int, temperature: Union[int, float]) -> None: self._output_device.sendCommand("M104 S%s T%s" % (temperature, position)) - def _onTargetHotendTemperatureChanged(self): + def _onTargetHotendTemperatureChanged(self) -> None: if not self._preheat_hotends_timer.isActive(): return + if not self._active_printer: + return for extruder in self._active_printer.extruders: if extruder in self._preheat_hotends and extruder.targetHotendTemperature == 0: @@ -123,7 +129,7 @@ class GenericOutputController(PrinterOutputController): if not self._preheat_hotends: self._preheat_hotends_timer.stop() - def preheatHotend(self, extruder: "ExtruderOutputModel", temperature, duration): + def preheatHotend(self, extruder: "ExtruderOutputModel", temperature, duration) -> None: position = extruder.getPosition() number_of_extruders = len(extruder.getPrinter().extruders) if position >= number_of_extruders: @@ -141,7 +147,7 @@ class GenericOutputController(PrinterOutputController): self._preheat_hotends.add(extruder) extruder.updateIsPreheating(True) - def cancelPreheatHotend(self, extruder: "ExtruderOutputModel"): + def cancelPreheatHotend(self, extruder: "ExtruderOutputModel") -> None: self.setTargetHotendTemperature(extruder.getPrinter(), extruder.getPosition(), temperature=0) if extruder in self._preheat_hotends: extruder.updateIsPreheating(False) @@ -149,21 +155,22 @@ class GenericOutputController(PrinterOutputController): if not self._preheat_hotends and self._preheat_hotends_timer.isActive(): self._preheat_hotends_timer.stop() - def _onPreheatHotendsTimerFinished(self): + def _onPreheatHotendsTimerFinished(self) -> None: for extruder in self._preheat_hotends: self.setTargetHotendTemperature(extruder.getPrinter(), extruder.getPosition(), 0) - self._preheat_hotends = set() + self._preheat_hotends = set() #type: Set[ExtruderOutputModel] # Cancel any ongoing preheating timers, without setting back the temperature to 0 # This can be used eg at the start of a print - def stopPreheatTimers(self): + def stopPreheatTimers(self) -> None: if self._preheat_hotends_timer.isActive(): for extruder in self._preheat_hotends: extruder.updateIsPreheating(False) - self._preheat_hotends = set() + self._preheat_hotends = set() #type: Set[ExtruderOutputModel] self._preheat_hotends_timer.stop() if self._preheat_bed_timer.isActive(): - self._preheat_printer.updateIsPreheating(False) + if self._preheat_printer: + self._preheat_printer.updateIsPreheating(False) self._preheat_bed_timer.stop() diff --git a/cura/PrinterOutput/NetworkCamera.py b/cura/PrinterOutput/NetworkCamera.py deleted file mode 100644 index 5b28ffd30d..0000000000 --- a/cura/PrinterOutput/NetworkCamera.py +++ /dev/null @@ -1,119 +0,0 @@ -from UM.Logger import Logger - -from PyQt5.QtCore import QUrl, pyqtProperty, pyqtSignal, QObject, pyqtSlot -from PyQt5.QtGui import QImage -from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager - - -class NetworkCamera(QObject): - newImage = pyqtSignal() - - def __init__(self, target = None, parent = None): - super().__init__(parent) - self._stream_buffer = b"" - self._stream_buffer_start_index = -1 - self._manager = None - self._image_request = None - self._image_reply = None - self._image = QImage() - self._image_id = 0 - - self._target = target - self._started = False - - @pyqtSlot(str) - def setTarget(self, target): - restart_required = False - if self._started: - self.stop() - restart_required = True - - self._target = target - - if restart_required: - self.start() - - @pyqtProperty(QUrl, notify=newImage) - def latestImage(self): - self._image_id += 1 - # There is an image provider that is called "camera". In order to ensure that the image qml object, that - # requires a QUrl to function, updates correctly we add an increasing number. This causes to see the QUrl - # as new (instead of relying on cached version and thus forces an update. - temp = "image://camera/" + str(self._image_id) - - return QUrl(temp, QUrl.TolerantMode) - - @pyqtSlot() - def start(self): - # Ensure that previous requests (if any) are stopped. - self.stop() - if self._target is None: - Logger.log("w", "Unable to start camera stream without target!") - return - self._started = True - url = QUrl(self._target) - self._image_request = QNetworkRequest(url) - if self._manager is None: - self._manager = QNetworkAccessManager() - - self._image_reply = self._manager.get(self._image_request) - self._image_reply.downloadProgress.connect(self._onStreamDownloadProgress) - - @pyqtSlot() - def stop(self): - self._stream_buffer = b"" - self._stream_buffer_start_index = -1 - - if self._image_reply: - try: - # disconnect the signal - try: - self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) - except Exception: - pass - # abort the request if it's not finished - if not self._image_reply.isFinished(): - self._image_reply.close() - except Exception as e: # RuntimeError - pass # It can happen that the wrapped c++ object is already deleted. - - self._image_reply = None - self._image_request = None - - self._manager = None - - self._started = False - - def getImage(self): - return self._image - - ## Ensure that close gets called when object is destroyed - def __del__(self): - self.stop() - - def _onStreamDownloadProgress(self, bytes_received, bytes_total): - # An MJPG stream is (for our purpose) a stream of concatenated JPG images. - # JPG images start with the marker 0xFFD8, and end with 0xFFD9 - if self._image_reply is None: - return - self._stream_buffer += self._image_reply.readAll() - - if len(self._stream_buffer) > 2000000: # No single camera frame should be 2 Mb or larger - Logger.log("w", "MJPEG buffer exceeds reasonable size. Restarting stream...") - self.stop() # resets stream buffer and start index - self.start() - return - - if self._stream_buffer_start_index == -1: - self._stream_buffer_start_index = self._stream_buffer.indexOf(b'\xff\xd8') - stream_buffer_end_index = self._stream_buffer.lastIndexOf(b'\xff\xd9') - # If this happens to be more than a single frame, then so be it; the JPG decoder will - # ignore the extra data. We do it like this in order not to get a buildup of frames - - if self._stream_buffer_start_index != -1 and stream_buffer_end_index != -1: - jpg_data = self._stream_buffer[self._stream_buffer_start_index:stream_buffer_end_index + 2] - self._stream_buffer = self._stream_buffer[stream_buffer_end_index + 2:] - self._stream_buffer_start_index = -1 - self._image.loadFromData(jpg_data) - - self.newImage.emit() diff --git a/cura/PrinterOutput/NetworkMJPGImage.py b/cura/PrinterOutput/NetworkMJPGImage.py new file mode 100644 index 0000000000..522d684085 --- /dev/null +++ b/cura/PrinterOutput/NetworkMJPGImage.py @@ -0,0 +1,153 @@ +# Copyright (c) 2018 Aldo Hoeben / fieldOfView +# NetworkMJPGImage is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import QUrl, pyqtProperty, pyqtSignal, pyqtSlot, QRect, QByteArray +from PyQt5.QtGui import QImage, QPainter +from PyQt5.QtQuick import QQuickPaintedItem +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager + +from UM.Logger import Logger + +# +# A QQuickPaintedItem that progressively downloads a network mjpeg stream, +# picks it apart in individual jpeg frames, and paints it. +# +class NetworkMJPGImage(QQuickPaintedItem): + + def __init__(self, *args, **kwargs) -> None: + super().__init__(*args, **kwargs) + + self._stream_buffer = QByteArray() + self._stream_buffer_start_index = -1 + self._network_manager = None # type: QNetworkAccessManager + self._image_request = None # type: QNetworkRequest + self._image_reply = None # type: QNetworkReply + self._image = QImage() + self._image_rect = QRect() + + self._source_url = QUrl() + self._started = False + + self._mirror = False + + self.setAntialiasing(True) + + ## Ensure that close gets called when object is destroyed + def __del__(self) -> None: + self.stop() + + + def paint(self, painter: "QPainter") -> None: + if self._mirror: + painter.drawImage(self.contentsBoundingRect(), self._image.mirrored()) + return + + painter.drawImage(self.contentsBoundingRect(), self._image) + + + def setSourceURL(self, source_url: "QUrl") -> None: + self._source_url = source_url + self.sourceURLChanged.emit() + if self._started: + self.start() + + def getSourceURL(self) -> "QUrl": + return self._source_url + + sourceURLChanged = pyqtSignal() + source = pyqtProperty(QUrl, fget = getSourceURL, fset = setSourceURL, notify = sourceURLChanged) + + def setMirror(self, mirror: bool) -> None: + if mirror == self._mirror: + return + self._mirror = mirror + self.mirrorChanged.emit() + self.update() + + def getMirror(self) -> bool: + return self._mirror + + mirrorChanged = pyqtSignal() + mirror = pyqtProperty(bool, fget = getMirror, fset = setMirror, notify = mirrorChanged) + + imageSizeChanged = pyqtSignal() + + @pyqtProperty(int, notify = imageSizeChanged) + def imageWidth(self) -> int: + return self._image.width() + + @pyqtProperty(int, notify = imageSizeChanged) + def imageHeight(self) -> int: + return self._image.height() + + + @pyqtSlot() + def start(self) -> None: + self.stop() # Ensure that previous requests (if any) are stopped. + + if not self._source_url: + Logger.log("w", "Unable to start camera stream without target!") + return + self._started = True + + self._image_request = QNetworkRequest(self._source_url) + if self._network_manager is None: + self._network_manager = QNetworkAccessManager() + + self._image_reply = self._network_manager.get(self._image_request) + self._image_reply.downloadProgress.connect(self._onStreamDownloadProgress) + + @pyqtSlot() + def stop(self) -> None: + self._stream_buffer = QByteArray() + self._stream_buffer_start_index = -1 + + if self._image_reply: + try: + try: + self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) + except Exception: + pass + + if not self._image_reply.isFinished(): + self._image_reply.close() + except Exception as e: # RuntimeError + pass # It can happen that the wrapped c++ object is already deleted. + + self._image_reply = None + self._image_request = None + + self._network_manager = None + + self._started = False + + + def _onStreamDownloadProgress(self, bytes_received: int, bytes_total: int) -> None: + # An MJPG stream is (for our purpose) a stream of concatenated JPG images. + # JPG images start with the marker 0xFFD8, and end with 0xFFD9 + if self._image_reply is None: + return + self._stream_buffer += self._image_reply.readAll() + + if len(self._stream_buffer) > 2000000: # No single camera frame should be 2 Mb or larger + Logger.log("w", "MJPEG buffer exceeds reasonable size. Restarting stream...") + self.stop() # resets stream buffer and start index + self.start() + return + + if self._stream_buffer_start_index == -1: + self._stream_buffer_start_index = self._stream_buffer.indexOf(b'\xff\xd8') + stream_buffer_end_index = self._stream_buffer.lastIndexOf(b'\xff\xd9') + # If this happens to be more than a single frame, then so be it; the JPG decoder will + # ignore the extra data. We do it like this in order not to get a buildup of frames + + if self._stream_buffer_start_index != -1 and stream_buffer_end_index != -1: + jpg_data = self._stream_buffer[self._stream_buffer_start_index:stream_buffer_end_index + 2] + self._stream_buffer = self._stream_buffer[stream_buffer_end_index + 2:] + self._stream_buffer_start_index = -1 + self._image.loadFromData(jpg_data) + + if self._image.rect() != self._image_rect: + self.imageSizeChanged.emit() + + self.update() diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index 94f86f19a3..35d2ce014a 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -53,21 +53,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): self._sending_gcode = False self._compressing_gcode = False self._gcode = [] # type: List[str] - self._connection_state_before_timeout = None # type: Optional[ConnectionState] - printer_type = self._properties.get(b"machine", b"").decode("utf-8") - printer_type_identifiers = { - "9066": "ultimaker3", - "9511": "ultimaker3_extended", - "9051": "ultimaker_s5" - } - self._printer_type = "Unknown" - for key, value in printer_type_identifiers.items(): - if printer_type.startswith(key): - self._printer_type = value - break - def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, file_handler: Optional[FileHandler] = None, **kwargs: str) -> None: raise NotImplementedError("requestWrite needs to be implemented") @@ -143,9 +130,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): # We need to check if the manager needs to be re-created. If we don't, we get some issues when OSX goes to # sleep. if time_since_last_response > self._recreate_network_manager_time: - if self._last_manager_create_time is None: - self._createNetworkManager() - elif time() - self._last_manager_create_time > self._recreate_network_manager_time: + if self._last_manager_create_time is None or time() - self._last_manager_create_time > self._recreate_network_manager_time: self._createNetworkManager() assert(self._manager is not None) elif self._connection_state == ConnectionState.closed: @@ -228,7 +213,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): request = self._createEmptyRequest(target) self._last_request_time = time() if self._manager is not None: - reply = self._manager.post(request, data) + reply = self._manager.post(request, data.encode()) if on_progress is not None: reply.uploadProgress.connect(on_progress) self._registerOnFinishedCallback(reply, on_finished) @@ -341,7 +326,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): @pyqtProperty(str, constant = True) def printerType(self) -> str: - return self._printer_type + return self._properties.get(b"printer_type", b"Unknown").decode("utf-8") ## IP adress of this printer @pyqtProperty(str, constant = True) diff --git a/cura/PrinterOutput/PrintJobOutputModel.py b/cura/PrinterOutput/PrintJobOutputModel.py index 7366b95f86..25b168e6fd 100644 --- a/cura/PrinterOutput/PrintJobOutputModel.py +++ b/cura/PrinterOutput/PrintJobOutputModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot @@ -12,7 +12,6 @@ if TYPE_CHECKING: from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.ConfigurationModel import ConfigurationModel - class PrintJobOutputModel(QObject): stateChanged = pyqtSignal() timeTotalChanged = pyqtSignal() @@ -55,7 +54,7 @@ class PrintJobOutputModel(QObject): @pyqtProperty(QUrl, notify=previewImageChanged) def previewImageUrl(self): self._preview_image_id += 1 - # There is an image provider that is called "camera". In order to ensure that the image qml object, that + # There is an image provider that is called "print_job_preview". In order to ensure that the image qml object, that # requires a QUrl to function, updates correctly we add an increasing number. This causes to see the QUrl # as new (instead of relying on cached version and thus forces an update. temp = "image://print_job_preview/" + str(self._preview_image_id) + "/" + self._key @@ -91,7 +90,7 @@ class PrintJobOutputModel(QObject): def assignedPrinter(self): return self._assigned_printer - def updateAssignedPrinter(self, assigned_printer: "PrinterOutputModel"): + def updateAssignedPrinter(self, assigned_printer: Optional["PrinterOutputModel"]) -> None: if self._assigned_printer != assigned_printer: old_printer = self._assigned_printer self._assigned_printer = assigned_printer @@ -147,4 +146,4 @@ class PrintJobOutputModel(QObject): @pyqtSlot(str) def setState(self, state): - self._output_controller.setJobState(self, state) \ No newline at end of file + self._output_controller.setJobState(self, state) diff --git a/cura/PrinterOutput/PrinterOutputController.py b/cura/PrinterOutput/PrinterOutputController.py index 58c6ef05a7..cc7b78ac11 100644 --- a/cura/PrinterOutput/PrinterOutputController.py +++ b/cura/PrinterOutput/PrinterOutputController.py @@ -1,57 +1,68 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Logger import Logger +from UM.Signal import Signal + +from typing import Union MYPY = False if MYPY: from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel + from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice class PrinterOutputController: - def __init__(self, output_device): + def __init__(self, output_device: "PrinterOutputDevice") -> None: self.can_pause = True self.can_abort = True self.can_pre_heat_bed = True self.can_pre_heat_hotends = True self.can_send_raw_gcode = True self.can_control_manually = True + self.can_update_firmware = False self._output_device = output_device - def setTargetHotendTemperature(self, printer: "PrinterOutputModel", extruder: "ExtruderOutputModel", temperature: int): + def setTargetHotendTemperature(self, printer: "PrinterOutputModel", position: int, temperature: Union[int, float]) -> None: Logger.log("w", "Set target hotend temperature not implemented in controller") - def setTargetBedTemperature(self, printer: "PrinterOutputModel", temperature: int): + def setTargetBedTemperature(self, printer: "PrinterOutputModel", temperature: int) -> None: Logger.log("w", "Set target bed temperature not implemented in controller") - def setJobState(self, job: "PrintJobOutputModel", state: str): + def setJobState(self, job: "PrintJobOutputModel", state: str) -> None: Logger.log("w", "Set job state not implemented in controller") - def cancelPreheatBed(self, printer: "PrinterOutputModel"): + def cancelPreheatBed(self, printer: "PrinterOutputModel") -> None: Logger.log("w", "Cancel preheat bed not implemented in controller") - def preheatBed(self, printer: "PrinterOutputModel", temperature, duration): + def preheatBed(self, printer: "PrinterOutputModel", temperature, duration) -> None: Logger.log("w", "Preheat bed not implemented in controller") - def cancelPreheatHotend(self, extruder: "ExtruderOutputModel"): + def cancelPreheatHotend(self, extruder: "ExtruderOutputModel") -> None: Logger.log("w", "Cancel preheat hotend not implemented in controller") - def preheatHotend(self, extruder: "ExtruderOutputModel", temperature, duration): + def preheatHotend(self, extruder: "ExtruderOutputModel", temperature, duration) -> None: Logger.log("w", "Preheat hotend not implemented in controller") - def setHeadPosition(self, printer: "PrinterOutputModel", x, y, z, speed): + def setHeadPosition(self, printer: "PrinterOutputModel", x, y, z, speed) -> None: Logger.log("w", "Set head position not implemented in controller") - def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed): + def moveHead(self, printer: "PrinterOutputModel", x, y, z, speed) -> None: Logger.log("w", "Move head not implemented in controller") - def homeBed(self, printer: "PrinterOutputModel"): + def homeBed(self, printer: "PrinterOutputModel") -> None: Logger.log("w", "Home bed not implemented in controller") - def homeHead(self, printer: "PrinterOutputModel"): + def homeHead(self, printer: "PrinterOutputModel") -> None: Logger.log("w", "Home head not implemented in controller") - def sendRawCommand(self, printer: "PrinterOutputModel", command: str): + def sendRawCommand(self, printer: "PrinterOutputModel", command: str) -> None: Logger.log("w", "Custom command not implemented in controller") + + canUpdateFirmwareChanged = Signal() + def setCanUpdateFirmware(self, can_update_firmware: bool) -> None: + if can_update_firmware != self.can_update_firmware: + self.can_update_firmware = can_update_firmware + self.canUpdateFirmwareChanged.emit() \ No newline at end of file diff --git a/cura/PrinterOutput/PrinterOutputModel.py b/cura/PrinterOutput/PrinterOutputModel.py index f009a33178..4189b9fcbd 100644 --- a/cura/PrinterOutput/PrinterOutputModel.py +++ b/cura/PrinterOutput/PrinterOutputModel.py @@ -1,8 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot -from typing import Optional +from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant, pyqtSlot, QUrl +from typing import List, Dict, Optional from UM.Math.Vector import Vector from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel @@ -24,8 +24,9 @@ class PrinterOutputModel(QObject): keyChanged = pyqtSignal() printerTypeChanged = pyqtSignal() buildplateChanged = pyqtSignal() - cameraChanged = pyqtSignal() + cameraUrlChanged = pyqtSignal() configurationChanged = pyqtSignal() + canUpdateFirmwareChanged = pyqtSignal() def __init__(self, output_controller: "PrinterOutputController", number_of_extruders: int = 1, parent=None, firmware_version = "") -> None: super().__init__(parent) @@ -34,6 +35,7 @@ class PrinterOutputModel(QObject): self._name = "" self._key = "" # Unique identifier self._controller = output_controller + self._controller.canUpdateFirmwareChanged.connect(self._onControllerCanUpdateFirmwareChanged) self._extruders = [ExtruderOutputModel(printer = self, position = i) for i in range(number_of_extruders)] self._printer_configuration = ConfigurationModel() # Indicates the current configuration setup in this printer self._head_position = Vector(0, 0, 0) @@ -42,40 +44,40 @@ class PrinterOutputModel(QObject): self._printer_state = "unknown" self._is_preheating = False self._printer_type = "" - self._buildplate_name = None + self._buildplate_name = "" self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._extruders] - self._camera = None + self._camera_url = QUrl() # type: QUrl @pyqtProperty(str, constant = True) - def firmwareVersion(self): + def firmwareVersion(self) -> str: return self._firmware_version - def setCamera(self, camera): - if self._camera is not camera: - self._camera = camera - self.cameraChanged.emit() + def setCameraUrl(self, camera_url: "QUrl") -> None: + if self._camera_url != camera_url: + self._camera_url = camera_url + self.cameraUrlChanged.emit() - def updateIsPreheating(self, pre_heating): + @pyqtProperty(QUrl, fset = setCameraUrl, notify = cameraUrlChanged) + def cameraUrl(self) -> "QUrl": + return self._camera_url + + def updateIsPreheating(self, pre_heating: bool) -> None: if self._is_preheating != pre_heating: self._is_preheating = pre_heating self.isPreheatingChanged.emit() @pyqtProperty(bool, notify=isPreheatingChanged) - def isPreheating(self): + def isPreheating(self) -> bool: return self._is_preheating - @pyqtProperty(QObject, notify=cameraChanged) - def camera(self): - return self._camera - @pyqtProperty(str, notify = printerTypeChanged) - def type(self): + def type(self) -> str: return self._printer_type - def updateType(self, printer_type): + def updateType(self, printer_type: str) -> None: if self._printer_type != printer_type: self._printer_type = printer_type self._printer_configuration.printerType = self._printer_type @@ -83,10 +85,10 @@ class PrinterOutputModel(QObject): self.configurationChanged.emit() @pyqtProperty(str, notify = buildplateChanged) - def buildplate(self): + def buildplate(self) -> str: return self._buildplate_name - def updateBuildplateName(self, buildplate_name): + def updateBuildplateName(self, buildplate_name: str) -> None: if self._buildplate_name != buildplate_name: self._buildplate_name = buildplate_name self._printer_configuration.buildplateConfiguration = self._buildplate_name @@ -94,66 +96,66 @@ class PrinterOutputModel(QObject): self.configurationChanged.emit() @pyqtProperty(str, notify=keyChanged) - def key(self): + def key(self) -> str: return self._key - def updateKey(self, key: str): + def updateKey(self, key: str) -> None: if self._key != key: self._key = key self.keyChanged.emit() @pyqtSlot() - def homeHead(self): + def homeHead(self) -> None: self._controller.homeHead(self) @pyqtSlot() - def homeBed(self): + def homeBed(self) -> None: self._controller.homeBed(self) @pyqtSlot(str) - def sendRawCommand(self, command: str): + def sendRawCommand(self, command: str) -> None: self._controller.sendRawCommand(self, command) @pyqtProperty("QVariantList", constant = True) - def extruders(self): + def extruders(self) -> List["ExtruderOutputModel"]: return self._extruders @pyqtProperty(QVariant, notify = headPositionChanged) - def headPosition(self): + def headPosition(self) -> Dict[str, float]: return {"x": self._head_position.x, "y": self._head_position.y, "z": self.head_position.z} - def updateHeadPosition(self, x, y, z): + def updateHeadPosition(self, x: float, y: float, z: float) -> None: if self._head_position.x != x or self._head_position.y != y or self._head_position.z != z: self._head_position = Vector(x, y, z) self.headPositionChanged.emit() @pyqtProperty(float, float, float) @pyqtProperty(float, float, float, float) - def setHeadPosition(self, x, y, z, speed = 3000): + def setHeadPosition(self, x: float, y: float, z: float, speed: float = 3000) -> None: self.updateHeadPosition(x, y, z) self._controller.setHeadPosition(self, x, y, z, speed) @pyqtProperty(float) @pyqtProperty(float, float) - def setHeadX(self, x, speed = 3000): + def setHeadX(self, x: float, speed: float = 3000) -> None: self.updateHeadPosition(x, self._head_position.y, self._head_position.z) self._controller.setHeadPosition(self, x, self._head_position.y, self._head_position.z, speed) @pyqtProperty(float) @pyqtProperty(float, float) - def setHeadY(self, y, speed = 3000): + def setHeadY(self, y: float, speed: float = 3000) -> None: self.updateHeadPosition(self._head_position.x, y, self._head_position.z) self._controller.setHeadPosition(self, self._head_position.x, y, self._head_position.z, speed) @pyqtProperty(float) @pyqtProperty(float, float) - def setHeadZ(self, z, speed = 3000): + def setHeadZ(self, z: float, speed:float = 3000) -> None: self.updateHeadPosition(self._head_position.x, self._head_position.y, z) self._controller.setHeadPosition(self, self._head_position.x, self._head_position.y, z, speed) @pyqtSlot(float, float, float) @pyqtSlot(float, float, float, float) - def moveHead(self, x = 0, y = 0, z = 0, speed = 3000): + def moveHead(self, x: float = 0, y: float = 0, z: float = 0, speed: float = 3000) -> None: self._controller.moveHead(self, x, y, z, speed) ## Pre-heats the heated bed of the printer. @@ -162,47 +164,47 @@ class PrinterOutputModel(QObject): # Celsius. # \param duration How long the bed should stay warm, in seconds. @pyqtSlot(float, float) - def preheatBed(self, temperature, duration): + def preheatBed(self, temperature: float, duration: float) -> None: self._controller.preheatBed(self, temperature, duration) @pyqtSlot() - def cancelPreheatBed(self): + def cancelPreheatBed(self) -> None: self._controller.cancelPreheatBed(self) - def getController(self): + def getController(self) -> "PrinterOutputController": return self._controller - @pyqtProperty(str, notify=nameChanged) - def name(self): + @pyqtProperty(str, notify = nameChanged) + def name(self) -> str: return self._name - def setName(self, name): + def setName(self, name: str) -> None: self._setName(name) self.updateName(name) - def updateName(self, name): + def updateName(self, name: str) -> None: if self._name != name: self._name = name self.nameChanged.emit() ## Update the bed temperature. This only changes it locally. - def updateBedTemperature(self, temperature): + def updateBedTemperature(self, temperature: int) -> None: if self._bed_temperature != temperature: self._bed_temperature = temperature self.bedTemperatureChanged.emit() - def updateTargetBedTemperature(self, temperature): + def updateTargetBedTemperature(self, temperature: int) -> None: if self._target_bed_temperature != temperature: self._target_bed_temperature = temperature self.targetBedTemperatureChanged.emit() ## Set the target bed temperature. This ensures that it's actually sent to the remote. @pyqtSlot(int) - def setTargetBedTemperature(self, temperature): + def setTargetBedTemperature(self, temperature: int) -> None: self._controller.setTargetBedTemperature(self, temperature) self.updateTargetBedTemperature(temperature) - def updateActivePrintJob(self, print_job): + def updateActivePrintJob(self, print_job: Optional["PrintJobOutputModel"]) -> None: if self._active_print_job != print_job: old_print_job = self._active_print_job @@ -214,72 +216,83 @@ class PrinterOutputModel(QObject): old_print_job.updateAssignedPrinter(None) self.activePrintJobChanged.emit() - def updateState(self, printer_state): + def updateState(self, printer_state: str) -> None: if self._printer_state != printer_state: self._printer_state = printer_state self.stateChanged.emit() @pyqtProperty(QObject, notify = activePrintJobChanged) - def activePrintJob(self): + def activePrintJob(self) -> Optional["PrintJobOutputModel"]: return self._active_print_job @pyqtProperty(str, notify=stateChanged) - def state(self): + def state(self) -> str: return self._printer_state - @pyqtProperty(int, notify = bedTemperatureChanged) - def bedTemperature(self): + @pyqtProperty(int, notify=bedTemperatureChanged) + def bedTemperature(self) -> int: return self._bed_temperature @pyqtProperty(int, notify=targetBedTemperatureChanged) - def targetBedTemperature(self): + def targetBedTemperature(self) -> int: return self._target_bed_temperature # Does the printer support pre-heating the bed at all @pyqtProperty(bool, constant=True) - def canPreHeatBed(self): + def canPreHeatBed(self) -> bool: if self._controller: return self._controller.can_pre_heat_bed return False # Does the printer support pre-heating the bed at all @pyqtProperty(bool, constant=True) - def canPreHeatHotends(self): + def canPreHeatHotends(self) -> bool: if self._controller: return self._controller.can_pre_heat_hotends return False # Does the printer support sending raw G-code at all @pyqtProperty(bool, constant=True) - def canSendRawGcode(self): + def canSendRawGcode(self) -> bool: if self._controller: return self._controller.can_send_raw_gcode return False # Does the printer support pause at all @pyqtProperty(bool, constant=True) - def canPause(self): + def canPause(self) -> bool: if self._controller: return self._controller.can_pause return False # Does the printer support abort at all @pyqtProperty(bool, constant=True) - def canAbort(self): + def canAbort(self) -> bool: if self._controller: return self._controller.can_abort return False # Does the printer support manual control at all @pyqtProperty(bool, constant=True) - def canControlManually(self): + def canControlManually(self) -> bool: if self._controller: return self._controller.can_control_manually return False + # Does the printer support upgrading firmware + @pyqtProperty(bool, notify = canUpdateFirmwareChanged) + def canUpdateFirmware(self) -> bool: + if self._controller: + return self._controller.can_update_firmware + return False + + # Stub to connect UM.Signal to pyqtSignal + def _onControllerCanUpdateFirmwareChanged(self) -> None: + self.canUpdateFirmwareChanged.emit() + # Returns the configuration (material, variant and buildplate) of the current printer @pyqtProperty(QObject, notify = configurationChanged) - def printerConfiguration(self): + def printerConfiguration(self) -> Optional[ConfigurationModel]: if self._printer_configuration.isValid(): return self._printer_configuration return None \ No newline at end of file diff --git a/cura/PrinterOutputDevice.py b/cura/PrinterOutputDevice.py index 5ea65adb8e..969aa3c460 100644 --- a/cura/PrinterOutputDevice.py +++ b/cura/PrinterOutputDevice.py @@ -4,22 +4,24 @@ from UM.Decorators import deprecated from UM.i18n import i18nCatalog from UM.OutputDevice.OutputDevice import OutputDevice -from PyQt5.QtCore import pyqtProperty, QObject, QTimer, pyqtSignal +from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject, QTimer, QUrl from PyQt5.QtWidgets import QMessageBox from UM.Logger import Logger -from UM.FileHandler.FileHandler import FileHandler #For typing. -from UM.Scene.SceneNode import SceneNode #For typing. from UM.Signal import signalemitter from UM.Qt.QtApplication import QtApplication +from UM.FlameProfiler import pyqtSlot from enum import IntEnum # For the connection state tracking. -from typing import Callable, List, Optional +from typing import Callable, List, Optional, Union MYPY = False if MYPY: from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.ConfigurationModel import ConfigurationModel + from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater + from UM.FileHandler.FileHandler import FileHandler + from UM.Scene.SceneNode import SceneNode i18n_catalog = i18nCatalog("cura") @@ -83,6 +85,7 @@ class PrinterOutputDevice(QObject, OutputDevice): self._connection_state = ConnectionState.closed #type: ConnectionState + self._firmware_updater = None #type: Optional[FirmwareUpdater] self._firmware_name = None #type: Optional[str] self._address = "" #type: str self._connection_text = "" #type: str @@ -128,7 +131,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: + def requestWrite(self, nodes: List["SceneNode"], file_name: Optional[str] = None, limit_mimetypes: bool = False, file_handler: Optional["FileHandler"] = None, **kwargs: str) -> None: raise NotImplementedError("requestWrite needs to be implemented") @pyqtProperty(QObject, notify = printersChanged) @@ -225,4 +228,14 @@ class PrinterOutputDevice(QObject, OutputDevice): # # This name can be used to define device type def getFirmwareName(self) -> Optional[str]: - return self._firmware_name \ No newline at end of file + return self._firmware_name + + def getFirmwareUpdater(self) -> Optional["FirmwareUpdater"]: + return self._firmware_updater + + @pyqtSlot(str) + def updateFirmware(self, firmware_file: Union[str, QUrl]) -> None: + if not self._firmware_updater: + return + + self._firmware_updater.updateFirmware(firmware_file) \ No newline at end of file diff --git a/cura/Scene/BlockSlicingDecorator.py b/cura/Scene/BlockSlicingDecorator.py index 3fc0015836..0536e1635f 100644 --- a/cura/Scene/BlockSlicingDecorator.py +++ b/cura/Scene/BlockSlicingDecorator.py @@ -1,9 +1,12 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from UM.Scene.SceneNodeDecorator import SceneNodeDecorator class BlockSlicingDecorator(SceneNodeDecorator): - def __init__(self): + def __init__(self) -> None: super().__init__() - def isBlockSlicing(self): + def isBlockSlicing(self) -> bool: return True diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index ea54d64642..39124c5ba3 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -5,6 +5,7 @@ from PyQt5.QtCore import QTimer from UM.Application import Application from UM.Math.Polygon import Polygon + from UM.Scene.SceneNodeDecorator import SceneNodeDecorator from UM.Settings.ContainerRegistry import ContainerRegistry @@ -13,39 +14,49 @@ from cura.Scene import ConvexHullNode import numpy +from typing import TYPE_CHECKING, Any, Optional + +if TYPE_CHECKING: + from UM.Scene.SceneNode import SceneNode + from cura.Settings.GlobalStack import GlobalStack + from UM.Mesh.MeshData import MeshData + from UM.Math.Matrix import Matrix + + ## The convex hull decorator is a scene node decorator that adds the convex hull functionality to a scene node. # If a scene node has a convex hull decorator, it will have a shadow in which other objects can not be printed. class ConvexHullDecorator(SceneNodeDecorator): - def __init__(self): + def __init__(self) -> None: super().__init__() - self._convex_hull_node = None + self._convex_hull_node = None # type: Optional["SceneNode"] self._init2DConvexHullCache() - self._global_stack = None + self._global_stack = None # type: Optional[GlobalStack] # Make sure the timer is created on the main thread - self._recompute_convex_hull_timer = None - Application.getInstance().callLater(self.createRecomputeConvexHullTimer) + self._recompute_convex_hull_timer = None # type: Optional[QTimer] + from cura.CuraApplication import CuraApplication + if CuraApplication.getInstance() is not None: + CuraApplication.getInstance().callLater(self.createRecomputeConvexHullTimer) self._raft_thickness = 0.0 - # For raft thickness, DRY - self._build_volume = Application.getInstance().getBuildVolume() + self._build_volume = CuraApplication.getInstance().getBuildVolume() self._build_volume.raftThicknessChanged.connect(self._onChanged) - Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) - Application.getInstance().getController().toolOperationStarted.connect(self._onChanged) - Application.getInstance().getController().toolOperationStopped.connect(self._onChanged) + CuraApplication.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) + CuraApplication.getInstance().getController().toolOperationStarted.connect(self._onChanged) + CuraApplication.getInstance().getController().toolOperationStopped.connect(self._onChanged) self._onGlobalStackChanged() - def createRecomputeConvexHullTimer(self): + def createRecomputeConvexHullTimer(self) -> None: self._recompute_convex_hull_timer = QTimer() self._recompute_convex_hull_timer.setInterval(200) self._recompute_convex_hull_timer.setSingleShot(True) self._recompute_convex_hull_timer.timeout.connect(self.recomputeConvexHull) - def setNode(self, node): + def setNode(self, node: "SceneNode") -> None: previous_node = self._node # Disconnect from previous node signals if previous_node is not None and node is not previous_node: @@ -53,9 +64,9 @@ class ConvexHullDecorator(SceneNodeDecorator): previous_node.parentChanged.disconnect(self._onChanged) super().setNode(node) - - self._node.transformationChanged.connect(self._onChanged) - self._node.parentChanged.connect(self._onChanged) + # Mypy doesn't understand that self._node is no longer optional, so just use the node. + node.transformationChanged.connect(self._onChanged) + node.parentChanged.connect(self._onChanged) self._onChanged() @@ -63,37 +74,46 @@ class ConvexHullDecorator(SceneNodeDecorator): def __deepcopy__(self, memo): return ConvexHullDecorator() - ## Get the unmodified 2D projected convex hull of the node - def getConvexHull(self): + ## Get the unmodified 2D projected convex hull of the node (if any) + def getConvexHull(self) -> Optional[Polygon]: if self._node is None: return None hull = self._compute2DConvexHull() - if self._global_stack and self._node: + if self._global_stack and self._node is not None and hull is not None: # Parent can be None if node is just loaded. - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and (self._node.getParent() is None or not self._node.getParent().callDecoration("isGroup")): + if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): hull = hull.getMinkowskiHull(Polygon(numpy.array(self._global_stack.getProperty("machine_head_polygon", "value"), numpy.float32))) hull = self._add2DAdhesionMargin(hull) return hull ## Get the convex hull of the node with the full head size - def getConvexHullHeadFull(self): + def getConvexHullHeadFull(self) -> Optional[Polygon]: if self._node is None: return None return self._compute2DConvexHeadFull() + @staticmethod + def hasGroupAsParent(node: "SceneNode") -> bool: + parent = node.getParent() + if parent is None: + return False + return bool(parent.callDecoration("isGroup")) + ## Get convex hull of the object + head size # In case of printing all at once this is the same as the convex hull. # For one at the time this is area with intersection of mirrored head - def getConvexHullHead(self): + def getConvexHullHead(self) -> Optional[Polygon]: if self._node is None: return None if self._global_stack: - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and (self._node.getParent() is None or not self._node.getParent().callDecoration("isGroup")): + if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): head_with_fans = self._compute2DConvexHeadMin() + if head_with_fans is None: + return None head_with_fans_with_adhesion_margin = self._add2DAdhesionMargin(head_with_fans) return head_with_fans_with_adhesion_margin return None @@ -101,26 +121,33 @@ class ConvexHullDecorator(SceneNodeDecorator): ## Get convex hull of the node # In case of printing all at once this is the same as the convex hull. # For one at the time this is the area without the head. - def getConvexHullBoundary(self): + def getConvexHullBoundary(self) -> Optional[Polygon]: if self._node is None: return None if self._global_stack: - if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and (self._node.getParent() is None or not self._node.getParent().callDecoration("isGroup")): + if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time" and not self.hasGroupAsParent(self._node): # Printing one at a time and it's not an object in a group return self._compute2DConvexHull() return None - def recomputeConvexHullDelayed(self): + ## The same as recomputeConvexHull, but using a timer if it was set. + def recomputeConvexHullDelayed(self) -> None: if self._recompute_convex_hull_timer is not None: self._recompute_convex_hull_timer.start() else: self.recomputeConvexHull() - def recomputeConvexHull(self): + def recomputeConvexHull(self) -> None: controller = Application.getInstance().getController() root = controller.getScene().getRoot() if self._node is None or controller.isToolOperationActive() or not self.__isDescendant(root, self._node): + # If the tool operation is still active, we need to compute the convex hull later after the controller is + # no longer active. + if controller.isToolOperationActive(): + self.recomputeConvexHullDelayed() + return + if self._convex_hull_node: self._convex_hull_node.setParent(None) self._convex_hull_node = None @@ -132,27 +159,29 @@ class ConvexHullDecorator(SceneNodeDecorator): hull_node = ConvexHullNode.ConvexHullNode(self._node, convex_hull, self._raft_thickness, root) self._convex_hull_node = hull_node - def _onSettingValueChanged(self, key, property_name): - if property_name != "value": #Not the value that was changed. + def _onSettingValueChanged(self, key: str, property_name: str) -> None: + if property_name != "value": # Not the value that was changed. return if key in self._affected_settings: self._onChanged() if key in self._influencing_settings: - self._init2DConvexHullCache() #Invalidate the cache. + self._init2DConvexHullCache() # Invalidate the cache. self._onChanged() - def _init2DConvexHullCache(self): + def _init2DConvexHullCache(self) -> None: # Cache for the group code path in _compute2DConvexHull() - self._2d_convex_hull_group_child_polygon = None - self._2d_convex_hull_group_result = None + self._2d_convex_hull_group_child_polygon = None # type: Optional[Polygon] + self._2d_convex_hull_group_result = None # type: Optional[Polygon] # Cache for the mesh code path in _compute2DConvexHull() - self._2d_convex_hull_mesh = None - self._2d_convex_hull_mesh_world_transform = None - self._2d_convex_hull_mesh_result = None + self._2d_convex_hull_mesh = None # type: Optional[MeshData] + self._2d_convex_hull_mesh_world_transform = None # type: Optional[Matrix] + self._2d_convex_hull_mesh_result = None # type: Optional[Polygon] - def _compute2DConvexHull(self): + def _compute2DConvexHull(self) -> Optional[Polygon]: + if self._node is None: + return None if self._node.callDecoration("isGroup"): points = numpy.zeros((0, 2), dtype=numpy.int32) for child in self._node.getChildren(): @@ -178,49 +207,47 @@ class ConvexHullDecorator(SceneNodeDecorator): return offset_hull else: - offset_hull = None - mesh = None - world_transform = None - if self._node.getMeshData(): - mesh = self._node.getMeshData() - world_transform = self._node.getWorldTransformation() - - # Check the cache - if mesh is self._2d_convex_hull_mesh and world_transform == self._2d_convex_hull_mesh_world_transform: - return self._2d_convex_hull_mesh_result - - vertex_data = mesh.getConvexHullTransformedVertices(world_transform) - # Don't use data below 0. - # TODO; We need a better check for this as this gives poor results for meshes with long edges. - # Do not throw away vertices: the convex hull may be too small and objects can collide. - # vertex_data = vertex_data[vertex_data[:,1] >= -0.01] - - if len(vertex_data) >= 4: - # Round the vertex data to 1/10th of a mm, then remove all duplicate vertices - # This is done to greatly speed up further convex hull calculations as the convex hull - # becomes much less complex when dealing with highly detailed models. - vertex_data = numpy.round(vertex_data, 1) - - vertex_data = vertex_data[:, [0, 2]] # Drop the Y components to project to 2D. - - # Grab the set of unique points. - # - # This basically finds the unique rows in the array by treating them as opaque groups of bytes - # which are as long as the 2 float64s in each row, and giving this view to numpy.unique() to munch. - # See http://stackoverflow.com/questions/16970982/find-unique-rows-in-numpy-array - vertex_byte_view = numpy.ascontiguousarray(vertex_data).view( - numpy.dtype((numpy.void, vertex_data.dtype.itemsize * vertex_data.shape[1]))) - _, idx = numpy.unique(vertex_byte_view, return_index=True) - vertex_data = vertex_data[idx] # Select the unique rows by index. - - hull = Polygon(vertex_data) - - if len(vertex_data) >= 3: - convex_hull = hull.getConvexHull() - offset_hull = self._offsetHull(convex_hull) - else: + offset_hull = Polygon([]) + mesh = self._node.getMeshData() + if mesh is None: return Polygon([]) # Node has no mesh data, so just return an empty Polygon. + world_transform = self._node.getWorldTransformation() + + # Check the cache + if mesh is self._2d_convex_hull_mesh and world_transform == self._2d_convex_hull_mesh_world_transform: + return self._2d_convex_hull_mesh_result + + vertex_data = mesh.getConvexHullTransformedVertices(world_transform) + # Don't use data below 0. + # TODO; We need a better check for this as this gives poor results for meshes with long edges. + # Do not throw away vertices: the convex hull may be too small and objects can collide. + # vertex_data = vertex_data[vertex_data[:,1] >= -0.01] + + if len(vertex_data) >= 4: # type: ignore # mypy and numpy don't play along well just yet. + # Round the vertex data to 1/10th of a mm, then remove all duplicate vertices + # This is done to greatly speed up further convex hull calculations as the convex hull + # becomes much less complex when dealing with highly detailed models. + vertex_data = numpy.round(vertex_data, 1) + + vertex_data = vertex_data[:, [0, 2]] # Drop the Y components to project to 2D. + + # Grab the set of unique points. + # + # This basically finds the unique rows in the array by treating them as opaque groups of bytes + # which are as long as the 2 float64s in each row, and giving this view to numpy.unique() to munch. + # See http://stackoverflow.com/questions/16970982/find-unique-rows-in-numpy-array + vertex_byte_view = numpy.ascontiguousarray(vertex_data).view( + numpy.dtype((numpy.void, vertex_data.dtype.itemsize * vertex_data.shape[1]))) + _, idx = numpy.unique(vertex_byte_view, return_index=True) + vertex_data = vertex_data[idx] # Select the unique rows by index. + + hull = Polygon(vertex_data) + + if len(vertex_data) >= 3: + convex_hull = hull.getConvexHull() + offset_hull = self._offsetHull(convex_hull) + # Store the result in the cache self._2d_convex_hull_mesh = mesh self._2d_convex_hull_mesh_world_transform = world_transform @@ -228,24 +255,33 @@ class ConvexHullDecorator(SceneNodeDecorator): return offset_hull - def _getHeadAndFans(self): - return Polygon(numpy.array(self._global_stack.getHeadAndFansCoordinates(), numpy.float32)) + def _getHeadAndFans(self) -> Polygon: + if self._global_stack: + return Polygon(numpy.array(self._global_stack.getHeadAndFansCoordinates(), numpy.float32)) + return Polygon() - def _compute2DConvexHeadFull(self): - return self._compute2DConvexHull().getMinkowskiHull(self._getHeadAndFans()) + def _compute2DConvexHeadFull(self) -> Optional[Polygon]: + convex_hull = self._compute2DConvexHull() + if convex_hull: + return convex_hull.getMinkowskiHull(self._getHeadAndFans()) + return None - def _compute2DConvexHeadMin(self): - headAndFans = self._getHeadAndFans() - mirrored = headAndFans.mirror([0, 0], [0, 1]).mirror([0, 0], [1, 0]) # Mirror horizontally & vertically. + def _compute2DConvexHeadMin(self) -> Optional[Polygon]: + head_and_fans = self._getHeadAndFans() + mirrored = head_and_fans.mirror([0, 0], [0, 1]).mirror([0, 0], [1, 0]) # Mirror horizontally & vertically. head_and_fans = self._getHeadAndFans().intersectionConvexHulls(mirrored) # Min head hull is used for the push free - min_head_hull = self._compute2DConvexHull().getMinkowskiHull(head_and_fans) - return min_head_hull + convex_hull = self._compute2DConvexHeadFull() + if convex_hull: + return convex_hull.getMinkowskiHull(head_and_fans) + return None ## Compensate given 2D polygon with adhesion margin # \return 2D polygon with added margin - def _add2DAdhesionMargin(self, poly): + def _add2DAdhesionMargin(self, poly: Polygon) -> Polygon: + if not self._global_stack: + return Polygon() # Compensate for raft/skirt/brim # Add extra margin depending on adhesion type adhesion_type = self._global_stack.getProperty("adhesion_type", "value") @@ -263,7 +299,7 @@ class ConvexHullDecorator(SceneNodeDecorator): else: raise Exception("Unknown bed adhesion type. Did you forget to update the convex hull calculations for your new bed adhesion type?") - # adjust head_and_fans with extra margin + # Adjust head_and_fans with extra margin if extra_margin > 0: extra_margin_polygon = Polygon.approximatedCircle(extra_margin) poly = poly.getMinkowskiHull(extra_margin_polygon) @@ -274,7 +310,7 @@ class ConvexHullDecorator(SceneNodeDecorator): # \param convex_hull Polygon of the original convex hull. # \return New Polygon instance that is offset with everything that # influences the collision area. - def _offsetHull(self, convex_hull): + def _offsetHull(self, convex_hull: Polygon) -> Polygon: horizontal_expansion = max( self._getSettingProperty("xy_offset", "value"), self._getSettingProperty("xy_offset_layer_0", "value") @@ -295,12 +331,12 @@ class ConvexHullDecorator(SceneNodeDecorator): else: return convex_hull - def _onChanged(self, *args): + def _onChanged(self, *args) -> None: self._raft_thickness = self._build_volume.getRaftThickness() if not args or args[0] == self._node: self.recomputeConvexHullDelayed() - def _onGlobalStackChanged(self): + def _onGlobalStackChanged(self) -> None: if self._global_stack: self._global_stack.propertyChanged.disconnect(self._onSettingValueChanged) self._global_stack.containersChanged.disconnect(self._onChanged) @@ -321,7 +357,9 @@ class ConvexHullDecorator(SceneNodeDecorator): self._onChanged() ## Private convenience function to get a setting from the correct extruder (as defined by limit_to_extruder property). - def _getSettingProperty(self, setting_key, prop = "value"): + def _getSettingProperty(self, setting_key: str, prop: str = "value") -> Any: + if self._global_stack is None or self._node is None: + return None per_mesh_stack = self._node.callDecoration("getStack") if per_mesh_stack: return per_mesh_stack.getProperty(setting_key, prop) @@ -339,8 +377,8 @@ class ConvexHullDecorator(SceneNodeDecorator): # Limit_to_extruder is set. The global stack handles this then return self._global_stack.getProperty(setting_key, prop) - ## Returns true if node is a descendant or the same as the root node. - def __isDescendant(self, root, node): + ## Returns True if node is a descendant or the same as the root node. + def __isDescendant(self, root: "SceneNode", node: Optional["SceneNode"]) -> bool: if node is None: return False if root is node: diff --git a/cura/Scene/GCodeListDecorator.py b/cura/Scene/GCodeListDecorator.py index 5738d0a7f2..572fea6ac4 100644 --- a/cura/Scene/GCodeListDecorator.py +++ b/cura/Scene/GCodeListDecorator.py @@ -1,13 +1,19 @@ from UM.Scene.SceneNodeDecorator import SceneNodeDecorator +from typing import List class GCodeListDecorator(SceneNodeDecorator): - def __init__(self): + def __init__(self) -> None: super().__init__() - self._gcode_list = [] + self._gcode_list = [] # type: List[str] - def getGCodeList(self): + def getGCodeList(self) -> List[str]: return self._gcode_list - def setGCodeList(self, list): + def setGCodeList(self, list: List[str]): self._gcode_list = list + + def __deepcopy__(self, memo) -> "GCodeListDecorator": + copied_decorator = GCodeListDecorator() + copied_decorator.setGCodeList(self.getGCodeList()) + return copied_decorator \ No newline at end of file diff --git a/cura/Scene/SliceableObjectDecorator.py b/cura/Scene/SliceableObjectDecorator.py index 1cb589d9c6..982a38d667 100644 --- a/cura/Scene/SliceableObjectDecorator.py +++ b/cura/Scene/SliceableObjectDecorator.py @@ -2,11 +2,11 @@ from UM.Scene.SceneNodeDecorator import SceneNodeDecorator class SliceableObjectDecorator(SceneNodeDecorator): - def __init__(self): + def __init__(self) -> None: super().__init__() - def isSliceable(self): + def isSliceable(self) -> bool: return True - def __deepcopy__(self, memo): + def __deepcopy__(self, memo) -> "SliceableObjectDecorator": return type(self)() diff --git a/cura/Scene/ZOffsetDecorator.py b/cura/Scene/ZOffsetDecorator.py index d3ee5c8454..b35b17a412 100644 --- a/cura/Scene/ZOffsetDecorator.py +++ b/cura/Scene/ZOffsetDecorator.py @@ -1,18 +1,19 @@ from UM.Scene.SceneNodeDecorator import SceneNodeDecorator + ## A decorator that stores the amount an object has been moved below the platform. class ZOffsetDecorator(SceneNodeDecorator): - def __init__(self): + def __init__(self) -> None: super().__init__() - self._z_offset = 0 + self._z_offset = 0. - def setZOffset(self, offset): + def setZOffset(self, offset: float) -> None: self._z_offset = offset - def getZOffset(self): + def getZOffset(self) -> float: return self._z_offset - def __deepcopy__(self, memo): + def __deepcopy__(self, memo) -> "ZOffsetDecorator": copied_decorator = ZOffsetDecorator() copied_decorator.setZOffset(self.getZOffset()) return copied_decorator diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 2b8ff4a234..3cfca1a944 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -4,12 +4,12 @@ import os import urllib.parse import uuid -from typing import Any -from typing import Dict, Union, Optional +from typing import Dict, Union, Any, TYPE_CHECKING, List -from PyQt5.QtCore import QObject, QUrl, QVariant +from PyQt5.QtCore import QObject, QUrl from PyQt5.QtWidgets import QMessageBox + from UM.i18n import i18nCatalog from UM.FlameProfiler import pyqtSlot from UM.Logger import Logger @@ -21,6 +21,18 @@ from UM.Settings.ContainerStack import ContainerStack from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.InstanceContainer import InstanceContainer + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + from cura.Machines.ContainerNode import ContainerNode + from cura.Machines.MaterialNode import MaterialNode + from cura.Machines.QualityChangesGroup import QualityChangesGroup + from UM.PluginRegistry import PluginRegistry + from cura.Settings.MachineManager import MachineManager + from cura.Machines.MaterialManager import MaterialManager + from cura.Machines.QualityManager import QualityManager + from cura.Settings.CuraContainerRegistry import CuraContainerRegistry + catalog = i18nCatalog("cura") @@ -31,20 +43,20 @@ catalog = i18nCatalog("cura") # when a certain action happens. This can be done through this class. class ContainerManager(QObject): - def __init__(self, application): + def __init__(self, application: "CuraApplication") -> None: if ContainerManager.__instance is not None: raise RuntimeError("Try to create singleton '%s' more than once" % self.__class__.__name__) ContainerManager.__instance = self super().__init__(parent = application) - self._application = application - self._plugin_registry = self._application.getPluginRegistry() - self._container_registry = self._application.getContainerRegistry() - self._machine_manager = self._application.getMachineManager() - self._material_manager = self._application.getMaterialManager() - self._quality_manager = self._application.getQualityManager() - self._container_name_filters = {} # type: Dict[str, Dict[str, Any]] + self._application = application # type: CuraApplication + self._plugin_registry = self._application.getPluginRegistry() # type: PluginRegistry + self._container_registry = self._application.getContainerRegistry() # type: CuraContainerRegistry + self._machine_manager = self._application.getMachineManager() # type: MachineManager + self._material_manager = self._application.getMaterialManager() # type: MaterialManager + self._quality_manager = self._application.getQualityManager() # type: QualityManager + self._container_name_filters = {} # type: Dict[str, Dict[str, Any]] @pyqtSlot(str, str, result=str) def getContainerMetaDataEntry(self, container_id: str, entry_names: str) -> str: @@ -69,21 +81,23 @@ class ContainerManager(QObject): # by using "/" as a separator. For example, to change an entry "foo" in a # dictionary entry "bar", you can specify "bar/foo" as entry name. # - # \param container_id \type{str} The ID of the container to change. + # \param container_node \type{ContainerNode} # \param entry_name \type{str} The name of the metadata entry to change. # \param entry_value The new value of the entry. # - # \return True if successful, False if not. # TODO: This is ONLY used by MaterialView for material containers. Maybe refactor this. # Update: In order for QML to use objects and sub objects, those (sub) objects must all be QObject. Is that what we want? @pyqtSlot("QVariant", str, str) - def setContainerMetaDataEntry(self, container_node, entry_name, entry_value): - root_material_id = container_node.metadata["base_file"] + def setContainerMetaDataEntry(self, container_node: "ContainerNode", entry_name: str, entry_value: str) -> bool: + root_material_id = container_node.getMetaDataEntry("base_file", "") if self._container_registry.isReadOnly(root_material_id): Logger.log("w", "Cannot set metadata of read-only container %s.", root_material_id) return False material_group = self._material_manager.getMaterialGroup(root_material_id) + if material_group is None: + Logger.log("w", "Unable to find material group for: %s.", root_material_id) + return False entries = entry_name.split("/") entry_name = entries.pop() @@ -91,11 +105,11 @@ class ContainerManager(QObject): sub_item_changed = False if entries: root_name = entries.pop(0) - root = material_group.root_material_node.metadata.get(root_name) + root = material_group.root_material_node.getMetaDataEntry(root_name) item = root for _ in range(len(entries)): - item = item.get(entries.pop(0), { }) + item = item.get(entries.pop(0), {}) if item[entry_name] != entry_value: sub_item_changed = True @@ -109,9 +123,10 @@ class ContainerManager(QObject): container.setMetaDataEntry(entry_name, entry_value) if sub_item_changed: #If it was only a sub-item that has changed then the setMetaDataEntry won't correctly notice that something changed, and we must manually signal that the metadata changed. container.metaDataChanged.emit(container) + return True @pyqtSlot(str, result = str) - def makeUniqueName(self, original_name): + def makeUniqueName(self, original_name: str) -> str: return self._container_registry.uniqueName(original_name) ## Get a list of string that can be used as name filters for a Qt File Dialog @@ -125,7 +140,7 @@ class ContainerManager(QObject): # # \return A string list with name filters. @pyqtSlot(str, result = "QStringList") - def getContainerNameFilters(self, type_name): + def getContainerNameFilters(self, type_name: str) -> List[str]: if not self._container_name_filters: self._updateContainerNameFilters() @@ -257,7 +272,7 @@ class ContainerManager(QObject): # # \return \type{bool} True if successful, False if not. @pyqtSlot(result = bool) - def updateQualityChanges(self): + def updateQualityChanges(self) -> bool: global_stack = self._machine_manager.activeMachine if not global_stack: return False @@ -313,10 +328,10 @@ class ContainerManager(QObject): # \param material_id \type{str} the id of the material for which to get the linked materials. # \return \type{list} a list of names of materials with the same GUID @pyqtSlot("QVariant", bool, result = "QStringList") - def getLinkedMaterials(self, material_node, exclude_self = False): - guid = material_node.metadata["GUID"] + def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False): + guid = material_node.getMetaDataEntry("GUID", "") - self_root_material_id = material_node.metadata["base_file"] + self_root_material_id = material_node.getMetaDataEntry("base_file") material_group_list = self._material_manager.getMaterialGroupListByGUID(guid) linked_material_names = [] @@ -324,15 +339,19 @@ class ContainerManager(QObject): for material_group in material_group_list: if exclude_self and material_group.name == self_root_material_id: continue - linked_material_names.append(material_group.root_material_node.metadata["name"]) + linked_material_names.append(material_group.root_material_node.getMetaDataEntry("name", "")) return linked_material_names ## Unlink a material from all other materials by creating a new GUID # \param material_id \type{str} the id of the material to create a new GUID for. @pyqtSlot("QVariant") - def unlinkMaterial(self, material_node): + def unlinkMaterial(self, material_node: "MaterialNode") -> None: # Get the material group - material_group = self._material_manager.getMaterialGroup(material_node.metadata["base_file"]) + material_group = self._material_manager.getMaterialGroup(material_node.getMetaDataEntry("base_file", "")) + + if material_group is None: + Logger.log("w", "Unable to find material group for %s", material_node) + return # Generate a new GUID new_guid = str(uuid.uuid4()) @@ -344,7 +363,7 @@ class ContainerManager(QObject): if container is not None: container.setMetaDataEntry("GUID", new_guid) - def _performMerge(self, merge_into, merge, clear_settings = True): + def _performMerge(self, merge_into: InstanceContainer, merge: InstanceContainer, clear_settings: bool = True) -> None: if merge == merge_into: return @@ -372,7 +391,8 @@ class ContainerManager(QObject): continue mime_type = self._container_registry.getMimeTypeForContainer(container_type) - + if mime_type is None: + continue entry = { "type": serialize_type, "mime": mime_type, @@ -400,7 +420,7 @@ class ContainerManager(QObject): ## Import single profile, file_url does not have to end with curaprofile @pyqtSlot(QUrl, result="QVariantMap") - def importProfile(self, file_url): + def importProfile(self, file_url: QUrl): if not file_url.isValid(): return path = file_url.toLocalFile() @@ -409,7 +429,7 @@ class ContainerManager(QObject): return self._container_registry.importProfile(path) @pyqtSlot(QObject, QUrl, str) - def exportQualityChangesGroup(self, quality_changes_group, file_url: QUrl, file_type: str): + def exportQualityChangesGroup(self, quality_changes_group: "QualityChangesGroup", file_url: QUrl, file_type: str) -> None: if not file_url.isValid(): return path = file_url.toLocalFile() diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index e1f50a157d..11640adc0f 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -187,11 +187,11 @@ class CuraContainerRegistry(ContainerRegistry): try: profile_or_list = profile_reader.read(file_name) # Try to open the file with the profile reader. except NoProfileException: - return { "status": "ok", "message": catalog.i18nc("@info:status Don't translate the XML tags or !", "No custom profile to import in file {0}", file_name)} + return { "status": "ok", "message": catalog.i18nc("@info:status Don't translate the XML tags !", "No custom profile to import in file {0}", file_name)} except Exception as e: # Note that this will fail quickly. That is, if any profile reader throws an exception, it will stop reading. It will only continue reading if the reader returned None. Logger.log("e", "Failed to import profile from %s: %s while using profile reader. Got exception %s", file_name, profile_reader.getPluginId(), str(e)) - return { "status": "error", "message": catalog.i18nc("@info:status Don't translate the XML tags or !", "Failed to import profile from {0}: {1}", file_name, "\n" + str(e))} + return { "status": "error", "message": catalog.i18nc("@info:status Don't translate the XML tags !", "Failed to import profile from {0}:", file_name) + "\n" + str(e) + ""} if profile_or_list: # Ensure it is always a list of profiles @@ -215,7 +215,7 @@ class CuraContainerRegistry(ContainerRegistry): if not global_profile: Logger.log("e", "Incorrect profile [%s]. Could not find global profile", file_name) return { "status": "error", - "message": catalog.i18nc("@info:status Don't translate the XML tags or !", "This profile {0} contains incorrect data, could not import it.", file_name)} + "message": catalog.i18nc("@info:status Don't translate the XML tags !", "This profile {0} contains incorrect data, could not import it.", file_name)} profile_definition = global_profile.getMetaDataEntry("definition") # Make sure we have a profile_definition in the file: @@ -225,7 +225,7 @@ class CuraContainerRegistry(ContainerRegistry): if not machine_definition: Logger.log("e", "Incorrect profile [%s]. Unknown machine type [%s]", file_name, profile_definition) return {"status": "error", - "message": catalog.i18nc("@info:status Don't translate the XML tags or !", "This profile {0} contains incorrect data, could not import it.", file_name) + "message": catalog.i18nc("@info:status Don't translate the XML tags !", "This profile {0} contains incorrect data, could not import it.", file_name) } machine_definition = machine_definition[0] @@ -238,7 +238,7 @@ class CuraContainerRegistry(ContainerRegistry): if profile_definition != expected_machine_definition: Logger.log("e", "Profile [%s] is for machine [%s] but the current active machine is [%s]. Will not import the profile", file_name, profile_definition, expected_machine_definition) return { "status": "error", - "message": catalog.i18nc("@info:status Don't translate the XML tags or !", "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it.", file_name, profile_definition, expected_machine_definition)} + "message": catalog.i18nc("@info:status Don't translate the XML tags !", "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it.", file_name, profile_definition, expected_machine_definition)} # Fix the global quality profile's definition field in case it's not correct global_profile.setMetaDataEntry("definition", expected_machine_definition) @@ -269,8 +269,7 @@ class CuraContainerRegistry(ContainerRegistry): if idx == 0: # move all per-extruder settings to the first extruder's quality_changes for qc_setting_key in global_profile.getAllKeys(): - settable_per_extruder = global_stack.getProperty(qc_setting_key, - "settable_per_extruder") + settable_per_extruder = global_stack.getProperty(qc_setting_key, "settable_per_extruder") if settable_per_extruder: setting_value = global_profile.getProperty(qc_setting_key, "value") @@ -310,8 +309,8 @@ class CuraContainerRegistry(ContainerRegistry): if result is not None: return {"status": "error", "message": catalog.i18nc( "@info:status Don't translate the XML tags or !", - "Failed to import profile from {0}: {1}", - file_name, result)} + "Failed to import profile from {0}:", + file_name) + " " + result + ""} return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile_or_list[0].getName())} @@ -686,7 +685,7 @@ class CuraContainerRegistry(ContainerRegistry): if not os.path.isfile(file_path): continue - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) try: parser.read([file_path]) except: diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 0ec95e2e41..042b065226 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -145,13 +145,11 @@ class CuraContainerStack(ContainerStack): def setDefinition(self, new_definition: DefinitionContainerInterface) -> None: self.replaceContainer(_ContainerIndexes.Definition, new_definition) - ## Get the definition container. - # - # \return The definition container. Should always be a valid container, but can be equal to the empty InstanceContainer. - @pyqtProperty(QObject, fset = setDefinition, notify = pyqtContainersChanged) - def definition(self) -> DefinitionContainer: + def getDefinition(self) -> "DefinitionContainer": return cast(DefinitionContainer, self._containers[_ContainerIndexes.Definition]) + definition = pyqtProperty(QObject, fget = getDefinition, fset = setDefinition, notify = pyqtContainersChanged) + @override(ContainerStack) def getBottom(self) -> "DefinitionContainer": return self.definition diff --git a/cura/Settings/CuraFormulaFunctions.py b/cura/Settings/CuraFormulaFunctions.py new file mode 100644 index 0000000000..1db01857f8 --- /dev/null +++ b/cura/Settings/CuraFormulaFunctions.py @@ -0,0 +1,130 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, List, Optional, TYPE_CHECKING + +from UM.Settings.PropertyEvaluationContext import PropertyEvaluationContext +from UM.Settings.SettingFunction import SettingFunction + +if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication + from cura.Settings.CuraContainerStack import CuraContainerStack + + +# +# This class contains all Cura-related custom functions that can be used in formulas. Some functions requires +# information such as the currently active machine, so this is made into a class instead of standalone functions. +# +class CuraFormulaFunctions: + + def __init__(self, application: "CuraApplication") -> None: + self._application = application + + # ================ + # Custom Functions + # ================ + + # Gets the default extruder position of the currently active machine. + def getDefaultExtruderPosition(self) -> str: + machine_manager = self._application.getMachineManager() + return machine_manager.defaultExtruderPosition + + # Gets the given setting key from the given extruder position. + def getValueInExtruder(self, extruder_position: int, property_key: str, + context: Optional["PropertyEvaluationContext"] = None) -> Any: + machine_manager = self._application.getMachineManager() + + if extruder_position == -1: + extruder_position = int(machine_manager.defaultExtruderPosition) + + global_stack = machine_manager.activeMachine + extruder_stack = global_stack.extruders[str(extruder_position)] + + value = extruder_stack.getRawProperty(property_key, "value", context = context) + if isinstance(value, SettingFunction): + value = value(extruder_stack, context = context) + + return value + + # Gets all extruder values as a list for the given property. + def getValuesInAllExtruders(self, property_key: str, + context: Optional["PropertyEvaluationContext"] = None) -> List[Any]: + machine_manager = self._application.getMachineManager() + extruder_manager = self._application.getExtruderManager() + + global_stack = machine_manager.activeMachine + + result = [] + for extruder in extruder_manager.getActiveExtruderStacks(): + if not extruder.isEnabled: + continue + # only include values from extruders that are "active" for the current machine instance + if int(extruder.getMetaDataEntry("position")) >= global_stack.getProperty("machine_extruder_count", "value", context = context): + continue + + value = extruder.getRawProperty(property_key, "value", context = context) + + if value is None: + continue + + if isinstance(value, SettingFunction): + value = value(extruder, context = context) + + result.append(value) + + if not result: + result.append(global_stack.getProperty(property_key, "value", context = context)) + + return result + + # Get the resolve value or value for a given key. + def getResolveOrValue(self, property_key: str, context: Optional["PropertyEvaluationContext"] = None) -> Any: + machine_manager = self._application.getMachineManager() + + global_stack = machine_manager.activeMachine + resolved_value = global_stack.getProperty(property_key, "value", context = context) + + return resolved_value + + # Gets the default setting value from given extruder position. The default value is what excludes the values in + # the user_changes container. + def getDefaultValueInExtruder(self, extruder_position: int, property_key: str) -> Any: + machine_manager = self._application.getMachineManager() + + global_stack = machine_manager.activeMachine + extruder_stack = global_stack.extruders[str(extruder_position)] + + context = self.createContextForDefaultValueEvaluation(extruder_stack) + + return self.getValueInExtruder(extruder_position, property_key, context = context) + + # Gets all default setting values as a list from all extruders of the currently active machine. + # The default values are those excluding the values in the user_changes container. + def getDefaultValuesInAllExtruders(self, property_key: str) -> List[Any]: + machine_manager = self._application.getMachineManager() + + global_stack = machine_manager.activeMachine + + context = self.createContextForDefaultValueEvaluation(global_stack) + + return self.getValuesInAllExtruders(property_key, context = context) + + # Gets the resolve value or value for a given key without looking the first container (user container). + def getDefaultResolveOrValue(self, property_key: str) -> Any: + machine_manager = self._application.getMachineManager() + + global_stack = machine_manager.activeMachine + + context = self.createContextForDefaultValueEvaluation(global_stack) + return self.getResolveOrValue(property_key, context = context) + + # Creates a context for evaluating default values (skip the user_changes container). + def createContextForDefaultValueEvaluation(self, source_stack: "CuraContainerStack") -> "PropertyEvaluationContext": + context = PropertyEvaluationContext(source_stack) + context.context["evaluate_from_container_index"] = 1 # skip the user settings container + context.context["override_operators"] = { + "extruderValue": self.getDefaultValueInExtruder, + "extruderValues": self.getDefaultValuesInAllExtruders, + "resolveOrValue": self.getDefaultResolveOrValue, + } + return context diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 58109d3a8d..c98c63f529 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -129,7 +129,7 @@ class CuraStackBuilder: # get material container for extruders material_container = application.empty_material_container - material_node = material_manager.getDefaultMaterial(global_stack, extruder_position, extruder_variant_name, + material_node = material_manager.getDefaultMaterial(global_stack, str(extruder_position), extruder_variant_name, extruder_definition = extruder_definition) if material_node and material_node.getContainer(): material_container = material_node.getContainer() @@ -145,7 +145,6 @@ class CuraStackBuilder: quality_container = application.empty_quality_container ) new_extruder.setNextStack(global_stack) - global_stack.addExtruder(new_extruder) registry.addContainer(new_extruder) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 8221203b78..9089ba96e9 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -12,11 +12,9 @@ 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.SettingFunction import SettingFunction from UM.Settings.ContainerStack import ContainerStack -from UM.Settings.PropertyEvaluationContext import PropertyEvaluationContext -from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING +from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING, Union if TYPE_CHECKING: from cura.Settings.ExtruderStack import ExtruderStack @@ -38,9 +36,12 @@ class ExtruderManager(QObject): self._application = cura.CuraApplication.CuraApplication.getInstance() # Per machine, a dictionary of extruder container stack IDs. Only for separately defined extruders. - self._extruder_trains = {} # type: Dict[str, Dict[str, ExtruderStack]] + self._extruder_trains = {} # type: Dict[str, Dict[str, "ExtruderStack"]] self._active_extruder_index = -1 # Indicates the index of the active extruder stack. -1 means no active extruder stack - self._selected_object_extruders = [] # type: List[str] + + # TODO; I have no idea why this is a union of ID's and extruder stacks. This needs to be fixed at some point. + self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] + self._addCurrentMachineExtruders() Selection.selectionChanged.connect(self.resetSelectedObjectExtruders) @@ -66,16 +67,6 @@ class ExtruderManager(QObject): except KeyError: # Extruder index could be -1 if the global tab is selected, or the entry doesn't exist if the machine definition is wrong. return None - ## Return extruder count according to extruder trains. - @pyqtProperty(int, notify = extrudersChanged) - def extruderCount(self) -> int: - if not self._application.getGlobalContainerStack(): - return 0 # No active machine, so no extruders. - try: - return len(self._extruder_trains[self._application.getGlobalContainerStack().getId()]) - except KeyError: - return 0 - ## Gets a dict with the extruder stack ids with the extruder number as the key. @pyqtProperty("QVariantMap", notify = extrudersChanged) def extruderIds(self) -> Dict[str, str]: @@ -114,7 +105,7 @@ class ExtruderManager(QObject): ## Provides a list of extruder IDs used by the current selected objects. @pyqtProperty("QVariantList", notify = selectedObjectExtrudersChanged) - def selectedObjectExtruders(self) -> List[str]: + def selectedObjectExtruders(self) -> List[Union[str, "ExtruderStack"]]: if not self._selected_object_extruders: object_extruders = set() @@ -139,7 +130,7 @@ class ExtruderManager(QObject): elif current_extruder_trains: object_extruders.add(current_extruder_trains[0].getId()) - self._selected_object_extruders = list(object_extruders) + self._selected_object_extruders = list(object_extruders) # type: List[Union[str, "ExtruderStack"]] return self._selected_object_extruders @@ -148,7 +139,7 @@ class ExtruderManager(QObject): # This will trigger a recalculation of the extruders used for the # selection. def resetSelectedObjectExtruders(self) -> None: - self._selected_object_extruders = [] + self._selected_object_extruders = [] # type: List[Union[str, "ExtruderStack"]] self.selectedObjectExtrudersChanged.emit() @pyqtSlot(result = QObject) @@ -383,86 +374,6 @@ class ExtruderManager(QObject): extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] extruder_stack_0.definition = extruder_definition - ## Get all extruder values for a certain setting. - # - # This is exposed to SettingFunction so it can be used in value functions. - # - # \param key The key of the setting to retrieve values for. - # - # \return A list of values for all extruders. If an extruder does not have a value, it will not be in the list. - # If no extruder has the value, the list will contain the global value. - @staticmethod - def getExtruderValues(key: str) -> List[Any]: - global_stack = cast(GlobalStack, cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()) #We know that there must be a global stack by the time you're requesting setting values. - - result = [] - for extruder in ExtruderManager.getInstance().getActiveExtruderStacks(): - if not extruder.isEnabled: - continue - # only include values from extruders that are "active" for the current machine instance - if int(extruder.getMetaDataEntry("position")) >= global_stack.getProperty("machine_extruder_count", "value"): - continue - - value = extruder.getRawProperty(key, "value") - - if value is None: - continue - - if isinstance(value, SettingFunction): - value = value(extruder) - - result.append(value) - - if not result: - result.append(global_stack.getProperty(key, "value")) - - return result - - ## Get all extruder values for a certain setting. This function will skip the user settings container. - # - # This is exposed to SettingFunction so it can be used in value functions. - # - # \param key The key of the setting to retrieve values for. - # - # \return A list of values for all extruders. If an extruder does not have a value, it will not be in the list. - # If no extruder has the value, the list will contain the global value. - @staticmethod - def getDefaultExtruderValues(key: str) -> List[Any]: - global_stack = cast(GlobalStack, cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()) #We know that there must be a global stack by the time you're requesting setting values. - context = PropertyEvaluationContext(global_stack) - context.context["evaluate_from_container_index"] = 1 # skip the user settings container - context.context["override_operators"] = { - "extruderValue": ExtruderManager.getDefaultExtruderValue, - "extruderValues": ExtruderManager.getDefaultExtruderValues, - "resolveOrValue": ExtruderManager.getDefaultResolveOrValue - } - - result = [] - for extruder in ExtruderManager.getInstance().getActiveExtruderStacks(): - # only include values from extruders that are "active" for the current machine instance - if int(extruder.getMetaDataEntry("position")) >= global_stack.getProperty("machine_extruder_count", "value", context = context): - continue - - value = extruder.getRawProperty(key, "value", context = context) - - if value is None: - continue - - if isinstance(value, SettingFunction): - value = value(extruder, context = context) - - result.append(value) - - if not result: - result.append(global_stack.getProperty(key, "value", context = context)) - - return result - - ## Return the default extruder position from the machine manager - @staticmethod - def getDefaultExtruderPosition() -> str: - return cura.CuraApplication.CuraApplication.getInstance().getMachineManager().defaultExtruderPosition - ## Get all extruder values for a certain setting. # # This is exposed to qml for display purposes @@ -471,62 +382,8 @@ class ExtruderManager(QObject): # # \return String representing the extruder values @pyqtSlot(str, result="QVariant") - def getInstanceExtruderValues(self, key) -> List: - return ExtruderManager.getExtruderValues(key) - - ## Get the value for a setting from a specific extruder. - # - # This is exposed to SettingFunction to use in value functions. - # - # \param extruder_index The index of the extruder to get the value from. - # \param key The key of the setting to get the value of. - # - # \return The value of the setting for the specified extruder or for the - # global stack if not found. - @staticmethod - def getExtruderValue(extruder_index: int, key: str) -> Any: - if extruder_index == -1: - extruder_index = int(cura.CuraApplication.CuraApplication.getInstance().getMachineManager().defaultExtruderPosition) - extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index) - - if extruder: - value = extruder.getRawProperty(key, "value") - if isinstance(value, SettingFunction): - value = value(extruder) - else: - # Just a value from global. - value = cast(GlobalStack, cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()).getProperty(key, "value") - - return value - - ## Get the default value from the given extruder. This function will skip the user settings container. - # - # This is exposed to SettingFunction to use in value functions. - # - # \param extruder_index The index of the extruder to get the value from. - # \param key The key of the setting to get the value of. - # - # \return The value of the setting for the specified extruder or for the - # global stack if not found. - @staticmethod - def getDefaultExtruderValue(extruder_index: int, key: str) -> Any: - extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index) - context = PropertyEvaluationContext(extruder) - context.context["evaluate_from_container_index"] = 1 # skip the user settings container - context.context["override_operators"] = { - "extruderValue": ExtruderManager.getDefaultExtruderValue, - "extruderValues": ExtruderManager.getDefaultExtruderValues, - "resolveOrValue": ExtruderManager.getDefaultResolveOrValue - } - - if extruder: - value = extruder.getRawProperty(key, "value", context = context) - if isinstance(value, SettingFunction): - value = value(extruder, context = context) - else: # Just a value from global. - value = cast(GlobalStack, cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()).getProperty(key, "value", context = context) - - return value + def getInstanceExtruderValues(self, key: str) -> List: + return self._application.getCuraFormulaFunctions().getValuesInAllExtruders(key) ## Get the resolve value or value for a given key # @@ -542,28 +399,6 @@ class ExtruderManager(QObject): return resolved_value - ## Get the resolve value or value for a given key without looking the first container (user container) - # - # This is the effective value for a given key, it is used for values in the global stack. - # This is exposed to SettingFunction to use in value functions. - # \param key The key of the setting to get the value of. - # - # \return The effective value - @staticmethod - def getDefaultResolveOrValue(key: str) -> Any: - global_stack = cast(GlobalStack, cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()) - context = PropertyEvaluationContext(global_stack) - context.context["evaluate_from_container_index"] = 1 # skip the user settings container - context.context["override_operators"] = { - "extruderValue": ExtruderManager.getDefaultExtruderValue, - "extruderValues": ExtruderManager.getDefaultExtruderValues, - "resolveOrValue": ExtruderManager.getDefaultResolveOrValue - } - - resolved_value = global_stack.getProperty(key, "value", context = context) - - return resolved_value - __instance = None # type: ExtruderManager @classmethod diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index ca687e358b..d7faedb71c 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -65,16 +65,33 @@ class ExtruderStack(CuraContainerStack): def getLoadingPriority(cls) -> int: return 3 + compatibleMaterialDiameterChanged = pyqtSignal() + ## Return the filament diameter that the machine requires. # # If the machine has no requirement for the diameter, -1 is returned. # \return The filament diameter for the printer - @property - def materialDiameter(self) -> float: + def getCompatibleMaterialDiameter(self) -> float: context = PropertyEvaluationContext(self) context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant - return self.getProperty("material_diameter", "value", context = context) + return float(self.getProperty("material_diameter", "value", context = context)) + + def setCompatibleMaterialDiameter(self, value: float) -> None: + old_approximate_diameter = self.getApproximateMaterialDiameter() + if self.getCompatibleMaterialDiameter() != value: + self.definitionChanges.setProperty("material_diameter", "value", value) + self.compatibleMaterialDiameterChanged.emit() + + # Emit approximate diameter changed signal if needed + if old_approximate_diameter != self.getApproximateMaterialDiameter(): + self.approximateMaterialDiameterChanged.emit() + + compatibleMaterialDiameter = pyqtProperty(float, fset = setCompatibleMaterialDiameter, + fget = getCompatibleMaterialDiameter, + notify = compatibleMaterialDiameterChanged) + + approximateMaterialDiameterChanged = pyqtSignal() ## Return the approximate filament diameter that the machine requires. # @@ -84,9 +101,11 @@ class ExtruderStack(CuraContainerStack): # If the machine has no requirement for the diameter, -1 is returned. # # \return The approximate filament diameter for the printer - @pyqtProperty(float) - def approximateMaterialDiameter(self) -> float: - return round(float(self.materialDiameter)) + def getApproximateMaterialDiameter(self) -> float: + return round(self.getCompatibleMaterialDiameter()) + + approximateMaterialDiameter = pyqtProperty(float, fget = getApproximateMaterialDiameter, + notify = approximateMaterialDiameterChanged) ## Overridden from ContainerStack # diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index e2f7df41ea..da1ec61254 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -4,7 +4,7 @@ from collections import defaultdict import threading from typing import Any, Dict, Optional, Set, TYPE_CHECKING -from PyQt5.QtCore import pyqtProperty +from PyQt5.QtCore import pyqtProperty, pyqtSlot from UM.Decorators import override from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase @@ -13,6 +13,8 @@ from UM.Settings.SettingInstance import InstanceState from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.Interfaces import PropertyEvaluationContext from UM.Logger import Logger +from UM.Resources import Resources +from UM.Platform import Platform from UM.Util import parseBool import cura.CuraApplication @@ -23,6 +25,7 @@ from .CuraContainerStack import CuraContainerStack if TYPE_CHECKING: from cura.Settings.ExtruderStack import ExtruderStack + ## Represents the Global or Machine stack and its related containers. # class GlobalStack(CuraContainerStack): @@ -199,6 +202,31 @@ class GlobalStack(CuraContainerStack): def getHasMachineQuality(self) -> bool: return parseBool(self.getMetaDataEntry("has_machine_quality", False)) + ## Get default firmware file name if one is specified in the firmware + @pyqtSlot(result = str) + def getDefaultFirmwareName(self) -> str: + machine_has_heated_bed = self.getProperty("machine_heated_bed", "value") + + baudrate = 250000 + if Platform.isLinux(): + # Linux prefers a baudrate of 115200 here because older versions of + # pySerial did not support a baudrate of 250000 + baudrate = 115200 + + # If a firmware file is available, it should be specified in the definition for the printer + hex_file = self.getMetaDataEntry("firmware_file", None) + if machine_has_heated_bed: + hex_file = self.getMetaDataEntry("firmware_hbk_file", hex_file) + + if not hex_file: + Logger.log("w", "There is no firmware for machine %s.", self.getBottom().id) + return "" + + try: + return Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.Firmware, hex_file.format(baudrate=baudrate)) + except FileNotFoundError: + Logger.log("w", "Firmware file %s not found.", hex_file) + return "" ## private: global_stack_mime = MimeType( diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3f918e21ba..f321ce94a6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -20,7 +20,6 @@ from UM.Message import Message from UM.Settings.SettingFunction import SettingFunction from UM.Signal import postponeSignals, CompressTechnique -import cura.CuraApplication from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch from cura.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutput.ConfigurationModel import ConfigurationModel @@ -29,6 +28,9 @@ from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderStack import ExtruderStack +from cura.Settings.cura_empty_instance_containers import (empty_definition_changes_container, empty_variant_container, + empty_material_container, empty_quality_container, + empty_quality_changes_container) from .CuraStackBuilder import CuraStackBuilder @@ -36,6 +38,7 @@ from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") if TYPE_CHECKING: + from cura.CuraApplication import CuraApplication from cura.Settings.CuraContainerStack import CuraContainerStack from cura.Settings.GlobalStack import GlobalStack from cura.Machines.MaterialManager import MaterialManager @@ -47,7 +50,7 @@ if TYPE_CHECKING: class MachineManager(QObject): - def __init__(self, parent: QObject = None) -> None: + def __init__(self, application: "CuraApplication", parent: Optional["QObject"] = None) -> None: super().__init__(parent) self._active_container_stack = None # type: Optional[ExtruderStack] @@ -66,9 +69,10 @@ class MachineManager(QObject): self._instance_container_timer.setSingleShot(True) self._instance_container_timer.timeout.connect(self.__emitChangedSignals) - self._application = cura.CuraApplication.CuraApplication.getInstance() #type: cura.CuraApplication.CuraApplication + self._application = application + self._container_registry = self._application.getContainerRegistry() self._application.globalContainerStackChanged.connect(self._onGlobalContainerChanged) - self._application.getContainerRegistry().containerLoadComplete.connect(self._onContainersChanged) + self._container_registry.containerLoadComplete.connect(self._onContainersChanged) ## When the global container is changed, active material probably needs to be updated. self.globalContainerChanged.connect(self.activeMaterialChanged) @@ -80,13 +84,6 @@ class MachineManager(QObject): self._stacks_have_errors = None # type: Optional[bool] - self._empty_container = CuraContainerRegistry.getInstance().getEmptyInstanceContainer() #type: InstanceContainer - self._empty_definition_changes_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_definition_changes")[0] #type: InstanceContainer - self._empty_variant_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_variant")[0] #type: InstanceContainer - self._empty_material_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_material")[0] #type: InstanceContainer - self._empty_quality_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_quality")[0] #type: InstanceContainer - self._empty_quality_changes_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_quality_changes")[0] #type: InstanceContainer - self._onGlobalContainerChanged() ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderStackChanged) @@ -192,19 +189,21 @@ class MachineManager(QObject): for extruder in self._global_container_stack.extruders.values(): extruder_configuration = ExtruderConfigurationModel() # For compare just the GUID is needed at this moment - mat_type = extruder.material.getMetaDataEntry("material") if extruder.material != self._empty_material_container else None - mat_guid = extruder.material.getMetaDataEntry("GUID") if extruder.material != self._empty_material_container else None - mat_color = extruder.material.getMetaDataEntry("color_name") if extruder.material != self._empty_material_container else None - mat_brand = extruder.material.getMetaDataEntry("brand") if extruder.material != self._empty_material_container else None - mat_name = extruder.material.getMetaDataEntry("name") if extruder.material != self._empty_material_container else None + mat_type = extruder.material.getMetaDataEntry("material") if extruder.material != empty_material_container else None + mat_guid = extruder.material.getMetaDataEntry("GUID") if extruder.material != empty_material_container else None + mat_color = extruder.material.getMetaDataEntry("color_name") if extruder.material != empty_material_container else None + mat_brand = extruder.material.getMetaDataEntry("brand") if extruder.material != empty_material_container else None + mat_name = extruder.material.getMetaDataEntry("name") if extruder.material != empty_material_container else None material_model = MaterialOutputModel(mat_guid, mat_type, mat_color, mat_brand, mat_name) extruder_configuration.position = int(extruder.getMetaDataEntry("position")) extruder_configuration.material = material_model - extruder_configuration.hotendID = extruder.variant.getName() if extruder.variant != self._empty_variant_container else None + extruder_configuration.hotendID = extruder.variant.getName() if extruder.variant != empty_variant_container else None self._current_printer_configuration.extruderConfigurations.append(extruder_configuration) - self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != self._empty_variant_container else None + # an empty build plate configuration from the network printer is presented as an empty string, so use "" for an + # empty build plate. + self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != empty_variant_container else "" self.currentConfigurationChanged.emit() @pyqtSlot(QObject, result = bool) @@ -258,14 +257,14 @@ class MachineManager(QObject): # Global stack can have only a variant if it is a buildplate global_variant = self._global_container_stack.variant - if global_variant != self._empty_variant_container: + if global_variant != empty_variant_container: if global_variant.getMetaDataEntry("hardware_type") != "buildplate": - self._global_container_stack.setVariant(self._empty_variant_container) + self._global_container_stack.setVariant(empty_variant_container) # set the global material to empty as we now use the extruder stack at all times - CURA-4482 global_material = self._global_container_stack.material - if global_material != self._empty_material_container: - self._global_container_stack.setMaterial(self._empty_material_container) + if global_material != empty_material_container: + self._global_container_stack.setMaterial(empty_material_container) # Listen for changes on all extruder stacks for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): @@ -367,6 +366,10 @@ class MachineManager(QObject): return global_stack = containers[0] + + # Make sure that the default machine actions for this machine have been added + self._application.getMachineActionManager().addDefaultMachineActions(global_stack) + ExtruderManager.getInstance()._fixSingleExtrusionMachineExtruderDefinition(global_stack) if not global_stack.isValid(): # Mark global stack as invalid @@ -593,7 +596,7 @@ class MachineManager(QObject): def globalVariantName(self) -> str: if self._global_container_stack: variant = self._global_container_stack.variant - if variant and not isinstance(variant, type(self._empty_variant_container)): + if variant and not isinstance(variant, type(empty_variant_container)): return variant.getName() return "" @@ -781,7 +784,7 @@ class MachineManager(QObject): if not stack.isEnabled: continue material_container = stack.material - if material_container == self._empty_material_container: + if material_container == empty_material_container: continue if material_container.getMetaDataEntry("buildplate_compatible"): buildplate_compatible = buildplate_compatible and material_container.getMetaDataEntry("buildplate_compatible")[self.activeVariantBuildplateName] @@ -803,7 +806,7 @@ class MachineManager(QObject): extruder_stacks = self._global_container_stack.extruders.values() for stack in extruder_stacks: material_container = stack.material - if material_container == self._empty_material_container: + if material_container == empty_material_container: continue buildplate_compatible = material_container.getMetaDataEntry("buildplate_compatible")[self.activeVariantBuildplateName] if material_container.getMetaDataEntry("buildplate_compatible") else True buildplate_usable = material_container.getMetaDataEntry("buildplate_recommended")[self.activeVariantBuildplateName] if material_container.getMetaDataEntry("buildplate_recommended") else True @@ -873,7 +876,7 @@ class MachineManager(QObject): extruder_manager = self._application.getExtruderManager() definition_changes_container = self._global_container_stack.definitionChanges - if not self._global_container_stack or definition_changes_container == self._empty_definition_changes_container: + if not self._global_container_stack or definition_changes_container == empty_definition_changes_container: return previous_extruder_count = self._global_container_stack.getProperty("machine_extruder_count", "value") @@ -893,7 +896,11 @@ class MachineManager(QObject): extruder_nr = node.callDecoration("getActiveExtruderPosition") if extruder_nr is not None and int(extruder_nr) > extruder_count - 1: - node.callDecoration("setActiveExtruder", extruder_manager.getExtruderStack(extruder_count - 1).getId()) + extruder = extruder_manager.getExtruderStack(extruder_count - 1) + if extruder is not None: + node.callDecoration("setActiveExtruder", extruder.getId()) + else: + Logger.log("w", "Could not find extruder to set active.") # Make sure one of the extruder stacks is active extruder_manager.setActiveExtruderIndex(0) @@ -1068,7 +1075,7 @@ class MachineManager(QObject): for stack in active_stacks: variant_container = stack.variant position = stack.getMetaDataEntry("position") - if variant_container and variant_container != self._empty_variant_container: + if variant_container and variant_container != empty_variant_container: result[position] = variant_container.getName() return result @@ -1082,11 +1089,11 @@ class MachineManager(QObject): return self._current_quality_group = None self._current_quality_changes_group = None - self._global_container_stack.quality = self._empty_quality_container - self._global_container_stack.qualityChanges = self._empty_quality_changes_container + self._global_container_stack.quality = empty_quality_container + self._global_container_stack.qualityChanges = empty_quality_changes_container for extruder in self._global_container_stack.extruders.values(): - extruder.quality = self._empty_quality_container - extruder.qualityChanges = self._empty_quality_changes_container + extruder.quality = empty_quality_container + extruder.qualityChanges = empty_quality_changes_container self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() @@ -1111,13 +1118,13 @@ class MachineManager(QObject): # Set quality and quality_changes for the GlobalStack self._global_container_stack.quality = quality_group.node_for_global.getContainer() if empty_quality_changes: - self._global_container_stack.qualityChanges = self._empty_quality_changes_container + self._global_container_stack.qualityChanges = empty_quality_changes_container # Set quality and quality_changes for each ExtruderStack for position, node in quality_group.nodes_for_extruders.items(): self._global_container_stack.extruders[str(position)].quality = node.getContainer() if empty_quality_changes: - self._global_container_stack.extruders[str(position)].qualityChanges = self._empty_quality_changes_container + self._global_container_stack.extruders[str(position)].qualityChanges = empty_quality_changes_container self.activeQualityGroupChanged.emit() self.activeQualityChangesGroupChanged.emit() @@ -1143,8 +1150,8 @@ class MachineManager(QObject): if quality_group is None: self._fixQualityChangesGroupToNotSupported(quality_changes_group) - quality_changes_container = self._empty_quality_changes_container - quality_container = self._empty_quality_container + quality_changes_container = empty_quality_changes_container + quality_container = empty_quality_container # type: Optional[InstanceContainer] if quality_changes_group.node_for_global and quality_changes_group.node_for_global.getContainer(): quality_changes_container = cast(InstanceContainer, quality_changes_group.node_for_global.getContainer()) if quality_group is not None and quality_group.node_for_global and quality_group.node_for_global.getContainer(): @@ -1159,8 +1166,8 @@ class MachineManager(QObject): if quality_group is not None: quality_node = quality_group.nodes_for_extruders.get(position) - quality_changes_container = self._empty_quality_changes_container - quality_container = self._empty_quality_container + quality_changes_container = empty_quality_changes_container + quality_container = empty_quality_container if quality_changes_node and quality_changes_node.getContainer(): quality_changes_container = cast(InstanceContainer, quality_changes_node.getContainer()) if quality_node and quality_node.getContainer(): @@ -1194,7 +1201,7 @@ class MachineManager(QObject): self._global_container_stack.extruders[position].material = container_node.getContainer() root_material_id = container_node.getMetaDataEntry("base_file", None) else: - self._global_container_stack.extruders[position].material = self._empty_material_container + self._global_container_stack.extruders[position].material = empty_material_container root_material_id = None # The _current_root_material_id is used in the MaterialMenu to see which material is selected if root_material_id != self._current_root_material_id[position]: @@ -1269,14 +1276,10 @@ class MachineManager(QObject): current_material_base_name = extruder.material.getMetaDataEntry("base_file") current_nozzle_name = None - if extruder.variant.getId() != self._empty_variant_container.getId(): + if extruder.variant.getId() != empty_variant_container.getId(): current_nozzle_name = extruder.variant.getMetaDataEntry("name") - from UM.Settings.Interfaces import PropertyEvaluationContext - from cura.Settings.CuraContainerStack import _ContainerIndexes - context = PropertyEvaluationContext(extruder) - context.context["evaluate_from_container_index"] = _ContainerIndexes.DefinitionChanges - material_diameter = extruder.getProperty("material_diameter", "value", context) + material_diameter = extruder.getCompatibleMaterialDiameter() candidate_materials = self._material_manager.getAvailableMaterials( self._global_container_stack.definition, current_nozzle_name, @@ -1344,12 +1347,12 @@ class MachineManager(QObject): if variant_container_node: self._setVariantNode(position, variant_container_node) else: - self._global_container_stack.extruders[position].variant = self._empty_variant_container + self._global_container_stack.extruders[position].variant = empty_variant_container if material_container_node: self._setMaterial(position, material_container_node) else: - self._global_container_stack.extruders[position].material = self._empty_material_container + self._global_container_stack.extruders[position].material = empty_material_container self.updateMaterialWithVariant(position) if configuration.buildplateConfiguration is not None: @@ -1357,9 +1360,9 @@ class MachineManager(QObject): if global_variant_container_node: self._setGlobalVariant(global_variant_container_node) else: - self._global_container_stack.variant = self._empty_variant_container + self._global_container_stack.variant = empty_variant_container else: - self._global_container_stack.variant = self._empty_variant_container + self._global_container_stack.variant = empty_variant_container self._updateQualityWithMaterial() # See if we need to show the Discard or Keep changes screen @@ -1411,7 +1414,7 @@ class MachineManager(QObject): position = str(position) extruder_stack = self._global_container_stack.extruders[position] nozzle_name = extruder_stack.variant.getName() - material_diameter = extruder_stack.approximateMaterialDiameter + material_diameter = extruder_stack.getApproximateMaterialDiameter() material_node = self._material_manager.getMaterialNode(machine_definition_id, nozzle_name, buildplate_name, material_diameter, root_material_id) self.setMaterial(position, material_node) @@ -1477,7 +1480,7 @@ class MachineManager(QObject): # This is not changing the quality for the active machine !!!!!!!! global_stack.quality = quality_group.node_for_global.getContainer() for extruder_nr, extruder_stack in global_stack.extruders.items(): - quality_container = self._empty_quality_container + quality_container = empty_quality_container if extruder_nr in quality_group.nodes_for_extruders: container = quality_group.nodes_for_extruders[extruder_nr].getContainer() quality_container = container if container is not None else quality_container @@ -1521,7 +1524,7 @@ class MachineManager(QObject): @pyqtProperty(str, notify = activeQualityGroupChanged) def activeQualityOrQualityChangesName(self) -> str: - name = self._empty_quality_container.getName() + name = empty_quality_container.getName() if self._current_quality_changes_group: name = self._current_quality_changes_group.name elif self._current_quality_group: diff --git a/cura/Settings/MachineNameValidator.py b/cura/Settings/MachineNameValidator.py index 19b29feac4..acdda4b0a0 100644 --- a/cura/Settings/MachineNameValidator.py +++ b/cura/Settings/MachineNameValidator.py @@ -35,10 +35,9 @@ class MachineNameValidator(QObject): ## Check if a specified machine name is allowed. # # \param name The machine name to check. - # \param position The current position of the cursor in the text box. # \return ``QValidator.Invalid`` if it's disallowed, or # ``QValidator.Acceptable`` if it's allowed. - def validate(self, name, position): + def validate(self, name): #Check for file name length of the current settings container (which is the longest file we're saving with the name). try: filename_max_length = os.statvfs(Resources.getDataStoragePath()).f_namemax @@ -54,7 +53,7 @@ class MachineNameValidator(QObject): ## Updates the validation state of a machine name text field. @pyqtSlot(str) def updateValidation(self, new_name): - is_valid = self.validate(new_name, 0) + is_valid = self.validate(new_name) if is_valid == QValidator.Acceptable: self.validation_regex = "^.*$" #Matches anything. else: diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 9cd24558b7..12b541c3d8 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -1,6 +1,6 @@ # Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import List +from typing import List, Optional, TYPE_CHECKING from PyQt5.QtCore import QObject, QTimer, pyqtProperty, pyqtSignal from UM.FlameProfiler import pyqtSlot @@ -20,13 +20,18 @@ from UM.Settings.SettingInstance import InstanceState from cura.Settings.ExtruderManager import ExtruderManager +if TYPE_CHECKING: + from cura.Settings.ExtruderStack import ExtruderStack + from UM.Settings.SettingDefinition import SettingDefinition + + class SettingInheritanceManager(QObject): - def __init__(self, parent = None): + def __init__(self, parent = None) -> None: super().__init__(parent) Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerChanged) - self._global_container_stack = None - self._settings_with_inheritance_warning = [] - self._active_container_stack = None + self._global_container_stack = None # type: Optional[ContainerStack] + self._settings_with_inheritance_warning = [] # type: List[str] + self._active_container_stack = None # type: Optional[ExtruderStack] self._onGlobalContainerChanged() ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) @@ -41,7 +46,9 @@ class SettingInheritanceManager(QObject): ## Get the keys of all children settings with an override. @pyqtSlot(str, result = "QStringList") - def getChildrenKeysWithOverride(self, key): + def getChildrenKeysWithOverride(self, key: str) -> List[str]: + if self._global_container_stack is None: + return [] definitions = self._global_container_stack.definition.findDefinitions(key=key) if not definitions: Logger.log("w", "Could not find definition for key [%s]", key) @@ -53,9 +60,11 @@ class SettingInheritanceManager(QObject): return result @pyqtSlot(str, str, result = "QStringList") - def getOverridesForExtruder(self, key, extruder_index): - result = [] + def getOverridesForExtruder(self, key: str, extruder_index: str) -> List[str]: + if self._global_container_stack is None: + return [] + result = [] # type: List[str] extruder_stack = ExtruderManager.getInstance().getExtruderStack(extruder_index) if not extruder_stack: Logger.log("w", "Unable to find extruder for current machine with index %s", extruder_index) @@ -73,16 +82,16 @@ class SettingInheritanceManager(QObject): return result @pyqtSlot(str) - def manualRemoveOverride(self, key): + def manualRemoveOverride(self, key: str) -> None: if key in self._settings_with_inheritance_warning: self._settings_with_inheritance_warning.remove(key) self.settingsWithIntheritanceChanged.emit() @pyqtSlot() - def forceUpdate(self): + def forceUpdate(self) -> None: self._update() - def _onActiveExtruderChanged(self): + def _onActiveExtruderChanged(self) -> None: new_active_stack = ExtruderManager.getInstance().getActiveExtruderStack() if not new_active_stack: self._active_container_stack = None @@ -94,13 +103,14 @@ class SettingInheritanceManager(QObject): self._active_container_stack.containersChanged.disconnect(self._onContainersChanged) self._active_container_stack = new_active_stack - self._active_container_stack.propertyChanged.connect(self._onPropertyChanged) - self._active_container_stack.containersChanged.connect(self._onContainersChanged) + if self._active_container_stack is not None: + self._active_container_stack.propertyChanged.connect(self._onPropertyChanged) + self._active_container_stack.containersChanged.connect(self._onContainersChanged) self._update() # Ensure that the settings_with_inheritance_warning list is populated. - def _onPropertyChanged(self, key, property_name): + def _onPropertyChanged(self, key: str, property_name: str) -> None: if (property_name == "value" or property_name == "enabled") and self._global_container_stack: - definitions = self._global_container_stack.definition.findDefinitions(key = key) + definitions = self._global_container_stack.definition.findDefinitions(key = key) # type: List["SettingDefinition"] if not definitions: return @@ -139,7 +149,7 @@ class SettingInheritanceManager(QObject): if settings_with_inheritance_warning_changed: self.settingsWithIntheritanceChanged.emit() - def _recursiveCheck(self, definition): + def _recursiveCheck(self, definition: "SettingDefinition") -> bool: for child in definition.children: if child.key in self._settings_with_inheritance_warning: return True @@ -149,7 +159,7 @@ class SettingInheritanceManager(QObject): return False @pyqtProperty("QVariantList", notify = settingsWithIntheritanceChanged) - def settingsWithInheritanceWarning(self): + def settingsWithInheritanceWarning(self) -> List[str]: return self._settings_with_inheritance_warning ## Check if a setting has an inheritance function that is overwritten @@ -157,9 +167,14 @@ class SettingInheritanceManager(QObject): has_setting_function = False if not stack: stack = self._active_container_stack - if not stack: #No active container stack yet! + if not stack: # No active container stack yet! return False - containers = [] # type: List[ContainerInterface] + + if self._active_container_stack is None: + return False + all_keys = self._active_container_stack.getAllKeys() + + containers = [] # type: List[ContainerInterface] ## Check if the setting has a user state. If not, it is never overwritten. has_user_state = stack.getProperty(key, "state") == InstanceState.User @@ -190,8 +205,8 @@ class SettingInheritanceManager(QObject): has_setting_function = isinstance(value, SettingFunction) if has_setting_function: for setting_key in value.getUsedSettingKeys(): - if setting_key in self._active_container_stack.getAllKeys(): - break # We found an actual setting. So has_setting_function can remain true + if setting_key in all_keys: + break # We found an actual setting. So has_setting_function can remain true else: # All of the setting_keys turned out to not be setting keys at all! # This can happen due enum keys also being marked as settings. @@ -205,7 +220,7 @@ class SettingInheritanceManager(QObject): break # There is a setting function somewhere, stop looking deeper. return has_setting_function and has_non_function_value - def _update(self): + def _update(self) -> None: self._settings_with_inheritance_warning = [] # Reset previous data. # Make sure that the GlobalStack is not None. sometimes the globalContainerChanged signal gets here late. @@ -226,7 +241,7 @@ class SettingInheritanceManager(QObject): # Notify others that things have changed. self.settingsWithIntheritanceChanged.emit() - def _onGlobalContainerChanged(self): + def _onGlobalContainerChanged(self) -> None: if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) self._global_container_stack.containersChanged.disconnect(self._onContainersChanged) diff --git a/cura/Settings/SettingVisibilityPreset.py b/cura/Settings/SettingVisibilityPreset.py new file mode 100644 index 0000000000..e8a4211d69 --- /dev/null +++ b/cura/Settings/SettingVisibilityPreset.py @@ -0,0 +1,90 @@ +import os +import urllib.parse +from configparser import ConfigParser +from typing import List + +from PyQt5.QtCore import pyqtProperty, QObject, pyqtSignal + +from UM.Logger import Logger +from UM.MimeTypeDatabase import MimeTypeDatabase + + +class SettingVisibilityPreset(QObject): + onSettingsChanged = pyqtSignal() + onNameChanged = pyqtSignal() + onWeightChanged = pyqtSignal() + onIdChanged = pyqtSignal() + + def __init__(self, preset_id: str = "", name: str = "", weight: int = 0, parent = None) -> None: + super().__init__(parent) + self._settings = [] # type: List[str] + self._id = preset_id + self._weight = weight + self._name = name + + @pyqtProperty("QStringList", notify = onSettingsChanged) + def settings(self) -> List[str]: + return self._settings + + @pyqtProperty(str, notify = onIdChanged) + def presetId(self) -> str: + return self._id + + @pyqtProperty(int, notify = onWeightChanged) + def weight(self) -> int: + return self._weight + + @pyqtProperty(str, notify = onNameChanged) + def name(self) -> str: + return self._name + + def setName(self, name: str) -> None: + if name != self._name: + self._name = name + self.onNameChanged.emit() + + def setId(self, id: str) -> None: + if id != self._id: + self._id = id + self.onIdChanged.emit() + + def setWeight(self, weight: int) -> None: + if weight != self._weight: + self._weight = weight + self.onWeightChanged.emit() + + def setSettings(self, settings: List[str]) -> None: + if set(settings) != set(self._settings): + self._settings = list(set(settings)) # filter out non unique + self.onSettingsChanged.emit() + + # Load a preset from file. We expect a file that can be parsed by means of the config parser. + # The sections indicate the categories and the parameters placed in it (which don't need values) are the settings + # that should be considered visible. + def loadFromFile(self, file_path: str) -> None: + mime_type = MimeTypeDatabase.getMimeTypeForFile(file_path) + + item_id = urllib.parse.unquote_plus(mime_type.stripExtension(os.path.basename(file_path))) + if not os.path.isfile(file_path): + Logger.log("e", "[%s] is not a file", file_path) + return None + + parser = ConfigParser(interpolation = None, allow_no_value = True) # Accept options without any value, + + parser.read([file_path]) + if not parser.has_option("general", "name") or not parser.has_option("general", "weight"): + return None + + settings = [] # type: List[str] + for section in parser.sections(): + if section == "general": + continue + + settings.append(section) + for option in parser[section].keys(): + settings.append(option) + self.setSettings(settings) + self.setId(item_id) + self.setName(parser["general"]["name"]) + self.setWeight(int(parser["general"]["weight"])) + diff --git a/cura/Settings/UserChangesModel.py b/cura/Settings/UserChangesModel.py index 95674e5ecd..9a26e5607e 100644 --- a/cura/Settings/UserChangesModel.py +++ b/cura/Settings/UserChangesModel.py @@ -1,15 +1,17 @@ -from UM.Qt.ListModel import ListModel +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import os +from collections import OrderedDict from PyQt5.QtCore import pyqtSlot, Qt + from UM.Application import Application -from cura.Settings.ExtruderManager import ExtruderManager from UM.Settings.ContainerRegistry import ContainerRegistry from UM.i18n import i18nCatalog from UM.Settings.SettingFunction import SettingFunction -from UM.Settings.PropertyEvaluationContext import PropertyEvaluationContext -from collections import OrderedDict -import os +from UM.Qt.ListModel import ListModel class UserChangesModel(ListModel): @@ -38,9 +40,13 @@ class UserChangesModel(ListModel): self._update() def _update(self): + application = Application.getInstance() + machine_manager = application.getMachineManager() + cura_formula_functions = application.getCuraFormulaFunctions() + item_dict = OrderedDict() item_list = [] - global_stack = Application.getInstance().getGlobalContainerStack() + global_stack = machine_manager.activeMachine if not global_stack: return @@ -71,13 +77,7 @@ class UserChangesModel(ListModel): # Override "getExtruderValue" with "getDefaultExtruderValue" so we can get the default values user_changes = containers.pop(0) - default_value_resolve_context = PropertyEvaluationContext(stack) - default_value_resolve_context.context["evaluate_from_container_index"] = 1 # skip the user settings container - default_value_resolve_context.context["override_operators"] = { - "extruderValue": ExtruderManager.getDefaultExtruderValue, - "extruderValues": ExtruderManager.getDefaultExtruderValues, - "resolveOrValue": ExtruderManager.getDefaultResolveOrValue - } + default_value_resolve_context = cura_formula_functions.createContextForDefaultValueEvaluation(stack) for setting_key in user_changes.getAllKeys(): original_value = None diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 6d55e0643d..9ee2ef0dd4 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -298,7 +298,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): values = parser["values"] if parser.has_section("values") else dict() num_settings_overriden_by_quality_changes += len(values) # Check if quality changes already exists. - quality_changes = self._container_registry.findInstanceContainers(id = container_id) + quality_changes = self._container_registry.findInstanceContainers(name = custom_quality_name, + type = "quality_changes") if quality_changes: containers_found_dict["quality_changes"] = True # Check if there really is a conflict by comparing the values @@ -926,7 +927,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): build_plate_id = global_stack.variant.getId() # get material diameter of this extruder - machine_material_diameter = extruder_stack.materialDiameter + machine_material_diameter = extruder_stack.getCompatibleMaterialDiameter() material_node = material_manager.getMaterialNode(global_stack.definition.getId(), extruder_stack.variant.getName(), build_plate_id, @@ -934,7 +935,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): root_material_id) if material_node is not None and material_node.getContainer() is not None: - extruder_stack.material = material_node.getContainer() + extruder_stack.material = material_node.getContainer() # type: InstanceContainer def _applyChangesToMachine(self, global_stack, extruder_stack_dict): # Clear all first @@ -1012,7 +1013,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): ## Get the list of ID's of all containers in a container stack by partially parsing it's serialized data. def _getContainerIdListFromSerialized(self, serialized): - parser = ConfigParser(interpolation=None, empty_lines_in_values=False) + parser = ConfigParser(interpolation = None, empty_lines_in_values = False) parser.read_string(serialized) container_ids = [] @@ -1033,7 +1034,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): return container_ids def _getMachineNameFromSerializedStack(self, serialized): - parser = ConfigParser(interpolation=None, empty_lines_in_values=False) + parser = ConfigParser(interpolation = None, empty_lines_in_values = False) parser.read_string(serialized) return parser["general"].get("name", "") diff --git a/plugins/3MFWriter/__init__.py b/plugins/3MFWriter/__init__.py index 4b8a03888d..eff1648489 100644 --- a/plugins/3MFWriter/__init__.py +++ b/plugins/3MFWriter/__init__.py @@ -12,7 +12,7 @@ from . import ThreeMFWorkspaceWriter from UM.i18n import i18nCatalog from UM.Platform import Platform -i18n_catalog = i18nCatalog("uranium") +i18n_catalog = i18nCatalog("cura") def getMetaData(): workspace_extension = "3mf" diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index c51f9aa5c7..78d174a3a1 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -1,10 +1,83 @@ -[3.5.1] +[3.6.0] *BlackBelt changes - Added automatic support generation - Optimised start and end gcode - Updated firmware to Marlin 1.1.9, with support for homing the Y axis and parking the nozzle on pause - Fixed multiplying models on the belt - Fixed layer view for objects that are cut off below the belt +*Gyroid infill +New infill pattern with enhanced strength properties. Gyroid infill is one of the strongest infill types for a given weight, has isotropic properties, and prints relatively fast with reduced material use and a fully connected part interior. Note: Slicing time can increase up to 40 seconds or more, depending on the model. Contributed by smartavionics. + +*Support brim +New setting that integrates the first layer of support material with the brim’s geometry. This significantly improves adhesion when printing with support material. Contributed by BagelOrb. + +*Cooling fan number +It is now possible to specify the cooling fan to use if your printer has multiple fans. This is implemented under Machine settings in the Extruder tab. Contributed by smartavionics. + +*Settings refactor +The CuraEngine has been refactored to create a more testable, future-proof way of storing and representing settings. This makes slicing faster, and future development easier. + +*Print core CC 0.6 +The new print core CC 0.6 is selectable when the Ultimaker S5 profile is active. This print core is optimized for use with abrasive materials and composites. + +*File name and layer display +Added M117 commands to GCODE to give real-time information about the print job file name and layer number shown on the printer’s display when printing via USB. Contributed by adecastilho. + +*Firmware checker/Ultimaker S5 +The update checker code has been improved and tested for more reliable firmware update notifications in Ultimaker Cura. The Ultimaker S5 is now included. + +*Fullscreen mode shortcuts +Fullscreen mode can be toggled using the View menu or with the keyboard shortcuts: Command + Control + F (macOS), or F11 (Windows and Linux). Contributed by KangDroid. + +*Configuration error message +In previous versions, Ultimaker Cura would display an error dialog explaining when something happened to user configuration files, including the option to reset to factory defaults. This would not warn about losing the current printer and print profile settings, so this information has been added. + +*Rename Toolbox to Marketplace +The entry points to the Toolbox are now renamed to Marketplace. + +*Materials in the Marketplace +A new tab has been added to the Marketplace that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials. + +*New third-party definitions +New profiles added for Anycube 4MAx and Tizyx K25. Contributed by jscurtu and ValentinPitre respectively. + +*Improved definitions for Ender-3 +The Ender-3 build plate size has been adjusted to the correct size of 235 x 235 mm, corrected the start-up sequence, and the printhead position has been adjusted when prints are purged or completed. Contributed by stelgenhof. + +*Add mesh names to slicing message +Added comment generation to indicate which mesh the GCODE after this comment is constructing. Contributed by paukstelis. + +*Bug fixes +- The active material is highlighted in Ultimaker Cura’s material manager list. This behavior is now consistent with the profile and machine manager. +- The option to use 1.75 mm diameter filament with third-party 3D printers is now fixed and does not revert back to 2.85 mm. This fix also applies the appropriate a Z-axis speed change for 1.75 mm filament printers. Contributed by kaleidoscopeit. +- A fix was created to handle OSX version 10.10, but due to the QT upgrade, users with older versions won’t be able to run Ultimaker Cura on their system without a system update. This applies to OSX version 10.09 and 10.08. +- Fixed a memory leak when leaving the “Monitor” page open. +- Added performance improvements to the PolygonConnector to efficiently connect polygons that are close to each other. This also reduces the chances of the print head collide with previously printed things. Contributed by BagelOrb. +- Fixed a bug where the GCODE reader didn’t show retractions. +- Changes the USBPrinting update thread to prevent flooding the printer with M105 temperature update requests. Contributed by fieldOfView. +- Fix the behavior of the "manage visible settings" button, when pressing the "cog" icon of a particular category. Contributed by fieldOfView. +- Add a new post processing script that pauses the print at a certain height that works with RepRap printers. Contributed by Kriechi. +- Fix updates to the print monitor temperatures while preheating. Contributed by fieldOfView. +- Fixed a bug where material cost is not shown unless weight is changed. +- Fixed bugs crashing the CuraEngine when TreeSupport is enabled. +- Fixed a bug where Ultimaker Cura would upload the wrong firmware after switching printers in the UI. +- Fixed a bug where the layer view was missing if the first layer was empty. +- Fixed a bug where erroneous combing movements were taking place. +- Fixed a bug where the initial layer temperature is set correctly for the first object but then never again. +- Fixed a bug where clicking the fx icon didn’t respond. + +[3.5.1] +*Bug fixes +- Fixed M104 temperature commands giving inaccurate results. +- Fixed crashes caused by loading files from USB stick on Windows platforms. +- Fixed several issues with configuration files that missed the type in the metadata. +- Fixed issues caused by skin/infill optimization. +- Fixed several issues related to missing definition files for third-party printers. +- Fixed an issue where combing path generation cuts corners. +- Fixed a range of crashes caused by lock files. +- Fixed issues with remembering save directories on MacOS. +- Fixed an issue where CuraEngine uses incorrect material settings. +- Fixed an issue where some support layers don't have support infill. [3.5.0] diff --git a/plugins/ChangeLogPlugin/__init__.py b/plugins/ChangeLogPlugin/__init__.py index 97d9e411e5..a5452b60c8 100644 --- a/plugins/ChangeLogPlugin/__init__.py +++ b/plugins/ChangeLogPlugin/__init__.py @@ -3,8 +3,6 @@ from . import ChangeLog -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") def getMetaData(): return {} diff --git a/plugins/CuraEngineBackend/Cura.proto b/plugins/CuraEngineBackend/Cura.proto index 69612210ec..292330576b 100644 --- a/plugins/CuraEngineBackend/Cura.proto +++ b/plugins/CuraEngineBackend/Cura.proto @@ -29,6 +29,7 @@ message Object bytes normals = 3; //An array of 3 floats. bytes indices = 4; //An array of ints. repeated Setting settings = 5; // Setting override per object, overruling the global settings. + string name = 6; } message Progress diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 91a9ee0e7b..58bc74f3f1 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -179,8 +179,7 @@ class CuraEngineBackend(QObject, Backend): # This is useful for debugging and used to actually start the engine. # \return list of commands and args / parameters. def getEngineCommand(self) -> List[str]: - json_path = Resources.getPath(Resources.DefinitionContainers, "fdmprinter.def.json") - command = [self._application.getPreferences().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, ""] + command = [self._application.getPreferences().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), ""] parser = argparse.ArgumentParser(prog = "cura", add_help = False) parser.add_argument("--debug", action = "store_true", default = False, help = "Turn on the debug mode by setting this option.") diff --git a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py index 3953625c7e..594bf3a43e 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py @@ -2,6 +2,7 @@ #Cura is released under the terms of the LGPLv3 or higher. import gc +import sys from UM.Job import Job from UM.Application import Application @@ -95,23 +96,35 @@ class ProcessSlicedLayersJob(Job): layer_count = len(self._layers) # Find the minimum layer number + # When disabling the remove empty first layers setting, the minimum layer number will be a positive + # value. In that case the first empty layers will be discarded and start processing layers from the + # first layer with data. # When using a raft, the raft layers are sent as layers < 0. Instead of allowing layers < 0, we - # instead simply offset all other layers so the lowest layer is always 0. It could happens that - # the first raft layer has value -8 but there are just 4 raft (negative) layers. - min_layer_number = 0 + # simply offset all other layers so the lowest layer is always 0. It could happens that the first + # raft layer has value -8 but there are just 4 raft (negative) layers. + min_layer_number = sys.maxsize negative_layers = 0 for layer in self._layers: - if layer.id < min_layer_number: - min_layer_number = layer.id - if layer.id < 0: - negative_layers += 1 + if layer.repeatedMessageCount("path_segment") > 0: + if layer.id < min_layer_number: + min_layer_number = layer.id + if layer.id < 0: + negative_layers += 1 current_layer = 0 for layer in self._layers: - # Negative layers are offset by the minimum layer number, but the positive layers are just - # offset by the number of negative layers so there is no layer gap between raft and model - abs_layer_number = layer.id + abs(min_layer_number) if layer.id < 0 else layer.id + negative_layers + # If the layer is below the minimum, it means that there is no data, so that we don't create a layer + # data. However, if there are empty layers in between, we compute them. + if layer.id < min_layer_number: + continue + + # Layers are offset by the minimum layer number. In case the raft (negative layers) is being used, + # then the absolute layer number is adjusted by removing the empty layers that can be in between raft + # and the model + abs_layer_number = layer.id - min_layer_number + if layer.id >= 0 and negative_layers != 0: + abs_layer_number += (min_layer_number + negative_layers) layer_data.addLayer(abs_layer_number) this_layer = layer_data.getLayer(abs_layer_number) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 37b490dcfc..79b1e5249c 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -277,7 +277,7 @@ class StartSliceJob(Job): obj = group_message.addRepeatedMessage("objects") obj.id = id(object) - + obj.name = object.getName() indices = mesh_data.getIndices() if indices is not None: flat_verts = numpy.take(verts, indices.flatten(), axis=0) @@ -447,8 +447,7 @@ class StartSliceJob(Job): Job.yieldThread() # Ensure that the engine is aware what the build extruder is. - if stack.getProperty("machine_extruder_count", "value") > 1: - changed_setting_keys.add("extruder_nr") + changed_setting_keys.add("extruder_nr") # Get values for all changed settings for key in changed_setting_keys: diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index 5957b2cecf..11e58dac6d 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -50,7 +50,7 @@ class CuraProfileReader(ProfileReader): # \param profile_id \type{str} The name of the profile. # \return \type{List[Tuple[str,str]]} List of serialized profile strings and matching profile names. def _upgradeProfile(self, serialized, profile_id): - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialized) if "general" not in parser: diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py index f01e8cb276..415931b7ec 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py @@ -1,9 +1,12 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +import os from PyQt5.QtCore import QUrl from PyQt5.QtGui import QDesktopServices +from typing import Set + from UM.Extension import Extension from UM.Application import Application from UM.Logger import Logger @@ -13,6 +16,7 @@ from UM.Settings.ContainerRegistry import ContainerRegistry from cura.Settings.GlobalStack import GlobalStack from .FirmwareUpdateCheckerJob import FirmwareUpdateCheckerJob +from .FirmwareUpdateCheckerMessage import FirmwareUpdateCheckerMessage i18n_catalog = i18nCatalog("cura") @@ -21,32 +25,31 @@ i18n_catalog = i18nCatalog("cura") # The plugin is currently only usable for applications maintained by Ultimaker. But it should be relatively easy # to change it to work for other applications. class FirmwareUpdateChecker(Extension): - JEDI_VERSION_URL = "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources" - def __init__(self): + def __init__(self) -> None: super().__init__() - # Initialize the Preference called `latest_checked_firmware` that stores the last version - # checked for the UM3. In the future if we need to check other printers' firmware - Application.getInstance().getPreferences().addPreference("info/latest_checked_firmware", "") - # Listen to a Signal that indicates a change in the list of printers, just if the user has enabled the - # 'check for updates' option + # "check for updates" option Application.getInstance().getPreferences().addPreference("info/automatic_update_check", True) if Application.getInstance().getPreferences().getValue("info/automatic_update_check"): ContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) - self._download_url = None self._check_job = None + self._checked_printer_names = set() # type: Set[str] ## Callback for the message that is spawned when there is a new version. def _onActionTriggered(self, message, action): - if action == "download": - if self._download_url is not None: - QDesktopServices.openUrl(QUrl(self._download_url)) - - def _onSetDownloadUrl(self, download_url): - self._download_url = download_url + if action == FirmwareUpdateCheckerMessage.STR_ACTION_DOWNLOAD: + machine_id = message.getMachineId() + download_url = message.getDownloadUrl() + if download_url is not None: + if QDesktopServices.openUrl(QUrl(download_url)): + Logger.log("i", "Redirected browser to {0} to show newly available firmware.".format(download_url)) + else: + Logger.log("e", "Can't reach URL: {0}".format(download_url)) + else: + Logger.log("e", "Can't find URL for {0}".format(machine_id)) def _onContainerAdded(self, container): # Only take care when a new GlobalStack was added @@ -63,13 +66,18 @@ class FirmwareUpdateChecker(Extension): # \param silent type(boolean) Suppresses messages other than "new version found" messages. # This is used when checking for a new firmware version at startup. def checkFirmwareVersion(self, container = None, silent = False): - # Do not run multiple check jobs in parallel - if self._check_job is not None: - Logger.log("i", "A firmware update check is already running, do nothing.") + container_name = container.definition.getName() + if container_name in self._checked_printer_names: + return + self._checked_printer_names.add(container_name) + + metadata = container.definition.getMetaData().get("firmware_update_info") + if metadata is None: + Logger.log("i", "No machine with name {0} in list of firmware to check.".format(container_name)) return - self._check_job = FirmwareUpdateCheckerJob(container = container, silent = silent, url = self.JEDI_VERSION_URL, - callback = self._onActionTriggered, - set_download_url_callback = self._onSetDownloadUrl) + self._check_job = FirmwareUpdateCheckerJob(container = container, silent = silent, + machine_name = container_name, metadata = metadata, + callback = self._onActionTriggered) self._check_job.start() self._check_job.finished.connect(self._onJobFinished) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py index eadacf2c02..4c60b95824 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py @@ -1,13 +1,18 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Application import Application from UM.Message import Message from UM.Logger import Logger from UM.Job import Job +from UM.Version import Version import urllib.request -import codecs +from urllib.error import URLError +from typing import Dict, Optional + +from .FirmwareUpdateCheckerLookup import FirmwareUpdateCheckerLookup, getSettingsKeyForMachine +from .FirmwareUpdateCheckerMessage import FirmwareUpdateCheckerMessage from UM.i18n import i18nCatalog i18n_catalog = i18nCatalog("cura") @@ -15,46 +20,86 @@ i18n_catalog = i18nCatalog("cura") ## This job checks if there is an update available on the provided URL. class FirmwareUpdateCheckerJob(Job): - def __init__(self, container = None, silent = False, url = None, callback = None, set_download_url_callback = None): + STRING_ZERO_VERSION = "0.0.0" + STRING_EPSILON_VERSION = "0.0.1" + ZERO_VERSION = Version(STRING_ZERO_VERSION) + EPSILON_VERSION = Version(STRING_EPSILON_VERSION) + + def __init__(self, container, silent, machine_name, metadata, callback) -> None: super().__init__() self._container = container self.silent = silent - self._url = url self._callback = callback - self._set_download_url_callback = set_download_url_callback - def run(self): - if not self._url: - Logger.log("e", "Can not check for a new release. URL not set!") - return + self._machine_name = machine_name + self._metadata = metadata + self._lookups = None # type:Optional[FirmwareUpdateCheckerLookup] + self._headers = {} # type:Dict[str, str] # Don't set headers yet. + + def getUrlResponse(self, url: str) -> str: + result = self.STRING_ZERO_VERSION try: + request = urllib.request.Request(url, headers = self._headers) + response = urllib.request.urlopen(request) + result = response.read().decode("utf-8") + except URLError: + Logger.log("w", "Could not reach '{0}', if this URL is old, consider removal.".format(url)) + + return result + + def parseVersionResponse(self, response: str) -> Version: + raw_str = response.split("\n", 1)[0].rstrip() + return Version(raw_str) + + def getCurrentVersion(self) -> Version: + max_version = self.ZERO_VERSION + if self._lookups is None: + return max_version + + machine_urls = self._lookups.getCheckUrls() + if machine_urls is not None: + for url in machine_urls: + version = self.parseVersionResponse(self.getUrlResponse(url)) + if version > max_version: + max_version = version + + if max_version < self.EPSILON_VERSION: + Logger.log("w", "MachineID {0} not handled!".format(self._lookups.getMachineName())) + + return max_version + + def run(self): + if self._lookups is None: + self._lookups = FirmwareUpdateCheckerLookup(self._machine_name, self._metadata) + + try: + # Initialize a Preference that stores the last version checked for this printer. + Application.getInstance().getPreferences().addPreference( + getSettingsKeyForMachine(self._lookups.getMachineId()), "") + + # Get headers application_name = Application.getInstance().getApplicationName() - headers = {"User-Agent": "%s - %s" % (application_name, Application.getInstance().getVersion())} - request = urllib.request.Request(self._url, headers = headers) - current_version_file = urllib.request.urlopen(request) - reader = codecs.getreader("utf-8") + application_version = Application.getInstance().getVersion() + self._headers = {"User-Agent": "%s - %s" % (application_name, application_version)} # get machine name from the definition container machine_name = self._container.definition.getName() - machine_name_parts = machine_name.lower().split(" ") # If it is not None, then we compare between the checked_version and the current_version - # Now we just do that if the active printer is Ultimaker 3 or Ultimaker 3 Extended or any - # other Ultimaker 3 that will come in the future - if len(machine_name_parts) >= 2 and machine_name_parts[:2] == ["ultimaker", "3"]: - Logger.log("i", "You have a UM3 in printer list. Let's check the firmware!") + machine_id = self._lookups.getMachineId() + if machine_id is not None: + Logger.log("i", "You have a(n) {0} in the printer list. Let's check the firmware!".format(machine_name)) - # Nothing to parse, just get the string - # TODO: In the future may be done by parsing a JSON file with diferent version for each printer model - current_version = reader(current_version_file).readline().rstrip() + current_version = self.getCurrentVersion() - # If it is the first time the version is checked, the checked_version is '' - checked_version = Application.getInstance().getPreferences().getValue("info/latest_checked_firmware") + # If it is the first time the version is checked, the checked_version is "" + setting_key_str = getSettingsKeyForMachine(machine_id) + checked_version = Version(Application.getInstance().getPreferences().getValue(setting_key_str)) - # If the checked_version is '', it's because is the first time we check firmware and in this case + # If the checked_version is "", it's because is the first time we check firmware and in this case # we will not show the notification, but we will store it for the next time - Application.getInstance().getPreferences().setValue("info/latest_checked_firmware", current_version) + Application.getInstance().getPreferences().setValue(setting_key_str, current_version) Logger.log("i", "Reading firmware version of %s: checked = %s - latest = %s", machine_name, checked_version, current_version) # The first time we want to store the current version, the notification will not be shown, @@ -62,28 +107,11 @@ class FirmwareUpdateCheckerJob(Job): # notify the user when no new firmware version is available. if (checked_version != "") and (checked_version != current_version): Logger.log("i", "SHOWING FIRMWARE UPDATE MESSAGE") - - message = Message(i18n_catalog.i18nc( - "@info Don't translate {machine_name}, since it gets replaced by a printer name!", - "New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format( - machine_name=machine_name), - title=i18n_catalog.i18nc( - "@info:title The %s gets replaced with the printer name.", - "New %s firmware available") % machine_name) - - message.addAction("download", - i18n_catalog.i18nc("@action:button", "How to update"), - "[no_icon]", - "[no_description]", - button_style=Message.ActionButtonStyle.LINK, - button_align=Message.ActionButtonStyle.BUTTON_ALIGN_LEFT) - - - # If we do this in a cool way, the download url should be available in the JSON file - if self._set_download_url_callback: - self._set_download_url_callback("https://ultimaker.com/en/resources/20500-upgrade-firmware") + message = FirmwareUpdateCheckerMessage(machine_id, machine_name, self._lookups.getRedirectUserUrl()) message.actionTriggered.connect(self._callback) message.show() + else: + Logger.log("i", "No machine with name {0} in list of firmware to check.".format(machine_name)) except Exception as e: Logger.log("w", "Failed to check for new version: %s", e) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerLookup.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerLookup.py new file mode 100644 index 0000000000..a21ad3f0e5 --- /dev/null +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerLookup.py @@ -0,0 +1,35 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import List, Optional + +from UM.i18n import i18nCatalog +i18n_catalog = i18nCatalog("cura") + + +def getSettingsKeyForMachine(machine_id: int) -> str: + return "info/latest_checked_firmware_for_{0}".format(machine_id) + + +class FirmwareUpdateCheckerLookup: + + def __init__(self, machine_name, machine_json) -> None: + # Parse all the needed lookup-tables from the ".json" file(s) in the resources folder. + self._machine_id = machine_json.get("id") + self._machine_name = machine_name.lower() # Lower in-case upper-case chars are added to the original json. + self._check_urls = [] # type:List[str] + for check_url in machine_json.get("check_urls"): + self._check_urls.append(check_url) + self._redirect_user = machine_json.get("update_url") + + def getMachineId(self) -> Optional[int]: + return self._machine_id + + def getMachineName(self) -> Optional[int]: + return self._machine_name + + def getCheckUrls(self) -> Optional[List[str]]: + return self._check_urls + + def getRedirectUserUrl(self) -> Optional[str]: + return self._redirect_user diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py new file mode 100644 index 0000000000..fd56c101a0 --- /dev/null +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py @@ -0,0 +1,37 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from UM.i18n import i18nCatalog +from UM.Message import Message + +i18n_catalog = i18nCatalog("cura") + + +# Make a separate class, since we need an extra field: The machine-id that this message is about. +class FirmwareUpdateCheckerMessage(Message): + STR_ACTION_DOWNLOAD = "download" + + def __init__(self, machine_id: int, machine_name: str, download_url: str) -> None: + super().__init__(i18n_catalog.i18nc( + "@info Don't translate {machine_name}, since it gets replaced by a printer name!", + "New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format( + machine_name = machine_name), + title = i18n_catalog.i18nc( + "@info:title The %s gets replaced with the printer name.", + "New %s firmware available") % machine_name) + + self._machine_id = machine_id + self._download_url = download_url + + self.addAction(self.STR_ACTION_DOWNLOAD, + i18n_catalog.i18nc("@action:button", "How to update"), + "[no_icon]", + "[no_description]", + button_style = Message.ActionButtonStyle.LINK, + button_align = Message.ActionButtonStyle.BUTTON_ALIGN_LEFT) + + def getMachineId(self) -> int: + return self._machine_id + + def getDownloadUrl(self) -> str: + return self._download_url diff --git a/plugins/FirmwareUpdateChecker/__init__.py b/plugins/FirmwareUpdateChecker/__init__.py index 3fae15e826..892c9c0320 100644 --- a/plugins/FirmwareUpdateChecker/__init__.py +++ b/plugins/FirmwareUpdateChecker/__init__.py @@ -1,12 +1,8 @@ # Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from UM.i18n import i18nCatalog - from . import FirmwareUpdateChecker -i18n_catalog = i18nCatalog("cura") - def getMetaData(): return {} diff --git a/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py new file mode 100644 index 0000000000..0a3e3a0ff0 --- /dev/null +++ b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py @@ -0,0 +1,69 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from cura.CuraApplication import CuraApplication +from UM.Settings.DefinitionContainer import DefinitionContainer +from cura.MachineAction import MachineAction +from UM.i18n import i18nCatalog +from UM.Settings.ContainerRegistry import ContainerRegistry +from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdateState + +from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject +from typing import Optional + +MYPY = False +if MYPY: + from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater + from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice + from UM.Settings.ContainerInterface import ContainerInterface + +catalog = i18nCatalog("cura") + +## Upgrade the firmware of a machine by USB with this action. +class FirmwareUpdaterMachineAction(MachineAction): + def __init__(self) -> None: + super().__init__("UpgradeFirmware", catalog.i18nc("@action", "Update Firmware")) + self._qml_url = "FirmwareUpdaterMachineAction.qml" + ContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) + + self._active_output_device = None # type: Optional[PrinterOutputDevice] + self._active_firmware_updater = None # type: Optional[FirmwareUpdater] + + CuraApplication.getInstance().engineCreatedSignal.connect(self._onEngineCreated) + + def _onEngineCreated(self) -> None: + CuraApplication.getInstance().getMachineManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) + + def _onContainerAdded(self, container: "ContainerInterface") -> None: + # Add this action as a supported action to all machine definitions if they support USB connection + if isinstance(container, DefinitionContainer) and container.getMetaDataEntry("type") == "machine" and container.getMetaDataEntry("supports_usb_connection"): + CuraApplication.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) + + def _onOutputDevicesChanged(self) -> None: + if self._active_output_device and self._active_output_device.activePrinter: + self._active_output_device.activePrinter.getController().canUpdateFirmwareChanged.disconnect(self._onControllerCanUpdateFirmwareChanged) + + output_devices = CuraApplication.getInstance().getMachineManager().printerOutputDevices + self._active_output_device = output_devices[0] if output_devices else None + + if self._active_output_device and self._active_output_device.activePrinter: + self._active_output_device.activePrinter.getController().canUpdateFirmwareChanged.connect(self._onControllerCanUpdateFirmwareChanged) + + self.outputDeviceCanUpdateFirmwareChanged.emit() + + def _onControllerCanUpdateFirmwareChanged(self) -> None: + self.outputDeviceCanUpdateFirmwareChanged.emit() + + outputDeviceCanUpdateFirmwareChanged = pyqtSignal() + @pyqtProperty(QObject, notify = outputDeviceCanUpdateFirmwareChanged) + def firmwareUpdater(self) -> Optional["FirmwareUpdater"]: + if self._active_output_device and self._active_output_device.activePrinter.getController().can_update_firmware: + self._active_firmware_updater = self._active_output_device.getFirmwareUpdater() + return self._active_firmware_updater + + elif self._active_firmware_updater and self._active_firmware_updater.firmwareUpdateState not in [FirmwareUpdateState.idle, FirmwareUpdateState.completed]: + # During a firmware update, the PrinterOutputDevice is disconnected but the FirmwareUpdater is still there + return self._active_firmware_updater + + self._active_firmware_updater = None + return None diff --git a/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml new file mode 100644 index 0000000000..9a56dbb20a --- /dev/null +++ b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml @@ -0,0 +1,191 @@ +// 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 QtQuick.Dialogs 1.2 // For filedialog + +import UM 1.2 as UM +import Cura 1.0 as Cura + + +Cura.MachineAction +{ + anchors.fill: parent; + property bool printerConnected: Cura.MachineManager.printerConnected + property var activeOutputDevice: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null + property bool canUpdateFirmware: activeOutputDevice ? activeOutputDevice.activePrinter.canUpdateFirmware : false + + Column + { + id: firmwareUpdaterMachineAction + anchors.fill: parent; + UM.I18nCatalog { id: catalog; name:"cura"} + spacing: UM.Theme.getSize("default_margin").height + + Label + { + width: parent.width + text: catalog.i18nc("@title", "Update Firmware") + wrapMode: Text.WordWrap + font.pointSize: 18 + } + Label + { + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label", "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work.") + } + + Label + { + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label", "The firmware shipping with new printers works, but new versions tend to have more features and improvements."); + } + + Row + { + anchors.horizontalCenter: parent.horizontalCenter + width: childrenRect.width + spacing: UM.Theme.getSize("default_margin").width + property string firmwareName: Cura.MachineManager.activeMachine.getDefaultFirmwareName() + Button + { + id: autoUpgradeButton + text: catalog.i18nc("@action:button", "Automatically upgrade Firmware"); + enabled: parent.firmwareName != "" && canUpdateFirmware + onClicked: + { + updateProgressDialog.visible = true; + activeOutputDevice.updateFirmware(parent.firmwareName); + } + } + Button + { + id: manualUpgradeButton + text: catalog.i18nc("@action:button", "Upload custom Firmware"); + enabled: canUpdateFirmware + onClicked: + { + customFirmwareDialog.open() + } + } + } + + Label + { + width: parent.width + wrapMode: Text.WordWrap + visible: !printerConnected && !updateProgressDialog.visible + text: catalog.i18nc("@label", "Firmware can not be updated because there is no connection with the printer."); + } + + Label + { + width: parent.width + wrapMode: Text.WordWrap + visible: printerConnected && !canUpdateFirmware + text: catalog.i18nc("@label", "Firmware can not be updated because the connection with the printer does not support upgrading firmware."); + } + } + + FileDialog + { + id: customFirmwareDialog + title: catalog.i18nc("@title:window", "Select custom firmware") + nameFilters: "Firmware image files (*.hex)" + selectExisting: true + onAccepted: + { + updateProgressDialog.visible = true; + activeOutputDevice.updateFirmware(fileUrl); + } + } + + UM.Dialog + { + id: updateProgressDialog + + width: minimumWidth + minimumWidth: 500 * screenScaleFactor + height: minimumHeight + minimumHeight: 100 * screenScaleFactor + + modality: Qt.ApplicationModal + + title: catalog.i18nc("@title:window","Firmware Update") + + Column + { + anchors.fill: parent + + Label + { + anchors + { + left: parent.left + right: parent.right + } + + text: { + if(manager.firmwareUpdater == null) + { + return ""; + } + switch (manager.firmwareUpdater.firmwareUpdateState) + { + case 0: + return ""; //Not doing anything (eg; idling) + case 1: + return catalog.i18nc("@label","Updating firmware."); + case 2: + return catalog.i18nc("@label","Firmware update completed."); + case 3: + return catalog.i18nc("@label","Firmware update failed due to an unknown error."); + case 4: + return catalog.i18nc("@label","Firmware update failed due to an communication error."); + case 5: + return catalog.i18nc("@label","Firmware update failed due to an input/output error."); + case 6: + return catalog.i18nc("@label","Firmware update failed due to missing firmware."); + } + } + + wrapMode: Text.Wrap + } + + ProgressBar + { + id: prog + value: (manager.firmwareUpdater != null) ? manager.firmwareUpdater.firmwareProgress : 0 + minimumValue: 0 + maximumValue: 100 + indeterminate: + { + if(manager.firmwareUpdater == null) + { + return false; + } + return manager.firmwareUpdater.firmwareProgress < 1 && manager.firmwareUpdater.firmwareProgress > 0; + } + anchors + { + left: parent.left; + right: parent.right; + } + } + } + + rightButtons: [ + Button + { + text: catalog.i18nc("@action:button","Close"); + enabled: (manager.firmwareUpdater != null) ? manager.firmwareUpdater.firmwareUpdateState != 1 : true; + onClicked: updateProgressDialog.visible = false; + } + ] + } +} \ No newline at end of file diff --git a/plugins/FirmwareUpdater/__init__.py b/plugins/FirmwareUpdater/__init__.py new file mode 100644 index 0000000000..5a008d7d15 --- /dev/null +++ b/plugins/FirmwareUpdater/__init__.py @@ -0,0 +1,12 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from . import FirmwareUpdaterMachineAction + +def getMetaData(): + return {} + +def register(app): + return { "machine_action": [ + FirmwareUpdaterMachineAction.FirmwareUpdaterMachineAction() + ]} diff --git a/plugins/FirmwareUpdater/plugin.json b/plugins/FirmwareUpdater/plugin.json new file mode 100644 index 0000000000..3e09eab2b5 --- /dev/null +++ b/plugins/FirmwareUpdater/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Firmware Updater", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Provides a machine actions for updating firmware.", + "api": 5, + "i18n-catalog": "cura" +} diff --git a/plugins/GCodeGzReader/GCodeGzReader.py b/plugins/GCodeGzReader/GCodeGzReader.py index 73a08075d2..d075e4e3b0 100644 --- a/plugins/GCodeGzReader/GCodeGzReader.py +++ b/plugins/GCodeGzReader/GCodeGzReader.py @@ -4,15 +4,22 @@ import gzip from UM.Mesh.MeshReader import MeshReader #The class we're extending/implementing. +from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType #To add the .gcode.gz files to the MIME type database. from UM.PluginRegistry import PluginRegistry - ## A file reader that reads gzipped g-code. # # If you're zipping g-code, you might as well use gzip! class GCodeGzReader(MeshReader): def __init__(self) -> None: super().__init__() + MimeTypeDatabase.addMimeType( + MimeType( + name = "application/x-cura-compressed-gcode-file", + comment = "Cura Compressed GCode File", + suffixes = ["gcode.gz"] + ) + ) self._supported_extensions = [".gcode.gz"] def _read(self, file_name): diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index eb19853748..6fe2cb5260 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -44,6 +44,7 @@ class FlavorParser: self._extruder_offsets = {} # type: Dict[int, List[float]] # Offsets for multi extruders. key is index, value is [x-offset, y-offset] self._current_layer_thickness = 0.2 # default self._filament_diameter = 2.85 # default + self._previous_extrusion_value = 0.0 # keep track of the filament retractions CuraApplication.getInstance().getPreferences().addPreference("gcodereader/show_caution", True) @@ -182,6 +183,7 @@ class FlavorParser: new_extrusion_value = params.e if self._is_absolute_extrusion else e[self._extruder_number] + params.e if new_extrusion_value > e[self._extruder_number]: path.append([x, y, z, f, new_extrusion_value + self._extrusion_length_offset[self._extruder_number], self._layer_type]) # extrusion + self._previous_extrusion_value = new_extrusion_value else: path.append([x, y, z, f, new_extrusion_value + self._extrusion_length_offset[self._extruder_number], LayerPolygon.MoveRetractionType]) # retraction e[self._extruder_number] = new_extrusion_value @@ -191,6 +193,8 @@ class FlavorParser: if z > self._previous_z and (z - self._previous_z < 1.5): self._current_layer_thickness = z - self._previous_z # allow a tiny overlap self._previous_z = z + elif self._previous_extrusion_value > e[self._extruder_number]: + path.append([x, y, z, f, e[self._extruder_number] + self._extrusion_length_offset[self._extruder_number], LayerPolygon.MoveRetractionType]) else: path.append([x, y, z, f, e[self._extruder_number] + self._extrusion_length_offset[self._extruder_number], LayerPolygon.MoveCombingType]) return self._position(x, y, z, f, e) @@ -227,6 +231,9 @@ class FlavorParser: # Sometimes a G92 E0 is introduced in the middle of the GCode so we need to keep those offsets for calculate the line_width self._extrusion_length_offset[self._extruder_number] += position.e[self._extruder_number] - params.e position.e[self._extruder_number] = params.e + self._previous_extrusion_value = params.e + else: + self._previous_extrusion_value = 0.0 return self._position( params.x if params.x is not None else position.x, params.y if params.y is not None else position.y, @@ -286,7 +293,7 @@ class FlavorParser: self._cancelled = False # We obtain the filament diameter from the selected extruder to calculate line widths global_stack = CuraApplication.getInstance().getGlobalContainerStack() - + if not global_stack: return None @@ -329,6 +336,7 @@ class FlavorParser: min_layer_number = 0 negative_layers = 0 previous_layer = 0 + self._previous_extrusion_value = 0.0 for line in stream.split("\n"): if self._cancelled: diff --git a/plugins/GCodeReader/GCodeReader.py b/plugins/GCodeReader/GCodeReader.py index 45ef1e1058..1bc22a3e62 100755 --- a/plugins/GCodeReader/GCodeReader.py +++ b/plugins/GCodeReader/GCodeReader.py @@ -1,4 +1,5 @@ # Copyright (c) 2017 Aleph Objects, Inc. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.FileHandler.FileReader import FileReader @@ -11,13 +12,7 @@ catalog = i18nCatalog("cura") from . import MarlinFlavorParser, RepRapFlavorParser -MimeTypeDatabase.addMimeType( - MimeType( - name = "application/x-cura-gcode-file", - comment = "Cura GCode File", - suffixes = ["gcode", "gcode.gz"] - ) -) + # Class for loading and parsing G-code files @@ -29,7 +24,15 @@ class GCodeReader(MeshReader): def __init__(self) -> None: super().__init__() + MimeTypeDatabase.addMimeType( + MimeType( + name = "application/x-cura-gcode-file", + comment = "Cura GCode File", + suffixes = ["gcode"] + ) + ) self._supported_extensions = [".gcode", ".g"] + self._flavor_reader = None Application.getInstance().getPreferences().addPreference("gcodereader/show_caution", True) diff --git a/plugins/GCodeReader/RepRapFlavorParser.py b/plugins/GCodeReader/RepRapFlavorParser.py index ba1e13f23d..2a24d16add 100644 --- a/plugins/GCodeReader/RepRapFlavorParser.py +++ b/plugins/GCodeReader/RepRapFlavorParser.py @@ -1,9 +1,9 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from . import FlavorParser -# This parser is intented for interpret the RepRap Firmware flavor +## This parser is intended to interpret the RepRap Firmware g-code flavor. class RepRapFlavorParser(FlavorParser.FlavorParser): def __init__(self): diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 5d5e3578cd..3e5bf59e73 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -70,7 +70,7 @@ class GCodeWriter(MeshWriter): active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate scene = Application.getInstance().getController().getScene() if not hasattr(scene, "gcode_dict"): - self.setInformation(catalog.i18nc("@warning:status", "Please generate G-code before saving.")) + self.setInformation(catalog.i18nc("@warning:status", "Please prepare G-code before exporting.")) return False gcode_dict = getattr(scene, "gcode_dict") gcode_list = gcode_dict.get(active_build_plate, None) @@ -86,7 +86,7 @@ class GCodeWriter(MeshWriter): stream.write(settings) return True - self.setInformation(catalog.i18nc("@warning:status", "Please generate G-code before saving.")) + self.setInformation(catalog.i18nc("@warning:status", "Please prepare G-code before exporting.")) return False ## Create a new container with container 2 as base and container 1 written over it. diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index d829f46459..12c6aa8dde 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -35,7 +35,7 @@ UM.Dialog width: parent.width Label { - text: catalog.i18nc("@action:label","Height (mm)") + text: catalog.i18nc("@action:label", "Height (mm)") width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } @@ -58,7 +58,7 @@ UM.Dialog width: parent.width Label { - text: catalog.i18nc("@action:label","Base (mm)") + text: catalog.i18nc("@action:label", "Base (mm)") width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } @@ -81,7 +81,7 @@ UM.Dialog width: parent.width Label { - text: catalog.i18nc("@action:label","Width (mm)") + text: catalog.i18nc("@action:label", "Width (mm)") width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } @@ -105,7 +105,7 @@ UM.Dialog width: parent.width Label { - text: catalog.i18nc("@action:label","Depth (mm)") + text: catalog.i18nc("@action:label", "Depth (mm)") width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } @@ -151,7 +151,7 @@ UM.Dialog width: parent.width Label { - text: catalog.i18nc("@action:label","Smoothing") + text: catalog.i18nc("@action:label", "Smoothing") width: 150 * screenScaleFactor anchors.verticalCenter: parent.verticalCenter } diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index 93c15ca8e0..cd577218d5 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -152,7 +152,7 @@ class LegacyProfileReader(ProfileReader): profile.setDirty(True) #Serialise and deserialise in order to perform the version upgrade. - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) data = profile.serialize() parser.read_string(data) parser["general"]["version"] = "1" diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 505c988a13..004b4e3cfc 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -405,7 +405,15 @@ Cura.MachineAction { if (settingsTabs.currentIndex > 0) { - manager.updateMaterialForDiameter(settingsTabs.currentIndex - 1); + manager.updateMaterialForDiameter(settingsTabs.currentIndex - 1) + } + } + function setValueFunction(value) + { + if (settingsTabs.currentIndex > 0) + { + const extruderIndex = index.toString() + Cura.MachineManager.activeMachine.extruders[extruderIndex].compatibleMaterialDiameter = value } } property bool isExtruderSetting: true @@ -435,6 +443,18 @@ Cura.MachineAction property bool allowNegative: true } + Loader + { + id: extruderCoolingFanNumberField + sourceComponent: numericTextFieldWithUnit + property string settingKey: "machine_extruder_cooling_fan_number" + property string label: catalog.i18nc("@label", "Cooling Fan Number") + property string unit: catalog.i18nc("@label", "") + property bool isExtruderSetting: true + property bool forceUpdateOnChange: true + property bool allowNegative: false + } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } Row @@ -552,6 +572,7 @@ Cura.MachineAction property bool _forceUpdateOnChange: (typeof(forceUpdateOnChange) === 'undefined') ? false : forceUpdateOnChange property string _label: (typeof(label) === 'undefined') ? "" : label property string _tooltip: (typeof(tooltip) === 'undefined') ? propertyProvider.properties.description : tooltip + property var _setValueFunction: (typeof(setValueFunction) === 'undefined') ? undefined : setValueFunction UM.SettingPropertyProvider { @@ -604,14 +625,32 @@ Cura.MachineAction { if (propertyProvider && text != propertyProvider.properties.value) { - propertyProvider.setPropertyValue("value", text); + // For some properties like the extruder-compatible material diameter, they need to + // trigger many updates, such as the available materials, the current material may + // need to be switched, etc. Although setting the diameter can be done directly via + // the provider, all the updates that need to be triggered then need to depend on + // the metadata update, a signal that can be fired way too often. The update functions + // can have if-checks to filter out the irrelevant updates, but still it incurs unnecessary + // overhead. + // The ExtruderStack class has a dedicated function for this call "setCompatibleMaterialDiameter()", + // and it triggers the diameter update signals only when it is needed. Here it is optionally + // choose to use setCompatibleMaterialDiameter() or other more specific functions that + // are available. + if (_setValueFunction !== undefined) + { + _setValueFunction(text) + } + else + { + propertyProvider.setPropertyValue("value", text) + } if(_forceUpdateOnChange) { - manager.forceUpdate(); + manager.forceUpdate() } if(_afterOnEditingFinished) { - _afterOnEditingFinished(); + _afterOnEditingFinished() } } } diff --git a/plugins/MachineSettingsAction/__init__.py b/plugins/MachineSettingsAction/__init__.py index b1c4a75fec..ff80a12551 100644 --- a/plugins/MachineSettingsAction/__init__.py +++ b/plugins/MachineSettingsAction/__init__.py @@ -3,8 +3,6 @@ from . import MachineSettingsAction -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") def getMetaData(): return {} diff --git a/plugins/ModelChecker/__init__.py b/plugins/ModelChecker/__init__.py index 5f4d443729..dffee21723 100644 --- a/plugins/ModelChecker/__init__.py +++ b/plugins/ModelChecker/__init__.py @@ -1,11 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. -# This example is released under the terms of the AGPLv3 or higher. +# Cura is released under the terms of the LGPLv3 or higher. from . import ModelChecker -from UM.i18n import i18nCatalog -i18n_catalog = i18nCatalog("cura") - def getMetaData(): return {} diff --git a/plugins/MonitorStage/__init__.py b/plugins/MonitorStage/__init__.py index 884d43a8af..bdaf53a36c 100644 --- a/plugins/MonitorStage/__init__.py +++ b/plugins/MonitorStage/__init__.py @@ -3,6 +3,7 @@ from . import MonitorStage + from UM.i18n import i18nCatalog i18n_catalog = i18nCatalog("cura") diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 4c9ba2169c..5d4e17a102 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -407,14 +407,9 @@ Item { function updateFilter() { var new_filter = {}; - if (printSequencePropertyProvider.properties.value == "one_at_a_time") - { - new_filter["settable_per_meshgroup"] = true; - } - else - { - new_filter["settable_per_mesh"] = true; - } + new_filter["settable_per_mesh"] = true; + // Don't filter on "settable_per_meshgroup" any more when `printSequencePropertyProvider.properties.value` + // is set to "one_at_a_time", because the current backend architecture isn't ready for that. if(filterInput.text != "") { diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index b28a028325..1a1ea92d10 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -2,6 +2,7 @@ # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, pyqtSlot +from typing import Dict, Type, TYPE_CHECKING, List, Optional, cast from UM.PluginRegistry import PluginRegistry from UM.Resources import Resources @@ -9,55 +10,62 @@ from UM.Application import Application from UM.Extension import Extension from UM.Logger import Logger -import configparser #The script lists are stored in metadata as serialised config files. -import io #To allow configparser to write to a string. +import configparser # The script lists are stored in metadata as serialised config files. +import io # To allow configparser to write to a string. import os.path import pkgutil import sys import importlib.util from UM.i18n import i18nCatalog +from cura.CuraApplication import CuraApplication + i18n_catalog = i18nCatalog("cura") +if TYPE_CHECKING: + from .Script import Script + ## The post processing plugin is an Extension type plugin that enables pre-written scripts to post process generated # g-code files. class PostProcessingPlugin(QObject, Extension): - def __init__(self, parent = None): - super().__init__(parent) + def __init__(self, parent = None) -> None: + QObject.__init__(self, parent) + Extension.__init__(self) self.addMenuItem(i18n_catalog.i18n("Modify G-Code"), self.showPopup) self._view = None # Loaded scripts are all scripts that can be used - self._loaded_scripts = {} - self._script_labels = {} + self._loaded_scripts = {} # type: Dict[str, Type[Script]] + self._script_labels = {} # type: Dict[str, str] # Script list contains instances of scripts in loaded_scripts. # There can be duplicates, which will be executed in sequence. - self._script_list = [] + self._script_list = [] # type: List[Script] self._selected_script_index = -1 Application.getInstance().getOutputDeviceManager().writeStarted.connect(self.execute) - Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged) #When the current printer changes, update the list of scripts. - Application.getInstance().mainWindowChanged.connect(self._createView) #When the main window is created, create the view so that we can display the post-processing icon if necessary. + Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged) # When the current printer changes, update the list of scripts. + CuraApplication.getInstance().mainWindowChanged.connect(self._createView) # When the main window is created, create the view so that we can display the post-processing icon if necessary. selectedIndexChanged = pyqtSignal() - @pyqtProperty("QVariant", notify = selectedIndexChanged) - def selectedScriptDefinitionId(self): + + @pyqtProperty(str, notify = selectedIndexChanged) + def selectedScriptDefinitionId(self) -> Optional[str]: try: return self._script_list[self._selected_script_index].getDefinitionId() except: return "" - @pyqtProperty("QVariant", notify=selectedIndexChanged) - def selectedScriptStackId(self): + @pyqtProperty(str, notify=selectedIndexChanged) + def selectedScriptStackId(self) -> Optional[str]: try: return self._script_list[self._selected_script_index].getStackId() except: return "" ## Execute all post-processing scripts on the gcode. - def execute(self, output_device): + def execute(self, output_device) -> None: scene = Application.getInstance().getController().getScene() # If the scene does not have a gcode, do nothing if not hasattr(scene, "gcode_dict"): @@ -67,7 +75,7 @@ class PostProcessingPlugin(QObject, Extension): return # get gcode list for the active build plate - active_build_plate_id = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate + active_build_plate_id = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate gcode_list = gcode_dict[active_build_plate_id] if not gcode_list: return @@ -86,16 +94,17 @@ class PostProcessingPlugin(QObject, Extension): Logger.log("e", "Already post processed") @pyqtSlot(int) - def setSelectedScriptIndex(self, index): - self._selected_script_index = index - self.selectedIndexChanged.emit() + def setSelectedScriptIndex(self, index: int) -> None: + if self._selected_script_index != index: + self._selected_script_index = index + self.selectedIndexChanged.emit() @pyqtProperty(int, notify = selectedIndexChanged) - def selectedScriptIndex(self): + def selectedScriptIndex(self) -> int: return self._selected_script_index @pyqtSlot(int, int) - def moveScript(self, index, new_index): + def moveScript(self, index: int, new_index: int) -> None: if new_index < 0 or new_index > len(self._script_list) - 1: return # nothing needs to be done else: @@ -107,7 +116,7 @@ class PostProcessingPlugin(QObject, Extension): ## Remove a script from the active script list by index. @pyqtSlot(int) - def removeScriptByIndex(self, index): + def removeScriptByIndex(self, index: int) -> None: self._script_list.pop(index) if len(self._script_list) - 1 < self._selected_script_index: self._selected_script_index = len(self._script_list) - 1 @@ -118,14 +127,16 @@ class PostProcessingPlugin(QObject, Extension): ## Load all scripts from all paths where scripts can be found. # # This should probably only be done on init. - def loadAllScripts(self): - if self._loaded_scripts: #Already loaded. + def loadAllScripts(self) -> None: + if self._loaded_scripts: # Already loaded. return - #The PostProcessingPlugin path is for built-in scripts. - #The Resources path is where the user should store custom scripts. - #The Preferences path is legacy, where the user may previously have stored scripts. + # The PostProcessingPlugin path is for built-in scripts. + # The Resources path is where the user should store custom scripts. + # The Preferences path is legacy, where the user may previously have stored scripts. for root in [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Resources), Resources.getStoragePath(Resources.Preferences)]: + if root is None: + continue path = os.path.join(root, "scripts") if not os.path.isdir(path): try: @@ -139,7 +150,7 @@ class PostProcessingPlugin(QObject, Extension): ## Load all scripts from provided path. # This should probably only be done on init. # \param path Path to check for scripts. - def loadScripts(self, path): + def loadScripts(self, path: str) -> None: ## Load all scripts in the scripts folders scripts = pkgutil.iter_modules(path = [path]) for loader, script_name, ispkg in scripts: @@ -148,6 +159,8 @@ class PostProcessingPlugin(QObject, Extension): try: spec = importlib.util.spec_from_file_location(__name__ + "." + script_name, os.path.join(path, script_name + ".py")) loaded_script = importlib.util.module_from_spec(spec) + if spec.loader is None: + continue spec.loader.exec_module(loaded_script) sys.modules[script_name] = loaded_script #TODO: This could be a security risk. Overwrite any module with a user-provided name? @@ -172,23 +185,24 @@ class PostProcessingPlugin(QObject, Extension): loadedScriptListChanged = pyqtSignal() @pyqtProperty("QVariantList", notify = loadedScriptListChanged) - def loadedScriptList(self): + def loadedScriptList(self) -> List[str]: return sorted(list(self._loaded_scripts.keys())) @pyqtSlot(str, result = str) - def getScriptLabelByKey(self, key): - return self._script_labels[key] + def getScriptLabelByKey(self, key: str) -> Optional[str]: + return self._script_labels.get(key) scriptListChanged = pyqtSignal() - @pyqtProperty("QVariantList", notify = scriptListChanged) - def scriptList(self): + @pyqtProperty("QStringList", notify = scriptListChanged) + def scriptList(self) -> List[str]: script_list = [script.getSettingData()["key"] for script in self._script_list] return script_list @pyqtSlot(str) - def addScriptToList(self, key): + def addScriptToList(self, key: str) -> None: Logger.log("d", "Adding script %s to list.", key) new_script = self._loaded_scripts[key]() + new_script.initialize() self._script_list.append(new_script) self.setSelectedScriptIndex(len(self._script_list) - 1) self.scriptListChanged.emit() @@ -196,81 +210,89 @@ class PostProcessingPlugin(QObject, Extension): ## When the global container stack is changed, swap out the list of active # scripts. - def _onGlobalContainerStackChanged(self): + def _onGlobalContainerStackChanged(self) -> None: self.loadAllScripts() new_stack = Application.getInstance().getGlobalContainerStack() + if new_stack is None: + return self._script_list.clear() - if not new_stack.getMetaDataEntry("post_processing_scripts"): #Missing or empty. - self.scriptListChanged.emit() #Even emit this if it didn't change. We want it to write the empty list to the stack's metadata. + if not new_stack.getMetaDataEntry("post_processing_scripts"): # Missing or empty. + self.scriptListChanged.emit() # Even emit this if it didn't change. We want it to write the empty list to the stack's metadata. return self._script_list.clear() scripts_list_strs = new_stack.getMetaDataEntry("post_processing_scripts") - for script_str in scripts_list_strs.split("\n"): #Encoded config files should never contain three newlines in a row. At most 2, just before section headers. - if not script_str: #There were no scripts in this one (or a corrupt file caused more than 3 consecutive newlines here). + for script_str in scripts_list_strs.split("\n"): # Encoded config files should never contain three newlines in a row. At most 2, just before section headers. + if not script_str: # There were no scripts in this one (or a corrupt file caused more than 3 consecutive newlines here). continue - script_str = script_str.replace(r"\\\n", "\n").replace(r"\\\\", "\\\\") #Unescape escape sequences. + script_str = script_str.replace(r"\\\n", "\n").replace(r"\\\\", "\\\\") # Unescape escape sequences. script_parser = configparser.ConfigParser(interpolation = None) - script_parser.optionxform = str #Don't transform the setting keys as they are case-sensitive. + script_parser.optionxform = str # type: ignore # Don't transform the setting keys as they are case-sensitive. script_parser.read_string(script_str) - for script_name, settings in script_parser.items(): #There should only be one, really! Otherwise we can't guarantee the order or allow multiple uses of the same script. - if script_name == "DEFAULT": #ConfigParser always has a DEFAULT section, but we don't fill it. Ignore this one. + for script_name, settings in script_parser.items(): # There should only be one, really! Otherwise we can't guarantee the order or allow multiple uses of the same script. + if script_name == "DEFAULT": # ConfigParser always has a DEFAULT section, but we don't fill it. Ignore this one. continue - if script_name not in self._loaded_scripts: #Don't know this post-processing plug-in. + if script_name not in self._loaded_scripts: # Don't know this post-processing plug-in. Logger.log("e", "Unknown post-processing script {script_name} was encountered in this global stack.".format(script_name = script_name)) continue new_script = self._loaded_scripts[script_name]() - for setting_key, setting_value in settings.items(): #Put all setting values into the script. - new_script._instance.setProperty(setting_key, "value", setting_value) + new_script.initialize() + for setting_key, setting_value in settings.items(): # Put all setting values into the script. + if new_script._instance is not None: + new_script._instance.setProperty(setting_key, "value", setting_value) self._script_list.append(new_script) self.setSelectedScriptIndex(0) self.scriptListChanged.emit() @pyqtSlot() - def writeScriptsToStack(self): - script_list_strs = [] + def writeScriptsToStack(self) -> None: + script_list_strs = [] # type: List[str] for script in self._script_list: - parser = configparser.ConfigParser(interpolation = None) #We'll encode the script as a config with one section. The section header is the key and its values are the settings. - parser.optionxform = str #Don't transform the setting keys as they are case-sensitive. + parser = configparser.ConfigParser(interpolation = None) # We'll encode the script as a config with one section. The section header is the key and its values are the settings. + parser.optionxform = str # type: ignore # Don't transform the setting keys as they are case-sensitive. script_name = script.getSettingData()["key"] parser.add_section(script_name) for key in script.getSettingData()["settings"]: value = script.getSettingValueByKey(key) parser[script_name][key] = str(value) - serialized = io.StringIO() #ConfigParser can only write to streams. Fine. + serialized = io.StringIO() # ConfigParser can only write to streams. Fine. parser.write(serialized) serialized.seek(0) script_str = serialized.read() - script_str = script_str.replace("\\\\", r"\\\\").replace("\n", r"\\\n") #Escape newlines because configparser sees those as section delimiters. + script_str = script_str.replace("\\\\", r"\\\\").replace("\n", r"\\\n") # Escape newlines because configparser sees those as section delimiters. script_list_strs.append(script_str) - script_list_strs = "\n".join(script_list_strs) #ConfigParser should never output three newlines in a row when serialised, so it's a safe delimiter. + script_list_string = "\n".join(script_list_strs) # ConfigParser should never output three newlines in a row when serialised, so it's a safe delimiter. global_stack = Application.getInstance().getGlobalContainerStack() + if global_stack is None: + return + if "post_processing_scripts" not in global_stack.getMetaData(): global_stack.setMetaDataEntry("post_processing_scripts", "") - Application.getInstance().getGlobalContainerStack().setMetaDataEntry("post_processing_scripts", script_list_strs) + + global_stack.setMetaDataEntry("post_processing_scripts", script_list_string) ## Creates the view used by show popup. The view is saved because of the fairly aggressive garbage collection. - def _createView(self): + def _createView(self) -> None: Logger.log("d", "Creating post processing plugin view.") self.loadAllScripts() # Create the plugin dialog component - path = os.path.join(PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), "PostProcessingPlugin.qml") - self._view = Application.getInstance().createQmlComponent(path, {"manager": self}) + path = os.path.join(cast(str, PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin")), "PostProcessingPlugin.qml") + self._view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self}) if self._view is None: Logger.log("e", "Not creating PostProcessing button near save button because the QML component failed to be created.") return Logger.log("d", "Post processing view created.") # Create the save button component - Application.getInstance().addAdditionalComponent("saveButton", self._view.findChild(QObject, "postProcessingSaveAreaButton")) + CuraApplication.getInstance().addAdditionalComponent("saveButton", self._view.findChild(QObject, "postProcessingSaveAreaButton")) ## Show the (GUI) popup of the post processing plugin. - def showPopup(self): + def showPopup(self) -> None: if self._view is None: self._createView() if self._view is None: @@ -282,8 +304,9 @@ class PostProcessingPlugin(QObject, Extension): # To do this we use the global container stack propertyChanged. # Re-slicing is necessary for setting changes in this plugin, because the changes # are applied only once per "fresh" gcode - def _propertyChanged(self): + def _propertyChanged(self) -> None: global_container_stack = Application.getInstance().getGlobalContainerStack() - global_container_stack.propertyChanged.emit("post_processing_plugin", "value") + if global_container_stack is not None: + global_container_stack.propertyChanged.emit("post_processing_plugin", "value") diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index e91fc73cf4..d492e06462 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -62,6 +62,7 @@ UM.Dialog anchors.right: parent.right anchors.rightMargin: base.textMargin font: UM.Theme.getFont("large") + elide: Text.ElideRight } ListView { @@ -115,6 +116,7 @@ UM.Dialog { wrapMode: Text.Wrap text: control.text + elide: Text.ElideRight color: activeScriptButton.checked ? palette.highlightedText : palette.text } } @@ -275,6 +277,7 @@ UM.Dialog anchors.leftMargin: base.textMargin anchors.right: parent.right anchors.rightMargin: base.textMargin + elide: Text.ElideRight height: 20 * screenScaleFactor font: UM.Theme.getFont("large") color: UM.Theme.getColor("text") diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index 7e430a5c78..e502f107f9 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -1,6 +1,8 @@ # Copyright (c) 2015 Jaime van Kessel # Copyright (c) 2018 Ultimaker B.V. # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +from typing import Optional, Any, Dict, TYPE_CHECKING, List + from UM.Signal import Signal, signalemitter from UM.i18n import i18nCatalog @@ -17,23 +19,27 @@ import json import collections i18n_catalog = i18nCatalog("cura") +if TYPE_CHECKING: + from UM.Settings.Interfaces import DefinitionContainerInterface + ## Base class for scripts. All scripts should inherit the script class. @signalemitter class Script: - def __init__(self): + def __init__(self) -> None: super().__init__() - self._settings = None - self._stack = None + self._stack = None # type: Optional[ContainerStack] + self._definition = None # type: Optional[DefinitionContainerInterface] + self._instance = None # type: Optional[InstanceContainer] + def initialize(self) -> None: setting_data = self.getSettingData() - self._stack = ContainerStack(stack_id = str(id(self))) + self._stack = ContainerStack(stack_id=str(id(self))) self._stack.setDirty(False) # This stack does not need to be saved. - ## Check if the definition of this script already exists. If not, add it to the registry. if "key" in setting_data: - definitions = ContainerRegistry.getInstance().findDefinitionContainers(id = setting_data["key"]) + definitions = ContainerRegistry.getInstance().findDefinitionContainers(id=setting_data["key"]) if definitions: # Definition was found self._definition = definitions[0] @@ -45,10 +51,13 @@ class Script: except ContainerFormatError: self._definition = None return + if self._definition is None: + return self._stack.addContainer(self._definition) self._instance = InstanceContainer(container_id="ScriptInstanceContainer") self._instance.setDefinition(self._definition.getId()) - self._instance.setMetaDataEntry("setting_version", self._definition.getMetaDataEntry("setting_version", default = 0)) + self._instance.setMetaDataEntry("setting_version", + self._definition.getMetaDataEntry("setting_version", default=0)) self._stack.addContainer(self._instance) self._stack.propertyChanged.connect(self._onPropertyChanged) @@ -57,16 +66,17 @@ class Script: settingsLoaded = Signal() valueChanged = Signal() # Signal emitted whenever a value of a setting is changed - def _onPropertyChanged(self, key, property_name): + def _onPropertyChanged(self, key: str, property_name: str) -> None: if property_name == "value": self.valueChanged.emit() # Property changed: trigger reslice # To do this we use the global container stack propertyChanged. - # Reslicing is necessary for setting changes in this plugin, because the changes + # Re-slicing is necessary for setting changes in this plugin, because the changes # are applied only once per "fresh" gcode global_container_stack = Application.getInstance().getGlobalContainerStack() - global_container_stack.propertyChanged.emit(key, property_name) + if global_container_stack is not None: + global_container_stack.propertyChanged.emit(key, property_name) ## Needs to return a dict that can be used to construct a settingcategory file. # See the example script for an example. @@ -74,30 +84,35 @@ class Script: # Scripts can either override getSettingData directly, or use getSettingDataString # to return a string that will be parsed as json. The latter has the benefit over # returning a dict in that the order of settings is maintained. - def getSettingData(self): - setting_data = self.getSettingDataString() - if type(setting_data) == str: - setting_data = json.loads(setting_data, object_pairs_hook = collections.OrderedDict) + def getSettingData(self) -> Dict[str, Any]: + setting_data_as_string = self.getSettingDataString() + setting_data = json.loads(setting_data_as_string, object_pairs_hook = collections.OrderedDict) return setting_data - def getSettingDataString(self): + def getSettingDataString(self) -> str: raise NotImplementedError() - def getDefinitionId(self): + def getDefinitionId(self) -> Optional[str]: if self._stack: - return self._stack.getBottom().getId() + bottom = self._stack.getBottom() + if bottom is not None: + return bottom.getId() + return None - def getStackId(self): + def getStackId(self) -> Optional[str]: if self._stack: return self._stack.getId() + return None ## Convenience function that retrieves value of a setting from the stack. - def getSettingValueByKey(self, key): - return self._stack.getProperty(key, "value") + def getSettingValueByKey(self, key: str) -> Any: + if self._stack is not None: + return self._stack.getProperty(key, "value") + return None ## Convenience function that finds the value in a line of g-code. # When requesting key = x from line "G1 X100" the value 100 is returned. - def getValue(self, line, key, default = None): + def getValue(self, line: str, key: str, default = None) -> Any: if not key in line or (';' in line and line.find(key) > line.find(';')): return default sub_part = line[line.find(key) + 1:] @@ -125,7 +140,7 @@ class Script: # \param line The original g-code line that must be modified. If not # provided, an entirely new g-code line will be produced. # \return A line of g-code with the desired parameters filled in. - def putValue(self, line = "", **kwargs): + def putValue(self, line: str = "", **kwargs) -> str: #Strip the comment. comment = "" if ";" in line: @@ -166,5 +181,5 @@ class Script: ## This is called when the script is executed. # It gets a list of g-code strings and needs to return a (modified) list. - def execute(self, data): + def execute(self, data: List[str]) -> List[str]: raise NotImplementedError() diff --git a/plugins/PostProcessingPlugin/__init__.py b/plugins/PostProcessingPlugin/__init__.py index 85f1126136..8064d1132a 100644 --- a/plugins/PostProcessingPlugin/__init__.py +++ b/plugins/PostProcessingPlugin/__init__.py @@ -2,10 +2,10 @@ # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from . import PostProcessingPlugin -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + + def getMetaData(): return {} - + def register(app): return {"extension": PostProcessingPlugin.PostProcessingPlugin()} \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 54d6fdb155..919b06d28e 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -407,13 +407,13 @@ class ChangeAtZ(Script): if "M106" in line and state < 3: #looking for fan speed old["fanSpeed"] = self.getValue(line, "S", old["fanSpeed"]) if "M221" in line and state < 3: #looking for flow rate - tmp_extruder = self.getValue(line,"T",None) + tmp_extruder = self.getValue(line, "T", None) if tmp_extruder == None: #check if extruder is specified old["flowrate"] = self.getValue(line, "S", old["flowrate"]) elif tmp_extruder == 0: #first extruder old["flowrateOne"] = self.getValue(line, "S", old["flowrateOne"]) elif tmp_extruder == 1: #second extruder - old["flowrateOne"] = self.getValue(line, "S", old["flowrateOne"]) + old["flowrateTwo"] = self.getValue(line, "S", old["flowrateTwo"]) if ("M84" in line or "M25" in line): if state>0 and ChangeProp["speed"]: #"finish" commands for UM Original and UM2 modified_gcode += "M220 S100 ; speed reset to 100% at the end of print\n" diff --git a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py new file mode 100644 index 0000000000..9fd9e08d7d --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py @@ -0,0 +1,53 @@ +# Cura PostProcessingPlugin +# Author: Amanda de Castilho +# Date: August 28, 2018 + +# 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 + +from ..Script import Script +from UM.Application import Application + +class DisplayFilenameAndLayerOnLCD(Script): + def __init__(self): + super().__init__() + + def getSettingDataString(self): + return """{ + "name": "Display filename and layer on LCD", + "key": "DisplayFilenameAndLayerOnLCD", + "metadata": {}, + "version": 2, + "settings": + { + "name": + { + "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": "" + } + } + }""" + + def execute(self, data): + if self.getSettingValueByKey("name") != "": + name = self.getSettingValueByKey("name") + else: + name = Application.getInstance().getPrintInformation().jobName + lcd_text = "M117 " + name + " layer: " + i = 0 + for layer in data: + display_text = lcd_text + str(i) + layer_index = data.index(layer) + lines = layer.split("\n") + for line in lines: + if line.startswith(";LAYER:"): + line_index = lines.index(line) + lines.insert(line_index + 1, display_text) + i += 1 + final_lines = "\n".join(lines) + data[layer_index] = final_lines + + return data diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 0fa52de4f1..ed0f6eb174 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,5 +1,6 @@ -# This PostProcessing Plugin script is released -# under the terms of the AGPLv3 or higher +# Copyright (c) 2018 Ultimaker B.V. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. + from typing import Optional, Tuple from UM.Logger import Logger @@ -54,17 +55,17 @@ class FilamentChange(Script): layer_nums = self.getSettingValueByKey("layer_number") initial_retract = self.getSettingValueByKey("initial_retract") later_retract = self.getSettingValueByKey("later_retract") - + color_change = "M600" - + if initial_retract is not None and initial_retract > 0.: - color_change = color_change + (" E-%.2f" % initial_retract) - + color_change = color_change + (" E%.2f" % initial_retract) + if later_retract is not None and later_retract > 0.: - color_change = color_change + (" L-%.2f" % later_retract) - + color_change = color_change + (" L%.2f" % later_retract) + color_change = color_change + " ; Generated by FilamentChange plugin" - + layer_targets = layer_nums.split(",") if len(layer_targets) > 0: for layer_num in layer_targets: diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeightRepRapFirmwareDuet.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeightRepRapFirmwareDuet.py new file mode 100644 index 0000000000..79e5d8c62d --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeightRepRapFirmwareDuet.py @@ -0,0 +1,51 @@ +from ..Script import Script + +class PauseAtHeightRepRapFirmwareDuet(Script): + + def getSettingDataString(self): + return """{ + "name": "Pause at height for RepRapFirmware DuetWifi / Duet Ethernet / Duet Maestro", + "key": "PauseAtHeightRepRapFirmwareDuet", + "metadata": {}, + "version": 2, + "settings": + { + "pause_height": + { + "label": "Pause height", + "description": "At what height should the pause occur", + "unit": "mm", + "type": "float", + "default_value": 5.0 + } + } + }""" + + def execute(self, data): + current_z = 0. + pause_z = self.getSettingValueByKey("pause_height") + + layers_started = False + for layer_number, layer in enumerate(data): + lines = layer.split("\n") + for line in lines: + if ";LAYER:0" in line: + layers_started = True + continue + + if not layers_started: + continue + + if self.getValue(line, 'G') == 1 or self.getValue(line, 'G') == 0: + current_z = self.getValue(line, 'Z') + if current_z != None: + if current_z >= pause_z: + prepend_gcode = ";TYPE:CUSTOM\n" + prepend_gcode += "; -- Pause at height (%.2f mm) --\n" % pause_z + prepend_gcode += self.putValue(M = 226) + "\n" + layer = prepend_gcode + layer + + data[layer_number] = layer # Override the data of this layer with the modified data + return data + break + return data diff --git a/plugins/RemovableDriveOutputDevice/__init__.py b/plugins/RemovableDriveOutputDevice/__init__.py index dc547b7bcc..1758801f8a 100644 --- a/plugins/RemovableDriveOutputDevice/__init__.py +++ b/plugins/RemovableDriveOutputDevice/__init__.py @@ -3,12 +3,10 @@ from UM.Platform import Platform from UM.Logger import Logger -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + def getMetaData(): - return { - } + return {} def register(app): if Platform.isWindows(): diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml index b69fede243..06c6a51b44 100644 --- a/plugins/SimulationView/SimulationSliderLabel.qml +++ b/plugins/SimulationView/SimulationSliderLabel.qml @@ -48,7 +48,7 @@ UM.PointingRectangle { horizontalCenter: parent.horizontalCenter } - width: (maximumValue.toString().length + 1) * 10 * screenScaleFactor + width: ((maximumValue + 1).toString().length + 1) * 10 * screenScaleFactor text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array horizontalAlignment: TextInput.AlignRight diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 5b369c26d2..0ae8b4d9e4 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -18,10 +18,14 @@ from UM.Platform import Platform from UM.PluginRegistry import PluginRegistry from UM.Resources import Resources from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator + from UM.Scene.Selection import Selection from UM.Signal import Signal +from UM.View.CompositePass import CompositePass from UM.View.GL.OpenGL import OpenGL from UM.View.GL.OpenGLContext import OpenGLContext +from UM.View.GL.ShaderProgram import ShaderProgram + from UM.View.View import View from UM.i18n import i18nCatalog from cura.Scene.ConvexHullNode import ConvexHullNode @@ -30,11 +34,18 @@ from cura.CuraApplication import CuraApplication from .NozzleNode import NozzleNode from .SimulationPass import SimulationPass from .SimulationViewProxy import SimulationViewProxy +import numpy +import os.path + +from typing import Optional, TYPE_CHECKING, List, cast + +if TYPE_CHECKING: + from UM.Scene.SceneNode import SceneNode + from UM.Scene.Scene import Scene + from UM.Settings.ContainerStack import ContainerStack catalog = i18nCatalog("cura") -import numpy -import os.path ## View used to display g-code paths. class SimulationView(View): @@ -44,7 +55,7 @@ class SimulationView(View): LAYER_VIEW_TYPE_FEEDRATE = 2 LAYER_VIEW_TYPE_THICKNESS = 3 - def __init__(self): + def __init__(self) -> None: super().__init__() self._max_layers = 0 @@ -52,7 +63,7 @@ class SimulationView(View): self._minimum_layer_num = 0 self._current_layer_mesh = None self._current_layer_jumps = None - self._top_layers_job = None + self._top_layers_job = None # type: Optional["_CreateTopLayersJob"] self._activity = False self._old_max_layers = 0 @@ -64,21 +75,21 @@ class SimulationView(View): self._busy = False self._simulation_running = False - self._ghost_shader = None - self._layer_pass = None - self._composite_pass = None - self._old_layer_bindings = None - self._simulationview_composite_shader = None - self._old_composite_shader = None + self._ghost_shader = None # type: Optional["ShaderProgram"] + self._layer_pass = None # type: Optional[SimulationPass] + self._composite_pass = None # type: Optional[CompositePass] + self._old_layer_bindings = None # type: Optional[List[str]] + self._simulationview_composite_shader = None # type: Optional["ShaderProgram"] + self._old_composite_shader = None # type: Optional["ShaderProgram"] - self._global_container_stack = None + self._global_container_stack = None # type: Optional[ContainerStack] self._proxy = SimulationViewProxy() self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged) self._resetSettings() self._legend_items = None self._show_travel_moves = False - self._nozzle_node = None + self._nozzle_node = None # type: Optional[NozzleNode] Application.getInstance().getPreferences().addPreference("view/top_layer_count", 5) Application.getInstance().getPreferences().addPreference("view/only_show_top_layers", False) @@ -102,29 +113,29 @@ class SimulationView(View): self._wireprint_warning_message = Message(catalog.i18nc("@info:status", "Cura does not accurately display layers when Wire Printing is enabled"), title = catalog.i18nc("@info:title", "Simulation View")) - def _evaluateCompatibilityMode(self): + def _evaluateCompatibilityMode(self) -> bool: return OpenGLContext.isLegacyOpenGL() or bool(Application.getInstance().getPreferences().getValue("view/force_layer_view_compatibility_mode")) - def _resetSettings(self): - self._layer_view_type = 0 # 0 is material color, 1 is color by linetype, 2 is speed, 3 is layer thickness + def _resetSettings(self) -> None: + self._layer_view_type = 0 # type: int # 0 is material color, 1 is color by linetype, 2 is speed, 3 is layer thickness self._extruder_count = 0 self._extruder_opacity = [1.0, 1.0, 1.0, 1.0] - self._show_travel_moves = 0 - self._show_helpers = 1 - self._show_skin = 1 - self._show_infill = 1 + self._show_travel_moves = False + self._show_helpers = True + self._show_skin = True + self._show_infill = True self.resetLayerData() - def getActivity(self): + def getActivity(self) -> bool: return self._activity - def setActivity(self, activity): + def setActivity(self, activity: bool) -> None: if self._activity == activity: return self._activity = activity self.activityChanged.emit() - def getSimulationPass(self): + def getSimulationPass(self) -> SimulationPass: if not self._layer_pass: # Currently the RenderPass constructor requires a size > 0 # This should be fixed in RenderPass's constructor. @@ -133,30 +144,30 @@ class SimulationView(View): self._layer_pass.setSimulationView(self) return self._layer_pass - def getCurrentLayer(self): + def getCurrentLayer(self) -> int: return self._current_layer_num - def getMinimumLayer(self): + def getMinimumLayer(self) -> int: return self._minimum_layer_num - def getMaxLayers(self): + def getMaxLayers(self) -> int: return self._max_layers - def getCurrentPath(self): + def getCurrentPath(self) -> int: return self._current_path_num - def getMinimumPath(self): + def getMinimumPath(self) -> int: return self._minimum_path_num - def getMaxPaths(self): + def getMaxPaths(self) -> int: return self._max_paths - def getNozzleNode(self): + def getNozzleNode(self) -> NozzleNode: if not self._nozzle_node: self._nozzle_node = NozzleNode() return self._nozzle_node - def _onSceneChanged(self, node): + def _onSceneChanged(self, node: "SceneNode") -> None: if node.getMeshData() is None: self.resetLayerData() @@ -164,21 +175,21 @@ class SimulationView(View): self.calculateMaxLayers() self.calculateMaxPathsOnLayer(self._current_layer_num) - def isBusy(self): + def isBusy(self) -> bool: return self._busy - def setBusy(self, busy): + def setBusy(self, busy: bool) -> None: if busy != self._busy: self._busy = busy self.busyChanged.emit() - def isSimulationRunning(self): + def isSimulationRunning(self) -> bool: return self._simulation_running - def setSimulationRunning(self, running): + def setSimulationRunning(self, running: bool) -> None: self._simulation_running = running - def resetLayerData(self): + def resetLayerData(self) -> None: self._current_layer_mesh = None self._current_layer_jumps = None self._max_feedrate = sys.float_info.min @@ -186,15 +197,17 @@ class SimulationView(View): self._max_thickness = sys.float_info.min self._min_thickness = sys.float_info.max - def beginRendering(self): + def beginRendering(self) -> None: scene = self.getController().getScene() renderer = self.getRenderer() if not self._ghost_shader: self._ghost_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "color.shader")) - self._ghost_shader.setUniformValue("u_color", Color(*Application.getInstance().getTheme().getColor("layerview_ghost").getRgb())) + theme = CuraApplication.getInstance().getTheme() + if theme is not None: + self._ghost_shader.setUniformValue("u_color", Color(*theme.getColor("layerview_ghost").getRgb())) - for node in DepthFirstIterator(scene.getRoot()): + for node in DepthFirstIterator(scene.getRoot()): # type: ignore # 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()): @@ -204,7 +217,7 @@ class SimulationView(View): if (node.getMeshData()) and node.isVisible(): renderer.queueNode(node, transparent = True, shader = self._ghost_shader) - def setLayer(self, value): + def setLayer(self, value: int) -> None: if self._current_layer_num != value: self._current_layer_num = value if self._current_layer_num < 0: @@ -218,7 +231,7 @@ class SimulationView(View): self.currentLayerNumChanged.emit() - def setMinimumLayer(self, value): + def setMinimumLayer(self, value: int) -> None: if self._minimum_layer_num != value: self._minimum_layer_num = value if self._minimum_layer_num < 0: @@ -232,7 +245,7 @@ class SimulationView(View): self.currentLayerNumChanged.emit() - def setPath(self, value): + def setPath(self, value: int) -> None: if self._current_path_num != value: self._current_path_num = value if self._current_path_num < 0: @@ -246,7 +259,7 @@ class SimulationView(View): self.currentPathNumChanged.emit() - def setMinimumPath(self, value): + def setMinimumPath(self, value: int) -> None: if self._minimum_path_num != value: self._minimum_path_num = value if self._minimum_path_num < 0: @@ -263,24 +276,24 @@ class SimulationView(View): ## Set the layer view type # # \param layer_view_type integer as in SimulationView.qml and this class - def setSimulationViewType(self, layer_view_type): + def setSimulationViewType(self, layer_view_type: int) -> None: self._layer_view_type = layer_view_type self.currentLayerNumChanged.emit() ## Return the layer view type, integer as in SimulationView.qml and this class - def getSimulationViewType(self): + def getSimulationViewType(self) -> int: return self._layer_view_type ## Set the extruder opacity # # \param extruder_nr 0..3 # \param opacity 0.0 .. 1.0 - def setExtruderOpacity(self, extruder_nr, opacity): + def setExtruderOpacity(self, extruder_nr: int, opacity: float) -> None: if 0 <= extruder_nr <= 3: self._extruder_opacity[extruder_nr] = opacity self.currentLayerNumChanged.emit() - def getExtruderOpacities(self): + def getExtruderOpacities(self)-> List[float]: return self._extruder_opacity def setShowTravelMoves(self, show): @@ -290,52 +303,52 @@ class SimulationView(View): def getShowTravelMoves(self): return self._show_travel_moves - def setShowHelpers(self, show): + def setShowHelpers(self, show: bool) -> None: self._show_helpers = show self.currentLayerNumChanged.emit() - def getShowHelpers(self): + def getShowHelpers(self) -> bool: return self._show_helpers - def setShowSkin(self, show): + def setShowSkin(self, show: bool) -> None: self._show_skin = show self.currentLayerNumChanged.emit() - def getShowSkin(self): + def getShowSkin(self) -> bool: return self._show_skin - def setShowInfill(self, show): + def setShowInfill(self, show: bool) -> None: self._show_infill = show self.currentLayerNumChanged.emit() - def getShowInfill(self): + def getShowInfill(self) -> bool: return self._show_infill - def getCompatibilityMode(self): + def getCompatibilityMode(self) -> bool: return self._compatibility_mode - def getExtruderCount(self): + def getExtruderCount(self) -> int: return self._extruder_count - def getMinFeedrate(self): + def getMinFeedrate(self) -> float: return self._min_feedrate - def getMaxFeedrate(self): + def getMaxFeedrate(self) -> float: return self._max_feedrate - def getMinThickness(self): + def getMinThickness(self) -> float: return self._min_thickness - def getMaxThickness(self): + def getMaxThickness(self) -> float: return self._max_thickness - def calculateMaxLayers(self): + def calculateMaxLayers(self) -> None: scene = self.getController().getScene() self._old_max_layers = self._max_layers ## Recalculate num max layers new_max_layers = -1 - for node in DepthFirstIterator(scene.getRoot()): + for node in DepthFirstIterator(scene.getRoot()): # type: ignore layer_data = node.callDecoration("getLayerData") if not layer_data: continue @@ -383,10 +396,10 @@ class SimulationView(View): self.maxLayersChanged.emit() self._startUpdateTopLayers() - def calculateMaxPathsOnLayer(self, layer_num): + def calculateMaxPathsOnLayer(self, layer_num: int) -> None: # Update the currentPath scene = self.getController().getScene() - for node in DepthFirstIterator(scene.getRoot()): + for node in DepthFirstIterator(scene.getRoot()): # type: ignore layer_data = node.callDecoration("getLayerData") if not layer_data: continue @@ -415,10 +428,10 @@ class SimulationView(View): def getProxy(self, engine, script_engine): return self._proxy - def endRendering(self): + def endRendering(self) -> None: pass - def event(self, event): + def event(self, event) -> bool: modifiers = QApplication.keyboardModifiers() ctrl_is_active = modifiers & Qt.ControlModifier shift_is_active = modifiers & Qt.ShiftModifier @@ -447,7 +460,7 @@ class SimulationView(View): if QOpenGLContext.currentContext() is None: Logger.log("d", "current context of OpenGL is empty on Mac OS X, will try to create shaders later") CuraApplication.getInstance().callLater(lambda e=event: self.event(e)) - return + return False # Make sure the SimulationPass is created layer_pass = self.getSimulationPass() @@ -462,15 +475,17 @@ class SimulationView(View): self._onGlobalStackChanged() if not self._simulationview_composite_shader: - self._simulationview_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("SimulationView"), "simulationview_composite.shader")) - theme = Application.getInstance().getTheme() - self._simulationview_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb())) - self._simulationview_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb())) + plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("SimulationView")) + self._simulationview_composite_shader = OpenGL.getInstance().createShaderProgram(os.path.join(plugin_path, "simulationview_composite.shader")) + theme = CuraApplication.getInstance().getTheme() + if theme is not None: + self._simulationview_composite_shader.setUniformValue("u_background_color", Color(*theme.getColor("viewport_background").getRgb())) + self._simulationview_composite_shader.setUniformValue("u_outline_color", Color(*theme.getColor("model_selection_outline").getRgb())) if not self._composite_pass: - self._composite_pass = self.getRenderer().getRenderPass("composite") + self._composite_pass = cast(CompositePass, self.getRenderer().getRenderPass("composite")) - self._old_layer_bindings = self._composite_pass.getLayerBindings()[:] # make a copy so we can restore to it later + self._old_layer_bindings = self._composite_pass.getLayerBindings()[:] # make a copy so we can restore to it later self._composite_pass.getLayerBindings().append("simulationview") self._old_composite_shader = self._composite_pass.getCompositeShader() self._composite_pass.setCompositeShader(self._simulationview_composite_shader) @@ -480,11 +495,14 @@ class SimulationView(View): Application.getInstance().globalContainerStackChanged.disconnect(self._onGlobalStackChanged) if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) - - self._nozzle_node.setParent(None) + if self._nozzle_node: + self._nozzle_node.setParent(None) self.getRenderer().removeRenderPass(self._layer_pass) - self._composite_pass.setLayerBindings(self._old_layer_bindings) - self._composite_pass.setCompositeShader(self._old_composite_shader) + if self._composite_pass: + self._composite_pass.setLayerBindings(cast(List[str], self._old_layer_bindings)) + self._composite_pass.setCompositeShader(cast(ShaderProgram, self._old_composite_shader)) + + return False def getCurrentLayerMesh(self): return self._current_layer_mesh @@ -492,7 +510,7 @@ class SimulationView(View): def getCurrentLayerJumps(self): return self._current_layer_jumps - def _onGlobalStackChanged(self): + def _onGlobalStackChanged(self) -> None: if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) self._global_container_stack = Application.getInstance().getGlobalContainerStack() @@ -504,17 +522,17 @@ class SimulationView(View): else: self._wireprint_warning_message.hide() - def _onPropertyChanged(self, key, property_name): + def _onPropertyChanged(self, key: str, property_name: str) -> None: if key == "wireframe_enabled" and property_name == "value": - if self._global_container_stack.getProperty("wireframe_enabled", "value"): + if self._global_container_stack and self._global_container_stack.getProperty("wireframe_enabled", "value"): self._wireprint_warning_message.show() else: self._wireprint_warning_message.hide() - def _onCurrentLayerNumChanged(self): + def _onCurrentLayerNumChanged(self) -> None: self.calculateMaxPathsOnLayer(self._current_layer_num) - def _startUpdateTopLayers(self): + def _startUpdateTopLayers(self) -> None: if not self._compatibility_mode: return @@ -525,10 +543,10 @@ class SimulationView(View): self.setBusy(True) self._top_layers_job = _CreateTopLayersJob(self._controller.getScene(), self._current_layer_num, self._solid_layers) - self._top_layers_job.finished.connect(self._updateCurrentLayerMesh) - self._top_layers_job.start() + self._top_layers_job.finished.connect(self._updateCurrentLayerMesh) # type: ignore # mypy doesn't understand the whole private class thing that's going on here. + self._top_layers_job.start() # type: ignore - def _updateCurrentLayerMesh(self, job): + def _updateCurrentLayerMesh(self, job: "_CreateTopLayersJob") -> None: self.setBusy(False) if not job.getResult(): @@ -539,9 +557,9 @@ class SimulationView(View): self._current_layer_jumps = job.getResult().get("jumps") self._controller.getScene().sceneChanged.emit(self._controller.getScene().getRoot()) - self._top_layers_job = None + self._top_layers_job = None # type: Optional["_CreateTopLayersJob"] - def _updateWithPreferences(self): + 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() @@ -563,7 +581,7 @@ class SimulationView(View): self._startUpdateTopLayers() self.preferencesChanged.emit() - def _onPreferencesChanged(self, preference): + def _onPreferencesChanged(self, preference: str) -> None: if preference not in { "view/top_layer_count", "view/only_show_top_layers", @@ -581,7 +599,7 @@ class SimulationView(View): class _CreateTopLayersJob(Job): - def __init__(self, scene, layer_number, solid_layers): + def __init__(self, scene: "Scene", layer_number: int, solid_layers: int) -> None: super().__init__() self._scene = scene @@ -589,9 +607,9 @@ class _CreateTopLayersJob(Job): self._solid_layers = solid_layers self._cancel = False - def run(self): + def run(self) -> None: layer_data = None - for node in DepthFirstIterator(self._scene.getRoot()): + for node in DepthFirstIterator(self._scene.getRoot()): # type: ignore layer_data = node.callDecoration("getLayerData") if layer_data: break @@ -638,6 +656,6 @@ class _CreateTopLayersJob(Job): self.setResult({"layers": layer_mesh.build(), "jumps": jump_mesh}) - def cancel(self): + def cancel(self) -> None: self._cancel = True super().cancel() diff --git a/plugins/SimulationView/layers3d.shader b/plugins/SimulationView/layers3d.shader index 03e279e9eb..de2b9335d8 100644 --- a/plugins/SimulationView/layers3d.shader +++ b/plugins/SimulationView/layers3d.shader @@ -256,6 +256,7 @@ fragment41core = out vec4 frag_color; uniform mediump vec4 u_ambientColor; + uniform mediump vec4 u_minimumAlbedo; uniform highp vec3 u_lightPosition; void main() @@ -263,7 +264,7 @@ fragment41core = mediump vec4 finalColor = vec4(0.0); float alpha = f_color.a; - finalColor.rgb += f_color.rgb * 0.3; + finalColor.rgb += f_color.rgb * 0.2 + u_minimumAlbedo.rgb; highp vec3 normal = normalize(f_normal); highp vec3 light_dir = normalize(u_lightPosition - f_vertex); @@ -285,6 +286,7 @@ u_extruder_opacity = [1.0, 1.0, 1.0, 1.0] u_specularColor = [0.4, 0.4, 0.4, 1.0] u_ambientColor = [0.3, 0.3, 0.3, 0.0] u_diffuseColor = [1.0, 0.79, 0.14, 1.0] +u_minimumAlbedo = [0.1, 0.1, 0.1, 1.0] u_shininess = 20.0 u_show_travel_moves = 0 diff --git a/plugins/SliceInfoPlugin/__init__.py b/plugins/SliceInfoPlugin/__init__.py index 7f1dfa5336..440ca8ec40 100644 --- a/plugins/SliceInfoPlugin/__init__.py +++ b/plugins/SliceInfoPlugin/__init__.py @@ -1,12 +1,11 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from . import SliceInfo -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + def getMetaData(): - return { - } + return {} def register(app): return { "extension": SliceInfo.SliceInfo()} \ No newline at end of file diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index 2a56898503..9a98c998b0 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -10,7 +10,7 @@ Window { id: base property var selection: null - title: catalog.i18nc("@title", "Toolbox") + title: catalog.i18nc("@title", "Marketplace") modality: Qt.ApplicationModal flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint @@ -33,6 +33,7 @@ Window { id: header } + Item { id: mainView @@ -75,6 +76,7 @@ Window visible: toolbox.viewCategory == "installed" } } + ToolboxFooter { id: footer diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml index 58fea079e9..c6dd2217da 100644 --- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml @@ -11,157 +11,205 @@ Item id: base property var packageData - property var technicalDataSheetUrl: { + 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 + } anchors.topMargin: UM.Theme.getSize("default_margin").height height: visible ? childrenRect.height : 0 - visible: packageData.type == "material" && packageData.has_configs - Label + + visible: packageData.type == "material" && + (packageData.has_configs || technicalDataSheetUrl !== undefined || + safetyDataSheetUrl !== undefined || printingGuidelinesUrl !== undefined) + + Item { - id: heading - anchors.topMargin: UM.Theme.getSize("default_margin").height + id: combatibilityItem + visible: packageData.has_configs width: parent.width - text: catalog.i18nc("@label", "Compatibility") - wrapMode: Text.WordWrap - color: UM.Theme.getColor("text_medium") - font: UM.Theme.getFont("medium") - } - TableView - { - id: table - anchors.top: heading.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - frameVisible: false + // This is a bit of a hack, but the whole QML is pretty messy right now. This needs a big overhaul. + height: visible ? heading.height + table.height: 0 - // Workaround for scroll issues (QTBUG-49652) - flickableItem.interactive: false - Component.onCompleted: + Label { - for (var i = 0; i < flickableItem.children.length; ++i) - { - flickableItem.children[i].enabled = false - } - } - selectionMode: 0 - model: packageData.supported_configs - headerDelegate: Rectangle - { - color: UM.Theme.getColor("sidebar") - height: UM.Theme.getSize("toolbox_chart_row").height - Label - { - anchors.verticalCenter: parent.verticalCenter - elide: Text.ElideRight - text: styleData.value || "" - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default_bold") - } - Rectangle - { - anchors.bottom: parent.bottom - height: UM.Theme.getSize("default_lining").height - width: parent.width - color: "black" - } - } - rowDelegate: Item - { - height: UM.Theme.getSize("toolbox_chart_row").height - Label - { - anchors.verticalCenter: parent.verticalCenter - elide: Text.ElideRight - text: styleData.value || "" - color: UM.Theme.getColor("text_medium") - font: UM.Theme.getFont("default") - } - } - itemDelegate: Item - { - height: UM.Theme.getSize("toolbox_chart_row").height - Label - { - anchors.verticalCenter: parent.verticalCenter - elide: Text.ElideRight - text: styleData.value || "" - color: UM.Theme.getColor("text_medium") - font: UM.Theme.getFont("default") - } + id: heading + anchors.topMargin: UM.Theme.getSize("default_margin").height + width: parent.width + text: catalog.i18nc("@label", "Compatibility") + wrapMode: Text.WordWrap + color: UM.Theme.getColor("text_medium") + font: UM.Theme.getFont("medium") } - Component + TableView { - id: columnTextDelegate - Label - { - anchors.fill: parent - verticalAlignment: Text.AlignVCenter - text: styleData.value || "" - elide: Text.ElideRight - color: UM.Theme.getColor("text_medium") - font: UM.Theme.getFont("default") - } - } + id: table + anchors.top: heading.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + width: parent.width + frameVisible: false - TableViewColumn - { - role: "machine" - title: "Machine" - width: Math.floor(table.width * 0.25) - delegate: columnTextDelegate - } - TableViewColumn - { - role: "print_core" - title: "Print Core" - width: Math.floor(table.width * 0.2) - } - TableViewColumn - { - role: "build_plate" - title: "Build Plate" - width: Math.floor(table.width * 0.225) - } - TableViewColumn - { - role: "support_material" - title: "Support" - width: Math.floor(table.width * 0.225) - } - TableViewColumn - { - role: "quality" - title: "Quality" - width: Math.floor(table.width * 0.1) + // Workaround for scroll issues (QTBUG-49652) + flickableItem.interactive: false + Component.onCompleted: + { + for (var i = 0; i < flickableItem.children.length; ++i) + { + flickableItem.children[i].enabled = false + } + } + selectionMode: 0 + model: packageData.supported_configs + headerDelegate: Rectangle + { + color: UM.Theme.getColor("sidebar") + height: UM.Theme.getSize("toolbox_chart_row").height + Label + { + anchors.verticalCenter: parent.verticalCenter + elide: Text.ElideRight + text: styleData.value || "" + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default_bold") + } + Rectangle + { + anchors.bottom: parent.bottom + height: UM.Theme.getSize("default_lining").height + width: parent.width + color: "black" + } + } + rowDelegate: Item + { + height: UM.Theme.getSize("toolbox_chart_row").height + Label + { + anchors.verticalCenter: parent.verticalCenter + elide: Text.ElideRight + text: styleData.value || "" + color: UM.Theme.getColor("text_medium") + font: UM.Theme.getFont("default") + } + } + itemDelegate: Item + { + height: UM.Theme.getSize("toolbox_chart_row").height + Label + { + anchors.verticalCenter: parent.verticalCenter + elide: Text.ElideRight + text: styleData.value || "" + color: UM.Theme.getColor("text_medium") + font: UM.Theme.getFont("default") + } + } + + Component + { + id: columnTextDelegate + Label + { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + text: styleData.value || "" + elide: Text.ElideRight + color: UM.Theme.getColor("text_medium") + font: UM.Theme.getFont("default") + } + } + + TableViewColumn + { + role: "machine" + title: "Machine" + width: Math.floor(table.width * 0.25) + delegate: columnTextDelegate + } + TableViewColumn + { + role: "print_core" + title: "Print Core" + width: Math.floor(table.width * 0.2) + } + TableViewColumn + { + role: "build_plate" + title: "Build Plate" + width: Math.floor(table.width * 0.225) + } + TableViewColumn + { + role: "support_material" + title: "Support" + width: Math.floor(table.width * 0.225) + } + TableViewColumn + { + role: "quality" + title: "Quality" + width: Math.floor(table.width * 0.1) + } } } Label { - id: technical_data_sheet - anchors.top: table.bottom + id: data_sheet_links + anchors.top: combatibilityItem.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height / 2 - visible: base.technicalDataSheetUrl !== undefined + visible: base.technicalDataSheetUrl !== undefined || + base.safetyDataSheetUrl !== undefined || base.printingGuidelinesUrl !== undefined + height: visible ? contentHeight : 0 text: { + var result = "" if (base.technicalDataSheetUrl !== undefined) { - return "%2".arg(base.technicalDataSheetUrl).arg("Technical Data Sheet") + result += "%2".arg(base.technicalDataSheetUrl).arg("Technical Data Sheet") } - return "" + if (base.safetyDataSheetUrl !== undefined) + { + if (result.length > 0) + { + result += "
" + } + result += "%2".arg(base.safetyDataSheetUrl).arg("Safety Data Sheet") + } + if (base.printingGuidelinesUrl !== undefined) + { + if (result.length > 0) + { + result += "
" + } + result += "%2".arg(base.printingGuidelinesUrl).arg("Printing Guidelines") + } + return result } font: UM.Theme.getFont("very_small") color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") onLinkActivated: Qt.openUrlExternally(link) } - } diff --git a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml b/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml index 4aa8b883b7..2c5d08aa72 100644 --- a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml +++ b/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml @@ -17,7 +17,7 @@ UM.Dialog // This dialog asks the user whether he/she wants to open a project file as a project or import models. id: base - title: catalog.i18nc("@title:window", "Confirm uninstall ") + toolbox.pluginToUninstall + title: catalog.i18nc("@title:window", "Confirm uninstall") + toolbox.pluginToUninstall width: 450 * screenScaleFactor height: 50 * screenScaleFactor + dialogText.height + buttonBar.height diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml index cba55051f5..437a2ef351 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml @@ -25,14 +25,11 @@ Item rightMargin: UM.Theme.getSize("wide_margin").width } height: UM.Theme.getSize("toolbox_detail_header").height - Image + Rectangle { id: thumbnail width: UM.Theme.getSize("toolbox_thumbnail_medium").width height: UM.Theme.getSize("toolbox_thumbnail_medium").height - fillMode: Image.PreserveAspectFit - source: details === null ? "" : (details.icon_url || "../images/logobot.svg") - mipmap: true anchors { top: parent.top @@ -40,6 +37,14 @@ Item leftMargin: UM.Theme.getSize("wide_margin").width topMargin: UM.Theme.getSize("wide_margin").height } + color: white //Always a white background for image (regardless of theme). + Image + { + anchors.fill: parent + fillMode: Image.PreserveAspectFit + source: details === null ? "" : (details.icon_url || "../images/logobot.svg") + mipmap: true + } } Label diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml index d544757d58..9061a8e06b 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml @@ -37,7 +37,7 @@ Item anchors.top: packageName.bottom width: parent.width text: model.description - maximumLineCount: 3 + maximumLineCount: 6 elide: Text.ElideRight wrapMode: Text.WordWrap color: UM.Theme.getColor("text") diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml index 4366db041c..887140bbfa 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml @@ -9,6 +9,7 @@ import UM 1.1 as UM Item { + id: toolboxDownloadsGridTile property int packageCount: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getTotalNumberOfMaterialPackagesByAuthor(model.id) : 1 property int installedPackages: (toolbox.viewCategory == "material" && model.type === undefined) ? toolbox.getNumberOfInstalledPackagesByAuthor(model.id) : (toolbox.isInstalled(model.id) ? 1 : 0) height: childrenRect.height diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml index 845bbe8f91..4fb70541d2 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml @@ -1,5 +1,5 @@ // Copyright (c) 2018 Ultimaker B.V. -// Toolbox is released under the terms of the LGPLv3 or higher. +// Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 import QtQuick.Controls 1.4 diff --git a/plugins/Toolbox/resources/qml/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/ToolboxHeader.qml index f2ed8fc31f..087402d564 100644 --- a/plugins/Toolbox/resources/qml/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/ToolboxHeader.qml @@ -21,8 +21,10 @@ Item left: parent.left leftMargin: UM.Theme.getSize("default_margin").width } + ToolboxTabButton { + id: pluginsTabButton text: catalog.i18nc("@title:tab", "Plugins") active: toolbox.viewCategory == "plugin" && enabled enabled: !toolbox.isDownloading && toolbox.viewPage != "loading" && toolbox.viewPage != "errored" @@ -34,9 +36,9 @@ Item } } - /* // NOTE: Remember to re-enable for v3.6! ToolboxTabButton { + id: materialsTabButton text: catalog.i18nc("@title:tab", "Materials") active: toolbox.viewCategory == "material" && enabled enabled: !toolbox.isDownloading && toolbox.viewPage != "loading" && toolbox.viewPage != "errored" @@ -47,10 +49,10 @@ Item toolbox.viewPage = "overview" } } - */ } ToolboxTabButton { + id: installedTabButton text: catalog.i18nc("@title:tab", "Installed") active: toolbox.viewCategory == "installed" enabled: !toolbox.isDownloading diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index ae4cd7682d..aa5626b7f2 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -52,7 +52,7 @@ class PackagesModel(ListModel): items = [] if self._metadata is None: - Logger.logException("w", "Failed to load packages for Toolbox") + Logger.logException("w", "Failed to load packages for Marketplace") self.setItems(items) return diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 3e2085277a..43e1f5b3d9 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -245,7 +245,7 @@ class Toolbox(QObject, Extension): self._dialog = self._createDialog("Toolbox.qml") if not self._dialog: - Logger.log("e", "Unexpected error trying to create the 'Toolbox' dialog.") + Logger.log("e", "Unexpected error trying to create the 'Marketplace' dialog.") return self._dialog.show() @@ -254,7 +254,7 @@ class Toolbox(QObject, Extension): self.enabledChanged.emit() def _createDialog(self, qml_name: str) -> Optional[QObject]: - Logger.log("d", "Toolbox: Creating dialog [%s].", qml_name) + Logger.log("d", "Marketplace: Creating dialog [%s].", qml_name) plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId()) if not plugin_path: return None @@ -262,24 +262,28 @@ class Toolbox(QObject, Extension): dialog = self._application.createQmlComponent(path, {"toolbox": self}) if not dialog: - raise Exception("Failed to create toolbox dialog") + raise Exception("Failed to create Marketplace dialog") return dialog - def _convertPluginMetadata(self, plugin: Dict[str, Any]) -> Dict[str, Any]: - formatted = { - "package_id": plugin["id"], - "package_type": "plugin", - "display_name": plugin["plugin"]["name"], - "package_version": plugin["plugin"]["version"], - "sdk_version": plugin["plugin"]["api"], - "author": { - "author_id": plugin["plugin"]["author"], - "display_name": plugin["plugin"]["author"] - }, - "is_installed": True, - "description": plugin["plugin"]["description"] - } - return formatted + def _convertPluginMetadata(self, plugin_data: Dict[str, Any]) -> Optional[Dict[str, Any]]: + try: + formatted = { + "package_id": plugin_data["id"], + "package_type": "plugin", + "display_name": plugin_data["plugin"]["name"], + "package_version": plugin_data["plugin"]["version"], + "sdk_version": plugin_data["plugin"]["api"], + "author": { + "author_id": plugin_data["plugin"]["author"], + "display_name": plugin_data["plugin"]["author"] + }, + "is_installed": True, + "description": plugin_data["plugin"]["description"] + } + return formatted + except: + Logger.log("w", "Unable to convert plugin meta data %s", str(plugin_data)) + return None @pyqtSlot() def _updateInstalledModels(self) -> None: @@ -299,7 +303,9 @@ class Toolbox(QObject, Extension): old_metadata = self._plugin_registry.getMetaData(plugin_id) new_metadata = self._convertPluginMetadata(old_metadata) - + if new_metadata is None: + # Something went wrong converting it. + continue self._old_plugin_ids.add(plugin_id) self._old_plugin_metadata[new_metadata["package_id"]] = new_metadata @@ -578,7 +584,7 @@ class Toolbox(QObject, Extension): # Make API Calls # -------------------------------------------------------------------------- def _makeRequestByType(self, type: str) -> None: - Logger.log("i", "Toolbox: Requesting %s metadata from server.", type) + Logger.log("i", "Marketplace: Requesting %s metadata from server.", type) request = QNetworkRequest(self._request_urls[type]) request.setRawHeader(*self._request_header) if self._network_manager: @@ -586,7 +592,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def startDownload(self, url: str) -> None: - Logger.log("i", "Toolbox: Attempting to download & install package from %s.", url) + Logger.log("i", "Marketplace: Attempting to download & install package from %s.", url) url = QUrl(url) self._download_request = QNetworkRequest(url) if hasattr(QNetworkRequest, "FollowRedirectsAttribute"): @@ -603,7 +609,7 @@ class Toolbox(QObject, Extension): @pyqtSlot() def cancelDownload(self) -> None: - Logger.log("i", "Toolbox: User cancelled the download of a package.") + Logger.log("i", "Marketplace: User cancelled the download of a package.") self.resetDownload() def resetDownload(self) -> None: @@ -690,7 +696,7 @@ class Toolbox(QObject, Extension): return except json.decoder.JSONDecodeError: - Logger.log("w", "Toolbox: Received invalid JSON for %s.", type) + Logger.log("w", "Marketplace: Received invalid JSON for %s.", type) break else: self.setViewPage("errored") @@ -717,10 +723,10 @@ class Toolbox(QObject, Extension): self._onDownloadComplete(file_path) def _onDownloadComplete(self, file_path: str) -> None: - Logger.log("i", "Toolbox: Download complete.") + Logger.log("i", "Marketplace: Download complete.") package_info = self._package_manager.getPackageInfo(file_path) if not package_info: - Logger.log("w", "Toolbox: Package file [%s] was not a valid CuraPackage.", file_path) + Logger.log("w", "Marketplace: Package file [%s] was not a valid CuraPackage.", file_path) return license_content = self._package_manager.getPackageLicense(file_path) @@ -819,7 +825,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str, str, str) def filterModelByProp(self, model_type: str, filter_type: str, parameter: str) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter({filter_type: parameter}) self.filterChanged.emit() @@ -827,7 +833,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str, "QVariantMap") def setFilters(self, model_type: str, filter_dict: dict) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter(filter_dict) self.filterChanged.emit() @@ -835,7 +841,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def removeFilters(self, model_type: str) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't remove filters on %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't remove filters on %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter({}) self.filterChanged.emit() @@ -845,6 +851,7 @@ class Toolbox(QObject, Extension): def buildMaterialsModels(self) -> None: self._metadata["materials_showcase"] = [] self._metadata["materials_available"] = [] + self._metadata["materials_generic"] = [] processed_authors = [] # type: List[str] diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index a85ee489cb..b3088fc863 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -1,5 +1,6 @@ #Copyright (c) 2018 Ultimaker B.V. #Cura is released under the terms of the LGPLv3 or higher. + from typing import cast from Charon.VirtualFile import VirtualFile #To open UFP files. @@ -9,6 +10,7 @@ from io import StringIO #For converting g-code to bytes. from UM.Application import Application from UM.Logger import Logger from UM.Mesh.MeshWriter import MeshWriter #The writer we need to implement. +from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry #To get the g-code writer. from PyQt5.QtCore import QBuffer @@ -22,8 +24,16 @@ catalog = i18nCatalog("cura") class UFPWriter(MeshWriter): def __init__(self): super().__init__(add_to_recent_files = False) + + MimeTypeDatabase.addMimeType( + MimeType( + name = "application/x-ufp", + comment = "Cura UFP File", + suffixes = ["ufp"] + ) + ) + self._snapshot = None - Application.getInstance().getOutputDeviceManager().writeStarted.connect(self._createSnapshot) def _createSnapshot(self, *args): # must be called from the main thread because of OpenGL @@ -51,6 +61,8 @@ class UFPWriter(MeshWriter): gcode.write(gcode_textio.getvalue().encode("UTF-8")) archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode") + self._createSnapshot() + #Store the thumbnail. if self._snapshot: archive.addContentType(extension = "png", mime_type = "image/png") diff --git a/plugins/UFPWriter/__init__.py b/plugins/UFPWriter/__init__.py index a2ec99044f..9db6b042f8 100644 --- a/plugins/UFPWriter/__init__.py +++ b/plugins/UFPWriter/__init__.py @@ -11,16 +11,6 @@ except ImportError: from UM.i18n import i18nCatalog #To translate the file format description. from UM.Mesh.MeshWriter import MeshWriter #For the binary mode flag. -from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType - - -MimeTypeDatabase.addMimeType( - MimeType( - name = "application/x-cura-stl-file", - comment = "Cura UFP File", - suffixes = ["ufp"] - ) -) i18n_catalog = i18nCatalog("cura") diff --git a/plugins/UM3NetworkPrinting/__init__.py b/plugins/UM3NetworkPrinting/__init__.py index 7f2b34223c..e2ad5a2b12 100644 --- a/plugins/UM3NetworkPrinting/__init__.py +++ b/plugins/UM3NetworkPrinting/__init__.py @@ -2,9 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. from .src import DiscoverUM3Action -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - from .src import UM3OutputDevicePlugin def getMetaData(): diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index 1ceebccf89..7e5c254e5c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -1,46 +1,40 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.3 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.3 -import QtQuick.Controls 2.0 as Controls2 -import QtGraphicalEffects 1.0 - import UM 1.3 as UM import Cura 1.0 as Cura -Rectangle -{ - property var iconSource: null +Rectangle { + property var iconSource: null; + color: clickArea.containsMouse ? UM.Theme.getColor("primary_hover") : UM.Theme.getColor("primary"); // "Cura Blue" + height: width; + radius: Math.round(0.5 * width); + width: 36 * screenScaleFactor; - width: 36 * screenScaleFactor - height: width - radius: 0.5 * width - color: clickArea.containsMouse ? UM.Theme.getColor("primary_hover") : UM.Theme.getColor("primary") - - UM.RecolorImage - { - id: icon - width: parent.width / 2 - height: width - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - color: UM.Theme.getColor("primary_text") - source: iconSource + UM.RecolorImage { + id: icon; + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + color: UM.Theme.getColor("primary_text"); + height: width; + source: iconSource; + width: Math.round(parent.width / 2); } - MouseArea - { - id: clickArea - anchors.fill:parent - hoverEnabled: true - onClicked: - { - if (OutputDevice.activeCamera !== null) - { - OutputDevice.setActiveCamera(null) - } - else - { - OutputDevice.setActiveCamera(modelData.camera) + MouseArea { + id: clickArea; + anchors.fill: parent; + hoverEnabled: true; + onClicked: { + if (OutputDevice.activeCameraUrl != "") { + OutputDevice.setActiveCameraUrl(""); + } else { + OutputDevice.setActiveCameraUrl(modelData.cameraUrl); } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml index f8ad0e763e..068c369a3f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml @@ -1,803 +1,109 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.3 -import QtQuick.Dialogs 1.1 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.3 -import QtGraphicalEffects 1.0 - -import QtQuick.Controls 2.0 as Controls2 - import UM 1.3 as UM import Cura 1.0 as Cura +Component { + Rectangle { + id: base; + property var shadowRadius: UM.Theme.getSize("monitor_shadow_radius").width; + property var cornerRadius: UM.Theme.getSize("monitor_corner_radius").width; + anchors.fill: parent; + color: UM.Theme.getColor("sidebar"); + visible: OutputDevice != null; -Component -{ - Rectangle - { - id: base - property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. - property var shadowRadius: 5 * screenScaleFactor - property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme. - visible: OutputDevice != null - anchors.fill: parent - color: "white" - - UM.I18nCatalog - { - id: catalog - name: "cura" + UM.I18nCatalog { + id: catalog; + name: "cura"; } - Label - { - id: printingLabel - font: UM.Theme.getFont("large") - anchors - { - margins: 2 * UM.Theme.getSize("default_margin").width - leftMargin: 4 * UM.Theme.getSize("default_margin").width - top: parent.top - left: parent.left - right: parent.right + Label { + id: printingLabel; + anchors { + left: parent.left; + leftMargin: 4 * UM.Theme.getSize("default_margin").width; + margins: 2 * UM.Theme.getSize("default_margin").width; + right: parent.right; + top: parent.top; } - - text: catalog.i18nc("@label", "Printing") - elide: Text.ElideRight + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("large"); + text: catalog.i18nc("@label", "Printing"); } - Label - { - id: managePrintersLabel - anchors.rightMargin: 4 * UM.Theme.getSize("default_margin").width - anchors.right: printerScrollView.right - anchors.bottom: printingLabel.bottom - text: catalog.i18nc("@label link to connect manager", "Manage printers") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("primary") - linkColor: UM.Theme.getColor("primary") - } - - MouseArea - { - anchors.fill: managePrintersLabel - hoverEnabled: true - onClicked: Cura.MachineManager.printerOutputDevices[0].openPrinterControlPanel() - onEntered: managePrintersLabel.font.underline = true - onExited: managePrintersLabel.font.underline = false - } - - ScrollView - { - id: printerScrollView - anchors - { - top: printingLabel.bottom - left: parent.left - right: parent.right - topMargin: UM.Theme.getSize("default_margin").height - bottom: parent.bottom - bottomMargin: UM.Theme.getSize("default_margin").height + Label { + id: managePrintersLabel; + anchors { + bottom: printingLabel.bottom; + right: printerScrollView.right; + rightMargin: 4 * UM.Theme.getSize("default_margin").width; } + color: UM.Theme.getColor("primary"); // "Cura Blue" + font: UM.Theme.getFont("default"); + linkColor: UM.Theme.getColor("primary"); // "Cura Blue" + text: catalog.i18nc("@label link to connect manager", "Manage printers"); + } - style: UM.Theme.styles.scrollview + MouseArea { + anchors.fill: managePrintersLabel; + hoverEnabled: true; + onClicked: Cura.MachineManager.printerOutputDevices[0].openPrinterControlPanel(); + onEntered: managePrintersLabel.font.underline = true; + onExited: managePrintersLabel.font.underline = false; + } - ListView - { - id: printer_list - property var current_index: -1 - anchors - { - top: parent.top - bottom: parent.bottom - left: parent.left - right: parent.right - leftMargin: 2 * UM.Theme.getSize("default_margin").width - rightMargin: 2 * UM.Theme.getSize("default_margin").width + // Skeleton loading + Column { + id: skeletonLoader; + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("wide_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("wide_margin").width; + top: printingLabel.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + } + spacing: UM.Theme.getSize("default_margin").height - 10; + visible: printerList.count === 0; + + PrinterCard { + printer: null; + } + PrinterCard { + printer: null; + } + } + + // Actual content + ScrollView { + id: printerScrollView; + anchors { + bottom: parent.bottom; + left: parent.left; + right: parent.right; + top: printingLabel.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + } + style: UM.Theme.styles.scrollview; + + ListView { + id: printerList; + property var currentIndex: -1; + anchors { + fill: parent; + leftMargin: UM.Theme.getSize("wide_margin").width; + rightMargin: UM.Theme.getSize("wide_margin").width; } - spacing: UM.Theme.getSize("default_margin").height -10 - model: OutputDevice.printers - - delegate: Item - { - width: parent.width - height: base.height + 2 * base.shadowRadius // To ensure that the shadow doesn't get cut off. - Rectangle - { - width: parent.width - 2 * shadowRadius - height: childrenRect.height + UM.Theme.getSize("default_margin").height - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: - { - if(modelData.state == "disabled") - { - return UM.Theme.getColor("monitor_background_inactive") - } - else - { - return UM.Theme.getColor("monitor_background_active") - } - } - id: base - property var shadowRadius: 5 * screenScaleFactor - property var collapsed: true - - layer.enabled: true - layer.effect: DropShadow - { - radius: 5 * screenScaleFactor - verticalOffset: 2 - color: "#3F000000" // 25% shadow - } - - Connections - { - target: printer_list - onCurrent_indexChanged: { base.collapsed = printer_list.current_index != model.index } - } - - Item - { - id: printerInfo - height: machineIcon.height - anchors - { - top: parent.top - left: parent.left - right: parent.right - margins: UM.Theme.getSize("default_margin").width - } - - MouseArea - { - anchors.fill: parent - onClicked: - { - if (base.collapsed) { - printer_list.current_index = model.index - } - else - { - printer_list.current_index = -1 - } - } - } - - Item - { - id: machineIcon - // Yeah, this is hardcoded now, but I can't think of a good way to fix this. - // The UI is going to get another update soon, so it's probably not worth the effort... - width: 58 - height: 58 - anchors.top: parent.top - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.left: parent.left - - UM.RecolorImage - { - anchors.centerIn: parent - source: - { - switch(modelData.type) - { - case "Ultimaker 3": - return "../svg/UM3-icon.svg" - case "Ultimaker 3 Extended": - return "../svg/UM3x-icon.svg" - case "Ultimaker S5": - return "../svg/UMs5-icon.svg" - } - } - width: sourceSize.width - height: sourceSize.height - - color: - { - if(modelData.state == "disabled") - { - return UM.Theme.getColor("monitor_text_inactive") - } - - if(modelData.activePrintJob != undefined) - { - return UM.Theme.getColor("primary") - } - - return UM.Theme.getColor("monitor_text_inactive") - } - } - } - Item - { - height: childrenRect.height - anchors - { - right: collapseIcon.left - rightMargin: UM.Theme.getSize("default_margin").width - left: machineIcon.right - leftMargin: UM.Theme.getSize("default_margin").width - - verticalCenter: machineIcon.verticalCenter - } - - Label - { - id: machineNameLabel - text: modelData.name - width: parent.width - elide: Text.ElideRight - font: UM.Theme.getFont("default_bold") - } - - Label - { - id: activeJobLabel - text: - { - if (modelData.state == "disabled") - { - return catalog.i18nc("@label", "Not available") - } else if (modelData.state == "unreachable") - { - return catalog.i18nc("@label", "Unreachable") - } - if (modelData.activePrintJob != null) - { - return modelData.activePrintJob.name - } - return catalog.i18nc("@label", "Available") - } - anchors.top: machineNameLabel.bottom - width: parent.width - elide: Text.ElideRight - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("monitor_text_inactive") - } - } - - UM.RecolorImage - { - id: collapseIcon - width: 15 - height: 15 - sourceSize.width: width - sourceSize.height: height - source: base.collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom") - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width - color: "black" - } - } - - Item - { - id: detailedInfo - property var printJob: modelData.activePrintJob - visible: height == childrenRect.height - anchors.top: printerInfo.bottom - width: parent.width - height: !base.collapsed ? childrenRect.height : 0 - opacity: visible ? 1 : 0 - Behavior on height { NumberAnimation { duration: 100 } } - Behavior on opacity { NumberAnimation { duration: 100 } } - Rectangle - { - id: topSpacer - color: - { - if(modelData.state == "disabled") - { - return UM.Theme.getColor("monitor_lining_inactive") - } - return UM.Theme.getColor("viewport_background") - } - // UM.Theme.getColor("viewport_background") - height: 1 - anchors - { - left: parent.left - right: parent.right - margins: UM.Theme.getSize("default_margin").width - top: parent.top - topMargin: UM.Theme.getSize("default_margin").width - } - } - PrinterFamilyPill - { - id: printerFamilyPill - color: - { - if(modelData.state == "disabled") - { - return "transparent" - } - return UM.Theme.getColor("viewport_background") - } - anchors.top: topSpacer.bottom - anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height - text: modelData.type - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - padding: 3 - } - Row - { - id: extrudersInfo - anchors.top: printerFamilyPill.bottom - anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height - anchors.left: parent.left - anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width - anchors.right: parent.right - anchors.rightMargin: 2 * UM.Theme.getSize("default_margin").width - height: childrenRect.height - spacing: UM.Theme.getSize("default_margin").width - - PrintCoreConfiguration - { - id: leftExtruderInfo - width: Math.round(parent.width / 2) - printCoreConfiguration: modelData.printerConfiguration.extruderConfigurations[0] - } - - PrintCoreConfiguration - { - id: rightExtruderInfo - width: Math.round(parent.width / 2) - printCoreConfiguration: modelData.printerConfiguration.extruderConfigurations[1] - } - } - - Rectangle - { - id: jobSpacer - color: UM.Theme.getColor("viewport_background") - height: 2 - anchors - { - left: parent.left - right: parent.right - margins: UM.Theme.getSize("default_margin").width - top: extrudersInfo.bottom - topMargin: 2 * UM.Theme.getSize("default_margin").height - } - } - - Item - { - id: jobInfo - property var showJobInfo: modelData.activePrintJob != null && modelData.activePrintJob.state != "queued" - - anchors.top: jobSpacer.bottom - anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: UM.Theme.getSize("default_margin").width - anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width - height: showJobInfo ? childrenRect.height + 2 * UM.Theme.getSize("default_margin").height: 0 - visible: showJobInfo - Label - { - id: printJobName - text: modelData.activePrintJob != null ? modelData.activePrintJob.name : "" - font: UM.Theme.getFont("default_bold") - anchors.left: parent.left - anchors.right: contextButton.left - anchors.rightMargin: UM.Theme.getSize("default_margin").width - elide: Text.ElideRight - } - Label - { - id: ownerName - anchors.top: printJobName.bottom - text: modelData.activePrintJob != null ? modelData.activePrintJob.owner : "" - font: UM.Theme.getFont("default") - opacity: 0.6 - width: parent.width - elide: Text.ElideRight - } - - function switchPopupState() - { - popup.visible ? popup.close() : popup.open() - } - - Controls2.Button - { - id: contextButton - text: "\u22EE" //Unicode; Three stacked points. - width: 35 - height: width - anchors - { - right: parent.right - top: parent.top - } - hoverEnabled: true - - background: Rectangle - { - opacity: contextButton.down || contextButton.hovered ? 1 : 0 - width: contextButton.width - height: contextButton.height - radius: 0.5 * width - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: contextButton.text - color: UM.Theme.getColor("monitor_text_inactive") - font.pixelSize: 25 - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - } - - onClicked: parent.switchPopupState() - } - - Controls2.Popup - { - // TODO Change once updating to Qt5.10 - The 'opened' property is in 5.10 but the behavior is now implemented with the visible property - id: popup - clip: true - closePolicy: Popup.CloseOnPressOutside - x: (parent.width - width) + 26 * screenScaleFactor - y: contextButton.height - 5 * screenScaleFactor // Because shadow - width: 182 * screenScaleFactor - height: contentItem.height + 2 * padding - visible: false - padding: 5 * screenScaleFactor // Because shadow - - transformOrigin: Popup.Top - contentItem: Item - { - width: popup.width - height: childrenRect.height + 36 * screenScaleFactor - anchors.topMargin: 10 * screenScaleFactor - anchors.bottomMargin: 10 * screenScaleFactor - Controls2.Button - { - id: pauseButton - text: modelData.activePrintJob != null && modelData.activePrintJob.state == "paused" ? catalog.i18nc("@label", "Resume") : catalog.i18nc("@label", "Pause") - onClicked: - { - if(modelData.activePrintJob.state == "paused") - { - modelData.activePrintJob.setState("print") - } - else if(modelData.activePrintJob.state == "printing") - { - modelData.activePrintJob.setState("pause") - } - popup.close() - } - width: parent.width - enabled: modelData.activePrintJob != null && ["paused", "printing"].indexOf(modelData.activePrintJob.state) >= 0 - visible: enabled - anchors.top: parent.top - anchors.topMargin: 18 * screenScaleFactor - height: visible ? 39 * screenScaleFactor : 0 * screenScaleFactor - hoverEnabled: true - background: Rectangle - { - opacity: pauseButton.down || pauseButton.hovered ? 1 : 0 - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: pauseButton.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter - } - } - - Controls2.Button - { - id: abortButton - text: catalog.i18nc("@label", "Abort") - onClicked: - { - abortConfirmationDialog.visible = true; - popup.close(); - } - width: parent.width - height: 39 * screenScaleFactor - anchors.top: pauseButton.bottom - hoverEnabled: true - enabled: modelData.activePrintJob != null && ["paused", "printing", "pre_print"].indexOf(modelData.activePrintJob.state) >= 0 - background: Rectangle - { - opacity: abortButton.down || abortButton.hovered ? 1 : 0 - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: abortButton.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter - } - } - - MessageDialog - { - id: abortConfirmationDialog - title: catalog.i18nc("@window:title", "Abort print") - icon: StandardIcon.Warning - text: catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to abort %1?").arg(modelData.activePrintJob.name) - standardButtons: StandardButton.Yes | StandardButton.No - Component.onCompleted: visible = false - onYes: modelData.activePrintJob.setState("abort") - } - } - - background: Item - { - width: popup.width - height: popup.height - - DropShadow - { - anchors.fill: pointedRectangle - radius: 5 - color: "#3F000000" // 25% shadow - source: pointedRectangle - transparentBorder: true - verticalOffset: 2 - } - - Item - { - id: pointedRectangle - width: parent.width - 10 * screenScaleFactor // Because of the shadow - height: parent.height - 10 * screenScaleFactor // Because of the shadow - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - Rectangle - { - id: point - height: 14 * screenScaleFactor - width: 14 * screenScaleFactor - color: UM.Theme.getColor("setting_control") - transform: Rotation { angle: 45} - anchors.right: bloop.right - anchors.rightMargin: 24 - y: 1 - } - - Rectangle - { - id: bloop - color: UM.Theme.getColor("setting_control") - width: parent.width - anchors.top: parent.top - anchors.topMargin: 8 * screenScaleFactor // Because of the shadow + point - anchors.bottom: parent.bottom - anchors.bottomMargin: 8 * screenScaleFactor // Because of the shadow - } - } - } - - exit: Transition - { - // This applies a default NumberAnimation to any changes a state change makes to x or y properties - NumberAnimation { property: "visible"; duration: 75; } - } - enter: Transition - { - // This applies a default NumberAnimation to any changes a state change makes to x or y properties - NumberAnimation { property: "visible"; duration: 75; } - } - - onClosed: visible = false - onOpened: visible = true - } - - Image - { - id: printJobPreview - source: modelData.activePrintJob != null ? modelData.activePrintJob.previewImageUrl : "" - anchors.top: ownerName.bottom - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width / 2 - height: width - opacity: - { - if(modelData.activePrintJob == null) - { - return 1.0 - } - - switch(modelData.activePrintJob.state) - { - case "wait_cleanup": - case "wait_user_action": - case "paused": - return 0.5 - default: - return 1.0 - } - } - - - } - - UM.RecolorImage - { - id: statusImage - anchors.centerIn: printJobPreview - source: - { - if(modelData.activePrintJob == null) - { - return "" - } - switch(modelData.activePrintJob.state) - { - case "paused": - return "../svg/paused-icon.svg" - case "wait_cleanup": - if(modelData.activePrintJob.timeElapsed < modelData.activePrintJob.timeTotal) - { - return "../svg/aborted-icon.svg" - } - return "../svg/approved-icon.svg" - case "wait_user_action": - return "../svg/aborted-icon.svg" - default: - return "" - } - } - visible: source != "" - width: 0.5 * printJobPreview.width - height: 0.5 * printJobPreview.height - sourceSize.width: width - sourceSize.height: height - color: "black" - } - - CameraButton - { - id: showCameraButton - iconSource: "../svg/camera-icon.svg" - anchors - { - left: parent.left - bottom: printJobPreview.bottom - } - } - } - } - - ProgressBar - { - property var progress: - { - if(modelData.activePrintJob == null) - { - return 0 - } - var result = modelData.activePrintJob.timeElapsed / modelData.activePrintJob.timeTotal - if(result > 1.0) - { - result = 1.0 - } - return result - } - - id: jobProgressBar - width: parent.width - value: progress - anchors.top: detailedInfo.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - - visible: modelData.activePrintJob != null && modelData.activePrintJob != undefined - - style: ProgressBarStyle - { - property var remainingTime: - { - if(modelData.activePrintJob == null) - { - return 0 - } - /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining - time from ever being less than 0. Negative durations cause strange behavior such - as displaying "-1h -1m". */ - var activeJob = modelData.activePrintJob - return Math.max(activeJob.timeTotal - activeJob.timeElapsed, 0); - } - property var progressText: - { - if(modelData.activePrintJob == null) - { - return "" - } - switch(modelData.activePrintJob.state) - { - case "wait_cleanup": - if(modelData.activePrintJob.timeTotal > modelData.activePrintJob.timeElapsed) - { - return catalog.i18nc("@label:status", "Aborted") - } - return catalog.i18nc("@label:status", "Finished") - case "pre_print": - case "sent_to_printer": - return catalog.i18nc("@label:status", "Preparing") - case "aborted": - return catalog.i18nc("@label:status", "Aborted") - case "wait_user_action": - return catalog.i18nc("@label:status", "Aborted") - case "pausing": - return catalog.i18nc("@label:status", "Pausing") - case "paused": - return OutputDevice.formatDuration( remainingTime ) - case "resuming": - return catalog.i18nc("@label:status", "Resuming") - case "queued": - return catalog.i18nc("@label:status", "Action required") - default: - return OutputDevice.formatDuration( remainingTime ) - } - } - - background: Rectangle - { - implicitWidth: 100 - implicitHeight: visible ? 24 : 0 - color: UM.Theme.getColor("viewport_background") - } - - progress: Rectangle - { - color: - { - var state = modelData.activePrintJob.state - var inactiveStates = [ - "pausing", - "paused", - "resuming", - "wait_cleanup" - ] - if(inactiveStates.indexOf(state) > -1 && remainingTime > 0) - { - return UM.Theme.getColor("monitor_text_inactive") - } - else - { - return UM.Theme.getColor("primary") - } - } - id: progressItem - function getTextOffset() - { - if(progressItem.width + progressLabel.width + 16 < control.width) - { - return progressItem.width + UM.Theme.getSize("default_margin").width - } - else - { - return progressItem.width - progressLabel.width - UM.Theme.getSize("default_margin").width - } - } - - Label - { - id: progressLabel - anchors.left: parent.left - anchors.leftMargin: getTextOffset() - text: progressText - anchors.verticalCenter: parent.verticalCenter - color: progressItem.width + progressLabel.width < control.width ? "black" : "white" - width: contentWidth - font: UM.Theme.getFont("default") - } - } - } - } - } + delegate: PrinterCard { + printer: modelData; } + model: OutputDevice.printers; + spacing: UM.Theme.getSize("default_margin").height - 10; } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml index f6cf6607c7..d210ab40f3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml @@ -1,108 +1,132 @@ +// 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.4 import QtQuick.Controls.Styles 1.4 - import UM 1.3 as UM import Cura 1.0 as Cura -Component -{ - Rectangle - { - id: monitorFrame - width: maximumWidth - height: maximumHeight - color: UM.Theme.getColor("viewport_background") - property var emphasisColor: UM.Theme.getColor("setting_control_border_highlight") - property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. - property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme. - - UM.I18nCatalog - { - id: catalog - name: "cura" - } - - Label - { - id: manageQueueLabel - anchors.rightMargin: 3 * UM.Theme.getSize("default_margin").width - anchors.right: queuedPrintJobs.right - anchors.bottom: queuedLabel.bottom - text: catalog.i18nc("@label link to connect manager", "Manage queue") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("primary") - linkColor: UM.Theme.getColor("primary") - } - - MouseArea - { - anchors.fill: manageQueueLabel - hoverEnabled: true - onClicked: Cura.MachineManager.printerOutputDevices[0].openPrintJobControlPanel() - onEntered: manageQueueLabel.font.underline = true - onExited: manageQueueLabel.font.underline = false - } - - Label - { - id: queuedLabel - anchors.left: queuedPrintJobs.left - anchors.top: parent.top - anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height - anchors.leftMargin: 3 * UM.Theme.getSize("default_margin").width + 5 - text: catalog.i18nc("@label", "Queued") - font: UM.Theme.getFont("large") - color: UM.Theme.getColor("text") - } - - ScrollView - { - id: queuedPrintJobs - - anchors - { - top: queuedLabel.bottom - topMargin: UM.Theme.getSize("default_margin").height - horizontalCenter: parent.horizontalCenter - bottomMargin: 0 - bottom: parent.bottom +Component { + Rectangle { + id: monitorFrame; + property var emphasisColor: UM.Theme.getColor("setting_control_border_highlight"); + property var cornerRadius: UM.Theme.getSize("monitor_corner_radius").width; + color: UM.Theme.getColor("viewport_background"); + height: maximumHeight; + onVisibleChanged: { + if (monitorFrame != null && !monitorFrame.visible) { + OutputDevice.setActiveCameraUrl(""); } - style: UM.Theme.styles.scrollview - width: Math.min(800 * screenScaleFactor, maximumWidth) - ListView - { - anchors.fill: parent - //anchors.margins: UM.Theme.getSize("default_margin").height - spacing: UM.Theme.getSize("default_margin").height - 10 // 2x the shadow radius + } + width: maximumWidth; - model: OutputDevice.queuedPrintJobs + UM.I18nCatalog { + id: catalog; + name: "cura"; + } - delegate: PrintJobInfoBlock - { - printJob: modelData - anchors.left: parent.left - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").height - anchors.leftMargin: UM.Theme.getSize("default_margin").height - height: 175 * screenScaleFactor + Label { + id: manageQueueLabel; + anchors { + bottom: queuedLabel.bottom; + right: queuedPrintJobs.right; + rightMargin: 3 * UM.Theme.getSize("default_margin").width; + } + color: UM.Theme.getColor("primary"); + font: UM.Theme.getFont("default"); + linkColor: UM.Theme.getColor("primary"); + text: catalog.i18nc("@label link to connect manager", "Manage queue"); + } + + MouseArea { + anchors.fill: manageQueueLabel; + hoverEnabled: true; + onClicked: Cura.MachineManager.printerOutputDevices[0].openPrintJobControlPanel(); + onEntered: manageQueueLabel.font.underline = true; + onExited: manageQueueLabel.font.underline = false; + } + + Label { + id: queuedLabel; + anchors { + left: queuedPrintJobs.left; + leftMargin: 3 * UM.Theme.getSize("default_margin").width + 5 * screenScaleFactor; + top: parent.top; + topMargin: 2 * UM.Theme.getSize("default_margin").height; + } + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("large"); + text: catalog.i18nc("@label", "Queued"); + } + + Column { + id: skeletonLoader; + anchors { + bottom: parent.bottom; + bottomMargin: UM.Theme.getSize("default_margin").height; + horizontalCenter: parent.horizontalCenter; + top: queuedLabel.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + } + visible: !queuedPrintJobs.visible; + width: Math.min(800 * screenScaleFactor, maximumWidth); + + PrintJobInfoBlock { + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; } + printJob: null; // Use as skeleton + } + + PrintJobInfoBlock { + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + } + printJob: null; // Use as skeleton } } - PrinterVideoStream - { - visible: OutputDevice.activeCamera != null - anchors.fill: parent - camera: OutputDevice.activeCamera + ScrollView { + id: queuedPrintJobs; + anchors { + top: queuedLabel.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + horizontalCenter: parent.horizontalCenter; + bottomMargin: UM.Theme.getSize("default_margin").height; + bottom: parent.bottom; + } + style: UM.Theme.styles.scrollview; + visible: OutputDevice.receivedPrintJobs; + width: Math.min(800 * screenScaleFactor, maximumWidth); + + ListView { + id: printJobList; + anchors.fill: parent; + delegate: PrintJobInfoBlock { + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + } + printJob: modelData; + } + model: OutputDevice.queuedPrintJobs; + spacing: UM.Theme.getSize("default_margin").height - 2 * UM.Theme.getSize("monitor_shadow_radius").width; + } } - onVisibleChanged: - { - if (monitorFrame != null && !monitorFrame.visible) - { - OutputDevice.setActiveCamera(null) - } + PrinterVideoStream { + anchors.fill: parent; + cameraUrl: OutputDevice.activeCameraUrl; + visible: OutputDevice.activeCameraUrl != ""; } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml index b5b80a3010..58443115a9 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml @@ -1,3 +1,6 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + import UM 1.2 as UM import Cura 1.0 as Cura diff --git a/plugins/UM3NetworkPrinting/resources/qml/HorizontalLine.qml b/plugins/UM3NetworkPrinting/resources/qml/HorizontalLine.qml new file mode 100644 index 0000000000..aeb92697ad --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/HorizontalLine.qml @@ -0,0 +1,12 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Controls 2.0 +import UM 1.3 as UM + +Rectangle { + color: UM.Theme.getColor("monitor_lining_light"); // TODO: Maybe theme separately? Maybe not. + height: UM.Theme.getSize("default_lining").height; + width: parent.width; +} \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml index bbbc3feee6..41b3a93a7b 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorItem.qml @@ -1,54 +1,45 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.2 - - import UM 1.3 as UM import Cura 1.0 as Cura -Component -{ - Item - { - width: maximumWidth - height: maximumHeight - Image - { - id: cameraImage - width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth) - height: Math.floor((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width) - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - z: 1 - Component.onCompleted: - { - if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null) - { - OutputDevice.activePrinter.camera.start() +Component { + Item { + height: maximumHeight; + width: maximumWidth; + + Cura.NetworkMJPGImage { + id: cameraImage; + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + Component.onCompleted: { + if (OutputDevice.activePrinter != null && OutputDevice.activePrinter.cameraUrl != null) { + cameraImage.start(); } } - onVisibleChanged: - { - if(visible) - { - if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null) - { - OutputDevice.activePrinter.camera.start() + height: Math.floor((imageHeight === 0 ? 600 * screenScaleFactor : imageHeight) * width / imageWidth); + onVisibleChanged: { + if (visible) { + if (OutputDevice.activePrinter != null && OutputDevice.activePrinter.cameraUrl != null) { + cameraImage.start(); } - } else - { - if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null) - { - OutputDevice.activePrinter.camera.stop() + } else { + if (OutputDevice.activePrinter != null && OutputDevice.activePrinter.cameraUrl != null) { + cameraImage.stop(); } } } - source: - { - if(OutputDevice.activePrinter != null && OutputDevice.activePrinter.camera != null && OutputDevice.activePrinter.camera.latestImage) - { - return OutputDevice.activePrinter.camera.latestImage; + source: { + if (OutputDevice.activePrinter != null && OutputDevice.activePrinter.cameraUrl != null) { + return OutputDevice.activePrinter.cameraUrl; } - return ""; } + width: Math.min(imageWidth === 0 ? 800 * screenScaleFactor : imageWidth, maximumWidth); + z: 1; } } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintCoreConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintCoreConfiguration.qml index b2f4e85f9a..7bcd9ce6e4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintCoreConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintCoreConfiguration.qml @@ -1,93 +1,121 @@ +// 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.4 import QtQuick.Controls.Styles 1.4 - import UM 1.2 as UM +Item { + id: extruderInfo; + property var printCoreConfiguration: null; + height: childrenRect.height; + width: Math.round(parent.width / 2); -Item -{ - id: extruderInfo - property var printCoreConfiguration + // Extruder circle + Item { + id: extruderCircle; + height: UM.Theme.getSize("monitor_extruder_circle").height; + width: UM.Theme.getSize("monitor_extruder_circle").width; - width: Math.round(parent.width / 2) - height: childrenRect.height + // Loading skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill"); + radius: Math.round(width / 2); + visible: !printCoreConfiguration; + } - Item - { - id: extruderCircle - width: 30 - height: 30 - - anchors.verticalCenter: printAndMaterialLabel.verticalCenter - opacity: - { - if(printCoreConfiguration == null || printCoreConfiguration.activeMaterial == null || printCoreConfiguration.hotendID == null) - { - return 0.5 + // Actual content + Rectangle { + anchors.fill: parent; + border.width: UM.Theme.getSize("monitor_thick_lining").width; + border.color: UM.Theme.getColor("monitor_lining_heavy"); + color: "transparent"; + opacity: { + if (printCoreConfiguration == null || printCoreConfiguration.activeMaterial == null || printCoreConfiguration.hotendID == null) { + return 0.5; + } + return 1; } - return 1 - } + radius: Math.round(width / 2); + visible: printCoreConfiguration; - Rectangle - { - anchors.fill: parent - radius: Math.round(width / 2) - border.width: 2 - border.color: "black" - } - - Label - { - anchors.centerIn: parent - font: UM.Theme.getFont("default_bold") - text: printCoreConfiguration.position + 1 + Label { + anchors.centerIn: parent; + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default_bold"); + text: printCoreConfiguration ? printCoreConfiguration.position + 1 : 0; + } } } - Item - { - id: printAndMaterialLabel - anchors - { - right: parent.right - left: extruderCircle.right - margins: UM.Theme.getSize("default_margin").width + // Print core and material labels + Item { + id: materialLabel + anchors { + left: extruderCircle.right; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + top: parent.top; } - height: childrenRect.height + height: UM.Theme.getSize("monitor_text_line").height; - Label - { - id: materialLabel - text: - { - if(printCoreConfiguration != undefined && printCoreConfiguration.activeMaterial != undefined) - { - return printCoreConfiguration.activeMaterial.name - } - return "" - } - font: UM.Theme.getFont("default") - elide: Text.ElideRight - width: parent.width + // Loading skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill"); + visible: !extruderInfo.printCoreConfiguration; } - Label - { - id: printCoreLabel - text: - { - if(printCoreConfiguration != undefined && printCoreConfiguration.hotendID != undefined) - { - return printCoreConfiguration.hotendID + // Actual content + Label { + anchors.fill: parent; + elide: Text.ElideRight; + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default"); + text: { + if (printCoreConfiguration && printCoreConfiguration.activeMaterial != undefined) { + return printCoreConfiguration.activeMaterial.name; } - return "" + return ""; } - anchors.top: materialLabel.bottom - elide: Text.ElideRight - width: parent.width - opacity: 0.6 - font: UM.Theme.getFont("default") + visible: extruderInfo.printCoreConfiguration; + } + } + + Item { + id: printCoreLabel; + anchors { + left: extruderCircle.right; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + top: materialLabel.bottom; + topMargin: Math.floor(UM.Theme.getSize("default_margin").height/4); + } + height: UM.Theme.getSize("monitor_text_line").height; + + // Loading skeleton + Rectangle { + color: UM.Theme.getColor("monitor_skeleton_fill"); + height: parent.height; + visible: !extruderInfo.printCoreConfiguration; + width: Math.round(parent.width / 3); + } + + // Actual content + Label { + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + opacity: 0.6; + text: { + if (printCoreConfiguration != undefined && printCoreConfiguration.hotendID != undefined) { + return printCoreConfiguration.hotendID; + } + return ""; + } + visible: extruderInfo.printCoreConfiguration; } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml new file mode 100644 index 0000000000..11bc913d06 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -0,0 +1,273 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Dialogs 1.1 +import QtGraphicalEffects 1.0 +import UM 1.3 as UM + +Item { + id: root; + property var printJob: null; + property var started: isStarted(printJob); + property var assigned: isAssigned(printJob); + + Button { + id: button; + background: Rectangle { + color: UM.Theme.getColor("viewport_background"); // TODO: Theme! + height: button.height; + opacity: button.down || button.hovered ? 1 : 0; + radius: Math.round(0.5 * width); + width: button.width; + } + contentItem: Label { + color: UM.Theme.getColor("monitor_context_menu_dots"); + font.pixelSize: 25 * screenScaleFactor; + horizontalAlignment: Text.AlignHCenter; + text: button.text; + verticalAlignment: Text.AlignVCenter; + } + height: width; + hoverEnabled: true; + onClicked: parent.switchPopupState(); + text: "\u22EE"; //Unicode; Three stacked points. + visible: { + if (!printJob) { + return false; + } + var states = ["queued", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"]; + return states.indexOf(printJob.state) !== -1; + } + width: 35 * screenScaleFactor; // TODO: Theme! + } + + Popup { + id: popup; + background: Item { + anchors.fill: parent; + + DropShadow { + anchors.fill: pointedRectangle; + color: UM.Theme.getColor("monitor_shadow"); + radius: UM.Theme.getSize("monitor_shadow_radius").width; + source: pointedRectangle; + transparentBorder: true; + verticalOffset: 2 * screenScaleFactor; + } + + Item { + id: pointedRectangle; + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + height: parent.height - 10 * screenScaleFactor; // Because of the shadow + width: parent.width - 10 * screenScaleFactor; // Because of the shadow + + Rectangle { + id: point; + anchors { + right: bloop.right; + rightMargin: 24 * screenScaleFactor; + } + color: UM.Theme.getColor("monitor_context_menu_background"); + height: 14 * screenScaleFactor; + transform: Rotation { + angle: 45; + } + width: 14 * screenScaleFactor; + y: 1 * screenScaleFactor; + } + + Rectangle { + id: bloop; + anchors { + bottom: parent.bottom; + bottomMargin: 8 * screenScaleFactor; // Because of the shadow + top: parent.top; + topMargin: 8 * screenScaleFactor; // Because of the shadow + point + } + color: UM.Theme.getColor("monitor_context_menu_background"); + width: parent.width; + } + } + } + clip: true; + closePolicy: Popup.CloseOnPressOutside; + contentItem: Column { + id: popupOptions; + anchors { + top: parent.top; + topMargin: UM.Theme.getSize("default_margin").height + 10 * screenScaleFactor; // Account for the point of the box + } + height: childrenRect.height + spacing * popupOptions.children.length + UM.Theme.getSize("default_margin").height; + spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2); + width: parent.width; + + PrintJobContextMenuItem { + onClicked: { + sendToTopConfirmationDialog.visible = true; + popup.close(); + } + text: catalog.i18nc("@label", "Move to top"); + visible: { + if (printJob && printJob.state == "queued" && !assigned) { + if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { + return OutputDevice.queuedPrintJobs[0].key != printJob.key; + } + } + return false; + } + } + + PrintJobContextMenuItem { + onClicked: { + deleteConfirmationDialog.visible = true; + popup.close(); + } + text: catalog.i18nc("@label", "Delete"); + visible: { + if (!printJob) { + return false; + } + var states = ["queued", "sent_to_printer"]; + return states.indexOf(printJob.state) !== -1; + } + } + + PrintJobContextMenuItem { + enabled: visible && !(printJob.state == "pausing" || printJob.state == "resuming"); + onClicked: { + if (printJob.state == "paused") { + printJob.setState("print"); + popup.close(); + return; + } + if (printJob.state == "printing") { + printJob.setState("pause"); + popup.close(); + return; + } + } + text: { + if (!printJob) { + return ""; + } + switch(printJob.state) { + case "paused": + return catalog.i18nc("@label", "Resume"); + case "pausing": + return catalog.i18nc("@label", "Pausing..."); + case "resuming": + return catalog.i18nc("@label", "Resuming..."); + default: + catalog.i18nc("@label", "Pause"); + } + } + visible: { + if (!printJob) { + return false; + } + var states = ["printing", "pausing", "paused", "resuming"]; + return states.indexOf(printJob.state) !== -1; + } + } + + PrintJobContextMenuItem { + enabled: visible && printJob.state !== "aborting"; + onClicked: { + abortConfirmationDialog.visible = true; + popup.close(); + } + text: printJob.state == "aborting" ? catalog.i18nc("@label", "Aborting...") : catalog.i18nc("@label", "Abort"); + visible: { + if (!printJob) { + return false; + } + var states = ["pre_print", "printing", "pausing", "paused", "resuming"]; + return states.indexOf(printJob.state) !== -1; + } + } + } + enter: Transition { + NumberAnimation { + duration: 75; + property: "visible"; + } + } + exit: Transition { + NumberAnimation { + duration: 75; + property: "visible"; + } + } + height: contentItem.height + 2 * padding; + onClosed: visible = false; + onOpened: visible = true; + padding: UM.Theme.getSize("monitor_shadow_radius").width; + transformOrigin: Popup.Top; + visible: false; + width: 182 * screenScaleFactor; + x: (button.width - width) + 26 * screenScaleFactor; + y: button.height + 5 * screenScaleFactor; // Because shadow + } + + MessageDialog { + id: sendToTopConfirmationDialog; + Component.onCompleted: visible = false; + icon: StandardIcon.Warning; + onYes: OutputDevice.sendJobToTop(printJob.key); + standardButtons: StandardButton.Yes | StandardButton.No; + text: printJob && printJob.name ? catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to move %1 to the top of the queue?").arg(printJob.name) : ""; + title: catalog.i18nc("@window:title", "Move print job to top"); + } + + MessageDialog { + id: deleteConfirmationDialog; + Component.onCompleted: visible = false; + icon: StandardIcon.Warning; + onYes: OutputDevice.deleteJobFromQueue(printJob.key); + standardButtons: StandardButton.Yes | StandardButton.No; + text: printJob && printJob.name ? catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to delete %1?").arg(printJob.name) : ""; + title: catalog.i18nc("@window:title", "Delete print job"); + } + + MessageDialog { + id: abortConfirmationDialog; + Component.onCompleted: visible = false; + icon: StandardIcon.Warning; + onYes: printJob.setState("abort"); + standardButtons: StandardButton.Yes | StandardButton.No; + text: printJob && printJob.name ? catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to abort %1?").arg(printJob.name) : ""; + title: catalog.i18nc("@window:title", "Abort print"); + } + + // Utils + function switchPopupState() { + popup.visible ? popup.close() : popup.open(); + } + function isStarted(job) { + if (!job) { + return false; + } + return ["pre_print", "printing", "pausing", "paused", "resuming", "aborting"].indexOf(job.state) !== -1; + } + function isAssigned(job) { + if (!job) { + return false; + } + return job.assignedPrinter ? true : false; + } + function getMenuLength() { + var visible = 0; + for (var i = 0; i < popupOptions.children.length; i++) { + if (popupOptions.children[i].visible) { + visible++; + } + } + return visible; + } +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml new file mode 100644 index 0000000000..eea8fac3e1 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml @@ -0,0 +1,23 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.4 +import UM 1.3 as UM + +Button { + background: Rectangle { + opacity: parent.down || parent.hovered ? 1 : 0; + color: UM.Theme.getColor("monitor_context_menu_highlight"); + } + contentItem: Label { + color: enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_inactive"); + text: parent.text + horizontalAlignment: Text.AlignLeft; + verticalAlignment: Text.AlignVCenter; + } + 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/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index cfadabad5c..a611cb4ff6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -1,429 +1,505 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.2 import QtQuick.Dialogs 1.1 import QtQuick.Controls 2.0 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.0 - +import QtQuick.Layouts 1.1 +import QtQuick.Dialogs 1.1 import UM 1.3 as UM +Item { + id: root; + property var shadowRadius: UM.Theme.getSize("monitor_shadow_radius").width; + property var shadowOffset: 2 * screenScaleFactor; + property var debug: false; + property var printJob: null; + width: parent.width; // Bubbles downward + height: childrenRect.height + shadowRadius * 2; // Bubbles upward -Item -{ - id: base - property var printJob: null - property var shadowRadius: 5 * screenScaleFactor - function getPrettyTime(time) - { - return OutputDevice.formatDuration(time) + UM.I18nCatalog { + id: catalog; + name: "cura"; } - width: parent.width - - UM.I18nCatalog - { - id: catalog - name: "cura" - } - - Rectangle - { - id: background - anchors - { - top: parent.top - topMargin: 3 * screenScaleFactor - left: parent.left - leftMargin: base.shadowRadius - rightMargin: base.shadowRadius - right: parent.right - bottom: parent.bottom - bottomMargin: base.shadowRadius + // The actual card (white block) + Rectangle { + // 5px margin, but shifted 2px vertically because of the shadow + anchors { + bottomMargin: root.shadowRadius + root.shadowOffset; + leftMargin: root.shadowRadius; + rightMargin: root.shadowRadius; + topMargin: root.shadowRadius - root.shadowOffset; } - + color: UM.Theme.getColor("monitor_card_background"); + height: childrenRect.height; layer.enabled: true - layer.effect: DropShadow - { - radius: base.shadowRadius + layer.effect: DropShadow { + radius: root.shadowRadius verticalOffset: 2 * screenScaleFactor - color: "#3F000000" // 25% shadow + color: "#3F000000" // 25% shadow } + width: parent.width - shadowRadius * 2; - Item - { - // Content on the left of the infobox - anchors - { - top: parent.top - bottom: parent.bottom - left: parent.left - right: parent.horizontalCenter - margins: UM.Theme.getSize("wide_margin").width - rightMargin: UM.Theme.getSize("default_margin").width - } + Column { + height: childrenRect.height; + width: parent.width; - Label - { - id: printJobName - text: printJob.name - font: UM.Theme.getFont("default_bold") - width: parent.width - elide: Text.ElideRight - } + // Main content + Item { + id: mainContent; + height: 200 * screenScaleFactor; // TODO: Theme! + width: parent.width; - Label - { - id: ownerName - anchors.top: printJobName.bottom - text: printJob.owner - font: UM.Theme.getFont("default") - opacity: 0.6 - width: parent.width - elide: Text.ElideRight - } - - Image - { - id: printJobPreview - source: printJob.previewImageUrl - anchors.top: ownerName.bottom - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: totalTimeLabel.bottom - width: height - opacity: printJob.state == "error" ? 0.5 : 1.0 - } - - UM.RecolorImage - { - id: statusImage - anchors.centerIn: printJobPreview - source: printJob.state == "error" ? "../svg/aborted-icon.svg" : "" - visible: source != "" - width: 0.5 * printJobPreview.width - height: 0.5 * printJobPreview.height - sourceSize.width: width - sourceSize.height: height - color: "black" - } - - Label - { - id: totalTimeLabel - anchors.bottom: parent.bottom - anchors.right: parent.right - font: UM.Theme.getFont("default") - text: printJob != null ? getPrettyTime(printJob.timeTotal) : "" - elide: Text.ElideRight - } - } - - Item - { - // Content on the right side of the infobox. - anchors - { - top: parent.top - bottom: parent.bottom - left: parent.horizontalCenter - right: parent.right - margins: 2 * UM.Theme.getSize("default_margin").width - leftMargin: UM.Theme.getSize("default_margin").width - rightMargin: UM.Theme.getSize("default_margin").width / 2 - } - - Label - { - id: targetPrinterLabel - elide: Text.ElideRight - font: UM.Theme.getFont("default_bold") - text: - { - if(printJob.assignedPrinter == null) - { - if(printJob.state == "error") - { - return catalog.i18nc("@label", "Waiting for: Unavailable printer") - } - return catalog.i18nc("@label", "Waiting for: First available") - } - else - { - return catalog.i18nc("@label", "Waiting for: ") + printJob.assignedPrinter.name + // Left content + Item { + anchors { + bottom: parent.bottom; + left: parent.left; + margins: UM.Theme.getSize("wide_margin").width; + right: parent.horizontalCenter; + top: parent.top; } - } + Item { + id: printJobName; + width: parent.width; + height: UM.Theme.getSize("monitor_text_line").height; - anchors - { - left: parent.left - right: contextButton.left - rightMargin: UM.Theme.getSize("default_margin").width - } - } - - - function switchPopupState() - { - popup.visible ? popup.close() : popup.open() - } - - Button - { - id: contextButton - text: "\u22EE" //Unicode; Three stacked points. - width: 35 - height: width - anchors - { - right: parent.right - top: parent.top - } - hoverEnabled: true - - background: Rectangle - { - opacity: contextButton.down || contextButton.hovered ? 1 : 0 - width: contextButton.width - height: contextButton.height - radius: 0.5 * width - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: contextButton.text - color: UM.Theme.getColor("monitor_text_inactive") - font.pixelSize: 25 - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - } - - onClicked: parent.switchPopupState() - } - - Popup - { - // TODO Change once updating to Qt5.10 - The 'opened' property is in 5.10 but the behavior is now implemented with the visible property - id: popup - clip: true - closePolicy: Popup.CloseOnPressOutside - x: (parent.width - width) + 26 * screenScaleFactor - y: contextButton.height - 5 * screenScaleFactor // Because shadow - width: 182 * screenScaleFactor - height: contentItem.height + 2 * padding - visible: false - padding: 5 * screenScaleFactor // Because shadow - - transformOrigin: Popup.Top - contentItem: Item - { - width: popup.width - height: childrenRect.height + 36 * screenScaleFactor - anchors.topMargin: 10 * screenScaleFactor - anchors.bottomMargin: 10 * screenScaleFactor - Button - { - id: sendToTopButton - text: catalog.i18nc("@label", "Move to top") - onClicked: - { - sendToTopConfirmationDialog.visible = true; - popup.close(); + Rectangle { + color: UM.Theme.getColor("monitor_skeleton_fill"); + height: parent.height; + visible: !printJob; + width: Math.round(parent.width / 3); } - width: parent.width - enabled: OutputDevice.queuedPrintJobs[0].key != printJob.key - visible: enabled - anchors.top: parent.top - anchors.topMargin: 18 * screenScaleFactor - height: visible ? 39 * screenScaleFactor : 0 * screenScaleFactor - hoverEnabled: true - background: Rectangle - { - opacity: sendToTopButton.down || sendToTopButton.hovered ? 1 : 0 - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: sendToTopButton.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter + Label { + anchors.fill: parent; + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default_bold"); + text: printJob && printJob.name ? printJob.name : ""; // Supress QML warnings + visible: printJob; } } - MessageDialog - { - id: sendToTopConfirmationDialog - title: catalog.i18nc("@window:title", "Move print job to top") - icon: StandardIcon.Warning - text: catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to move %1 to the top of the queue?").arg(printJob.name) - standardButtons: StandardButton.Yes | StandardButton.No - Component.onCompleted: visible = false - onYes: OutputDevice.sendJobToTop(printJob.key) - } + Item { + id: printJobOwnerName; + anchors { + top: printJobName.bottom; + topMargin: Math.floor(UM.Theme.getSize("default_margin").height / 2); + } + height: UM.Theme.getSize("monitor_text_line").height; + width: parent.width; - Button - { - id: deleteButton - text: catalog.i18nc("@label", "Delete") - onClicked: - { - deleteConfirmationDialog.visible = true; - popup.close(); + Rectangle { + color: UM.Theme.getColor("monitor_skeleton_fill"); + height: parent.height; + visible: !printJob; + width: Math.round(parent.width / 2); } - width: parent.width - height: 39 * screenScaleFactor - anchors.top: sendToTopButton.bottom - hoverEnabled: true - background: Rectangle - { - opacity: deleteButton.down || deleteButton.hovered ? 1 : 0 - color: UM.Theme.getColor("viewport_background") - } - contentItem: Label - { - text: deleteButton.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter + Label { + anchors.fill: parent; + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + text: printJob ? printJob.owner : ""; // Supress QML warnings + visible: printJob; } } - MessageDialog - { - id: deleteConfirmationDialog - title: catalog.i18nc("@window:title", "Delete print job") - icon: StandardIcon.Warning - text: catalog.i18nc("@label %1 is the name of a print job.", "Are you sure you want to delete %1?").arg(printJob.name) - standardButtons: StandardButton.Yes | StandardButton.No - Component.onCompleted: visible = false - onYes: OutputDevice.deleteJobFromQueue(printJob.key) + Item { + id: printJobPreview; + property var useUltibot: false; + anchors { + bottom: parent.bottom; + horizontalCenter: parent.horizontalCenter; + top: printJobOwnerName.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + } + width: height; + + // Skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill"); + radius: UM.Theme.getSize("default_margin").width; + visible: !printJob; + } + + // Actual content + Image { + id: previewImage; + anchors.fill: parent; + opacity: printJob && printJob.state == "error" ? 0.5 : 1.0; + source: printJob ? printJob.previewImageUrl : ""; + visible: printJob; + } + + UM.RecolorImage { + id: ultiBotImage; + + anchors.centerIn: printJobPreview; + color: UM.Theme.getColor("monitor_placeholder_image"); + height: printJobPreview.height; + source: "../svg/ultibot.svg"; + sourceSize { + height: height; + width: width; + } + /* Since print jobs ALWAYS have an image url, we have to check if that image URL errors or + not in order to determine if we show the placeholder (ultibot) image instead. */ + visible: printJob && previewImage.status == Image.Error; + width: printJobPreview.width; + } + + UM.RecolorImage { + id: statusImage; + anchors.centerIn: printJobPreview; + color: UM.Theme.getColor("monitor_image_overlay"); + height: 0.5 * printJobPreview.height; + source: printJob && printJob.state == "error" ? "../svg/aborted-icon.svg" : ""; + sourceSize { + height: height; + width: width; + } + visible: source != ""; + width: 0.5 * printJobPreview.width; + } + } + + Label { + id: totalTimeLabel; + anchors { + bottom: parent.bottom; + right: parent.right; + } + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""; } } - background: Item - { - width: popup.width - height: popup.height + // Divider + Rectangle { + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + color: !printJob ? UM.Theme.getColor("monitor_skeleton_fill") : UM.Theme.getColor("monitor_lining_light"); + height: parent.height - 2 * UM.Theme.getSize("default_margin").height; + width: UM.Theme.getSize("default_lining").width; + } - DropShadow - { - anchors.fill: pointedRectangle - radius: 5 - color: "#3F000000" // 25% shadow - source: pointedRectangle - transparentBorder: true - verticalOffset: 2 + // Right content + Item { + anchors { + bottom: parent.bottom; + left: parent.horizontalCenter; + margins: UM.Theme.getSize("wide_margin").width; + right: parent.right; + top: parent.top; } - Item - { - id: pointedRectangle - width: parent.width - 10 * screenScaleFactor // Because of the shadow - height: parent.height - 10 * screenScaleFactor // Because of the shadow - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter + Item { + id: targetPrinterLabel; + height: UM.Theme.getSize("monitor_text_line").height; + width: parent.width; - Rectangle - { - id: point - height: 14 * screenScaleFactor - width: 14 * screenScaleFactor - color: UM.Theme.getColor("setting_control") - transform: Rotation { angle: 45} - anchors.right: bloop.right - anchors.rightMargin: 24 - y: 1 + Rectangle { + visible: !printJob; + color: UM.Theme.getColor("monitor_skeleton_fill"); + anchors.fill: parent; } - Rectangle - { - id: bloop - color: UM.Theme.getColor("setting_control") - width: parent.width - anchors.top: parent.top - anchors.topMargin: 8 * screenScaleFactor // Because of the shadow + point - anchors.bottom: parent.bottom - anchors.bottomMargin: 8 * screenScaleFactor // Because of the shadow + Label { + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default_bold"); + text: { + if (printJob !== null) { + if (printJob.assignedPrinter == null) { + if (printJob.state == "error") { + return catalog.i18nc("@label", "Waiting for: Unavailable printer"); + } + return catalog.i18nc("@label", "Waiting for: First available"); + } else { + return catalog.i18nc("@label", "Waiting for: ") + printJob.assignedPrinter.name; + } + } + return ""; + } + visible: printJob; + } + } + + PrinterInfoBlock { + anchors.bottom: parent.bottom; + printer: root.printJon && root.printJob.assignedPrinter; + printJob: root.printJob; + } + } + + PrintJobContextMenu { + id: contextButton; + anchors { + right: mainContent.right; + rightMargin: UM.Theme.getSize("default_margin").width * 3 + root.shadowRadius; + top: mainContent.top; + topMargin: UM.Theme.getSize("default_margin").height; + } + printJob: root.printJob; + visible: root.printJob; + } + } + + Item { + id: configChangesBox; + height: childrenRect.height; + visible: printJob && printJob.configurationChanges.length !== 0; + width: parent.width; + + // Config change toggle + Rectangle { + id: configChangeToggle; + color: { + if (configChangeToggleArea.containsMouse) { + return UM.Theme.getColor("viewport_background"); // TODO: Theme! + } else { + return "transparent"; + } + } + width: parent.width; + height: UM.Theme.getSize("default_margin").height * 4; // TODO: Theme! + anchors { + left: parent.left; + right: parent.right; + top: parent.top; + } + + Rectangle { + color: !printJob ? UM.Theme.getColor("monitor_skeleton_fill") : UM.Theme.getColor("monitor_lining_light"); + height: UM.Theme.getSize("default_lining").height; + width: parent.width; + } + + UM.RecolorImage { + anchors { + right: configChangeToggleLabel.left; + rightMargin: UM.Theme.getSize("default_margin").width; + verticalCenter: parent.verticalCenter; + } + color: UM.Theme.getColor("text"); + height: 23 * screenScaleFactor; // TODO: Theme! + source: "../svg/warning-icon.svg"; + sourceSize { + height: height; + width: width; + } + width: 23 * screenScaleFactor; // TODO: Theme! + } + + Label { + id: configChangeToggleLabel; + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default"); + text: catalog.i18nc("@label", "Configuration change"); + } + + UM.RecolorImage { + anchors { + left: configChangeToggleLabel.right; + leftMargin: UM.Theme.getSize("default_margin").width; + verticalCenter: parent.verticalCenter; + } + color: UM.Theme.getColor("text"); + height: 15 * screenScaleFactor; // TODO: Theme! + source: { + if (configChangeDetails.visible) { + return UM.Theme.getIcon("arrow_top"); + } else { + return UM.Theme.getIcon("arrow_bottom"); + } + } + sourceSize { + width: width; + height: height; + } + width: 15 * screenScaleFactor; // TODO: Theme! + } + + MouseArea { + id: configChangeToggleArea; + anchors.fill: parent; + hoverEnabled: true; + onClicked: { + configChangeDetails.visible = !configChangeDetails.visible; } } } - exit: Transition - { - // This applies a default NumberAnimation to any changes a state change makes to x or y properties - NumberAnimation { property: "visible"; duration: 75; } - } - enter: Transition - { - // This applies a default NumberAnimation to any changes a state change makes to x or y properties - NumberAnimation { property: "visible"; duration: 75; } - } + // Config change details + Item { + id: configChangeDetails; + anchors.top: configChangeToggle.bottom; + Behavior on height { NumberAnimation { duration: 100 } } + // In case of really massive multi-line configuration changes + height: visible ? Math.max(UM.Theme.getSize("monitor_config_override_box").height, childrenRect.height) : 0; + visible: false; + width: parent.width; - onClosed: visible = false - onOpened: visible = true - } + Item { + anchors { + bottomMargin: UM.Theme.getSize("wide_margin").height; + fill: parent; + leftMargin: UM.Theme.getSize("wide_margin").height * 4; + rightMargin: UM.Theme.getSize("wide_margin").height * 4; + topMargin: UM.Theme.getSize("wide_margin").height; + } + clip: true; - Row - { - id: printerFamilyPills - spacing: 0.5 * UM.Theme.getSize("default_margin").width - anchors - { - left: parent.left - right: parent.right - bottom: extrudersInfo.top - bottomMargin: UM.Theme.getSize("default_margin").height - } - height: childrenRect.height - Repeater - { - model: printJob.compatibleMachineFamilies + Label { + anchors.fill: parent; + elide: Text.ElideRight; + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default"); + text: { + if (!printJob || printJob.configurationChanges.length === 0) { + return ""; + } + var topLine; + if (materialsAreKnown(printJob)) { + topLine = catalog.i18nc("@label", "The assigned printer, %1, requires the following configuration change(s):").arg(printJob.assignedPrinter.name); + } else { + topLine = catalog.i18nc("@label", "The printer %1 is assigned, but the job contains an unknown material configuration.").arg(printJob.assignedPrinter.name); + } + var result = "

" + topLine +"

"; + for (var i = 0; i < printJob.configurationChanges.length; i++) { + var change = printJob.configurationChanges[i]; + var text; + switch (change.typeOfChange) { + case "material_change": + text = catalog.i18nc("@label", "Change material %1 from %2 to %3.").arg(change.index + 1).arg(change.originName).arg(change.targetName); + break; + case "material_insert": + text = catalog.i18nc("@label", "Load %3 as material %1 (This cannot be overridden).").arg(change.index + 1).arg(change.targetName); + break; + case "print_core_change": + text = catalog.i18nc("@label", "Change print core %1 from %2 to %3.").arg(change.index + 1).arg(change.originName).arg(change.targetName); + break; + case "buildplate_change": + text = catalog.i18nc("@label", "Change build plate to %1 (This cannot be overridden).").arg(formatBuildPlateType(change.target_name)); + break; + default: + text = ""; + } + result += "

" + text + "

"; + } + return result; + } + wrapMode: Text.WordWrap; + } - delegate: PrinterFamilyPill - { - text: modelData - color: UM.Theme.getColor("viewport_background") - padding: 3 * screenScaleFactor + Button { + anchors { + bottom: parent.bottom; + left: parent.left; + } + background: Rectangle { + border { + color: UM.Theme.getColor("monitor_lining_heavy"); + width: UM.Theme.getSize("default_lining").width; + } + color: parent.hovered ? UM.Theme.getColor("monitor_card_background_inactive") : UM.Theme.getColor("monitor_card_background"); + implicitHeight: UM.Theme.getSize("default_margin").height * 3; + implicitWidth: UM.Theme.getSize("default_margin").height * 8; + } + contentItem: Label { + color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("medium"); + horizontalAlignment: Text.AlignHCenter; + text: parent.text; + verticalAlignment: Text.AlignVCenter; + } + onClicked: { + overrideConfirmationDialog.visible = true; + } + text: catalog.i18nc("@label", "Override"); + visible: { + if (printJob && printJob.configurationChanges) { + var length = printJob.configurationChanges.length; + for (var i = 0; i < length; i++) { + var typeOfChange = printJob.configurationChanges[i].typeOfChange; + if (typeOfChange === "material_insert" || typeOfChange === "buildplate_change") { + return false; + } + } + } + return true; + } + } } } - } - // PrintCore && Material config - Row - { - id: extrudersInfo - anchors.bottom: parent.bottom - anchors - { - left: parent.left - right: parent.right - } - height: childrenRect.height - - spacing: UM.Theme.getSize("default_margin").width - - PrintCoreConfiguration - { - id: leftExtruderInfo - width: Math.round(parent.width / 2) * screenScaleFactor - printCoreConfiguration: printJob.configuration.extruderConfigurations[0] - } - - PrintCoreConfiguration - { - id: rightExtruderInfo - width: Math.round(parent.width / 2) * screenScaleFactor - printCoreConfiguration: printJob.configuration.extruderConfigurations[1] + MessageDialog { + id: overrideConfirmationDialog; + Component.onCompleted: visible = false; + icon: StandardIcon.Warning; + onYes: OutputDevice.forceSendJob(printJob.key); + standardButtons: StandardButton.Yes | StandardButton.No; + text: { + if (!printJob) { + return ""; + } + var printJobName = formatPrintJobName(printJob.name); + var confirmText = catalog.i18nc("@label", "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?").arg(printJobName); + return confirmText; + } + title: catalog.i18nc("@window:title", "Override configuration configuration and start print"); } } - - } - - Rectangle - { - color: UM.Theme.getColor("viewport_background") - width: 2 * screenScaleFactor - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.margins: UM.Theme.getSize("default_margin").height - anchors.horizontalCenter: parent.horizontalCenter } } -} \ No newline at end of file + // Utils + function formatPrintJobName(name) { + var extensions = [ ".gz", ".gcode", ".ufp" ]; + for (var i = 0; i < extensions.length; i++) { + var extension = extensions[i]; + if (name.slice(-extension.length) === extension) { + name = name.substring(0, name.length - extension.length); + } + } + return name; + } + function materialsAreKnown(job) { + var conf0 = job.configuration[0]; + if (conf0 && !conf0.material.material) { + return false; + } + var conf1 = job.configuration[1]; + if (conf1 && !conf1.material.material) { + return false; + } + return true; + } + function formatBuildPlateType(buildPlateType) { + var translationText = ""; + switch (buildPlateType) { + case "glass": + translationText = catalog.i18nc("@label", "Glass"); + break; + case "aluminum": + translationText = catalog.i18nc("@label", "Aluminum"); + break; + default: + translationText = null; + } + return translationText; + } +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobPreview.qml new file mode 100644 index 0000000000..b1a73255f4 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobPreview.qml @@ -0,0 +1,75 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Dialogs 1.1 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.3 +import QtGraphicalEffects 1.0 +import QtQuick.Controls 1.4 as LegacyControls +import UM 1.3 as UM + +// Includes print job name, owner, and preview + +Item { + property var job: null; + property var useUltibot: false; + height: 100 * screenScaleFactor; + width: height; + + // Skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill"); + radius: UM.Theme.getSize("default_margin").width; + visible: !job; + } + + // Actual content + Image { + id: previewImage; + visible: job; + source: job ? job.previewImageUrl : ""; + opacity: { + if (job == null) { + return 1.0; + } + var states = ["wait_cleanup", "wait_user_action", "error", "paused"]; + if (states.indexOf(job.state) !== -1) { + return 0.5; + } + return 1.0; + } + anchors.fill: parent; + } + + UM.RecolorImage { + id: ultibotImage; + anchors.centerIn: parent; + color: UM.Theme.getColor("monitor_placeholder_image"); // TODO: Theme! + height: parent.height; + source: "../svg/ultibot.svg"; + sourceSize { + height: height; + width: width; + } + /* Since print jobs ALWAYS have an image url, we have to check if that image URL errors or + not in order to determine if we show the placeholder (ultibot) image instead. */ + visible: job && previewImage.status == Image.Error; + width: parent.width; + } + + UM.RecolorImage { + id: statusImage; + anchors.centerIn: parent; + color: "black"; // TODO: Theme! + height: Math.round(0.5 * parent.height); + source: job && job.state == "error" ? "../svg/aborted-icon.svg" : ""; + sourceSize { + height: height; + width: width; + } + visible: source != ""; + width: Math.round(0.5 * parent.width); + } +} \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobTitle.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobTitle.qml new file mode 100644 index 0000000000..f9f7b5ae87 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobTitle.qml @@ -0,0 +1,59 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Controls 2.0 +import UM 1.3 as UM + +Column { + property var job: null; + height: childrenRect.height; + spacing: Math.floor( UM.Theme.getSize("default_margin").height / 2); // TODO: Use explicit theme size + width: parent.width; + + Item { + id: jobName; + height: UM.Theme.getSize("monitor_text_line").height; + width: parent.width; + + // Skeleton loading + Rectangle { + color: UM.Theme.getColor("monitor_skeleton_fill"); + height: parent.height; + visible: !job; + width: Math.round(parent.width / 3); + } + + Label { + anchors.fill: parent; + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default_bold"); + text: job && job.name ? job.name : ""; + visible: job; + } + } + + Item { + id: ownerName; + height: UM.Theme.getSize("monitor_text_line").height; + width: parent.width; + + // Skeleton loading + Rectangle { + color: UM.Theme.getColor("monitor_skeleton_fill"); + height: parent.height; + visible: !job; + width: Math.round(parent.width / 2); + } + + Label { + anchors.fill: parent; + color: UM.Theme.getColor("text") + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + text: job ? job.owner : ""; + visible: job; + } + } +} \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index 9793b218fc..c2590e99a8 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -4,112 +4,100 @@ import QtQuick 2.2 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 - import UM 1.1 as UM -UM.Dialog -{ +UM.Dialog { id: base; - - minimumWidth: 500 * screenScaleFactor - minimumHeight: 140 * screenScaleFactor - maximumWidth: minimumWidth - maximumHeight: minimumHeight - width: minimumWidth - height: minimumHeight - - visible: true - modality: Qt.ApplicationModal - onVisibleChanged: - { - if(visible) - { - resetPrintersModel() - } - else - { - OutputDevice.cancelPrintSelection() - } - } - title: catalog.i18nc("@title:window", "Print over network") - - property var printersModel: ListModel{} - function resetPrintersModel() { - printersModel.clear() - printersModel.append({ name: "Automatic", key: ""}) - - for (var index in OutputDevice.printers) - { - printersModel.append({name: OutputDevice.printers[index].name, key: OutputDevice.printers[index].key}) - } - } - - Column - { - id: printerSelection - anchors.fill: parent - anchors.top: parent.top - anchors.topMargin: UM.Theme.getSize("default_margin").height - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.rightMargin: UM.Theme.getSize("default_margin").width - height: 50 * screenScaleFactor - Label - { - id: manualPrinterSelectionLabel - anchors - { - left: parent.left - topMargin: UM.Theme.getSize("default_margin").height - right: parent.right - } - text: catalog.i18nc("@label", "Printer selection") - wrapMode: Text.Wrap - height: 20 * screenScaleFactor - } - - ComboBox - { - id: printerSelectionCombobox - model: base.printersModel - textRole: "name" - - width: parent.width - height: 40 * screenScaleFactor - Behavior on height { NumberAnimation { duration: 100 } } - } - - SystemPalette - { - id: palette - } - - UM.I18nCatalog { id: catalog; name: "cura"; } - } - + height: minimumHeight; leftButtons: [ - Button - { - text: catalog.i18nc("@action:button","Cancel") - enabled: true + Button { + enabled: true; onClicked: { base.visible = false; - printerSelectionCombobox.currentIndex = 0 - OutputDevice.cancelPrintSelection() + printerSelectionCombobox.currentIndex = 0; + OutputDevice.cancelPrintSelection(); } + text: catalog.i18nc("@action:button","Cancel"); } ] - + maximumHeight: minimumHeight; + maximumWidth: minimumWidth; + minimumHeight: 140 * screenScaleFactor; + minimumWidth: 500 * screenScaleFactor; + modality: Qt.ApplicationModal; + onVisibleChanged: { + if (visible) { + resetPrintersModel(); + } else { + OutputDevice.cancelPrintSelection(); + } + } rightButtons: [ - Button - { - text: catalog.i18nc("@action:button","Print") - enabled: true + Button { + enabled: true; onClicked: { base.visible = false; - OutputDevice.selectPrinter(printerSelectionCombobox.model.get(printerSelectionCombobox.currentIndex).key) + OutputDevice.selectPrinter(printerSelectionCombobox.model.get(printerSelectionCombobox.currentIndex).key); // reset to defaults - printerSelectionCombobox.currentIndex = 0 + printerSelectionCombobox.currentIndex = 0; } + text: catalog.i18nc("@action:button","Print"); } ] + title: catalog.i18nc("@title:window", "Print over network"); + visible: true; + width: minimumWidth; + + Column { + id: printerSelection; + anchors { + fill: parent; + leftMargin: UM.Theme.getSize("default_margin").width; + rightMargin: UM.Theme.getSize("default_margin").width; + top: parent.top; + topMargin: UM.Theme.getSize("default_margin").height; + } + height: 50 * screenScaleFactor; + + SystemPalette { + id: palette; + } + + UM.I18nCatalog { + id: catalog; + name: "cura"; + } + + Label { + id: manualPrinterSelectionLabel; + anchors { + left: parent.left; + right: parent.right; + topMargin: UM.Theme.getSize("default_margin").height; + } + height: 20 * screenScaleFactor; + text: catalog.i18nc("@label", "Printer selection"); + wrapMode: Text.Wrap; + } + + ComboBox { + id: printerSelectionCombobox; + Behavior on height { NumberAnimation { duration: 100 } } + height: 40 * screenScaleFactor; + model: ListModel { + id: printersModel; + } + textRole: "name"; + width: parent.width; + } + } + + // Utils + function resetPrintersModel() { + printersModel.clear(); + printersModel.append({ name: "Automatic", key: ""}); + for (var index in OutputDevice.printers) { + printersModel.append({name: OutputDevice.printers[index].name, key: OutputDevice.printers[index].key}); + } + } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml new file mode 100644 index 0000000000..24beaf70fe --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml @@ -0,0 +1,241 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Dialogs 1.1 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.3 +import QtGraphicalEffects 1.0 +import UM 1.3 as UM + +Item { + id: root; + property var shadowRadius: UM.Theme.getSize("monitor_shadow_radius").width; + property var shadowOffset: UM.Theme.getSize("monitor_shadow_offset").width; + property var printer: null; + property var collapsed: true; + height: childrenRect.height + shadowRadius * 2; // Bubbles upward + width: parent.width; // Bubbles downward + + // The actual card (white block) + Rectangle { + // 5px margin, but shifted 2px vertically because of the shadow + anchors { + bottomMargin: root.shadowRadius + root.shadowOffset; + leftMargin: root.shadowRadius; + rightMargin: root.shadowRadius; + topMargin: root.shadowRadius - root.shadowOffset; + } + color: { + if (!printer) { + return UM.Theme.getColor("monitor_card_background_inactive"); + } + if (printer.state == "disabled") { + return UM.Theme.getColor("monitor_card_background_inactive"); + } else { + return UM.Theme.getColor("monitor_card_background"); + } + } + height: childrenRect.height; + layer.effect: DropShadow { + radius: root.shadowRadius; + verticalOffset: root.shadowOffset; + color: "#3F000000"; // 25% shadow + } + layer.enabled: true + width: parent.width - 2 * shadowRadius; + + Column { + id: cardContents; + height: childrenRect.height; + width: parent.width; + + // Main card + Item { + id: mainCard; + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + } + height: 60 * screenScaleFactor + 2 * UM.Theme.getSize("default_margin").height; + width: parent.width; + + // Machine icon + Item { + id: machineIcon; + anchors.verticalCenter: parent.verticalCenter; + height: parent.height - 2 * UM.Theme.getSize("default_margin").width; + width: height; + + // Skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill_dark"); + radius: UM.Theme.getSize("default_margin").width; + visible: !printer; + } + + // Content + UM.RecolorImage { + anchors.centerIn: parent; + color: { + if (printer && printer.activePrintJob != undefined) { + return UM.Theme.getColor("monitor_printer_icon"); + } + return UM.Theme.getColor("monitor_printer_icon_inactive"); + } + height: sourceSize.height; + source: { + if (!printer) { + return ""; + } + switch(printer.type) { + case "Ultimaker 3": + return "../svg/UM3-icon.svg"; + case "Ultimaker 3 Extended": + return "../svg/UM3x-icon.svg"; + case "Ultimaker S5": + return "../svg/UMs5-icon.svg"; + } + } + visible: printer; + width: sourceSize.width; + } + } + + // Printer info + Item { + id: printerInfo; + anchors { + left: machineIcon.right; + leftMargin: UM.Theme.getSize("wide_margin").width; + right: collapseIcon.left; + verticalCenter: machineIcon.verticalCenter; + } + height: childrenRect.height; + + // Machine name + Item { + id: machineNameLabel; + height: UM.Theme.getSize("monitor_text_line").height; + width: { + var percent = printer ? 0.75 : 0.3; + return Math.round(parent.width * percent); + } + + // Skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill_dark"); + visible: !printer; + } + + // Actual content + Label { + anchors.fill: parent; + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default_bold"); + text: printer ? printer.name : ""; + visible: printer; + width: parent.width; + } + } + + // Job name + Item { + id: activeJobLabel; + anchors { + top: machineNameLabel.bottom; + topMargin: Math.round(UM.Theme.getSize("default_margin").height / 2); + } + height: UM.Theme.getSize("monitor_text_line").height; + width: Math.round(parent.width * 0.75); + + // Skeleton + Rectangle { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_skeleton_fill_dark"); + visible: !printer; + } + + // Actual content + Label { + anchors.fill: parent; + color: UM.Theme.getColor("monitor_text_inactive"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + text: { + if (!printer) { + return ""; + } + if (printer.state == "disabled") { + return catalog.i18nc("@label", "Not available"); + } else if (printer.state == "unreachable") { + return catalog.i18nc("@label", "Unreachable"); + } + if (printer.activePrintJob != null && printer.activePrintJob.name) { + return printer.activePrintJob.name; + } + return catalog.i18nc("@label", "Available"); + } + visible: printer; + } + } + } + + // Collapse icon + UM.RecolorImage { + id: collapseIcon; + anchors { + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + verticalCenter: parent.verticalCenter; + } + color: UM.Theme.getColor("text"); + height: 15 * screenScaleFactor; // TODO: Theme! + source: root.collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom"); + sourceSize { + height: height; + width: width; + } + visible: printer; + width: 15 * screenScaleFactor; // TODO: Theme! + } + + MouseArea { + anchors.fill: parent; + enabled: printer; + onClicked: { + if (model && root.collapsed) { + printerList.currentIndex = model.index; + } else { + printerList.currentIndex = -1; + } + } + } + + Connections { + target: printerList; + onCurrentIndexChanged: { + root.collapsed = printerList.currentIndex != model.index; + } + } + } + // Detailed card + PrinterCardDetails { + collapsed: root.collapsed; + printer: root.printer; + visible: root.printer; + } + + // Progress bar + PrinterCardProgressBar { + visible: printer && printer.activePrintJob != null; + width: parent.width; + } + } + } +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml new file mode 100644 index 0000000000..31da388b00 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml @@ -0,0 +1,75 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Dialogs 1.1 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.3 +import QtGraphicalEffects 1.0 +import QtQuick.Controls 1.4 as LegacyControls +import UM 1.3 as UM + +Item { + id: root; + property var printer: null; + property var printJob: printer ? printer.activePrintJob : null; + property var collapsed: true; + Behavior on height { NumberAnimation { duration: 100 } } + Behavior on opacity { NumberAnimation { duration: 100 } } + height: collapsed ? 0 : childrenRect.height; + opacity: collapsed ? 0 : 1; + width: parent.width; + + Column { + id: contentColumn; + anchors { + left: parent.left; + leftMargin: UM.Theme.getSize("default_margin").width; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + } + height: childrenRect.height + UM.Theme.getSize("default_margin").height; + spacing: UM.Theme.getSize("default_margin").height; + width: parent.width; + + HorizontalLine {} + + PrinterInfoBlock { + printer: root.printer; + printJob: root.printer ? root.printer.activePrintJob : null; + } + + HorizontalLine {} + + Row { + height: childrenRect.height; + visible: root.printJob; + width: parent.width; + + PrintJobTitle { + job: root.printer ? root.printer.activePrintJob : null; + } + PrintJobContextMenu { + id: contextButton; + anchors { + right: parent.right; + rightMargin: UM.Theme.getSize("wide_margin").width; + } + printJob: root.printer ? root.printer.activePrintJob : null; + visible: printJob; + } + } + + PrintJobPreview { + anchors.horizontalCenter: parent.horizontalCenter; + job: root.printer && root.printer.activePrintJob ? root.printer.activePrintJob : null; + visible: root.printJob; + } + + CameraButton { + id: showCameraButton; + iconSource: "../svg/camera-icon.svg"; + visible: root.printer; + } + } +} diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml new file mode 100644 index 0000000000..e86c959b8c --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml @@ -0,0 +1,108 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Controls.Styles 1.3 +import QtQuick.Controls 1.4 +import UM 1.3 as UM + +ProgressBar { + property var progress: { + if (!printer || printer.activePrintJob == null) { + return 0; + } + var result = printer.activePrintJob.timeElapsed / printer.activePrintJob.timeTotal; + if (result > 1.0) { + result = 1.0; + } + return result; + } + style: ProgressBarStyle { + property var remainingTime: { + if (!printer || printer.activePrintJob == null) { + return 0; + } + /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent remaining + time from ever being less than 0. Negative durations cause strange behavior such + as displaying "-1h -1m". */ + return Math.max(printer.activePrintJob.timeTotal - printer.activePrintJob.timeElapsed, 0); + } + property var progressText: { + if (printer === null ) { + return ""; + } + switch (printer.activePrintJob.state) { + case "wait_cleanup": + if (printer.activePrintJob.timeTotal > printer.activePrintJob.timeElapsed) { + return catalog.i18nc("@label:status", "Aborted"); + } + return catalog.i18nc("@label:status", "Finished"); + case "pre_print": + case "sent_to_printer": + return catalog.i18nc("@label:status", "Preparing"); + case "aborted": + return catalog.i18nc("@label:status", "Aborted"); + case "wait_user_action": + return catalog.i18nc("@label:status", "Aborted"); + case "pausing": + return catalog.i18nc("@label:status", "Pausing"); + case "paused": + return OutputDevice.formatDuration( remainingTime ); + case "resuming": + return catalog.i18nc("@label:status", "Resuming"); + case "queued": + return catalog.i18nc("@label:status", "Action required"); + default: + return OutputDevice.formatDuration( remainingTime ); + } + } + background: Rectangle { + color: UM.Theme.getColor("monitor_progress_background"); + implicitHeight: visible ? 24 : 0; + implicitWidth: 100; + } + progress: Rectangle { + id: progressItem; + color: { + if (! printer || !printer.activePrintJob) { + return "black"; + } + var state = printer.activePrintJob.state + var inactiveStates = [ + "pausing", + "paused", + "resuming", + "wait_cleanup" + ]; + if (inactiveStates.indexOf(state) > -1 && remainingTime > 0) { + return UM.Theme.getColor("monitor_progress_fill_inactive"); + } else { + return UM.Theme.getColor("monitor_progress_fill"); + } + } + + Label { + id: progressLabel; + anchors { + left: parent.left; + leftMargin: getTextOffset(); + } + text: progressText; + anchors.verticalCenter: parent.verticalCenter; + color: progressItem.width + progressLabel.width < control.width ? UM.Theme.getColor("text") : UM.Theme.getColor("monitor_progress_fill_text"); + width: contentWidth; + font: UM.Theme.getFont("default"); + } + + function getTextOffset() { + if (progressItem.width + progressLabel.width + 16 < control.width) { + return progressItem.width + UM.Theme.getSize("default_margin").width; + } else { + return progressItem.width - progressLabel.width - UM.Theme.getSize("default_margin").width; + } + } + } + } + value: progress; + width: parent.width; +} \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterFamilyPill.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterFamilyPill.qml index b785cd02b7..0a88b053a8 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterFamilyPill.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterFamilyPill.qml @@ -1,28 +1,32 @@ +// 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.4 import UM 1.2 as UM -Item -{ - property alias color: background.color - property alias text: familyNameLabel.text - property var padding: 0 - implicitHeight: familyNameLabel.contentHeight + 2 * padding // Apply the padding to top and bottom. - implicitWidth: familyNameLabel.contentWidth + implicitHeight // The extra height is added to ensure the radius doesn't cut something off. - Rectangle - { - id: background - height: parent.height - width: parent.width - color: parent.color - anchors.right: parent.right - anchors.horizontalCenter: parent.horizontalCenter - radius: 0.5 * height +Item { + property alias text: familyNameLabel.text; + property var padding: 3 * screenScaleFactor; // TODO: Theme! + implicitHeight: familyNameLabel.contentHeight + 2 * padding; // Apply the padding to top and bottom. + implicitWidth: Math.max(48 * screenScaleFactor, familyNameLabel.contentWidth + implicitHeight); // The extra height is added to ensure the radius doesn't cut something off. + + Rectangle { + id: background; + anchors { + horizontalCenter: parent.horizontalCenter; + right: parent.right; + } + color: familyNameLabel.text.length < 1 ? UM.Theme.getColor("monitor_skeleton_fill") : UM.Theme.getColor("monitor_pill_background"); + height: parent.height; + radius: 0.5 * height; + width: parent.width; } - Label - { - id: familyNameLabel - anchors.centerIn: parent - text: "" + + Label { + id: familyNameLabel; + anchors.centerIn: parent; + color: UM.Theme.getColor("text"); + text: ""; } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml new file mode 100644 index 0000000000..92a8f1dcb3 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterInfoBlock.qml @@ -0,0 +1,83 @@ +// Copyright (c) 2018 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.3 +import QtQuick.Dialogs 1.1 +import QtQuick.Controls 2.0 +import QtQuick.Controls.Styles 1.3 +import QtGraphicalEffects 1.0 +import QtQuick.Controls 1.4 as LegacyControls +import UM 1.3 as UM + +// Includes printer type pill and extuder configurations + +Item { + id: root; + property var printer: null; + property var printJob: null; + width: parent.width; + height: childrenRect.height; + + // Printer family pills + Row { + id: printerFamilyPills; + anchors { + left: parent.left; + right: parent.right; + } + height: childrenRect.height; + spacing: Math.round(0.5 * UM.Theme.getSize("default_margin").width); + width: parent.width; + + Repeater { + id: compatiblePills; + delegate: PrinterFamilyPill { + text: modelData; + } + model: printJob ? printJob.compatibleMachineFamilies : []; + visible: printJob; + + } + + PrinterFamilyPill { + text: printer ? printer.type : ""; + visible: !compatiblePills.visible && printer; + } + } + + // Extruder info + Row { + id: extrudersInfo; + anchors { + left: parent.left; + right: parent.right; + rightMargin: UM.Theme.getSize("default_margin").width; + top: printerFamilyPills.bottom; + topMargin: UM.Theme.getSize("default_margin").height; + } + height: childrenRect.height; + spacing: UM.Theme.getSize("default_margin").width; + width: parent.width; + + PrintCoreConfiguration { + width: Math.round(parent.width / 2) * screenScaleFactor; + printCoreConfiguration: getExtruderConfig(0); + } + + PrintCoreConfiguration { + width: Math.round(parent.width / 2) * screenScaleFactor; + printCoreConfiguration: getExtruderConfig(1); + } + } + + function getExtruderConfig( i ) { + if (root.printJob) { + // Use more-specific print job if possible + return root.printJob.configuration.extruderConfigurations[i]; + } + if (root.printer) { + return root.printer.printerConfiguration.extruderConfigurations[i]; + } + return null; + } +} \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index d0213a4571..77b481f6d8 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -1,84 +1,65 @@ +// 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.4 import QtQuick.Controls.Styles 1.4 - import UM 1.3 as UM +import Cura 1.0 as Cura +Item { + property var cameraUrl: ""; -Item -{ - property var camera: null - - Rectangle - { - anchors.fill:parent - color: UM.Theme.getColor("viewport_overlay") - opacity: 0.5 + Rectangle { + anchors.fill:parent; + color: UM.Theme.getColor("viewport_overlay"); + opacity: 0.5; } - MouseArea - { - anchors.fill: parent - onClicked: OutputDevice.setActiveCamera(null) - z: 0 + MouseArea { + anchors.fill: parent; + onClicked: OutputDevice.setActiveCameraUrl(""); + z: 0; } - CameraButton - { - id: closeCameraButton - iconSource: UM.Theme.getIcon("cross1") - anchors - { - top: cameraImage.top - topMargin: UM.Theme.getSize("default_margin").height + CameraButton { + id: closeCameraButton; + anchors { right: cameraImage.right rightMargin: UM.Theme.getSize("default_margin").width + top: cameraImage.top + topMargin: UM.Theme.getSize("default_margin").height } - z: 999 + iconSource: UM.Theme.getIcon("cross1"); + z: 999; } - Image - { + Cura.NetworkMJPGImage { id: cameraImage - width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth) - height: Math.round((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width) - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter; + anchors.verticalCenter: parent.verticalCenter; + height: Math.round((imageHeight === 0 ? 600 * screenScaleFactor : imageHeight) * width / imageWidth); + onVisibleChanged: { + if (visible) { + if (cameraUrl != "") { + start(); + } + } else { + if (cameraUrl != "") { + stop(); + } + } + } + source: cameraUrl + width: Math.min(imageWidth === 0 ? 800 * screenScaleFactor : imageWidth, maximumWidth); z: 1 - onVisibleChanged: - { - if(visible) - { - if(camera != null) - { - camera.start() - } - } else - { - if(camera != null) - { - camera.stop() - } - } - } - - source: - { - if(camera != null && camera.latestImage != null) - { - return camera.latestImage; - } - return ""; - } } - MouseArea - { - anchors.fill: cameraImage - onClicked: - { - OutputDevice.setActiveCamera(null) + MouseArea { + anchors.fill: cameraImage; + onClicked: { + OutputDevice.setActiveCameraUrl(""); } - z: 1 + z: 1; } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml index a19d1be60d..105143c851 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml @@ -1,125 +1,126 @@ -import UM 1.2 as UM -import Cura 1.0 as Cura +// 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 +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: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands; + property bool authenticationRequested: printerConnected && (Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 || Cura.MachineManager.printerOutputDevices[0].authenticationState == 5); // AuthState.AuthenticationRequested or AuthenticationReceived. - property string activeQualityDefinitionId: Cura.MachineManager.activeQualityDefinitionId - property bool isUM3: activeQualityDefinitionId == "ultimaker3" || activeQualityDefinitionId.match("ultimaker_") != null - property bool printerConnected: Cura.MachineManager.printerConnected - property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands - property bool authenticationRequested: printerConnected && (Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 || Cura.MachineManager.printerOutputDevices[0].authenticationState == 5) // AuthState.AuthenticationRequested or AuthenticationReceived. + UM.I18nCatalog { + id: catalog; + name: "cura"; + } - Row - { - objectName: "networkPrinterConnectButton" - visible: isUM3 - spacing: UM.Theme.getSize("default_margin").width + Row { + objectName: "networkPrinterConnectButton"; + spacing: UM.Theme.getSize("default_margin").width; + visible: isUM3; - Button - { - height: UM.Theme.getSize("save_button_save_to_button").height - tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer") - text: catalog.i18nc("@action:button", "Request Access") - style: UM.Theme.styles.sidebar_action_button - onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication() - visible: printerConnected && !printerAcceptsCommands && !authenticationRequested + Button { + height: UM.Theme.getSize("save_button_save_to_button").height; + onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication(); + style: UM.Theme.styles.sidebar_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 - tooltip: catalog.i18nc("@info:tooltip", "Connect to a printer") - text: catalog.i18nc("@action:button", "Connect") - style: UM.Theme.styles.sidebar_action_button - onClicked: connectActionDialog.show() - visible: !printerConnected + Button { + height: UM.Theme.getSize("save_button_save_to_button").height; + onClicked: connectActionDialog.show(); + style: UM.Theme.styles.sidebar_action_button; + text: catalog.i18nc("@action:button", "Connect"); + tooltip: catalog.i18nc("@info:tooltip", "Connect to a printer"); + visible: !printerConnected; } } - UM.Dialog - { - id: connectActionDialog - Loader - { - anchors.fill: parent - source: "DiscoverUM3Action.qml" + UM.Dialog { + id: connectActionDialog; + rightButtons: Button { + iconName: "dialog-close"; + onClicked: connectActionDialog.reject(); + text: catalog.i18nc("@action:button", "Close"); } - rightButtons: Button - { - text: catalog.i18nc("@action:button", "Close") - iconName: "dialog-close" - onClicked: connectActionDialog.reject() + + Loader { + anchors.fill: parent; + source: "DiscoverUM3Action.qml"; } } + Column { + anchors.fill: parent; + objectName: "networkPrinterConnectionInfo"; + spacing: UM.Theme.getSize("default_margin").width; + visible: isUM3; - Column - { - objectName: "networkPrinterConnectionInfo" - visible: isUM3 - spacing: UM.Theme.getSize("default_margin").width - anchors.fill: parent - - Button - { - tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer") - text: catalog.i18nc("@action:button", "Request Access") - onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication() - visible: printerConnected && !printerAcceptsCommands && !authenticationRequested + Button { + onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication(); + text: catalog.i18nc("@action:button", "Request Access"); + tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer"); + visible: printerConnected && !printerAcceptsCommands && !authenticationRequested; } - Row - { - visible: printerConnected - spacing: UM.Theme.getSize("default_margin").width + Row { + anchors { + left: parent.left; + right: parent.right; + } + height: childrenRect.height; + spacing: UM.Theme.getSize("default_margin").width; + visible: printerConnected; - anchors.left: parent.left - anchors.right: parent.right - height: childrenRect.height + Column { + Repeater { + model: Cura.ExtrudersModel { + simpleNames: true; + } - Column - { - Repeater - { - model: Cura.ExtrudersModel { simpleNames: true } - Label { text: model.name } + Label { + text: model.name; + } } } - Column - { - Repeater - { - id: nozzleColumn - model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].hotendIds : null - Label { text: nozzleColumn.model[index] } + + Column { + Repeater { + id: nozzleColumn; + model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].hotendIds : null; + + Label { + text: nozzleColumn.model[index]; + } } } - Column - { - Repeater - { - id: materialColumn - model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].materialNames : null - Label { text: materialColumn.model[index] } + + Column { + Repeater { + id: materialColumn; + model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].materialNames : null; + + Label { + text: materialColumn.model[index]; + } } } } - Button - { - tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura") - text: catalog.i18nc("@action:button", "Activate Configuration") - visible: false // printerConnected && !isClusterPrinter() - onClicked: manager.loadConfigurationFromPrinter() + Button { + onClicked: manager.loadConfigurationFromPrinter(); + text: catalog.i18nc("@action:button", "Activate Configuration"); + tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura"); + visible: false; // printerConnected && !isClusterPrinter() } } - - UM.I18nCatalog{id: catalog; name:"cura"} } diff --git a/plugins/UM3NetworkPrinting/resources/svg/ultibot.svg b/plugins/UM3NetworkPrinting/resources/svg/ultibot.svg new file mode 100644 index 0000000000..be6ca64723 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/ultibot.svg @@ -0,0 +1 @@ +logobot-placeholder \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg index 1e5359a5eb..064d0783e0 100644 --- a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg +++ b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg @@ -1 +1,4 @@ -warning-icon \ No newline at end of file + + warning-icon + + \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py index 409ca7a84a..7504d55ad9 100644 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py @@ -21,12 +21,12 @@ from cura.PrinterOutput.ConfigurationModel import ConfigurationModel from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice, AuthState from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel -from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel -from cura.PrinterOutput.NetworkCamera import NetworkCamera from .ClusterUM3PrinterOutputController import ClusterUM3PrinterOutputController from .SendMaterialJob import SendMaterialJob +from .ConfigurationChangeModel import ConfigurationChangeModel +from .UM3PrintJobOutputModel import UM3PrintJobOutputModel from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply from PyQt5.QtGui import QDesktopServices, QImage @@ -46,7 +46,8 @@ i18n_catalog = i18nCatalog("cura") class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): printJobsChanged = pyqtSignal() activePrinterChanged = pyqtSignal() - activeCameraChanged = pyqtSignal() + activeCameraUrlChanged = pyqtSignal() + receivedPrintJobsChanged = pyqtSignal() # This is a bit of a hack, as the notify can only use signals that are defined by the class that they are in. # Inheritance doesn't seem to work. Tying them together does work, but i'm open for better suggestions. @@ -60,7 +61,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): self._dummy_lambdas = ("", {}, io.BytesIO()) #type: Tuple[str, Dict, Union[io.StringIO, io.BytesIO]] - self._print_jobs = [] # type: List[PrintJobOutputModel] + self._print_jobs = [] # type: List[UM3PrintJobOutputModel] + self._received_print_jobs = False # type: bool self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterMonitorItem.qml") self._control_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../resources/qml/ClusterControlItem.qml") @@ -90,14 +92,14 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): self._printer_uuid_to_unique_name_mapping = {} # type: Dict[str, str] - self._finished_jobs = [] # type: List[PrintJobOutputModel] + 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 = None # type: Optional[NetworkCamera] + 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) @@ -261,30 +263,21 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): def activePrinter(self) -> Optional[PrinterOutputModel]: return self._active_printer - @pyqtProperty(QObject, notify=activeCameraChanged) - def activeCamera(self) -> Optional[NetworkCamera]: - return self._active_camera - @pyqtSlot(QObject) def setActivePrinter(self, printer: Optional[PrinterOutputModel]) -> None: if self._active_printer != printer: - if self._active_printer and self._active_printer.camera: - self._active_printer.camera.stop() self._active_printer = printer self.activePrinterChanged.emit() - @pyqtSlot(QObject) - def setActiveCamera(self, camera: Optional[NetworkCamera]) -> None: - if self._active_camera != camera: - if self._active_camera: - self._active_camera.stop() + @pyqtProperty(QUrl, notify = activeCameraUrlChanged) + def activeCameraUrl(self) -> "QUrl": + return self._active_camera_url - self._active_camera = camera - - if self._active_camera: - self._active_camera.start() - - self.activeCameraChanged.emit() + @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: @@ -349,15 +342,19 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): QDesktopServices.openUrl(QUrl("http://" + self._address + "/printers")) @pyqtProperty("QVariantList", notify = printJobsChanged) - def printJobs(self)-> List[PrintJobOutputModel]: + 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[PrintJobOutputModel]: + 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[PrintJobOutputModel]: + 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) @@ -406,6 +403,11 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): # 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() @@ -455,6 +457,9 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): 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 @@ -533,12 +538,12 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): def _createPrinterModel(self, data: Dict[str, Any]) -> PrinterOutputModel: printer = PrinterOutputModel(output_controller = ClusterUM3PrinterOutputController(self), number_of_extruders = self._number_of_extruders) - printer.setCamera(NetworkCamera("http://" + data["ip_address"] + ":8080/?action=stream")) + printer.setCameraUrl(QUrl("http://" + data["ip_address"] + ":8080/?action=stream")) self._printers.append(printer) return printer - def _createPrintJobModel(self, data: Dict[str, Any]) -> PrintJobOutputModel: - print_job = PrintJobOutputModel(output_controller=ClusterUM3PrinterOutputController(self), + def _createPrintJobModel(self, data: Dict[str, Any]) -> UM3PrintJobOutputModel: + print_job = UM3PrintJobOutputModel(output_controller=ClusterUM3PrinterOutputController(self), key=data["uuid"], name= data["name"]) configuration = ConfigurationModel() @@ -558,7 +563,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): print_job.stateChanged.connect(self._printJobStateChanged) return print_job - def _updatePrintJob(self, print_job: PrintJobOutputModel, data: Dict[str, Any]) -> None: + 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", []) @@ -574,6 +579,16 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): 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) -> MaterialOutputModel: containers = ContainerRegistry.getInstance().findInstanceContainers(type="material", GUID=material_data["guid"]) @@ -631,7 +646,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): material = self._createMaterialOutputModel(material_data) extruder.updateActiveMaterial(material) - def _removeJob(self, job: PrintJobOutputModel) -> bool: + def _removeJob(self, job: UM3PrintJobOutputModel) -> bool: if job not in self._print_jobs: return False @@ -675,7 +690,7 @@ def checkValidGetReply(reply: QNetworkReply) -> bool: return True -def findByKey(lst: List[Union[PrintJobOutputModel, PrinterOutputModel]], key: str) -> Optional[PrintJobOutputModel]: +def findByKey(lst: List[Union[UM3PrintJobOutputModel, PrinterOutputModel]], key: str) -> Optional[UM3PrintJobOutputModel]: for item in lst: if item.key == key: return item diff --git a/plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py b/plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py new file mode 100644 index 0000000000..ef8a212b76 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/ConfigurationChangeModel.py @@ -0,0 +1,29 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot + +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._index = index + self._target_name = target_name + self._origin_name = origin_name + + @pyqtProperty(int, constant = True) + def index(self) -> int: + return self._index + + @pyqtProperty(str, constant = True) + def typeOfChange(self) -> str: + return self._type_of_change + + @pyqtProperty(str, constant = True) + def targetName(self) -> str: + return self._target_name + + @pyqtProperty(str, constant = True) + def originName(self) -> str: + return self._origin_name diff --git a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py index fe94500aa1..18af22e72f 100644 --- a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py @@ -7,7 +7,6 @@ from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutp from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.MaterialOutputModel import MaterialOutputModel -from cura.PrinterOutput.NetworkCamera import NetworkCamera from cura.Settings.ContainerManager import ContainerManager from cura.Settings.ExtruderManager import ExtruderManager @@ -18,7 +17,7 @@ from UM.i18n import i18nCatalog from UM.Message import Message from PyQt5.QtNetwork import QNetworkRequest -from PyQt5.QtCore import QTimer +from PyQt5.QtCore import QTimer, QUrl from PyQt5.QtWidgets import QMessageBox from .LegacyUM3PrinterOutputController import LegacyUM3PrinterOutputController @@ -100,8 +99,7 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): title=i18n_catalog.i18nc("@info:title", "Authentication status")) - self._authentication_failed_message = Message(i18n_catalog.i18nc("@info:status", ""), - 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) @@ -500,8 +498,8 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): self._authentication_id = None self.post("auth/request", - json.dumps({"application": "Cura-" + CuraApplication.getInstance().getVersion(), - "user": self._getUserName()}).encode(), + json.dumps({"application": "Cura-" + CuraApplication.getInstance().getVersion(), + "user": self._getUserName()}), on_finished=self._onRequestAuthenticationFinished) self.setAuthenticationState(AuthState.AuthenticationRequested) @@ -569,7 +567,7 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): # 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].setCamera(NetworkCamera("http://" + self._address + ":8080/?action=stream")) + 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) diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index f4749a6747..9c070f2de2 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -260,6 +260,19 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): # 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: diff --git a/plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py b/plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py new file mode 100644 index 0000000000..2ac3e6ba4f --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/UM3PrintJobOutputModel.py @@ -0,0 +1,29 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, pyqtSlot +from typing import Optional, TYPE_CHECKING, List +from PyQt5.QtCore import QUrl +from PyQt5.QtGui import QImage + +from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel + +from .ConfigurationChangeModel import ConfigurationChangeModel + + +class UM3PrintJobOutputModel(PrintJobOutputModel): + configurationChangesChanged = pyqtSignal() + + 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] + + @pyqtProperty("QVariantList", notify=configurationChangesChanged) + def configurationChanges(self) -> List[ConfigurationChangeModel]: + return self._configuration_changes + + def updateConfigurationChanges(self, changes: List[ConfigurationChangeModel]) -> None: + if len(self._configuration_changes) == 0 and len(changes) == 0: + return + self._configuration_changes = changes + self.configurationChangesChanged.emit() diff --git a/plugins/USBPrinting/AvrFirmwareUpdater.py b/plugins/USBPrinting/AvrFirmwareUpdater.py new file mode 100644 index 0000000000..56e3f99c23 --- /dev/null +++ b/plugins/USBPrinting/AvrFirmwareUpdater.py @@ -0,0 +1,68 @@ +# Copyright (c) 2018 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from UM.Logger import Logger + +from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater, FirmwareUpdateState + +from .avr_isp import stk500v2, intelHex +from serial import SerialException + +from time import sleep + +MYPY = False +if MYPY: + from cura.PrinterOutputDevice import PrinterOutputDevice + + +class AvrFirmwareUpdater(FirmwareUpdater): + def __init__(self, output_device: "PrinterOutputDevice") -> None: + super().__init__(output_device) + + def _updateFirmware(self) -> None: + try: + hex_file = intelHex.readHex(self._firmware_file) + assert len(hex_file) > 0 + except (FileNotFoundError, AssertionError): + Logger.log("e", "Unable to read provided hex file. Could not update firmware.") + self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error) + return + + programmer = stk500v2.Stk500v2() + programmer.progress_callback = self._onFirmwareProgress + + # Ensure that other connections are closed. + if self._output_device.isConnected(): + self._output_device.close() + + try: + programmer.connect(self._output_device._serial_port) + except: + programmer.close() + Logger.logException("e", "Failed to update firmware") + self._setFirmwareUpdateState(FirmwareUpdateState.communication_error) + return + + # Give programmer some time to connect. Might need more in some cases, but this worked in all tested cases. + sleep(1) + if not programmer.isConnected(): + Logger.log("e", "Unable to connect with serial. Could not update firmware") + self._setFirmwareUpdateState(FirmwareUpdateState.communication_error) + try: + programmer.programChip(hex_file) + except SerialException as e: + Logger.log("e", "A serial port exception occured during firmware update: %s" % e) + self._setFirmwareUpdateState(FirmwareUpdateState.io_error) + return + except Exception as e: + Logger.log("e", "An unknown exception occured during firmware update: %s" % e) + self._setFirmwareUpdateState(FirmwareUpdateState.unknown_error) + return + + programmer.close() + + # Try to re-connect with the machine again, which must be done on the Qt thread, so we use call later. + CuraApplication.getInstance().callLater(self._output_device.connect) + + self._cleanupAfterUpdate() diff --git a/plugins/USBPrinting/FirmwareUpdateWindow.qml b/plugins/USBPrinting/FirmwareUpdateWindow.qml deleted file mode 100644 index e0f9de314e..0000000000 --- a/plugins/USBPrinting/FirmwareUpdateWindow.qml +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) 2017 Ultimaker B.V. -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Window 2.2 -import QtQuick.Controls 1.2 - -import UM 1.1 as UM - -UM.Dialog -{ - id: base; - - width: minimumWidth; - minimumWidth: 500 * screenScaleFactor; - height: minimumHeight; - minimumHeight: 100 * screenScaleFactor; - - visible: true; - modality: Qt.ApplicationModal; - - title: catalog.i18nc("@title:window","Firmware Update"); - - Column - { - anchors.fill: parent; - - Label - { - anchors - { - left: parent.left; - right: parent.right; - } - - text: { - switch (manager.firmwareUpdateState) - { - case 0: - return "" //Not doing anything (eg; idling) - case 1: - return catalog.i18nc("@label","Updating firmware.") - case 2: - return catalog.i18nc("@label","Firmware update completed.") - case 3: - return catalog.i18nc("@label","Firmware update failed due to an unknown error.") - case 4: - return catalog.i18nc("@label","Firmware update failed due to an communication error.") - case 5: - return catalog.i18nc("@label","Firmware update failed due to an input/output error.") - case 6: - return catalog.i18nc("@label","Firmware update failed due to missing firmware.") - } - } - - wrapMode: Text.Wrap; - } - - ProgressBar - { - id: prog - value: manager.firmwareProgress - minimumValue: 0 - maximumValue: 100 - indeterminate: manager.firmwareProgress < 1 && manager.firmwareProgress > 0 - anchors - { - left: parent.left; - right: parent.right; - } - } - - SystemPalette - { - id: palette; - } - - UM.I18nCatalog { id: catalog; name: "cura"; } - } - - rightButtons: [ - Button - { - text: catalog.i18nc("@action:button","Close"); - enabled: manager.firmwareUpdateCompleteStatus; - onClicked: base.visible = false; - } - ] -} diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 4ceda52875..e1c39ff8fa 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -4,7 +4,6 @@ from UM.Logger import Logger from UM.i18n import i18nCatalog from UM.Qt.Duration import DurationFormat -from UM.PluginRegistry import PluginRegistry from cura.CuraApplication import CuraApplication from cura.PrinterOutputDevice import PrinterOutputDevice, ConnectionState @@ -13,28 +12,21 @@ from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.GenericOutputController import GenericOutputController from .AutoDetectBaudJob import AutoDetectBaudJob -from .avr_isp import stk500v2, intelHex - -from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty, QUrl +from .AvrFirmwareUpdater import AvrFirmwareUpdater from serial import Serial, SerialException, SerialTimeoutException from threading import Thread, Event -from time import time, sleep +from time import time from queue import Queue -from enum import IntEnum from typing import Union, Optional, List, cast import re import functools # Used for reduce -import os catalog = i18nCatalog("cura") class USBPrinterOutputDevice(PrinterOutputDevice): - firmwareProgressChanged = pyqtSignal() - firmwareUpdateStateChanged = pyqtSignal() - def __init__(self, serial_port: str, baud_rate: Optional[int] = None) -> None: super().__init__(serial_port) self.setName(catalog.i18nc("@item:inmenu", "USB printing")) @@ -59,9 +51,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._all_baud_rates = [115200, 250000, 230400, 57600, 38400, 19200, 9600] # Instead of using a timer, we really need the update to be as a thread, as reading from serial can block. - self._update_thread = Thread(target=self._update, daemon = True) - - self._update_firmware_thread = Thread(target=self._updateFirmware, daemon = True) + self._update_thread = Thread(target = self._update, daemon = True) self._last_temperature_request = None # type: Optional[int] @@ -74,11 +64,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._accepts_commands = True self._paused = False - - self._firmware_view = None - self._firmware_location = None - self._firmware_progress = 0 - self._firmware_update_state = FirmwareUpdateState.idle + self._printer_busy = False # when printer is preheating and waiting (M190/M109), or when waiting for action on the printer self.setConnectionText(catalog.i18nc("@info:status", "Connected via USB")) @@ -88,6 +74,9 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._command_received = Event() self._command_received.set() + self._firmware_name_requested = False + self._firmware_updater = AvrFirmwareUpdater(self) + CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit) # This is a callback function that checks if there is any printing in progress via USB when the application tries @@ -109,7 +98,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): ## Reset USB device settings # - def resetDeviceSettings(self): + def resetDeviceSettings(self) -> None: self._firmware_name = None ## Request the current scene to be sent to a USB-connected printer. @@ -135,93 +124,6 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._printGCode(gcode_list) - ## Show firmware interface. - # This will create the view if its not already created. - def showFirmwareInterface(self): - if self._firmware_view is None: - path = os.path.join(PluginRegistry.getInstance().getPluginPath("USBPrinting"), "FirmwareUpdateWindow.qml") - self._firmware_view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self}) - - self._firmware_view.show() - - @pyqtSlot(str) - def updateFirmware(self, file): - # the file path could be url-encoded. - if file.startswith("file://"): - self._firmware_location = QUrl(file).toLocalFile() - else: - self._firmware_location = file - self.showFirmwareInterface() - self.setFirmwareUpdateState(FirmwareUpdateState.updating) - self._update_firmware_thread.start() - - def _updateFirmware(self): - # Ensure that other connections are closed. - if self._connection_state != ConnectionState.closed: - self.close() - - try: - hex_file = intelHex.readHex(self._firmware_location) - assert len(hex_file) > 0 - except (FileNotFoundError, AssertionError): - Logger.log("e", "Unable to read provided hex file. Could not update firmware.") - self.setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error) - return - - programmer = stk500v2.Stk500v2() - programmer.progress_callback = self._onFirmwareProgress - - try: - programmer.connect(self._serial_port) - except: - programmer.close() - Logger.logException("e", "Failed to update firmware") - self.setFirmwareUpdateState(FirmwareUpdateState.communication_error) - return - - # Give programmer some time to connect. Might need more in some cases, but this worked in all tested cases. - sleep(1) - if not programmer.isConnected(): - Logger.log("e", "Unable to connect with serial. Could not update firmware") - self.setFirmwareUpdateState(FirmwareUpdateState.communication_error) - try: - programmer.programChip(hex_file) - except SerialException: - self.setFirmwareUpdateState(FirmwareUpdateState.io_error) - return - except: - self.setFirmwareUpdateState(FirmwareUpdateState.unknown_error) - return - - programmer.close() - - # Clean up for next attempt. - self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True) - self._firmware_location = "" - self._onFirmwareProgress(100) - self.setFirmwareUpdateState(FirmwareUpdateState.completed) - - # Try to re-connect with the machine again, which must be done on the Qt thread, so we use call later. - CuraApplication.getInstance().callLater(self.connect) - - @pyqtProperty(float, notify = firmwareProgressChanged) - def firmwareProgress(self): - return self._firmware_progress - - @pyqtProperty(int, notify=firmwareUpdateStateChanged) - def firmwareUpdateState(self): - return self._firmware_update_state - - def setFirmwareUpdateState(self, state): - if self._firmware_update_state != state: - self._firmware_update_state = state - self.firmwareUpdateStateChanged.emit() - - # Callback function for firmware update progress. - def _onFirmwareProgress(self, progress, max_progress = 100): - self._firmware_progress = (progress / max_progress) * 100 # Convert to scale of 0-100 - self.firmwareProgressChanged.emit() - ## Start a print based on a g-code. # \param gcode_list List with gcode (strings). def _printGCode(self, gcode_list: List[str]): @@ -258,7 +160,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._baud_rate = baud_rate def connect(self): - self._firmware_name = None # after each connection ensure that the firmware name is removed + self._firmware_name = None # after each connection ensure that the firmware name is removed if self._baud_rate is None: if self._use_auto_detect: @@ -272,13 +174,19 @@ class USBPrinterOutputDevice(PrinterOutputDevice): except SerialException: Logger.log("w", "An exception occured while trying to create serial connection") return + CuraApplication.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged) + self._onGlobalContainerStackChanged() + self.setConnectionState(ConnectionState.connected) + self._update_thread.start() + + def _onGlobalContainerStackChanged(self): container_stack = CuraApplication.getInstance().getGlobalContainerStack() num_extruders = container_stack.getProperty("machine_extruder_count", "value") # Ensure that a printer is created. - self._printers = [PrinterOutputModel(output_controller=GenericOutputController(self), number_of_extruders=num_extruders)] + controller = GenericOutputController(self) + controller.setCanUpdateFirmware(True) + self._printers = [PrinterOutputModel(output_controller = controller, number_of_extruders = num_extruders)] self._printers[0].updateName(container_stack.getName()) - self.setConnectionState(ConnectionState.connected) - self._update_thread.start() def close(self): super().close() @@ -295,6 +203,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._command_queue.put(command) else: self._sendCommand(command) + def _sendCommand(self, command: Union[str, bytes]): if self._serial is None or self._connection_state != ConnectionState.connected: return @@ -316,18 +225,21 @@ class USBPrinterOutputDevice(PrinterOutputDevice): except: continue + if not self._firmware_name_requested: + self._firmware_name_requested = True + self.sendCommand("M115") + + if b"FIRMWARE_NAME:" in line: + self._setFirmwareName(line) + if self._last_temperature_request is None or time() > self._last_temperature_request + self._timeout: # Timeout, or no request has been sent at all. - self._command_received.set() # We haven't really received the ok, but we need to send a new command + if not self._printer_busy: # Don't flood the printer with temperature requests while it is busy + self.sendCommand("M105") + self._last_temperature_request = time() - self.sendCommand("M105") - self._last_temperature_request = time() - - if self._firmware_name is None: - self.sendCommand("M115") - - if (b"ok " in line and b"T:" in line) or line.startswith(b"T:") or b"ok B:" in line or line.startswith(b"B:"): # Temperature message. 'T:' for extruder and 'B:' for bed - extruder_temperature_matches = re.findall(b"T(\d*): ?([\d\.]+) ?\/?([\d\.]+)?", line) + if re.search(b"[B|T\d*]: ?\d+\.?\d*", line): # Temperature message. 'T:' for extruder and 'B:' for bed + extruder_temperature_matches = re.findall(b"T(\d*): ?(\d+\.?\d*) ?\/?(\d+\.?\d*)?", line) # Update all temperature values matched_extruder_nrs = [] for match in extruder_temperature_matches: @@ -349,7 +261,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): if match[2]: extruder.updateTargetHotendTemperature(float(match[2])) - bed_temperature_matches = re.findall(b"B: ?([\d\.]+) ?\/?([\d\.]+)?", line) + bed_temperature_matches = re.findall(b"B: ?(\d+\.?\d*) ?\/?(\d+\.?\d*) ?", line) if bed_temperature_matches: match = bed_temperature_matches[0] if match[0]: @@ -357,29 +269,39 @@ class USBPrinterOutputDevice(PrinterOutputDevice): if match[1]: self._printers[0].updateTargetBedTemperature(float(match[1])) - if b"FIRMWARE_NAME:" in line: - self._setFirmwareName(line) + if line == b"": + # An empty line means that the firmware is idle + # Multiple empty lines probably means that the firmware and Cura are waiting + # for eachother due to a missed "ok", so we keep track of empty lines + self._firmware_idle_count += 1 + else: + self._firmware_idle_count = 0 + + if line.startswith(b"ok") or self._firmware_idle_count > 1: + self._printer_busy = False - if b"ok" in line: self._command_received.set() if not self._command_queue.empty(): self._sendCommand(self._command_queue.get()) - if self._is_printing: + elif self._is_printing: if self._paused: pass # Nothing to do! else: self._sendNextGcodeLine() + if line.startswith(b"echo:busy:"): + self._printer_busy = True + if self._is_printing: if line.startswith(b'!!'): Logger.log('e', "Printer signals fatal error. Cancelling print. {}".format(line)) self.cancelPrint() - elif b"resend" in line.lower() or b"rs" in line: + elif line.lower().startswith(b"resend") or line.startswith(b"rs"): # A resend can be requested either by Resend, resend or rs. try: self._gcode_position = int(line.replace(b"N:", b" ").replace(b"N", b" ").replace(b":", b" ").split()[-1]) except: - if b"rs" in line: + if line.startswith(b"rs"): # In some cases of the RS command it needs to be handled differently. self._gcode_position = int(line.split()[1]) @@ -445,7 +367,9 @@ class USBPrinterOutputDevice(PrinterOutputDevice): elapsed_time = int(time() - self._print_start_time) print_job = self._printers[0].activePrintJob if print_job is None: - print_job = PrintJobOutputModel(output_controller = GenericOutputController(self), name= CuraApplication.getInstance().getPrintInformation().jobName) + controller = GenericOutputController(self) + controller.setCanUpdateFirmware(True) + print_job = PrintJobOutputModel(output_controller=controller, name=CuraApplication.getInstance().getPrintInformation().jobName) print_job.updateState("printing") self._printers[0].updateActivePrintJob(print_job) @@ -456,13 +380,3 @@ class USBPrinterOutputDevice(PrinterOutputDevice): print_job.updateTimeTotal(estimated_time) self._gcode_position += 1 - - -class FirmwareUpdateState(IntEnum): - idle = 0 - updating = 1 - completed = 2 - unknown_error = 3 - communication_error = 4 - io_error = 5 - firmware_not_found_error = 6 diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 464f3093a5..bd207d9d96 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -2,14 +2,12 @@ # Cura is released under the terms of the LGPLv3 or higher. import threading -import platform import time import serial.tools.list_ports from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal from UM.Logger import Logger -from UM.Resources import Resources from UM.Signal import Signal, signalemitter from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from UM.i18n import i18nCatalog @@ -87,66 +85,6 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): self._addRemovePorts(port_list) time.sleep(5) - @pyqtSlot(result = str) - def getDefaultFirmwareName(self): - # Check if there is a valid global container stack - global_container_stack = self._application.getGlobalContainerStack() - if not global_container_stack: - Logger.log("e", "There is no global container stack. Can not update firmware.") - self._firmware_view.close() - return "" - - # The bottom of the containerstack is the machine definition - machine_id = global_container_stack.getBottom().id - - machine_has_heated_bed = global_container_stack.getProperty("machine_heated_bed", "value") - - if platform.system() == "Linux": - baudrate = 115200 - else: - baudrate = 250000 - - # NOTE: The keyword used here is the id of the machine. You can find the id of your machine in the *.json file, eg. - # https://github.com/Ultimaker/Cura/blob/master/resources/machines/ultimaker_original.json#L2 - # The *.hex files are stored at a seperate repository: - # https://github.com/Ultimaker/cura-binary-data/tree/master/cura/resources/firmware - machine_without_extras = {"bq_witbox" : "MarlinWitbox.hex", - "bq_hephestos_2" : "MarlinHephestos2.hex", - "ultimaker_original" : "MarlinUltimaker-{baudrate}.hex", - "ultimaker_original_plus" : "MarlinUltimaker-UMOP-{baudrate}.hex", - "ultimaker_original_dual" : "MarlinUltimaker-{baudrate}-dual.hex", - "ultimaker2" : "MarlinUltimaker2.hex", - "ultimaker2_go" : "MarlinUltimaker2go.hex", - "ultimaker2_plus" : "MarlinUltimaker2plus.hex", - "ultimaker2_extended" : "MarlinUltimaker2extended.hex", - "ultimaker2_extended_plus" : "MarlinUltimaker2extended-plus.hex", - "blackbelt" : "MarlinBlackBelt3D.hex", - } - machine_with_heated_bed = {"ultimaker_original" : "MarlinUltimaker-HBK-{baudrate}.hex", - "ultimaker_original_dual" : "MarlinUltimaker-HBK-{baudrate}-dual.hex", - } - ##TODO: Add check for multiple extruders - hex_file = None - if machine_id in machine_without_extras.keys(): # The machine needs to be defined here! - if machine_id in machine_with_heated_bed.keys() and machine_has_heated_bed: - Logger.log("d", "Choosing firmware with heated bed enabled for machine %s.", machine_id) - hex_file = machine_with_heated_bed[machine_id] # Return firmware with heated bed enabled - else: - Logger.log("d", "Choosing basic firmware for machine %s.", machine_id) - hex_file = machine_without_extras[machine_id] # Return "basic" firmware - else: - Logger.log("w", "There is no firmware for machine %s.", machine_id) - - if hex_file: - try: - return Resources.getPath(CuraApplication.ResourceTypes.Firmware, hex_file.format(baudrate=baudrate)) - except FileNotFoundError: - Logger.log("w", "Could not find any firmware for machine %s.", machine_id) - return "" - else: - Logger.log("w", "Could not find any firmware for machine %s.", machine_id) - return "" - ## Helper to identify serial ports (and scan for them) def _addRemovePorts(self, serial_ports): # First, find and add all new or changed keys diff --git a/plugins/USBPrinting/__init__.py b/plugins/USBPrinting/__init__.py index fd5488eead..075ad2943b 100644 --- a/plugins/USBPrinting/__init__.py +++ b/plugins/USBPrinting/__init__.py @@ -2,9 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. from . import USBPrinterOutputDeviceManager -from PyQt5.QtQml import qmlRegisterSingletonType -from UM.i18n import i18nCatalog -i18n_catalog = i18nCatalog("cura") def getMetaData(): @@ -14,5 +11,4 @@ def getMetaData(): def register(app): # We are violating the QT API here (as we use a factory, which is technically not allowed). # but we don't really have another means for doing this (and it seems to you know -work-) - qmlRegisterSingletonType(USBPrinterOutputDeviceManager.USBPrinterOutputDeviceManager, "Cura", 1, 0, "USBPrinterManager", USBPrinterOutputDeviceManager.USBPrinterOutputDeviceManager.getInstance) return {"output_device": USBPrinterOutputDeviceManager.USBPrinterOutputDeviceManager(app)} diff --git a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml index b92638aa12..4a1d42e248 100644 --- a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml @@ -17,7 +17,7 @@ Cura.MachineAction property int rightRow: (checkupMachineAction.width * 0.60) | 0 property bool heatupHotendStarted: false property bool heatupBedStarted: false - property bool usbConnected: Cura.USBPrinterManager.connectedPrinterList.rowCount() > 0 + property bool printerConnected: Cura.MachineManager.printerConnected UM.I18nCatalog { id: catalog; name:"cura"} Label @@ -86,7 +86,7 @@ Cura.MachineAction anchors.left: connectionLabel.right anchors.top: parent.top wrapMode: Text.WordWrap - text: checkupMachineAction.usbConnected ? catalog.i18nc("@info:status","Connected"): catalog.i18nc("@info:status","Not connected") + text: checkupMachineAction.printerConnected ? catalog.i18nc("@info:status","Connected"): catalog.i18nc("@info:status","Not connected") } ////////////////////////////////////////////////////////// Label @@ -97,7 +97,7 @@ Cura.MachineAction anchors.top: connectionLabel.bottom wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop X: ") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } Label { @@ -107,7 +107,7 @@ Cura.MachineAction anchors.top: connectionLabel.bottom wrapMode: Text.WordWrap text: manager.xMinEndstopTestCompleted ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } ////////////////////////////////////////////////////////////// Label @@ -118,7 +118,7 @@ Cura.MachineAction anchors.top: endstopXLabel.bottom wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop Y: ") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } Label { @@ -128,7 +128,7 @@ Cura.MachineAction anchors.top: endstopXLabel.bottom wrapMode: Text.WordWrap text: manager.yMinEndstopTestCompleted ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } ///////////////////////////////////////////////////////////////////// Label @@ -139,7 +139,7 @@ Cura.MachineAction anchors.top: endstopYLabel.bottom wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop Z: ") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } Label { @@ -149,7 +149,7 @@ Cura.MachineAction anchors.top: endstopYLabel.bottom wrapMode: Text.WordWrap text: manager.zMinEndstopTestCompleted ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } //////////////////////////////////////////////////////////// Label @@ -161,7 +161,7 @@ Cura.MachineAction anchors.top: endstopZLabel.bottom wrapMode: Text.WordWrap text: catalog.i18nc("@label","Nozzle temperature check: ") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } Label { @@ -171,7 +171,7 @@ Cura.MachineAction anchors.left: nozzleTempLabel.right wrapMode: Text.WordWrap text: catalog.i18nc("@info:status","Not checked") - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } Item { @@ -181,7 +181,7 @@ Cura.MachineAction anchors.top: nozzleTempLabel.top anchors.left: bedTempStatus.right anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").width/2) - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected Button { text: checkupMachineAction.heatupHotendStarted ? catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating") @@ -209,7 +209,7 @@ Cura.MachineAction wrapMode: Text.WordWrap text: manager.hotendTemperature + "°C" font.bold: true - visible: checkupMachineAction.usbConnected + visible: checkupMachineAction.printerConnected } ///////////////////////////////////////////////////////////////////////////// Label @@ -221,7 +221,7 @@ Cura.MachineAction anchors.top: nozzleTempLabel.bottom wrapMode: Text.WordWrap text: catalog.i18nc("@label","Build plate temperature check:") - visible: checkupMachineAction.usbConnected && manager.hasHeatedBed + visible: checkupMachineAction.printerConnected && manager.hasHeatedBed } Label @@ -232,7 +232,7 @@ Cura.MachineAction anchors.left: bedTempLabel.right wrapMode: Text.WordWrap text: manager.bedTestCompleted ? catalog.i18nc("@info:status","Not checked"): catalog.i18nc("@info:status","Checked") - visible: checkupMachineAction.usbConnected && manager.hasHeatedBed + visible: checkupMachineAction.printerConnected && manager.hasHeatedBed } Item { @@ -242,7 +242,7 @@ Cura.MachineAction anchors.top: bedTempLabel.top anchors.left: bedTempStatus.right anchors.leftMargin: Math.round(UM.Theme.getSize("default_margin").width/2) - visible: checkupMachineAction.usbConnected && manager.hasHeatedBed + visible: checkupMachineAction.printerConnected && manager.hasHeatedBed Button { text: checkupMachineAction.heatupBedStarted ?catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating") @@ -270,7 +270,7 @@ Cura.MachineAction wrapMode: Text.WordWrap text: manager.bedTemperature + "°C" font.bold: true - visible: checkupMachineAction.usbConnected && manager.hasHeatedBed + visible: checkupMachineAction.printerConnected && manager.hasHeatedBed } Label { diff --git a/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py b/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py deleted file mode 100644 index 1f0e640f04..0000000000 --- a/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py +++ /dev/null @@ -1,19 +0,0 @@ -from UM.Application import Application -from UM.Settings.DefinitionContainer import DefinitionContainer -from cura.MachineAction import MachineAction -from UM.i18n import i18nCatalog -from UM.Settings.ContainerRegistry import ContainerRegistry - -catalog = i18nCatalog("cura") - -## Upgrade the firmware of a machine by USB with this action. -class UpgradeFirmwareMachineAction(MachineAction): - def __init__(self): - super().__init__("UpgradeFirmware", catalog.i18nc("@action", "Upgrade Firmware")) - self._qml_url = "UpgradeFirmwareMachineAction.qml" - ContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) - - def _onContainerAdded(self, container): - # Add this action as a supported action to all machine definitions if they support USB connection - if isinstance(container, DefinitionContainer) and container.getMetaDataEntry("type") == "machine" and container.getMetaDataEntry("supports_usb_connection"): - Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) diff --git a/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml b/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml deleted file mode 100644 index ed771d2a04..0000000000 --- a/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) 2016 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 QtQuick.Dialogs 1.2 // For filedialog - -import UM 1.2 as UM -import Cura 1.0 as Cura - - -Cura.MachineAction -{ - anchors.fill: parent; - property bool printerConnected: Cura.MachineManager.printerConnected - property var activeOutputDevice: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null - - Item - { - id: upgradeFirmwareMachineAction - anchors.fill: parent; - UM.I18nCatalog { id: catalog; name:"cura"} - - Label - { - id: pageTitle - width: parent.width - text: catalog.i18nc("@title", "Upgrade Firmware") - wrapMode: Text.WordWrap - font.pointSize: 18 - } - Label - { - id: pageDescription - anchors.top: pageTitle.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label", "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work.") - } - - Label - { - id: upgradeText1 - anchors.top: pageDescription.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label", "The firmware shipping with new printers works, but new versions tend to have more features and improvements."); - } - - Row - { - anchors.top: upgradeText1.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height - anchors.horizontalCenter: parent.horizontalCenter - width: childrenRect.width - spacing: UM.Theme.getSize("default_margin").width - property var firmwareName: Cura.USBPrinterManager.getDefaultFirmwareName() - Button - { - id: autoUpgradeButton - text: catalog.i18nc("@action:button", "Automatically upgrade Firmware"); - enabled: parent.firmwareName != "" && activeOutputDevice - onClicked: - { - activeOutputDevice.updateFirmware(parent.firmwareName) - } - } - Button - { - id: manualUpgradeButton - text: catalog.i18nc("@action:button", "Upload custom Firmware"); - enabled: activeOutputDevice != null - onClicked: - { - customFirmwareDialog.open() - } - } - } - - FileDialog - { - id: customFirmwareDialog - title: catalog.i18nc("@title:window", "Select custom firmware") - nameFilters: "Firmware image files (*.hex)" - selectExisting: true - onAccepted: activeOutputDevice.updateFirmware(fileUrl) - } - } -} \ No newline at end of file diff --git a/plugins/UltimakerMachineActions/__init__.py b/plugins/UltimakerMachineActions/__init__.py index 495f212736..e87949580a 100644 --- a/plugins/UltimakerMachineActions/__init__.py +++ b/plugins/UltimakerMachineActions/__init__.py @@ -1,22 +1,16 @@ -# Copyright (c) 2016 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from . import BedLevelMachineAction -from . import UpgradeFirmwareMachineAction from . import UMOUpgradeSelection from . import UM2UpgradeSelection -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - def getMetaData(): - return { - } + return {} def register(app): return { "machine_action": [ BedLevelMachineAction.BedLevelMachineAction(), - UpgradeFirmwareMachineAction.UpgradeFirmwareMachineAction(), UMOUpgradeSelection.UMOUpgradeSelection(), UM2UpgradeSelection.UM2UpgradeSelection() ]} diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py b/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py index 435621ec54..609781ebfe 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade21to22 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade21to22.VersionUpgrade21to22() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index 730a62e591..a56f1f807b 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -73,7 +73,7 @@ class VersionUpgrade22to24(VersionUpgrade): def __convertVariant(self, variant_path): # Copy the variant to the machine_instances/*_settings.inst.cfg - variant_config = configparser.ConfigParser(interpolation=None) + variant_config = configparser.ConfigParser(interpolation = None) with open(variant_path, "r", encoding = "utf-8") as fhandle: variant_config.read_file(fhandle) diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py b/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py index fbdbf92a4b..278b660ec1 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade.VersionUpgrade22to24() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/VersionUpgrade25to26.py b/plugins/VersionUpgrade/VersionUpgrade25to26/VersionUpgrade25to26.py index 2430b35ea0..6643edb765 100644 --- a/plugins/VersionUpgrade/VersionUpgrade25to26/VersionUpgrade25to26.py +++ b/plugins/VersionUpgrade/VersionUpgrade25to26/VersionUpgrade25to26.py @@ -117,7 +117,7 @@ class VersionUpgrade25to26(VersionUpgrade): # \param serialised The serialised form of a quality profile. # \param filename The name of the file to upgrade. def upgradeMachineStack(self, serialised, filename): - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) # NOTE: This is for Custom FDM printers diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py b/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py index 1419325cc1..67aa73233f 100644 --- a/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade25to26 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade25to26.VersionUpgrade25to26() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py b/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py index 79ed5e8b68..0e26ca8bbf 100644 --- a/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade26to27 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade26to27.VersionUpgrade26to27() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py b/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py index a88ff5ac1c..399eb18b5d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py +++ b/plugins/VersionUpgrade/VersionUpgrade30to31/VersionUpgrade30to31.py @@ -84,7 +84,7 @@ class VersionUpgrade30to31(VersionUpgrade): # \param serialised The serialised form of a preferences file. # \param filename The name of the file to upgrade. def upgradePreferences(self, serialised, filename): - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) # Update version numbers @@ -105,7 +105,7 @@ class VersionUpgrade30to31(VersionUpgrade): # \param serialised The serialised form of the container file. # \param filename The name of the file to upgrade. def upgradeInstanceContainer(self, serialised, filename): - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) for each_section in ("general", "metadata"): @@ -130,7 +130,7 @@ class VersionUpgrade30to31(VersionUpgrade): # \param serialised The serialised form of a container stack. # \param filename The name of the file to upgrade. def upgradeStack(self, serialised, filename): - parser = configparser.ConfigParser(interpolation=None) + parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialised) for each_section in ("general", "metadata"): diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py b/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py index 4faa1290b5..1130c1e9e2 100644 --- a/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py @@ -5,13 +5,13 @@ from . import VersionUpgrade33to34 upgrade = VersionUpgrade33to34.VersionUpgrade33to34() - def getMetaData(): return { "version_upgrade": { # From To Upgrade function ("definition_changes", 3000004): ("definition_changes", 4000004, upgrade.upgradeInstanceContainer), ("quality_changes", 3000004): ("quality_changes", 4000004, upgrade.upgradeInstanceContainer), + ("quality", 3000004): ("quality", 4000004, upgrade.upgradeInstanceContainer), ("user", 3000004): ("user", 4000004, upgrade.upgradeInstanceContainer), }, "sources": { @@ -23,6 +23,10 @@ def getMetaData(): "get_version": upgrade.getCfgVersion, "location": {"./quality_changes"} }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, "user": { "get_version": upgrade.getCfgVersion, "location": {"./user"} diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py index 9d3410e40d..2ea74f6194 100644 --- a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py @@ -5,7 +5,6 @@ from . import VersionUpgrade34to35 upgrade = VersionUpgrade34to35.VersionUpgrade34to35() - def getMetaData(): return { "version_upgrade": { @@ -14,6 +13,7 @@ def getMetaData(): ("definition_changes", 4000004): ("definition_changes", 4000005, upgrade.upgradeInstanceContainer), ("quality_changes", 4000004): ("quality_changes", 4000005, upgrade.upgradeInstanceContainer), + ("quality", 4000004): ("quality", 4000005, upgrade.upgradeInstanceContainer), ("user", 4000004): ("user", 4000005, upgrade.upgradeInstanceContainer), ("machine_stack", 4000004): ("machine_stack", 4000005, upgrade.upgradeStack), @@ -40,6 +40,10 @@ def getMetaData(): "get_version": upgrade.getCfgVersion, "location": {"./quality_changes"} }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, "user": { "get_version": upgrade.getCfgVersion, "location": {"./user"} diff --git a/plugins/XmlMaterialProfile/__init__.py b/plugins/XmlMaterialProfile/__init__.py index 70a359ee76..e8bde78424 100644 --- a/plugins/XmlMaterialProfile/__init__.py +++ b/plugins/XmlMaterialProfile/__init__.py @@ -5,10 +5,7 @@ from . import XmlMaterialProfile from . import XmlMaterialUpgrader from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase -from UM.i18n import i18nCatalog - -catalog = i18nCatalog("cura") upgrader = XmlMaterialUpgrader.XmlMaterialUpgrader() diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 7107bbe4f0..ee82b17a75 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -9,7 +9,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -26,7 +26,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -43,7 +43,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -60,7 +60,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -77,7 +77,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -94,7 +94,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -111,7 +111,24 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, + "FirmwareUpdater": { + "package_info": { + "package_id": "FirmwareUpdater", + "package_type": "plugin", + "display_name": "Firmware Updater", + "description": "Provides a machine actions for updating firmware.", + "package_version": "1.0.0", + "sdk_version": 5, + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -128,7 +145,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -145,7 +162,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -162,7 +179,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -196,7 +213,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -213,7 +230,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -230,7 +247,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -264,7 +281,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -281,7 +298,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -298,7 +315,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -315,7 +332,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -332,7 +349,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -349,7 +366,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -366,7 +383,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -383,7 +400,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -400,7 +417,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -417,7 +434,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -434,7 +451,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -451,7 +468,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -468,7 +485,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -485,7 +502,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -502,7 +519,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -519,7 +536,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -536,7 +553,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -553,7 +570,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -570,7 +587,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -587,7 +604,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -604,7 +621,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -621,7 +638,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -638,7 +655,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -655,7 +672,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -672,7 +689,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -706,7 +723,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -723,7 +740,7 @@ "sdk_version": 5, "website": "https://ultimaker.com", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "plugins@ultimaker.com", "website": "https://ultimaker.com" @@ -736,8 +753,8 @@ "package_type": "material", "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -754,8 +771,44 @@ "package_type": "material", "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://github.com/Ultimaker/fdm_materials", + "author": { + "author_id": "Generic", + "display_name": "Generic", + "email": "materials@ultimaker.com", + "website": "https://github.com/Ultimaker/fdm_materials", + "description": "Professional 3D printing made accessible." + } + } + }, + "GenericCFFCPE": { + "package_info": { + "package_id": "GenericCFFCPE", + "package_type": "material", + "display_name": "Generic CFF CPE", + "description": "The generic CFF CPE profile which other profiles can be based upon.", + "package_version": "1.1.0", + "sdk_version": 5, + "website": "https://github.com/Ultimaker/fdm_materials", + "author": { + "author_id": "Generic", + "display_name": "Generic", + "email": "materials@ultimaker.com", + "website": "https://github.com/Ultimaker/fdm_materials", + "description": "Professional 3D printing made accessible." + } + } + }, + "GenericCFFPA": { + "package_info": { + "package_id": "GenericCFFPA", + "package_type": "material", + "display_name": "Generic CFF PA", + "description": "The generic CFF PA profile which other profiles can be based upon.", + "package_version": "1.1.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -772,8 +825,8 @@ "package_type": "material", "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -790,8 +843,44 @@ "package_type": "material", "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://github.com/Ultimaker/fdm_materials", + "author": { + "author_id": "Generic", + "display_name": "Generic", + "email": "materials@ultimaker.com", + "website": "https://github.com/Ultimaker/fdm_materials", + "description": "Professional 3D printing made accessible." + } + } + }, + "GenericGFFCPE": { + "package_info": { + "package_id": "GenericGFFCPE", + "package_type": "material", + "display_name": "Generic GFF CPE", + "description": "The generic GFF CPE profile which other profiles can be based upon.", + "package_version": "1.1.0", + "sdk_version": 5, + "website": "https://github.com/Ultimaker/fdm_materials", + "author": { + "author_id": "Generic", + "display_name": "Generic", + "email": "materials@ultimaker.com", + "website": "https://github.com/Ultimaker/fdm_materials", + "description": "Professional 3D printing made accessible." + } + } + }, + "GenericGFFPA": { + "package_info": { + "package_id": "GenericGFFPA", + "package_type": "material", + "display_name": "Generic GFF PA", + "description": "The generic GFF PA profile which other profiles can be based upon.", + "package_version": "1.1.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -809,7 +898,7 @@ "display_name": "Generic HIPS", "description": "The generic HIPS profile which other profiles can be based upon.", "package_version": "1.0.0", - "sdk_version": 6, + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -826,8 +915,8 @@ "package_type": "material", "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -844,8 +933,8 @@ "package_type": "material", "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -863,7 +952,7 @@ "display_name": "Generic PETG", "description": "The generic PETG profile which other profiles can be based upon.", "package_version": "1.0.0", - "sdk_version": 6, + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -880,8 +969,8 @@ "package_type": "material", "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -898,8 +987,8 @@ "package_type": "material", "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -916,8 +1005,8 @@ "package_type": "material", "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -934,8 +1023,8 @@ "package_type": "material", "display_name": "Generic Tough PLA", "description": "The generic Tough PLA profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.0.1", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -952,8 +1041,8 @@ "package_type": "material", "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", - "package_version": "1.0.0", - "sdk_version": 6, + "package_version": "1.2.0", + "sdk_version": 5, "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1060,7 +1149,7 @@ "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", - "diplay_name": "Fiberlogy S.A.", + "display_name": "Fiberlogy S.A.", "email": "grzegorz.h@fiberlogy.com", "website": "http://fiberlogy.com" } @@ -1208,11 +1297,30 @@ "package_type": "material", "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/en/resources/troubleshooting/materials" + } + } + }, + "UltimakerBAM": { + "package_info": { + "package_id": "UltimakerBAM", + "package_type": "material", + "display_name": "Ultimaker Breakaway", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://ultimaker.com/products/materials/breakaway", + "author": { + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", @@ -1227,11 +1335,30 @@ "package_type": "material", "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/en/resources/troubleshooting/materials" + } + } + }, + "UltimakerCPEP": { + "package_info": { + "package_id": "UltimakerCPEP", + "package_type": "material", + "display_name": "Ultimaker CPE+", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://ultimaker.com/products/materials/cpe", + "author": { + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", @@ -1246,11 +1373,11 @@ "package_type": "material", "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", @@ -1265,11 +1392,11 @@ "package_type": "material", "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/pc", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", @@ -1284,11 +1411,30 @@ "package_type": "material", "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/en/resources/troubleshooting/materials" + } + } + }, + "UltimakerPP": { + "package_info": { + "package_id": "UltimakerPP", + "package_type": "material", + "display_name": "Ultimaker PP", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://ultimaker.com/products/materials/pp", + "author": { + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", @@ -1303,11 +1449,49 @@ "package_type": "material", "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", - "package_version": "1.0.0", + "package_version": "1.2.0", "sdk_version": 5, "website": "https://ultimaker.com/products/materials/abs", "author": { - "author_id": "Ultimaker", + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/en/resources/troubleshooting/materials" + } + } + }, + "UltimakerTPU": { + "package_info": { + "package_id": "UltimakerTPU", + "package_type": "material", + "display_name": "Ultimaker TPU 95A", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.2.0", + "sdk_version": 5, + "website": "https://ultimaker.com/products/materials/tpu-95a", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "materials@ultimaker.com", + "website": "https://ultimaker.com", + "description": "Professional 3D printing made accessible.", + "support_website": "https://ultimaker.com/en/resources/troubleshooting/materials" + } + } + }, + "UltimakerTPLA": { + "package_info": { + "package_id": "UltimakerTPLA", + "package_type": "material", + "display_name": "Ultimaker Tough PLA", + "description": "Example package for material and quality profiles for Ultimaker materials.", + "package_version": "1.0.2", + "sdk_version": 5, + "website": "https://ultimaker.com/products/materials/tough-pla", + "author": { + "author_id": "UltimakerPackages", "display_name": "Ultimaker B.V.", "email": "materials@ultimaker.com", "website": "https://ultimaker.com", diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json new file mode 100644 index 0000000000..c14ce1ac31 --- /dev/null +++ b/resources/definitions/anycubic_4max.def.json @@ -0,0 +1,88 @@ +{ + "version": 2, + "name": "Anycubic 4Max", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Jason Scurtu", + "manufacturer": "Anycubic", + "category": "Other", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform": "anycubic_4max_platform.stl", + "has_materials": true, + "quality_definition": "anycubic_4max", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "anycubic_4max_extruder_0" + } + }, + + "overrides": + { + "machine_name": { "default_value": "Anycubic 4Max" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 220 }, + "machine_height": {"default_value": 300 }, + "machine_depth": { "default_value": 220 }, + "machine_center_is_zero": { "default_value": false }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_acceleration": { "default_value": 1500 }, + "machine_max_acceleration_x": { "default_value": 1500 }, + "machine_max_acceleration_y": { "default_value": 1500 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_jerk_xy": { "default_value": 11.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 11.0 }, + + "jerk_enabled": { "value": "True" }, + "jerk_layer_0": { "value": "jerk_topbottom" }, + "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_print": { "value": "11" }, + "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)" }, + + "gantry_height": { "default_value": 25.0 }, + "skin_overlap": { "value": "10" }, + + "acceleration_enabled": { "value": "True" }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_print": { "value": "900" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, + "acceleration_travel": { "value": "acceleration_print" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, + + "speed_layer_0": { "value": "20" }, + "speed_print": { "value": "40" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": { "value": "60" }, + "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, + "speed_wall_x": { "value": "speed_wall" }, + + "infill_pattern": {"value": "'zigzag'" }, + "infill_before_walls": {"value": false }, + + "adhesion_type": { "default_value": "skirt" }, + "material_bed_temperature": { "maximum_value": "150" }, + "material_bed_temperature_layer_0": { "maximum_value": "150" }, + + "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"}, + "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"} + } +} diff --git a/resources/definitions/blackbelt.def.json b/resources/definitions/blackbelt.def.json index 1de22698c3..784a7a7cce 100644 --- a/resources/definitions/blackbelt.def.json +++ b/resources/definitions/blackbelt.def.json @@ -7,6 +7,7 @@ "author": "fieldOfView", "manufacturer": "BLACKBELT 3D B.V.", "category": "BLACKBELT 3D", + "firmware_file": "MarlinBlackBelt3D.hex", "platform": "blackbelt_platform.stl", "platform_offset": [0, -2, 0], "limit_buildvolume": diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index 8dc67a8cad..be024cd6fa 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -12,7 +12,8 @@ "machine_extruder_trains": { "0": "bq_hephestos_extruder_0" - } + }, + "firmware_file": "MarlinHephestos2.hex" }, "overrides": { diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index 0ae1c5e339..b96da6179c 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -12,7 +12,8 @@ "machine_extruder_trains": { "0": "bq_witbox_extruder_0" - } + }, + "firmware_file": "MarlinWitbox.hex" }, "overrides": { diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index b727834db3..fb63867163 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -37,7 +37,7 @@ "top_bottom_thickness": { "default_value": 0.6 }, - "top_bottom_pattern": { + "top_bottom_pattern_0": { "default_value": "concentric" }, "infill_pattern": { diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index d3765ca9b3..08d8e92b72 100755 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -19,13 +19,13 @@ "default_value": "Creality Ender-3" }, "machine_width": { - "default_value": 220 + "default_value": 235 }, "machine_height": { "default_value": 250 }, "machine_depth": { - "default_value": 220 + "default_value": 235 }, "machine_heated_bed": { "default_value": true @@ -87,10 +87,10 @@ "default_value": 5 }, "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z5.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 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed" + "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 Z10 ; Move Z Axis up 10 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\nM104 S0 ; Turn off Extruder temperature\nM140 S0 ; Turn off Heat Bed\nM106 S0 ; Turn off Cooling Fan\nM107 ; Turn off Fan\nM84 ; Disable stepper motors" + "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" } } -} \ No newline at end of file +} diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json old mode 100644 new mode 100755 index a4b2d47a7b..0c4cec3674 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -33,6 +33,7 @@ "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "material_diameter": { "default_value": 1.75 }, "travel_avoid_distance": { "default_value": 1, "value": "1" }, "speed_print" : { "default_value": 70 }, "speed_travel": { "value": "150.0" }, @@ -55,6 +56,7 @@ "support_use_towers" : { "default_value": false }, "jerk_wall_0" : { "value": "30" }, "jerk_travel" : { "default_value": 20 }, - "acceleration_travel" : { "value": 10000 } + "acceleration_travel" : { "value": 10000 }, + "machine_max_feedrate_z" : { "default_value": 150 } } } diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 3f84ed69a4..19c9e92d18 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -178,7 +178,19 @@ "maximum_value": "machine_height", "settable_per_mesh": false, "settable_per_extruder": true - } + }, + "machine_extruder_cooling_fan_number": + { + "label": "Extruder Print Cooling Fan", + "description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.", + "type": "int", + "default_value": 0, + "minimum_value": "0", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false, + "setttable_globally": false + } } }, "platform_adhesion": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 14f948ce5b..bc6e8a40f4 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -230,6 +230,7 @@ "label": "Number of Extruders that are enabled", "description": "Number of extruder trains that are enabled; automatically set in software", "value": "machine_extruder_count", + "default_value": 1, "minimum_value": "1", "maximum_value": "16", "type": "int", @@ -845,6 +846,7 @@ "default_value": 0.4, "type": "float", "value": "line_width", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1191,6 +1193,7 @@ "zigzag": "Zig Zag" }, "default_value": "lines", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1206,6 +1209,7 @@ "zigzag": "Zig Zag" }, "default_value": "lines", + "enabled": "top_layers > 0 or bottom_layers > 0", "value": "top_bottom_pattern", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true @@ -1213,11 +1217,11 @@ "connect_skin_polygons": { "label": "Connect Top/Bottom Polygons", - "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality.", + "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.", "type": "bool", "default_value": false, - "enabled": "top_bottom_pattern == 'concentric'", - "limit_to_extruder": "infill_extruder_nr", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric'", + "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, "skin_angles": @@ -1226,7 +1230,7 @@ "description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", "type": "[int]", "default_value": "[ ]", - "enabled": "top_bottom_pattern != 'concentric'", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1452,7 +1456,8 @@ "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.", "type": "bool", - "default_value": true, + "default_value": false, + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1464,6 +1469,7 @@ "minimum_value": "0", "maximum_value_warning": "10", "type": "int", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1638,7 +1644,7 @@ "infill_pattern": { "label": "Infill Pattern", - "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.", + "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.", "type": "enum", "options": { @@ -1653,7 +1659,8 @@ "concentric": "Concentric", "zigzag": "Zig Zag", "cross": "Cross", - "cross_3d": "Cross 3D" + "cross_3d": "Cross 3D", + "gyroid": "Gyroid" }, "default_value": "grid", "enabled": "infill_sparse_density > 0", @@ -1668,7 +1675,7 @@ "type": "bool", "default_value": false, "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", - "enabled": "infill_pattern == 'lines' or infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "enabled": "infill_pattern == 'lines' or infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'gyroid'", "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, @@ -1678,8 +1685,8 @@ "description": "Connect infill paths where they run next to each other. For infill patterns which consist of several closed polygons, enabling this setting greatly reduces the travel time.", "type": "bool", "default_value": true, - "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0", - "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0", + "value": "(infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0) and infill_wall_line_count > 0", + "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'concentric' or infill_multiplier % 2 == 0 or infill_wall_line_count > 1", "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, @@ -1792,7 +1799,7 @@ "minimum_value_warning": "-50", "maximum_value_warning": "100", "value": "5 if top_bottom_pattern != 'concentric' else 0", - "enabled": "top_bottom_pattern != 'concentric'", + "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": @@ -1807,7 +1814,7 @@ "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_bottom_pattern != 'concentric'", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", "settable_per_mesh": true } } @@ -1920,6 +1927,7 @@ "default_value": 0, "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", "minimum_value": "0", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true, "children": @@ -1933,6 +1941,7 @@ "default_value": 0, "value": "skin_preshrink", "minimum_value": "0", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1945,6 +1954,7 @@ "default_value": 0, "value": "skin_preshrink", "minimum_value": "0", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true } @@ -1960,6 +1970,7 @@ "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", "minimum_value": "-skin_preshrink", "limit_to_extruder": "top_bottom_extruder_nr", + "enabled": "top_layers > 0 or bottom_layers > 0", "settable_per_mesh": true, "children": { @@ -1972,6 +1983,7 @@ "default_value": 2.8, "value": "expand_skins_expand_distance", "minimum_value": "-top_skin_preshrink", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -1984,6 +1996,7 @@ "default_value": 2.8, "value": "expand_skins_expand_distance", "minimum_value": "-bottom_skin_preshrink", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true } @@ -1999,7 +2012,7 @@ "minimum_value_warning": "2", "maximum_value": "90", "default_value": 90, - "enabled": "top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true, "children": @@ -2013,7 +2026,7 @@ "default_value": 2.24, "value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))", "minimum_value": "0", - "enabled": "top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true } @@ -2563,6 +2576,7 @@ "default_value": 30, "value": "speed_print / 2", "limit_to_extruder": "top_bottom_extruder_nr", + "enabled": "top_layers > 0 or bottom_layers > 0", "settable_per_mesh": true }, "speed_support": @@ -2887,6 +2901,7 @@ "default_value": 3000, "value": "acceleration_topbottom", "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", + "enabled": "top_layers > 0 or bottom_layers > 0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true }, @@ -3187,7 +3202,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_print", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "(top_layers > 0 or bottom_layers > 0) and resolveOrValue('jerk_enabled')", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -3816,7 +3831,8 @@ "value": "1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0", "enabled": "support_enable", "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true + "settable_per_mesh": false, + "settable_per_extruder": true }, "zig_zaggify_support": { @@ -3902,6 +3918,48 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "support_brim_enable": + { + "label": "Enable Support Brim", + "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.", + "type": "bool", + "default_value": false, + "enabled": "support_enable or support_tree_enable", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "support_brim_width": + { + "label": "Support Brim Width", + "description": "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material.", + "type": "float", + "unit": "mm", + "default_value": 8.0, + "minimum_value": "0.0", + "maximum_value_warning": "50.0", + "enabled": "support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "support_infill_extruder_nr", + "children": + { + "support_brim_line_count": + { + "label": "Support Brim Line Count", + "description": "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material.", + "type": "int", + "default_value": 20, + "minimum_value": "0", + "maximum_value_warning": "50 / skirt_brim_line_width", + "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))", + "enabled": "support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "support_infill_extruder_nr" + } + } + }, "support_z_distance": { "label": "Support Z Distance", @@ -4552,6 +4610,17 @@ } } }, + "brim_replaces_support": + { + "label": "Brim Replaces Support", + "description": "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions.", + "type": "bool", + "default_value": true, + "enabled": "resolveOrValue('adhesion_type') == 'brim' and support_enable", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "support_infill_extruder_nr" + }, "brim_outside_only": { "label": "Brim Only on Outside", @@ -5861,7 +5930,7 @@ "description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.", "type": "bool", "default_value": false, - "enabled": "top_bottom_pattern != 'concentric'", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -6529,9 +6598,8 @@ "unit": "%", "type": "float", "default_value": 100, - "minimum_value": "10", + "minimum_value": "0.001", "minimum_value_warning": "25", - "maximum_value": "100", "settable_per_mesh": true }, "bridge_settings_enabled": diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 2f9173c90e..d40d63f97b 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -8,7 +8,6 @@ "manufacturer": "NA", "file_formats": "text/x-gcode", "has_materials": false, - "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ], "machine_extruder_trains": { "0": "makeit_l_dual_1st", diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 0cd7b42df3..1f0381df86 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -8,7 +8,6 @@ "manufacturer": "NA", "file_formats": "text/x-gcode", "has_materials": false, - "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ], "machine_extruder_trains": { "0": "makeit_dual_1st", diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 1770b7a979..3b02215e74 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -6,6 +6,7 @@ "visible": true, "author": "Ultimaker", "manufacturer": "MakerBot", + "machine_x3g_variant": "r1", "file_formats": "application/x3g", "platform_offset": [ 0, 0, 0], "machine_extruder_trains": diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 9865abedda..0ed8d657a2 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -10,7 +10,6 @@ "platform": "tam_series1.stl", "platform_offset": [-580.0, -6.23, 253.5], "has_materials": false, - "supported_actions": ["UpgradeFirmware"], "machine_extruder_trains": { "0": "tam_extruder_0" diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 94a20b371e..d6a5ff5ecd 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -14,6 +14,8 @@ "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" diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index a91d2332b0..bbe61d49fb 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -17,11 +17,12 @@ "preferred_variant_name": "0.4 mm", "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"], "first_start_actions": ["UM2UpgradeSelection"], - "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"], + "supported_actions":["UM2UpgradeSelection"], "machine_extruder_trains": { "0": "ultimaker2_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker2.hex" }, "overrides": { "machine_name": { "default_value": "Ultimaker 2" }, diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index af169c94fb..39a1ca37b3 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -14,7 +14,8 @@ "machine_extruder_trains": { "0": "ultimaker2_extended_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker2extended.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index f3a8bfcf9f..0242115057 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -10,11 +10,11 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "supported_actions": ["UpgradeFirmware"], "machine_extruder_trains": { "0": "ultimaker2_extended_plus_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker2extended-plus.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index c66fb38fc0..e2ad2b00a1 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -13,11 +13,11 @@ "platform_texture": "Ultimaker2Gobackplate.png", "platform_offset": [0, 0, 0], "first_start_actions": [], - "supported_actions": ["UpgradeFirmware"], "machine_extruder_trains": { "0": "ultimaker2_go_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker2go.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index bc4d3a6230..bf48353f59 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -15,11 +15,11 @@ "has_machine_materials": true, "has_machine_quality": true, "first_start_actions": [], - "supported_actions": ["UpgradeFirmware"], "machine_extruder_trains": { "0": "ultimaker2_plus_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker2plus.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index b1daa6b780..72756de2a5 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -24,7 +24,16 @@ }, "first_start_actions": [ "DiscoverUM3Action" ], "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false + "supports_usb_connection": false, + "firmware_update_info": { + "id": 9066, + "check_urls": + [ + "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources", + "http://software.ultimaker.com/releases/firmware/9066/stable/version.txt" + ], + "update_url": "https://ultimaker.com/firmware" + } }, diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index eb3cda9320..68f26969b7 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -23,7 +23,16 @@ "1": "ultimaker3_extended_extruder_right" }, "first_start_actions": [ "DiscoverUM3Action" ], - "supported_actions": [ "DiscoverUM3Action" ] + "supported_actions": [ "DiscoverUM3Action" ], + "firmware_update_info": { + "id": 9511, + "check_urls": + [ + "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources", + "http://software.ultimaker.com/releases/firmware/9511/stable/version.txt" + ], + "update_url": "https://ultimaker.com/firmware" + } }, "overrides": { diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index c961423504..4714fc1217 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -14,11 +14,13 @@ "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"], "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"], + "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"], "machine_extruder_trains": { "0": "ultimaker_original_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker-{baudrate}.hex", + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 55eddba85f..0dc1cb3d2d 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -19,8 +19,10 @@ "0": "ultimaker_original_dual_1st", "1": "ultimaker_original_dual_2nd" }, + "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"] + "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"] }, "overrides": { diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 71aa53b2bf..01523f34b7 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -12,11 +12,12 @@ "platform_texture": "UltimakerPlusbackplate.png", "quality_definition": "ultimaker_original", "first_start_actions": ["UMOCheckup", "BedLevel"], - "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"], + "supported_actions": ["UMOCheckup", "BedLevel"], "machine_extruder_trains": { "0": "ultimaker_original_plus_extruder_0" - } + }, + "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex" }, "overrides": { diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 115c84c0db..310765dbc3 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -30,7 +30,12 @@ "first_start_actions": [ "DiscoverUM3Action" ], "supported_actions": [ "DiscoverUM3Action" ], "supports_usb_connection": false, - "weight": -1 + "weight": -1, + "firmware_update_info": { + "id": 9051, + "check_urls": ["http://software.ultimaker.com/releases/firmware/9051/stable/version.txt"], + "update_url": "https://ultimaker.com/firmware" + } }, "overrides": { @@ -63,7 +68,7 @@ "machine_end_gcode": { "default_value": "" }, "prime_tower_position_x": { "default_value": 345 }, "prime_tower_position_y": { "default_value": 222.5 }, - "prime_blob_enable": { "enabled": true }, + "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel": { @@ -127,6 +132,7 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "skin_overlap": { "value": "10" }, + "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -145,6 +151,7 @@ "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_thickness": { "value": "1" }, + "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, diff --git a/resources/definitions/wanhao_d6.def.json b/resources/definitions/wanhao_d6.def.json index 6164f4d016..e269615c4a 100644 --- a/resources/definitions/wanhao_d6.def.json +++ b/resources/definitions/wanhao_d6.def.json @@ -18,9 +18,6 @@ 0, -28, 0 - ], - "supported_actions": [ - "UpgradeFirmware" ] }, "overrides": { diff --git a/resources/extruders/anycubic_4max_extruder_0.def.json b/resources/extruders/anycubic_4max_extruder_0.def.json new file mode 100644 index 0000000000..5c2ab8d479 --- /dev/null +++ b/resources/extruders/anycubic_4max_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "anycubic_4max_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "anycubic_4max", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/deltacomb_extruder_0.def.json b/resources/extruders/deltacomb_extruder_0.def.json old mode 100644 new mode 100755 diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 2fe966fe99..1874604139 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." +msgid "Please prepare G-code before exporting." msgstr "" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 @@ -74,6 +74,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -84,27 +89,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "" "A USB print is in progress, closing Cura will stop this print. Are you sure?" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "" @@ -198,7 +203,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "" @@ -227,8 +232,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "" @@ -255,115 +260,110 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "" "Connected over the network. Please approve the access request on the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "" "Access to the printer requested. Please approve the request on the printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "" "There is an issue with the configuration of your Ultimaker, which makes it " "impossible to start the print. Please resolve this issues before continuing." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "" "There is a mismatch between the configuration or calibration of the printer " @@ -371,33 +371,33 @@ msgid "" "that are inserted in your printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -407,19 +407,19 @@ msgctxt "@action:button" msgid "Cancel" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "" @@ -427,23 +427,23 @@ msgid "" "{remote_printcore_name}) selected for extruder {extruder_id}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "" "The PrintCores and/or materials on your printer differ from those within " @@ -451,39 +451,39 @@ msgid "" "and materials that are inserted in your printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 -#, 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:422 #, 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:424 +#, python-brace-format +msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "" @@ -493,12 +493,17 @@ msgctxt "@action" msgid "Connect via Network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "" "@info Don't translate {machine_name}, since it gets replaced by a printer " @@ -508,38 +513,33 @@ msgid "" "update the firmware on your printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "" - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "" @@ -553,32 +553,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "" "Allow Cura to send anonymized usage statistics to help prioritize future " @@ -616,24 +616,24 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "" "Unable to slice with the current material as it is incompatible with the " "selected machine or configuration." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "" @@ -641,7 +641,7 @@ msgid "" "errors: {0}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "" @@ -649,13 +649,13 @@ msgid "" "errors on one or more models: {error_labels}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "" "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "" @@ -663,20 +663,20 @@ msgid "" "%s." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "" "Nothing to slice because none of the models fit the build volume. Please " "scale or rotate models to fit." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "" @@ -692,13 +692,13 @@ msgid "Configure Per Model Settings" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "" @@ -710,7 +710,7 @@ msgid "3MF File" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "" @@ -739,18 +739,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 msgctxt "@info:generic" msgid "" "Make sure the g-code is suitable for your printer and printer configuration " @@ -763,16 +763,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -794,11 +784,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -809,79 +794,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -895,19 +880,19 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "" "The selected material is incompatible with the selected machine or " "configuration." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, python-format msgctxt "@info:generic" msgid "" @@ -915,7 +900,7 @@ msgid "" "[%s]" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "" @@ -947,8 +932,6 @@ msgid "Export succeeded" msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" @@ -958,14 +941,20 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "" "This profile {0} contains incorrect data, could not " "import it." @@ -973,47 +962,53 @@ msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "" -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1040,12 +1035,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "" @@ -1062,22 +1057,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "" "Tried to restore a Cura backup that does not match your current version." @@ -1252,22 +1247,22 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, python-format msgctxt "" "@info 'width', 'depth' and 'height' are variable names that must NOT be " @@ -1275,19 +1270,19 @@ msgctxt "" msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" @@ -1318,9 +1313,9 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "" @@ -1472,22 +1467,32 @@ msgid "" "diameter will be overridden by the material and/or the profile." msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "" @@ -1509,41 +1514,42 @@ msgid "" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "" @@ -1578,7 +1584,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " +msgid "Confirm uninstall" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 @@ -1628,7 +1634,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "" @@ -1709,48 +1715,96 @@ msgid "Changelog" msgstr "" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "" +"Firmware is the piece of software running directly on your 3D printer. This " +"firmware controls the step motors, regulates the temperature and ultimately " +"makes your printer work." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "" +"The firmware shipping with new printers works, but new versions tend to have " +"more features and improvements." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "" +"Firmware can not be updated because there is no connection with the printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "" +"Firmware can not be updated because the connection with the printer does not " +"support upgrading firmware." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "" @@ -1760,24 +1814,24 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "" "This printer/group is already added to Cura. Please select another printer/" "group." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 msgctxt "@label" msgid "" "To print directly to your printer over the network, please make sure your " @@ -1789,18 +1843,18 @@ msgid "" "Select your printer from the list below:" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1808,246 +1862,307 @@ msgctxt "@action:button" msgid "Remove" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "" "If your printer is not listed, read the network printing " "troubleshooting guide" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" +msgid "Printer selection" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "" +"The assigned printer, %1, requires the following configuration change(s):" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "" +"Starting a print job with an incompatible configuration could damage your 3D " +"printer. Are you sure you want to override the configuration and print %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2138,17 +2253,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "" @@ -2279,23 +2394,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "" @@ -2346,6 +2461,7 @@ msgid "Type" msgstr "" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "" @@ -2363,6 +2479,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2437,84 +2554,6 @@ msgctxt "@action:button" msgid "Open" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "" -"@label Print estimates: m for meters, g for grams, %4 is currency and %3 is " -"print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2562,41 +2601,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "" -"Firmware is the piece of software running directly on your 3D printer. This " -"firmware controls the step motors, regulates the temperature and ultimately " -"makes your printer work." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "" -"The firmware shipping with new printers works, but new versions tend to have " -"more features and improvements." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2784,7 +2788,7 @@ msgid "Customized" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "" @@ -2934,6 +2938,12 @@ msgctxt "@action:button" msgid "Import" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -3021,222 +3031,222 @@ msgid "Unit" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 msgctxt "@info:tooltip" msgid "" "When you have made changes to a profile and switched to a different one, a " @@ -3244,44 +3254,44 @@ 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -3289,33 +3299,33 @@ msgid "" "stored." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "" @@ -3337,7 +3347,7 @@ msgid "Connection:" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "" @@ -3363,7 +3373,7 @@ msgid "Aborting print..." msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "" @@ -3446,17 +3456,17 @@ msgid "Global Settings" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "" @@ -3471,119 +3481,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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 "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -3593,7 +3623,7 @@ msgctxt "@label" msgid "Profile:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the " @@ -3602,53 +3632,53 @@ msgid "" "Click to open the profile manager." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated " @@ -3667,19 +3697,19 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3687,7 +3717,7 @@ msgid "" "Click to restore the value of the profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value " @@ -3852,12 +3882,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -3867,12 +3897,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "" @@ -3933,19 +3963,46 @@ msgid "" "G-code files cannot be modified" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "" "Recommended Print Setup

Print with the recommended settings " "for the selected printer, material and quality." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "" "Custom Print Setup

Print with finegrained control over every " @@ -3972,223 +4029,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "" @@ -4249,7 +4306,7 @@ msgid "Select the active output device" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "" @@ -4272,147 +4329,147 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "" "Are you sure you want to start a new project? This will clear the build " "plate and any unsaved settings." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 msgctxt "@text:window" msgid "" "We have found one or more G-Code files within the files you have selected. " @@ -4425,11 +4482,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4507,24 +4559,24 @@ msgid "" "Gradual infill will gradually increase the amount of infill towards the top." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 msgctxt "@label" msgid "" "Generate structures to support parts of the model which have overhangs. " "Without these structures, such parts would collapse during printing." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "" "Select which extruder to use for support. This will build up supporting " @@ -4532,19 +4584,19 @@ msgid "" "mid air." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 msgctxt "@label" msgid "" "Enable printing a brim or raft. This will add a flat area around or under " "your object which is easy to cut off afterwards." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "" "Need help improving your prints?
Read the Ultimaker " @@ -4709,6 +4761,16 @@ msgctxt "name" msgid "Changelog" msgstr "" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -5059,16 +5121,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 2b118f942e..3433edc5bd 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-09-28 14:42+0200\n" "Last-Translator: Bothof \n" "Language-Team: German\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter unterstützt keinen Nicht-Textmodus." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Generieren Sie vor dem Speichern bitte einen G-Code." +msgid "Please prepare G-code before exporting." +msgstr "Vor dem Exportieren bitte G-Code vorbereiten." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -64,17 +64,18 @@ msgid "" "

{model_names}

\n" "

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

\n" "

View print quality guide

" -msgstr "" -"

Ein oder mehrere 3D-Modelle können möglicherweise aufgrund der Modellgröße und Materialkonfiguration nicht optimal gedruckt werden:

\n" -"

{model_names}

\n" -"

Erfahren Sie, wie Sie die bestmögliche Druckqualität und Zuverlässigkeit sicherstellen.

\n" -"

Leitfaden zu Druckqualität anzeigen

" +msgstr "

Ein oder mehrere 3D-Modelle können möglicherweise aufgrund der Modellgröße und Materialkonfiguration nicht optimal gedruckt werden:

\n

{model_names}

\n

Erfahren Sie, wie Sie die bestmögliche Druckqualität und Zuverlässigkeit sicherstellen.

\n

Leitfaden zu Druckqualität anzeigen

" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.py:32 msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Änderungsprotokoll anzeigen" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Firmware aktualisieren" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +86,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Das Profil wurde geglättet und aktiviert." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB-Drucken" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Über USB drucken" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Über USB drucken" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Über USB verbunden" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -137,7 +138,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeWriter unterstützt keinen Textmodus." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" @@ -159,7 +160,7 @@ msgid "Save to Removable Drive {0}" msgstr "Auf Wechseldatenträger speichern {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Es sind keine Dateiformate zum Schreiben vorhanden!" @@ -198,7 +199,7 @@ msgstr "Konnte nicht auf dem Wechseldatenträger gespeichert werden {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Fehler" @@ -227,8 +228,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Warnhinweis" @@ -255,141 +256,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Wechseldatenträger" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Drucken über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Drücken über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Über Netzwerk verbunden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Über Netzwerk verbunden. Geben Sie die Zugriffsanforderung für den Drucker frei." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Über Netzwerk verbunden. Kein Zugriff auf die Druckerverwaltung." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Zugriff auf Drucker erforderlich. Bestätigen Sie den Zugriff auf den Drucker" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Authentifizierungsstatus" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Authentifizierungsstatus" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Erneut versuchen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Zugriffanforderung erneut senden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Zugriff auf den Drucker genehmigt" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Kein Zugriff auf das Drucken mit diesem Drucker. Druckauftrag kann nicht gesendet werden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Zugriff anfordern" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Zugriffsanforderung für den Drucker senden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Es kann kein neuer Druckauftrag gestartet werden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Es liegt ein Problem mit der Konfiguration Ihres Ultimaker vor, das den Druckstart verhindert. Lösen Sie dieses Problem bitte, bevor Sie fortfahren." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Konfiguration nicht übereinstimmend" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Möchten Sie wirklich mit der gewählten Konfiguration drucken?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Daten werden zum Drucker gesendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Daten werden gesendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +395,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Abbrechen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Kein PrintCore geladen in Steckplatz {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Kein Material geladen in Steckplatz {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "Abweichender PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) für Extruder gewählt {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Abweichendes Material (Cura: {0}, Drucker: {1}) für Extruder {2} gewählt" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Synchronisieren Ihres Druckers" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Möchten Sie Ihre aktuelle Druckerkonfiguration in Cura verwenden?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Die PrintCores und/oder Materialien auf Ihrem Drucker unterscheiden sich von denen Ihres aktuellen Projekts. 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/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Über Netzwerk verbunden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Daten gesendet" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "In Monitor überwachen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Druck vollendet" @@ -480,49 +476,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Anschluss über Netzwerk" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Überwachen" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Zugriff auf Update-Informationen nicht möglich." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Für Ihren {machine_name} sind neue Funktionen verfügbar! Es wird empfohlen, ein Firmware-Update für Ihren Drucker auszuführen." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Neue Firmware für %s verfügbar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Anleitung für die Aktualisierung" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Zugriff auf Update-Informationen nicht möglich." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Schichtenansicht" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura zeigt die Schichten nicht akkurat an, wenn Wire Printing aktiviert ist" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Simulationsansicht" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "G-Code ändern" @@ -536,32 +532,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Erstellt ein Volumen, in dem keine Stützstrukturen gedruckt werden." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura erfasst anonymisierte Nutzungsstatistiken." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Daten werden erfasst" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Mehr Infos" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Siehe mehr Informationen dazu, was Cura sendet." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Zulassen" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Damit lassen Sie zu, dass Cura anonymisierte Nutzungsstatistiken sendet, um zukünftige Verbesserungen für Cura zu definieren. Einige Ihrer Präferenzen und Einstellungen, die Cura-Version und ein Hash der Modelle, die Sie slicen, werden gesendet." @@ -596,56 +592,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF-Bilddatei" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Slicing mit dem aktuellen Material nicht möglich, da es mit der gewählten Maschine oder Konfiguration nicht kompatibel ist." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Slicing nicht möglich" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Die aktuellen Einstellungen lassen kein Schneiden (Slicing) zu. Die folgenden Einstellungen sind fehlerhaft:{0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Aufgrund der Pro-Modell-Einstellungen ist kein Schneiden (Slicing) möglich. Die folgenden Einstellungen sind für ein oder mehrere Modelle fehlerhaft: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Schneiden (Slicing) ist nicht möglich, da der Einzugsturm oder die Einzugsposition(en) ungültig ist (sind)." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Schneiden (Slicing) ist nicht möglich, da Objekte vorhanden sind, die mit dem deaktivierten Extruder %s verbunden sind." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Es ist kein Objekt zum Schneiden vorhanden, da keines der Modelle der Druckabmessung entspricht. Bitte die Modelle passend skalieren oder drehen." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Schichten werden verarbeitet" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informationen" @@ -661,13 +657,13 @@ msgid "Configure Per Model Settings" msgstr "Pro Objekteinstellungen konfigurieren" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Empfohlen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Benutzerdefiniert" @@ -679,7 +675,7 @@ msgid "3MF File" msgstr "3MF-Datei" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Düse" @@ -705,18 +701,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G-Datei" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-Code parsen" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-Code-Details" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Stellen Sie sicher, dass der G-Code für Ihren Drucker und Ihre Druckerkonfiguration geeignet ist, bevor Sie die Datei senden. Der Darstellung des G-Codes ist möglicherweise nicht korrekt." @@ -727,16 +723,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-Profil" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profilassistent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profilassistent" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +744,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Upgrades wählen" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Firmware aktualisieren" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +754,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Druckbett nivellieren" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Außenwand" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Innenwände" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Außenhaut" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Füllung" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Stützstruktur-Füllung" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Stützstruktur-Schnittstelle" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Stützstruktur" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Bewegungen" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Einzüge" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Sonstige" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Unbekannt" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Vorgeschnittene Datei {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Login fehlgeschlagen" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Datei bereits vorhanden" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +838,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Nicht überschrieben" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Das gewählte Material ist mit der gewählten Maschine oder Konfiguration nicht kompatibel." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Material nicht kompatibel" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Einstellungen aktualisiert" @@ -902,8 +883,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +890,70 @@ msgstr "Import des Profils aus Datei {0} fehlgeschlagen: or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Benutzerdefiniertes Profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Es konnte keine Qualitätsangabe {0} für die vorliegende Konfiguration gefunden werden." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +980,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Benutzerdefiniertes Material" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Benutzerdefiniert" @@ -1009,22 +1000,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Produktabmessungen" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Konnte kein Archiv von Benutzer-Datenverzeichnis {} erstellen" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Versucht, ein Cura-Backup-Verzeichnis ohne entsprechende Daten oder Metadaten wiederherzustellen." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Versucht, ein Cura-Backup zu erstellen, das nicht Ihrer aktuellen Version entspricht." @@ -1078,12 +1069,7 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "" -"

Hoppla, bei Ultimaker Cura ist ein Problem aufgetreten.

\n" -"

Beim Start ist ein nicht behebbarer Fehler aufgetreten. Er wurde möglicherweise durch einige falsche Konfigurationsdateien verursacht. Wir empfehlen ein Backup und Reset Ihrer Konfiguration.

\n" -"

Backups sind im Konfigurationsordner abgelegt.

\n" -"

Senden Sie uns diesen Absturzbericht bitte, um das Problem zu beheben.

\n" -" " +msgstr "

Hoppla, bei Ultimaker Cura ist ein Problem aufgetreten.

\n

Beim Start ist ein nicht behebbarer Fehler aufgetreten. Er wurde möglicherweise durch einige falsche Konfigurationsdateien verursacht. Wir empfehlen ein Backup und Reset Ihrer Konfiguration.

\n

Backups sind im Konfigurationsordner abgelegt.

\n

Senden Sie uns diesen Absturzbericht bitte, um das Problem zu beheben.

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:102 msgctxt "@action:button" @@ -1116,10 +1102,7 @@ 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 "" -"

Ein schwerer Fehler ist in Cura aufgetreten. Senden Sie uns diesen Absturzbericht, um das Problem zu beheben

\n" -"

Verwenden Sie bitte die Schaltfläche „Bericht senden“, um den Fehlerbericht automatisch an unsere Server zu senden

\n" -" " +msgstr "

Ein schwerer Fehler ist in Cura aufgetreten. Senden Sie uns diesen Absturzbericht, um das Problem zu beheben

\n

Verwenden Sie bitte die Schaltfläche „Bericht senden“, um den Fehlerbericht automatisch an unsere Server zu senden

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:177 msgctxt "@title:groupbox" @@ -1199,40 +1182,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Bericht senden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Geräte werden geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Die Szene wird eingerichtet..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Die Benutzeroberfläche wird geladen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Das gewählte Modell war zu klein zum Laden." @@ -1263,9 +1246,9 @@ msgstr "X (Breite)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1383,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Der Nenndurchmesser des durch den Drucker unterstützten Filaments. Der exakte Durchmesser wird durch das Material und/oder das Profil überschrieben." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "X-Versatz Düse" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Y-Versatz Düse" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Kühllüfter-Nr." + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "G-Code Extruder-Start" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "G-Code Extruder-Ende" @@ -1436,41 +1429,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Verbindung zur Cura Paket-Datenbank konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Verbindung." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Plugins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materialien" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Version" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Zuletzt aktualisiert" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Unbekannt" @@ -1505,8 +1499,8 @@ msgstr "Zurück" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Deinstallieren bestätigen " +msgid "Confirm uninstall" +msgstr "Deinstallieren bestätigen" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1547,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Generische Materialien" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Installiert" @@ -1584,10 +1578,7 @@ 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 "" -"Dieses Plugin enthält eine Lizenz.\n" -"Sie müssen diese Lizenz akzeptieren, um das Plugin zu installieren.\n" -"Stimmen Sie den nachfolgenden Bedingungen zu?" +msgstr "Dieses Plugin enthält eine Lizenz.\nSie müssen diese Lizenz akzeptieren, um das Plugin zu installieren.\nStimmen Sie den nachfolgenden Bedingungen zu?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:54 msgctxt "@action:button" @@ -1635,48 +1626,88 @@ msgid "Changelog" msgstr "Änderungsprotokoll" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Schließen" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Firmware aktualisieren" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Die Firmware ist der Teil der Software, der direkt auf Ihrem 3D-Drucker läuft. Diese Firmware kontrolliert die Schrittmotoren, reguliert die Temperatur und sorgt letztlich dafür, dass Ihr Drucker funktioniert." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Die mit neuen Druckern gelieferte Firmware funktioniert, allerdings enthalten neue Versionen üblicherweise mehr Funktionen und Verbesserungen." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Firmware automatisch aktualisieren" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Benutzerdefinierte Firmware hochladen" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Firmware kann nicht aktualisiert werden, da keine Verbindung zum Drucker besteht." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Firmware kann nicht aktualisiert werden, da die Verbindung zum Drucker die Firmware-Aktualisierung nicht unterstützt." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Benutzerdefinierte Firmware wählen" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Firmware-Aktualisierung" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Die Firmware wird aktualisiert." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Firmware-Aktualisierung abgeschlossen." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Die Firmware-Aktualisierung ist aufgrund eines unbekannten Fehlers fehlgeschlagen." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Die Firmware-Aktualisierung ist aufgrund eines Kommunikationsfehlers fehlgeschlagen." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Die Firmware-Aktualisierung ist aufgrund eines Eingabe-/Ausgabefehlers fehlgeschlagen." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Die Firmware-Aktualisierung ist aufgrund von fehlender Firmware fehlgeschlagen." @@ -1686,44 +1717,41 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Benutzervereinbarung" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Vorhandene Verbindung" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Diese/r Drucker/Gruppe wurde bereits zu Cura hinzugefügt. Wählen Sie bitte eine/n andere/n Drucker/Gruppe." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Anschluss an vernetzten Drucker" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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:" +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\nWählen Sie Ihren Drucker aus der folgenden Liste:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Hinzufügen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Bearbeiten" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1759,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Entfernen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Aktualisieren" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Wenn Ihr Drucker nicht aufgeführt ist, lesen Sie die Anleitung für Fehlerbehebung für Netzwerkdruck" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Typ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Firmware-Version" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Adresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Dieser Drucker ist nicht eingerichtet um eine Gruppe von Druckern anzusteuern." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Dieser Drucker steuert eine Gruppe von %1 Druckern an." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Der Drucker unter dieser Adresse hat nicht reagiert." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Verbinden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Druckeradresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Geben Sie die IP-Adresse oder den Hostnamen Ihres Druckers auf dem Netzwerk ein." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Drucken über Netzwerk" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Druckerauswahl" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Drucken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Drucken über Netzwerk" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Warten auf: Drucker nicht verfügbar" +msgid "Printer selection" +msgstr "Druckerauswahl" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Warten auf: Ersten verfügbaren" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Warten auf: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Vorziehen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Druckauftrag vorziehen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Soll dieser %1 wirklich an den Anfang der Warteschlange vorgezogen werden?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Löschen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Druckauftrag löschen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Soll %1 wirklich gelöscht werden?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Warteschlange verwalten" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "In Warteschlange" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Drucken" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Drucker verwalten" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Nicht verfügbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Nicht erreichbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Verfügbar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Abgebrochen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Beendet" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Vorbereitung" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Wird pausiert" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Wird fortgesetzt" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Handlung erforderlich" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Warten auf: Drucker nicht verfügbar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Warten auf: Ersten verfügbaren" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Warten auf: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Konfigurationsänderung" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "Der zugewiesene Drucker %1 erfordert die folgende(n) Konfigurationsänderung(en):" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Überschreiben" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Das Starten eines Druckauftrags mit einer inkompatiblen Konfiguration kann Ihren 3D-Drucker beschädigen. Möchten Sie die Konfiguration wirklich überschreiben und %1 drucken?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Konfiguration überschreiben und Druck starten" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Glas" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Aluminium" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Warteschlange verwalten" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "In Warteschlange" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Drucken" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Drucker verwalten" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Vorziehen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Löschen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Zurückkehren" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pausieren" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Abbrechen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Soll dieser %1 wirklich an den Anfang der Warteschlange vorgezogen werden?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Druckauftrag vorziehen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Soll %1 wirklich gelöscht werden?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Druckauftrag löschen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Möchten Sie %1 wirklich abbrechen?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Drucken abbrechen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Möchten Sie %1 wirklich abbrechen?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Abgebrochen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Beendet" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Vorbereitung" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Wird pausiert" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Pausiert" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Wird fortgesetzt" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Handlung erforderlich" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Mit einem Drucker verbinden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Die Druckerkonfiguration in Cura laden" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Konfiguration aktivieren" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Die Druckerkonfiguration in Cura laden" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2143,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Skripts Nachbearbeitung" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Ein Skript hinzufügen" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Einstellungen" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Aktive Skripts Nachbearbeitung ändern" @@ -2194,23 +2278,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Einstellungen für Füllung von anderen Modellen bearbeiten" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Einstellungen wählen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Einstellungen für die benutzerdefinierte Anpassung dieses Modells wählen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtern..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Alle anzeigen" @@ -2261,6 +2345,7 @@ msgid "Type" msgstr "Typ" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Druckergruppe" @@ -2278,6 +2363,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2438,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Öffnen" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Zurück" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Export" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Weiter" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Tipp" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00 Stunden 00 Minuten" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Kostenangabe" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Insgesamt:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Druckexperiment" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Checkliste" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2479,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Gehe zur nächsten Position" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Firmware aktualisieren" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Die Firmware ist der Teil der Software, der direkt auf Ihrem 3D-Drucker läuft. Diese Firmware kontrolliert die Schrittmotoren, reguliert die Temperatur und sorgt letztlich dafür, dass Ihr Drucker funktioniert." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Die mit neuen Druckern gelieferte Firmware funktioniert, allerdings enthalten neue Versionen üblicherweise mehr Funktionen und Verbesserungen." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Firmware automatisch aktualisieren" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Benutzerdefinierte Firmware hochladen" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Benutzerdefinierte Firmware wählen" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2666,9 +2646,7 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "" -"Sie haben einige Profileinstellungen angepasst.\n" -"Möchten Sie diese Einstellungen übernehmen oder verwerfen?" +msgstr "Sie haben einige Profileinstellungen angepasst.\nMöchten Sie diese Einstellungen übernehmen oder verwerfen?" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -2686,7 +2664,7 @@ msgid "Customized" msgstr "Angepasst" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Stets nachfragen" @@ -2834,6 +2812,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Import" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Export" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2919,283 +2903,283 @@ msgid "Unit" msgstr "Einheit" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Allgemein" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Schnittstelle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Sprache:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Währung:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch schneiden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Viewport-Verhalten" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Überhang anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "In Mausrichtung zoomen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Dateien öffnen und speichern" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Große Modelle anpassen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extrem kleine Modelle skalieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 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:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Immer als Projekt öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Modelle immer importieren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Geänderte Einstellungen immer verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privatsphäre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bei Start nach Updates suchen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonyme) Druckinformationen senden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Mehr Informationen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Experimentell" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Mehrfach-Druckplattenfunktion verwenden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Drucker" @@ -3217,7 +3201,7 @@ msgid "Connection:" msgstr "Verbindung:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Der Drucker ist nicht verbunden." @@ -3243,7 +3227,7 @@ msgid "Aborting print..." msgstr "Drucken wird abgebrochen..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" @@ -3324,17 +3308,17 @@ msgid "Global Settings" msgstr "Globale Einstellungen" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Drucker hinzufügen" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Druckername:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Drucker hinzufügen" @@ -3349,121 +3333,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Über Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "Version: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Komplettlösung für den 3D-Druck mit geschmolzenem Filament." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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 wurde von Ultimaker B.V. in Zusammenarbeit mit der Community entwickelt.\n" -"Cura verwendet mit Stolz die folgenden Open Source-Projekte:" +msgstr "Cura wurde von Ultimaker B.V. in Zusammenarbeit mit der Community entwickelt.\nCura verwendet mit Stolz die folgenden Open Source-Projekte:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafische Benutzerschnittstelle" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Anwendungsrahmenwerk" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-Code-Generator" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Bibliothek Interprozess-Kommunikation" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Programmiersprache" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI-Rahmenwerk" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI-Rahmenwerk Einbindungen" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ Einbindungsbibliothek" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Format Datenaustausch" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Support-Bibliothek für wissenschaftliche Berechnung" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Support-Bibliothek für schnelleres Rechnen" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Support-Bibliothek für die Handhabung von STL-Dateien" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Support-Bibliothek für die Handhabung von ebenen Objekten" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Support-Bibliothek für die Handhabung von dreieckigen Netzen" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Support-Bibliothek für die Analyse von komplexen Netzwerken" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Support-Bibliothek für die Handhabung von 3MF-Dateien" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Support-Bibliothek für Datei-Metadaten und Streaming" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Bibliothek für serielle Kommunikation" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bibliothek für ZeroConf-Erkennung" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliothek für Polygon-Beschneidung" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Bibliothek für Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Schriftart" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG-Symbole" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Distributionsunabhängiges Format für Linux-Anwendungen" @@ -3473,73 +3475,67 @@ msgctxt "@label" msgid "Profile:" msgstr "Profil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "" -"Einige Einstellungs-/Überschreibungswerte unterscheiden sich von den im Profil gespeicherten Werten.\n" -"\n" -"Klicken Sie, um den Profilmanager zu öffnen." +msgstr "Einige Einstellungs-/Überschreibungswerte unterscheiden sich von den im Profil gespeicherten Werten.\n\nKlicken Sie, um den Profilmanager zu öffnen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Suchen..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Diese Einstellung ausblenden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Diese Einstellung weiterhin anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Sichtbarkeit einstellen wird konfiguriert..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Alle verkleinern" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Alle vergrößern" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "" -"Einige ausgeblendete Einstellungen verwenden Werte, die von ihren normalen, berechneten Werten abweichen.\n" -"\n" -"Klicken Sie, um diese Einstellungen sichtbar zu machen." +msgstr "Einige ausgeblendete Einstellungen verwenden Werte, die von ihren normalen, berechneten Werten abweichen.\n\nKlicken Sie, um diese Einstellungen sichtbar zu machen." #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61 msgctxt "@label Header for list of settings." @@ -3551,37 +3547,31 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Wird beeinflusst von" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 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 "" -"Diese Einstellung hat einen vom Profil abweichenden Wert.\n" -"\n" -"Klicken Sie, um den Wert des Profils wiederherzustellen." +msgstr "Diese Einstellung hat einen vom Profil abweichenden Wert.\n\nKlicken Sie, um den Wert des Profils wiederherzustellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 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 "" -"Diese Einstellung wird normalerweise berechnet; aktuell ist jedoch ein Absolutwert eingestellt.\n" -"\n" -"Klicken Sie, um den berechneten Wert wiederherzustellen." +msgstr "Diese Einstellung wird normalerweise berechnet; aktuell ist jedoch ein Absolutwert eingestellt.\n\nKlicken Sie, um den berechneten Wert wiederherzustellen." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:129 msgctxt "@label" @@ -3727,12 +3717,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ansicht" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kameraposition" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Druckplatte" @@ -3742,12 +3732,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Sichtbare Einstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Alle Einstellungen anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Sichtbarkeit einstellen verwalten..." @@ -3806,21 +3796,46 @@ msgctxt "@label:listbox" msgid "" "Print Setup disabled\n" "G-code files cannot be modified" -msgstr "" -"Druckeinrichtung deaktiviert\n" -"G-Code-Dateien können nicht geändert werden" +msgstr "Druckeinrichtung deaktiviert\nG-Code-Dateien können nicht geändert werden" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00 Stunden 00 Minuten" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Zeitangabe" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Kostenangabe" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Insgesamt:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Empfohlene Druckeinrichtung

Drucken mit den empfohlenen Einstellungen für den gewählten Drucker, das gewählte Material und die gewählte Qualität." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Benutzerdefinierte Druckeinrichtung

Druck mit Feineinstellung über jedem einzelnen Bereich des Schneidvorgangs." @@ -3845,223 +3860,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Geschätzte verbleibende Zeit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Umschalten auf Vollbild-Modus" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Rückgängig machen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Wiederholen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Beenden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-Ansicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vorderansicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Draufsicht" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Ansicht von links" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Ansicht von rechts" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura konfigurieren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Drucker hinzufügen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Dr&ucker verwalten..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialien werden verwaltet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Aktuelle Änderungen verwerfen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profile verwalten..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online-&Dokumentation anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "&Fehler melden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Über..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modell löschen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modell auf Druckplatte ze&ntrieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelle &gruppieren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Gruppierung für Modelle aufheben" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modelle &zusammenführen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Modell &multiplizieren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modelle wählen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Druckplatte reinigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modelle neu laden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle Modelle anordnen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Anordnung auswählen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modellpositionen zurücksetzen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modelltransformationen zurücksetzen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Datei(en) öffnen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Neues Projekt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Engine-&Protokoll anzeigen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Konfigurationsordner anzeigen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Pakete durchsuchen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Seitenleiste vergrößern/verkleinern" @@ -4122,7 +4137,7 @@ msgid "Select the active output device" msgstr "Wählen Sie das aktive Ausgabegerät" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Datei(en) öffnen" @@ -4142,145 +4157,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Datei" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Speichern..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportieren..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Auswahl exportieren..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Bearbeiten" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Ansicht" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Konfiguration" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "Dr&ucker" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Material" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Als aktiven Extruder festlegen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Extruder aktivieren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder deaktivieren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Druckplatte" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Er&weiterungen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Toolbox" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "E&instellungen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Hilfe" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Datei öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Einstellungen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Neues Projekt" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Möchten Sie wirklich ein neues Projekt beginnen? Damit werden das Druckbett und alle nicht gespeicherten Einstellungen gelöscht." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura wird geschlossen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Paket installieren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Datei(en) öffnen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4290,11 +4305,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projekt speichern" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4365,37 +4375,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Die graduelle Füllung steigert die Menge der Füllung nach oben hin schrittweise." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Graduell aktivieren" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Stützstruktur generieren" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Wählen Sie, welcher Extruder für die Unterstützung verwendet wird. Dient zum Konstruieren von Stützstrukturen unter dem Modell, damit dieses nicht absinkt oder frei schwebend gedruckt wird." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Druckplattenhaftung" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Sie benötigen Hilfe für Ihre Drucke?
Lesen Sie die Ultimaker Anleitungen für Fehlerbehebung>" @@ -4557,6 +4567,16 @@ msgctxt "name" msgid "Changelog" msgstr "Änderungsprotokoll" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Ermöglicht Gerätemaßnahmen für die Aktualisierung der Firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Firmware-Aktualisierungsfunktion" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4907,16 +4927,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-Profil-Writer" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Ermöglichen Sie Materialherstellern die Erstellung neuer Material- und Qualitätsprofile, indem Sie eine Drop-In-Benutzerschnittstelle verwenden." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Druckprofil-Assistent" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4947,6 +4957,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-Profil-Reader" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Generieren Sie vor dem Speichern bitte einen G-Code." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profilassistent" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profilassistent" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Firmware aktualisieren" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Unbekannt" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Kein benutzerdefiniertes Profil für das Importieren in Datei {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Dieses Profil {0} enthält falsche Daten, Importieren nicht möglich." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Deinstallieren bestätigen " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Pausiert" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Zurück" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Weiter" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Tipp" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Druckexperiment" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Checkliste" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Firmware aktualisieren" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Ermöglichen Sie Materialherstellern die Erstellung neuer Material- und Qualitätsprofile, indem Sie eine Drop-In-Benutzerschnittstelle verwenden." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Druckprofil-Assistent" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Mit Doodle3D WLAN-Box drucken" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index 56b6c35c93..77ffa5631d 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: German\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Drucklüfter Extruder" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Die Anzahl der Drucklüfter für diesen Extruder. Nur vom Standardwert 0 ändern, wenn Sie für jeden Extruder einen anderen Drucklüfter verwenden." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 3b3e8b9115..383a7a3886 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:57+0200\n" "Last-Translator: Bothof \n" "Language-Team: German\n" @@ -57,9 +57,7 @@ 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" @@ -71,9 +69,7 @@ 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" @@ -1077,7 +1073,7 @@ msgstr "Polygone oben/unten verbinden" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "Außenhaut-Pfade oben/unten verbinden, wenn sie nebeneinander laufen. Bei konzentrischen Mustern reduziert die Aktivierung dieser Einstellung die Durchlaufzeit erheblich. Da die Verbindungen jedoch auf halbem Weg über der Füllung erfolgen können, kann diese Funktion die Oberflächenqualität reduzieren." #: fdmprinter.def.json @@ -1497,8 +1493,8 @@ msgstr "Füllmuster" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Das Muster des Füllmaterials des Drucks. Die Linien- und Zickzackfüllmethode wechseln nach jeder Schicht die Richtung, um Materialkosten zu reduzieren. Die Gitter-, Dreieck- Tri-Hexagon-, Würfel-, Octahedral-, Viertelwürfel-, Quer- und konzentrischen Muster werden in jeder Schicht vollständig gedruckt. Würfel-, Viertelwürfel- und Octahedral-Füllungen wechseln mit jeder Schicht, um eine gleichmäßigere Verteilung der Stärke in allen Richtungen zu erzielen." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Das Muster des Füllmaterials des Drucks. Die Linien- und Zickzackfüllmethode wechseln nach jeder Schicht die Richtung, um Materialkosten zu reduzieren. Die Gitter-, Dreieck- Tri-Hexagon-, Würfel-, Octahedral-, Viertelwürfel-, Quer- und konzentrischen Muster werden in jeder Schicht vollständig gedruckt. Gyroid-, Würfel-, Viertelwürfel- und Octahedral-Füllungen wechseln mit jeder Schicht, um eine gleichmäßigere Verteilung der Stärke in allen Richtungen zu erzielen." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1556,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "3D-Quer" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroid" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1630,9 +1631,7 @@ 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" @@ -3264,6 +3263,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Stütz-Brim aktivieren" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Erstellen Sie ein Brim in den Stützstruktur-Füllungsbereichen der ersten Schicht. Das Brim wird unterhalb der Stützstruktur und nicht drumherum gedruckt. Die Aktivierung dieser Einstellung erhöht die Haftung der Stützstruktur am Druckbett." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Breite der Brim-Stützstruktur" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Die Breite des unter der Stützstruktur zu druckenden Brims. Ein größeres Brim erhöht die Haftung am Druckbett, jedoch erhöht sich hierdurch der Materialverbrauch." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Anzahl der Brim-Stützstrukturlinien" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Die Anzahl der Linien für die Brim-Stützstruktur. Eine größere Anzahl von Brim-Linien verbessert die Haftung am Druckbett, jedoch erhöht sich hierdurch der Materialverbrauch." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3799,9 +3828,7 @@ 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.\n" -"Es 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.\nEs 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" @@ -3833,6 +3860,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Die Anzahl der Linien für das Brim-Element. Eine größere Anzahl von Brim-Linien verbessert die Haftung am Druckbett, es wird dadurch aber auch der verwendbare Druckbereich verkleinert." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Brim ersetzt die Stützstruktur" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Erzwingen Sie den Druck des Brims um das Modell herum, auch wenn dieser Raum sonst durch die Stützstruktur belegt würde. Dies ersetzt einige der ersten Schichten der Stützstruktur durch Brim-Bereiche." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5238,9 +5275,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5657,6 +5692,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Außenhaut-Pfade oben/unten verbinden, wenn sie nebeneinander laufen. Bei konzentrischen Mustern reduziert die Aktivierung dieser Einstellung die Durchlaufzeit erheblich. Da die Verbindungen jedoch auf halbem Weg über der Füllung erfolgen können, kann diese Funktion die Oberflächenqualität reduzieren." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Das Muster des Füllmaterials des Drucks. Die Linien- und Zickzackfüllmethode wechseln nach jeder Schicht die Richtung, um Materialkosten zu reduzieren. Die Gitter-, Dreieck- Tri-Hexagon-, Würfel-, Octahedral-, Viertelwürfel-, Quer- und konzentrischen Muster werden in jeder Schicht vollständig gedruckt. Würfel-, Viertelwürfel- und Octahedral-Füllungen wechseln mit jeder Schicht, um eine gleichmäßigere Verteilung der Stärke in allen Richtungen zu erzielen." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Konzentrisch 3D" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 1c4d985f97..e6b5867e39 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-09-28 14:55+0200\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter no es compatible con el modo sin texto." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Genere un G-code antes de guardar." +msgid "Please prepare G-code before exporting." +msgstr "Prepare el Gcode antes de la exportación." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -64,17 +64,18 @@ msgid "" "

{model_names}

\n" "

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

\n" "

View print quality guide

" -msgstr "" -"

Es posible que uno o más modelos 3D no se impriman correctamente debido al tamaño del modelo y la configuración del material:

\n" -"

{model_names}

\n" -"

Obtenga más información sobre cómo garantizar la mejor calidad y fiabilidad de impresión posible.

\n" -"

Ver guía de impresión de calidad

" +msgstr "

Es posible que uno o más modelos 3D no se impriman correctamente debido al tamaño del modelo y la configuración del material:

\n

{model_names}

\n

Obtenga más información sobre cómo garantizar la mejor calidad y fiabilidad de impresión posible.

\n

Ver guía de impresión de calidad

" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.py:32 msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Mostrar registro de cambios" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Actualizar firmware" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +86,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "El perfil se ha aplanado y activado." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Impresión USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Imprimir mediante USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Imprimir mediante USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Conectado mediante USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -137,7 +138,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter no es compatible con el modo texto." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Paquete de formato Ultimaker" @@ -159,7 +160,7 @@ msgid "Save to Removable Drive {0}" msgstr "Guardar en unidad extraíble {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "¡No hay formatos de archivo disponibles con los que escribir!" @@ -198,7 +199,7 @@ msgstr "No se pudo guardar en unidad extraíble {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Error" @@ -227,8 +228,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Advertencia" @@ -255,141 +256,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unidad extraíble" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprime a través de la red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Conectado a través de la red." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Conectado a través de la red. Apruebe la solicitud de acceso en la impresora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Conectado a través de la red. No hay acceso para controlar la impresora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Acceso a la impresora solicitado. Apruebe la solicitud en la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Estado de la autenticación" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Estado de la autenticación" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Volver a intentar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Reenvía la solicitud de acceso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Acceso a la impresora aceptado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "No hay acceso para imprimir con esta impresora. No se puede enviar el trabajo de impresión." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Solicitar acceso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Envía la solicitud de acceso a la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "No se puede iniciar un nuevo trabajo de impresión." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Un problema con la configuración de Ultimaker impide iniciar la impresión. Soluciónelo antes de continuar." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Configuración desajustada" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "¿Seguro que desea imprimir con la configuración seleccionada?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Enviando datos a la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Enviando datos" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +395,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "No se ha cargado ningún PrintCore en la ranura {slot_number}." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "No se ha cargado ningún material en la ranura {slot_number}." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "PrintCore distinto (Cura: {cura_printcore_name}, impresora: {remote_printcore_name}) seleccionado para extrusor {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Material distinto (Cura: {0}, impresora: {1}) seleccionado para extrusor {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Sincronizar con la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "¿Desea utilizar la configuración actual de su impresora en Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Los PrintCores o los materiales de la impresora difieren de los del proyecto actual. Para obtener el mejor resultado, segmente siempre los PrintCores y materiales que se hayan insertado en la impresora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 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:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Fecha de envío" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver en pantalla" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Impresión terminada" @@ -480,49 +476,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar a través de la red" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Supervisar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "No se pudo acceder a la información actualizada." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Hay nuevas funciones disponibles para {machine_name}. Se recomienda actualizar el firmware de la impresora." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Nuevo firmware de %s disponible" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Cómo actualizar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "No se pudo acceder a la información actualizada." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vista de capas" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura no muestra correctamente las capas si la impresión de alambre está habilitada" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Vista de simulación" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modificar GCode" @@ -536,32 +532,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Cree un volumen que no imprima los soportes." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura recopila estadísticas de uso de forma anónima." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Recopilando datos" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Más información" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Obtenga más información sobre qué datos envía Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Permitir" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Permitir a Cura enviar estadísticas de uso de forma anónima para ayudar a priorizar mejoras futuras para Cura. Se envían algunas de sus preferencias y ajustes, la versión de Cura y un resumen de los modelos que está fragmentando." @@ -596,56 +592,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Imagen GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "No se puede segmentar con el material actual, ya que es incompatible con el dispositivo o la configuración seleccionados." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "No se puede segmentar" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Los ajustes actuales no permiten la segmentación. Los siguientes ajustes contienen errores: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Los ajustes de algunos modelos no permiten la segmentación. Los siguientes ajustes contienen errores en uno o más modelos: {error_labels}." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "No se puede segmentar porque la torre auxiliar o la posición o posiciones de preparación no son válidas." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "No se puede segmentar porque hay objetos asociados al extrusor %s que está deshabilitado." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "No hay nada que segmentar porque ninguno de los modelos se adapta al volumen de impresión. Escale o rote los modelos para que se adapten." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Procesando capas" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Información" @@ -661,13 +657,13 @@ msgid "Configure Per Model Settings" msgstr "Configurar ajustes por modelo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -679,7 +675,7 @@ msgid "3MF File" msgstr "Archivo 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Tobera" @@ -705,18 +701,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Archivo G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analizar GCode" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Datos de GCode" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Asegúrese de que el GCode es adecuado para la impresora y para su configuración antes de enviar el archivo a la misma. Es posible que la representación del GCode no sea precisa." @@ -727,16 +723,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil de cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Asistente del perfil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Asistente del perfil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +744,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Seleccionar actualizaciones" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Actualizar firmware" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +754,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Nivelar placa de impresión" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Pared exterior" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes interiores" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Forro" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Relleno" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Relleno de soporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interfaz de soporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Soporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Falda" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Desplazamiento" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Retracciones" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Otro" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Desconocido" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Archivo {0} presegmentado" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Fallo de inicio de sesión" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "El archivo ya existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +838,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "No reemplazado" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "El material seleccionado no es compatible con la máquina o la configuración seleccionada." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Material incompatible" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes actualizados" @@ -902,8 +883,6 @@ msgid "Export succeeded" msgstr "Exportación correcta" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +890,70 @@ msgstr "Error al importar el perfil de {0}: {1} or !" +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 que importar en el archivo {0}" +msgstr "No hay ningún perfil personalizado para importar en el archivo {0}." + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "No se ha podido encontrar un tipo de calidad {0} para la configuración actual." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +980,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Material personalizado" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -1009,22 +1000,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Volumen de impresión" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "No se ha podido crear el archivo desde el directorio de datos de usuario: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Copia de seguridad" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Se ha intentado restaurar una copia de seguridad de Cura sin tener los datos o metadatos adecuados." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Se ha intentado restaurar una copia de seguridad de Cura que no coincide con la versión actual." @@ -1078,12 +1069,7 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "" -"

¡Vaya! Ultimaker Cura ha encontrado un error.

\n" -"

Hemos detectado un error irreversible durante el inicio, posiblemente como consecuencia de varios archivos de configuración erróneos. Le recomendamos que realice una copia de seguridad y que restablezca los ajustes.

\n" -"

Las copias de seguridad se encuentran en la carpeta de configuración.

\n" -"

Envíenos el informe de errores para que podamos solucionar el problema.

\n" -" " +msgstr "

¡Vaya! Ultimaker Cura ha encontrado un error.

\n

Hemos detectado un error irreversible durante el inicio, posiblemente como consecuencia de varios archivos de configuración erróneos. Le recomendamos que realice una copia de seguridad y que restablezca los ajustes.

\n

Las copias de seguridad se encuentran en la carpeta de configuración.

\n

Envíenos el informe de errores para que podamos solucionar el problema.

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:102 msgctxt "@action:button" @@ -1116,10 +1102,7 @@ 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 "" -"

Se ha producido un error grave en Cura. Envíenos este informe de errores para que podamos solucionar el problema.

\n" -"

Utilice el botón \"Enviar informe\" para publicar automáticamente el informe de errores en nuestros servidores.

\n" -" " +msgstr "

Se ha producido un error grave en Cura. Envíenos este informe de errores para que podamos solucionar el problema.

\n

Utilice el botón \"Enviar informe\" para publicar automáticamente el informe de errores en nuestros servidores.

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:177 msgctxt "@title:groupbox" @@ -1199,40 +1182,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar informe" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Cargando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando escena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Cargando interfaz..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "No se puede cargar el modelo seleccionado, es demasiado pequeño." @@ -1263,9 +1246,9 @@ msgstr "X (anchura)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1383,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "El diámetro nominal del filamento compatible con la impresora. El diámetro exacto se sobrescribirá según el material o el perfil." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Desplazamiento de la tobera sobre el eje X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Desplazamiento de la tobera sobre el eje Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Número de ventilador de enfriamiento" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "GCode inicial del extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "GCode final del extrusor" @@ -1436,41 +1429,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "No se ha podido conectar con la base de datos del Paquete Cura. Compruebe la conexión." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiales" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Versión" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Última actualización" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Descargas" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Desconocido" @@ -1505,8 +1499,8 @@ msgstr "Atrás" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Confirmar desinstalación " +msgid "Confirm uninstall" +msgstr "Confirmar desinstalación" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1547,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Materiales genéricos" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Instalado" @@ -1584,10 +1578,7 @@ 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 complemento incluye una licencia.\n" -"Debe aceptar dicha licencia para instalar el complemento.\n" -"¿Acepta las condiciones que aparecen a continuación?" +msgstr "Este complemento incluye una licencia.\nDebe aceptar dicha licencia para instalar el complemento.\n¿Acepta las condiciones que aparecen a continuación?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:54 msgctxt "@action:button" @@ -1635,48 +1626,88 @@ msgid "Changelog" msgstr "Registro de cambios" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Cerrar" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Actualizar firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "El firmware es la parte del software que se ejecuta directamente en la impresora 3D. Este firmware controla los motores de pasos, regula la temperatura y, finalmente, hace que funcione la impresora." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "El firmware que se envía con las nuevas impresoras funciona, pero las nuevas versiones suelen tener más funciones y mejoras." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Actualización de firmware automática" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Cargar firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "No se puede actualizar el firmware porque no hay conexión con la impresora." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "No se puede actualizar el firmware porque la conexión con la impresora no permite actualizaciones de firmware." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Seleccionar firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Actualización del firmware" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Actualización del firmware." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Actualización del firmware completada." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Se ha producido un error al actualizar el firmware debido a un error desconocido." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Se ha producido un error al actualizar el firmware debido a un error de comunicación." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Se ha producido un error al actualizar el firmware debido a un error de entrada/salida." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Se ha producido un error al actualizar el firmware porque falta el firmware." @@ -1686,44 +1717,41 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Acuerdo de usuario" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Conexión existente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Esta impresora o grupo de impresoras ya se ha añadido a Cura. Seleccione otra impresora o grupo de impresoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Conectar con la impresora en red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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 esta 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:" +msgstr "Para imprimir directamente en la impresora a través de la red, asegúrese de que esta 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:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Agregar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1759,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Eliminar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Actualizar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Si la impresora no aparece en la lista, lea la guía de solución de problemas de impresión y red" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Versión de firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Dirección" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impresora no está configurada para alojar un grupo de impresoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impresora aloja un grupo de %1 impresoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "La impresora todavía no ha respondido en esta dirección." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Dirección de la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Introduzca la dirección IP o el nombre de host de la impresora en red." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "Aceptar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Imprimir a través de la red" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Selección de la impresora" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Imprimir" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Imprimir a través de la red" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Esperando: impresora no disponible" +msgid "Printer selection" +msgstr "Selección de la impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Esperando: primera disponible" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Esperando: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Mover al principio" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Mover trabajo de impresión al principio" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "¿Seguro que desea mover %1 al principio de la cola?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Borrar" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Borrar trabajo de impresión" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "¿Seguro que desea borrar %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Administrar cola" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "En cola" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Imprimiendo" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Administrar impresoras" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "No disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "No se puede conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Cancelado" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Terminado" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Preparando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Pausando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Reanudando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Acción requerida" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Esperando: impresora no disponible" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Esperando: primera disponible" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Esperando: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Cambio de configuración" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "Es necesario modificar la siguiente configuración de la impresora asignada %1:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Anular" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Iniciar un trabajo de impresión con una configuración no compatible puede causar daños en su impresora 3D. ¿Seguro de que desea sobrescribir la configuración e imprimir %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Sobrescribir la configuración e iniciar la impresión" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Vidrio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Aluminio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Administrar cola" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "En cola" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Imprimiendo" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Administrar impresoras" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Mover al principio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Borrar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Reanudar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pausar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Cancelar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "¿Seguro que desea mover %1 al principio de la cola?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Mover trabajo de impresión al principio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "¿Seguro que desea borrar %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Borrar trabajo de impresión" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "¿Seguro que desea cancelar %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Cancela la impresión" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "¿Seguro que desea cancelar %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Cancelado" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Terminado" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Preparando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Pausando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "En pausa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Reanudando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Acción requerida" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Conecta a una impresora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Carga la configuración de la impresora en Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Activar configuración" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Carga la configuración de la impresora en Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2143,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Secuencias de comandos de posprocesamiento" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Añadir secuencia de comando" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Cambia las secuencias de comandos de posprocesamiento" @@ -2194,23 +2278,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modificar ajustes del relleno de otros modelos" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Seleccionar ajustes" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleccionar ajustes o personalizar este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar todo" @@ -2261,6 +2345,7 @@ msgid "Type" msgstr "Tipo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de impresoras" @@ -2278,6 +2363,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2438,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Abrir" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Siguiente" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Consejo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00 h 00 min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Especificación de costes" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Total:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1 m/~ %2 g/~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1 m/~ %2 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Ensayo de impresión" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificación" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2479,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Mover a la siguiente posición" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Actualización de firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "El firmware es la parte del software que se ejecuta directamente en la impresora 3D. Este firmware controla los motores de pasos, regula la temperatura y, finalmente, hace que funcione la impresora." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "El firmware que se envía con las nuevas impresoras funciona, pero las nuevas versiones suelen tener más funciones y mejoras." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Actualización de firmware automática" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Cargar firmware personalizado" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Seleccionar firmware personalizado" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2666,9 +2646,7 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "" -"Ha personalizado parte de los ajustes del perfil.\n" -"¿Desea descartar los cambios o guardarlos?" +msgstr "Ha personalizado parte de los ajustes del perfil.\n¿Desea descartar los cambios o guardarlos?" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -2686,7 +2664,7 @@ msgid "Customized" msgstr "Valor personalizado" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Preguntar siempre" @@ -2834,6 +2812,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importar" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2919,283 +2903,283 @@ msgid "Unit" msgstr "Unidad" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "General" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interfaz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Moneda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Segmentar automáticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamiento de la ventanilla" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar voladizos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 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:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Asegúrese de que lo modelos están separados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir y guardar archivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Escalar modelos de gran tamaño" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Escalar modelos demasiado pequeños" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Seleccionar modelos al abrirlos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir siempre como un proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar modelos siempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Perfiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar siempre los ajustes modificados" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privacidad" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Buscar actualizaciones al iniciar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 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:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Más información" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Impresoras" @@ -3217,7 +3201,7 @@ msgid "Connection:" msgstr "Conexión:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "La impresora no está conectada." @@ -3243,7 +3227,7 @@ msgid "Aborting print..." msgstr "Cancelando impresión..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfiles" @@ -3324,17 +3308,17 @@ msgid "Global Settings" msgstr "Ajustes globales" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Agregar impresora" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nombre de la impresora:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Agregar impresora" @@ -3349,121 +3333,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Acerca de Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "versión: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solución completa para la impresión 3D de filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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 "" -"Ultimaker B.V. ha desarrollado Cura en cooperación con la comunidad.\n" -"Cura se enorgullece de utilizar los siguientes proyectos de código abierto:" +msgstr "Ultimaker B.V. ha desarrollado Cura en cooperación con la comunidad.\nCura se enorgullece de utilizar los siguientes proyectos de código abierto:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Interfaz gráfica de usuario (GUI)" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Entorno de la aplicación" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Generador de GCode" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicación entre procesos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Lenguaje de programación" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Entorno de la GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Enlaces del entorno de la GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de enlaces C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de intercambio de datos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Biblioteca de apoyo para cálculos científicos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de apoyo para cálculos más rápidos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de apoyo para gestionar archivos STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Biblioteca de compatibilidad para trabajar con objetos planos" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Biblioteca de compatibilidad para trabajar con mallas triangulares" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Biblioteca de compatibilidad para analizar redes complejas" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de compatibilidad para trabajar con archivos 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Biblioteca de compatibilidad para metadatos y transmisión de archivos" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicación en serie" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de detección para Zeroconf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recorte de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca HTTP de Python" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Fuente" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Iconos SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementación de la aplicación de distribución múltiple de Linux" @@ -3473,73 +3475,67 @@ msgctxt "@label" msgid "Profile:" msgstr "Perfil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "" -"Algunos valores de los ajustes o sobrescrituras son distintos a los valores almacenados en el perfil.\n" -"\n" -"Haga clic para abrir el administrador de perfiles." +msgstr "Algunos valores de los ajustes o sobrescrituras son distintos a los valores almacenados en el perfil.\n\nHaga clic para abrir el administrador de perfiles." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Buscar..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "No mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mostrar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidad de los ajustes..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Contraer todo" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Ampliar todo" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "" -"Algunos ajustes ocultos utilizan valores diferentes de los valores normales calculados.\n" -"\n" -"Haga clic para mostrar estos ajustes." +msgstr "Algunos ajustes ocultos utilizan valores diferentes de los valores normales calculados.\n\nHaga clic para mostrar estos ajustes." #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61 msgctxt "@label Header for list of settings." @@ -3551,37 +3547,31 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afectado por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 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 "" -"Este ajuste tiene un valor distinto del perfil.\n" -"\n" -"Haga clic para restaurar el valor del perfil." +msgstr "Este ajuste tiene un valor distinto del perfil.\n\nHaga clic para restaurar el valor del perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 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 "" -"Este ajuste se calcula normalmente pero actualmente tiene un valor absoluto establecido.\n" -"\n" -"Haga clic para restaurar el valor calculado." +msgstr "Este ajuste se calcula normalmente pero actualmente tiene un valor absoluto establecido.\n\nHaga clic para restaurar el valor calculado." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:129 msgctxt "@label" @@ -3727,12 +3717,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ver" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posición de la cámara" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&laca de impresión" @@ -3742,12 +3732,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Ajustes visibles" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Mostrar todos los ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gestionar visibilidad de los ajustes..." @@ -3806,21 +3796,46 @@ msgctxt "@label:listbox" msgid "" "Print Setup disabled\n" "G-code files cannot be modified" -msgstr "" -"Ajustes de impresión deshabilitados\n" -"No se pueden modificar los archivos GCode" +msgstr "Ajustes de impresión deshabilitados\nNo se pueden modificar los archivos GCode" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00 h 00 min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Especificación de tiempos" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Especificación de costes" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Total:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Configuración de impresión recomendada

Imprimir con los ajustes recomendados para la impresora, el material y la calidad seleccionados." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Configuración de impresión personalizada

Imprimir con un control muy detallado del proceso de segmentación." @@ -3845,223 +3860,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Tiempo restante estimado" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar pantalla completa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Des&hacer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rehacer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Salir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista en 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista frontal" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista superior" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista del lado izquierdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista del lado derecho" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Agregar impresora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar impresoras ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar materiales..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar cambios actuales" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfiles..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentación en línea" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Informar de un &error" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Acerca de..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Eliminar modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar modelo en plataforma" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleccionar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Borrar placa de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recargar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Organizar todos los modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Organizar selección" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir archivo(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuevo proyecto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "&Mostrar registro del motor..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar carpeta de configuración" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Examinar paquetes..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Expandir/contraer barra lateral" @@ -4122,7 +4137,7 @@ msgid "Select the active output device" msgstr "Seleccione el dispositivo de salida activo" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir archivo(s)" @@ -4142,145 +4157,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Archivo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Guardar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar selección..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Edición" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Ver" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "A&justes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Impresora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Material" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Definir como extrusor activo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Habilitar extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Deshabilitar extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Placa de impresión" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensiones" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Cuadro de herramientas" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "Pre&ferencias" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "A&yuda" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Abrir archivo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Nuevo proyecto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "¿Está seguro de que desea iniciar un nuevo proyecto? Esto borrará la placa de impresión y cualquier ajuste no guardado." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cerrando Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar paquete" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir archivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4290,11 +4305,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar proyecto" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4365,37 +4375,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Un relleno gradual aumentará gradualmente la cantidad de relleno hacia arriba." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Habilitar gradual" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Generar soporte" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Seleccione qué extrusor se utilizará como soporte. Esta opción formará estructuras de soporte por debajo del modelo para evitar que éste se combe o la impresión se haga en el aire." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Adherencia de la placa de impresión" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "¿Necesita ayuda para mejorar sus impresiones?
Lea las Guías de solución de problemas de Ultimaker" @@ -4557,6 +4567,16 @@ msgctxt "name" msgid "Changelog" msgstr "Registro de cambios" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Proporciona opciones a la máquina para actualizar el firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Actualizador de firmware" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4907,16 +4927,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Escritor de perfiles de Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite a los fabricantes de material crear nuevos perfiles de material y calidad mediante una IU integrada." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Imprimir asistente del perfil" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4947,6 +4957,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lector de perfiles de Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Genere un G-code antes de guardar." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Asistente del perfil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Asistente del perfil" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Actualizar firmware" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Desconocido" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "No hay ningún perfil personalizado que importar en el archivo {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Este perfil {0} contiene datos incorrectos, no se han podido importar." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Confirmar desinstalación " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "En pausa" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Siguiente" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Consejo" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1 m/~ %2 g/~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1 m/~ %2 g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Ensayo de impresión" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificación" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Actualización de firmware" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite a los fabricantes de material crear nuevos perfiles de material y calidad mediante una IU integrada." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Imprimir asistente del perfil" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Imprimir con un enrutador Doodle3D" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index ec191c5271..3da8d5251f 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Coordenada Z de la posición en la que la tobera queda preparada al inicio de la impresión." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ventilador de refrigeración de impresión del extrusor" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Número del ventilador de refrigeración de impresión asociado al extrusor. Modifique el valor predeterminado 0 solo cuando disponga de un ventilador de refrigeración de impresión diferente para cada extrusor." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 99135813b2..bd4ad9fd7f 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:56+0200\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" @@ -57,9 +57,7 @@ msgctxt "machine_start_gcode description" msgid "" "G-code commands to be executed at the very start - separated by \n" "." -msgstr "" -"Los comandos de GCode que se ejecutarán justo al inicio separados por - \n" -"." +msgstr "Los comandos de GCode que se ejecutarán justo al inicio separados por - \n." #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -71,9 +69,7 @@ msgctxt "machine_end_gcode description" msgid "" "G-code commands to be executed at the very end - separated by \n" "." -msgstr "" -"Los comandos de GCode que se ejecutarán justo al final separados por -\n" -"." +msgstr "Los comandos de GCode que se ejecutarán justo al final separados por -\n." #: fdmprinter.def.json msgctxt "material_guid label" @@ -1077,8 +1073,8 @@ msgstr "Conectar polígonos superiores/inferiores" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Conectar las trayectorias de forro superior/inferior cuando están próximas entre sí. Al habilitar este ajuste, en el patrón concéntrico se reduce considerablemente el tiempo de desplazamiento, pero las conexiones pueden producirse en mitad del relleno, con lo que la bajaría la calidad de la superficie superior." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Conecta las trayectorias de forro superior/inferior cuando están próximas entre sí. Al habilitar este ajuste, en el patrón concéntrico se reduce considerablemente el tiempo de desplazamiento, pero las conexiones pueden producirse en mitad del relleno, con lo que bajaría la calidad de la superficie superior." #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1497,8 +1493,8 @@ msgstr "Patrón de relleno" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Patrón del material de relleno de la impresión. El relleno de línea y zigzag cambia de dirección en capas alternas, con lo que se reduce el coste del material. Los patrones de rejilla, triángulo, trihexagonal, cúbico, de octeto, cúbico bitruncado y transversal y concéntrico se imprimen en todas las capas por completo. El relleno cúbico, cúbico bitruncado y de octeto cambian en cada capa para proporcionar una distribución de fuerza equitativa en cada dirección." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Patrón del material de relleno de la impresión. El relleno de línea y zigzag cambia de dirección en capas alternas, con lo que se reduce el coste de material. Los patrones de rejilla, triángulo, trihexágono, cubo, octeto, cubo bitruncado, transversal y concéntrico se imprimen en todas las capas por completo. El relleno giroide, cúbico, cúbico bitruncado y de octeto cambian en cada capa para proporcionar una distribución de fuerza equitativa en cada dirección." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1556,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Cruz 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Giroide" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1630,9 +1631,7 @@ 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 "" -"Agregar paredes adicionales alrededor del área de relleno. Estas paredes pueden hacer que las líneas del forro superior/inferior se aflojen menos, lo que significa que necesitaría menos capas de forro superior/inferior para obtener la misma calidad utilizando algo más de material.\n" -"Puede utilizar esta función junto a la de Conectar polígonos de relleno para conectar todo el relleno en una única trayectoria de extrusión sin necesidad de desplazamientos ni retracciones si se configura correctamente." +msgstr "Agregar paredes adicionales alrededor del área de relleno. Estas paredes pueden hacer que las líneas del forro superior/inferior se aflojen menos, lo que significa que necesitaría menos capas de forro superior/inferior para obtener la misma calidad utilizando algo más de material.\nPuede utilizar esta función junto a la de Conectar polígonos de relleno para conectar todo el relleno en una única trayectoria de extrusión sin necesidad de desplazamientos ni retracciones si se configura correctamente." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -3264,6 +3263,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Habilitar borde de soporte" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Genera un borde dentro de las zonas de relleno del soporte de la primera capa. Este borde se imprime por debajo del soporte y no a su alrededor. Si habilita esta configuración aumentará la adhesión del soporte a la placa de impresión." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Ancho del borde de soporte" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Anchura del borde de impresión que se imprime por debajo del soporte. Una anchura de soporte amplia mejora la adhesión a la placa de impresión, pero requieren material adicional." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Recuento de líneas del borde de soporte" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Número de líneas utilizadas para el borde de soporte. Más líneas de borde mejoran la adhesión a la placa de impresión, pero requieren material adicional." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3799,9 +3828,7 @@ 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 distancia horizontal entre la falda y la primera capa de la impresión.\n" -"Se trata de la distancia mínima. Múltiples líneas de falda se extenderán hacia el exterior a partir de esta distancia." +msgstr "La distancia horizontal entre la falda y la primera capa de la impresión.\nSe trata de la distancia mínima. Múltiples líneas de falda se extenderán hacia el exterior a partir de esta distancia." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -3833,6 +3860,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Número de líneas utilizadas para un borde. Más líneas de borde mejoran la adhesión a la plataforma de impresión, pero también reducen el área de impresión efectiva." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Sustituir soporte por borde" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Aplica la impresión de un borde alrededor del modelo, aunque en esa posición debiera estar el soporte. Sustituye algunas áreas de la primera capa de soporte por áreas de borde." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5238,9 +5275,7 @@ 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 "" -"Distancia de un movimiento ascendente que se extrude a media velocidad.\n" -"Esto puede causar una mejor adherencia a las capas anteriores, aunque no calienta demasiado el material en esas capas. Solo se aplica a la impresión de alambre." +msgstr "Distancia de un movimiento ascendente que se extrude a media velocidad.\nEsto puede causar una mejor adherencia a las capas anteriores, aunque no calienta demasiado el material en esas capas. Solo se aplica a la impresión de alambre." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5657,6 +5692,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Conectar las trayectorias de forro superior/inferior cuando están próximas entre sí. Al habilitar este ajuste, en el patrón concéntrico se reduce considerablemente el tiempo de desplazamiento, pero las conexiones pueden producirse en mitad del relleno, con lo que la bajaría la calidad de la superficie superior." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Patrón del material de relleno de la impresión. El relleno de línea y zigzag cambia de dirección en capas alternas, con lo que se reduce el coste del material. Los patrones de rejilla, triángulo, trihexagonal, cúbico, de octeto, cúbico bitruncado y transversal y concéntrico se imprimen en todas las capas por completo. El relleno cúbico, cúbico bitruncado y de octeto cambian en cada capa para proporcionar una distribución de fuerza equitativa en cada dirección." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Concéntrico 3D" diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot index 5a89eaee33..fbb003f3c6 100644 --- a/resources/i18n/fdmextruder.def.json.pot +++ b/resources/i18n/fdmextruder.def.json.pot @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" -"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -169,6 +169,19 @@ msgid "" "printing." msgstr "" +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "" +"The number of the print cooling fan associated with this extruder. Only " +"change this from the default value of 0 when you have a different print " +"cooling fan for each extruder." +msgstr "" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 79bcf5c7dc..96071d82b8 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" -"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -1171,7 +1171,7 @@ msgctxt "connect_skin_polygons description" msgid "" "Connect top/bottom skin paths where they run next to each other. For the " "concentric pattern enabling this setting greatly reduces the travel time, " -"but because the connections can happend midway over infill this feature can " +"but because the connections can happen midway over infill this feature can " "reduce the top surface quality." msgstr "" @@ -1675,8 +1675,8 @@ msgid "" "The pattern of the infill material of the print. The line and zig zag infill " "swap direction on alternate layers, reducing material cost. The grid, " "triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric " -"patterns are fully printed every layer. Cubic, quarter cubic and octet " -"infill change with every layer to provide a more equal distribution of " +"patterns are fully printed every layer. Gyroid, cubic, quarter cubic and " +"octet infill change with every layer to provide a more equal distribution of " "strength over each direction." msgstr "" @@ -1740,6 +1740,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -3757,6 +3762,43 @@ msgid "" "is rotated in the horizontal plane." msgstr "" +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "" +"Generate a brim within the support infill regions of the first layer. This " +"brim is printed underneath the support, not around it. Enabling this setting " +"increases the adhesion of support to the build plate." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "" +"The width of the brim to print underneath the support. A larger brim " +"enhances adhesion to the build plate, at the cost of some extra material." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "" +"The number of lines used for the support brim. More brim lines enhance " +"adhesion to the build plate, at the cost of some extra material." +msgstr "" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -4421,6 +4463,19 @@ msgid "" "build plate, but also reduces the effective print area." msgstr "" +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "" +"Enforce brim to be printed around the model even if that space would " +"otherwise be occupied by support. This replaces some regions of the first " +"layer of support by brim regions." +msgstr "" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index ede84960be..442500f21b 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -46,7 +46,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." +msgid "Please prepare G-code before exporting." msgstr "" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 @@ -69,6 +69,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Näytä muutosloki" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -79,27 +84,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profiili on tasoitettu ja aktivoitu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB-tulostus" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Tulosta USB:n kautta" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Tulosta USB:n kautta" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Yhdistetty USB:n kautta" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "" @@ -131,7 +136,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "" @@ -153,7 +158,7 @@ msgid "Save to Removable Drive {0}" msgstr "Tallenna siirrettävälle asemalle {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "" @@ -192,7 +197,7 @@ msgstr "Ei voitu tallentaa siirrettävälle asemalle {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Virhe" @@ -221,8 +226,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Varoitus" @@ -249,141 +254,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Siirrettävä asema" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Tulosta verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Tulosta verkon kautta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Yhdistetty verkon kautta tulostimeen." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Yhdistetty verkon kautta. Hyväksy tulostimen käyttöoikeuspyyntö." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Yhdistetty verkon kautta tulostimeen. Ei käyttöoikeutta tulostimen hallintaan." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Tulostimen käyttöoikeutta pyydetty. Hyväksy tulostimen pyyntö" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Yritä uudelleen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Lähetä käyttöoikeuspyyntö uudelleen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Tulostimen käyttöoikeus hyväksytty" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Tällä tulostimella tulostukseen ei ole käyttöoikeutta. Tulostustyön lähetys ei onnistu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Pyydä käyttöoikeutta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Lähetä tulostimen käyttöoikeuspyyntö" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Ristiriitainen määritys" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Haluatko varmasti tulostaa valitulla määrityksellä?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Lähetetään tietoja tulostimeen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Lähetetään tietoja" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -393,78 +393,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Peruuta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Eri materiaali (Cura: {0}, tulostin: {1}) valittu suulakkeelle {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Synkronoi tulostimen kanssa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Haluatko käyttää nykyistä tulostimen määritystä Curassa?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Tulostimen PrintCoret tai materiaalit eivät vastaa tulostettavan projektin asetuksia. Parhaat tulokset saavutetaan viipaloimalla aina tulostimeen asetetuille PrintCoreille ja materiaaleille." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Tulosta valmis" @@ -474,49 +474,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Yhdistä verkon kautta" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Päivitystietoja ei löytynyt." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Uusi tulostimen %s laiteohjelmisto saatavilla" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Päivitystietoja ei löytynyt." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Kerrosnäkymä" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura ei näytä kerroksia täsmällisesti, kun rautalankatulostus on käytössä" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Muokkaa GCode-arvoa" @@ -530,32 +530,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Kerätään tietoja" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "" @@ -590,56 +590,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF-kuva" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Viipalointi ei onnistu nykyisellä materiaalilla, sillä se ei sovellu käytettäväksi valitun laitteen tai kokoonpanon kanssa." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Viipalointi ei onnistu" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Viipalointi ei onnistu nykyisten asetuksien ollessa voimassa. Seuraavissa asetuksissa on virheitä: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Viipalointi ei onnistu, koska esitäyttötorni tai esitäytön sijainti tai sijainnit eivät kelpaa." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Ei viipaloitavaa, koska mikään malleista ei sovellu tulostustilavuuteen. Skaalaa tai pyöritä mallia, kunnes se on sopiva." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Käsitellään kerroksia" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Tiedot" @@ -655,13 +655,13 @@ msgid "Configure Per Model Settings" msgstr "Määritä mallikohtaiset asetukset" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Suositeltu" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Mukautettu" @@ -673,7 +673,7 @@ msgid "3MF File" msgstr "3MF-tiedosto" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Suutin" @@ -699,18 +699,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G File -tiedosto" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-coden jäsennys" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-coden tiedot" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Varmista, että G-code on tulostimelle ja sen tulostusasetuksille soveltuva, ennen kuin lähetät tiedoston siihen. G-coden esitys ei välttämättä ole tarkka." @@ -721,16 +721,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiili" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -752,11 +742,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Valitse päivitykset" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Päivitä laiteohjelmisto" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -767,79 +752,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Tasaa alusta" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Ulkoseinämä" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Sisäseinämät" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Pintakalvo" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Täyttö" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Tuen täyttö" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Tukiliittymä" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Tuki" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Helma" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Siirtoliike" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Takaisinvedot" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Muu" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Esiviipaloitu tiedosto {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Tiedosto on jo olemassa" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -851,23 +836,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Valittu materiaali ei sovellu käytettäväksi valitun laitteen tai kokoonpanon kanssa." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Yhteensopimaton materiaali" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, python-format msgctxt "@info:generic" msgid "Settings have been changed to match the current availability of extruders: [%s]" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "" @@ -896,8 +881,6 @@ msgid "Export succeeded" msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -905,58 +888,70 @@ msgstr "Profiilin tuonti epäonnistui tiedostosta {0}: or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Mukautettu profiili" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profiilista puuttuu laatutyyppi." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Laatutyyppiä {0} ei löydy nykyiselle kokoonpanolle." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -983,12 +978,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Mukautettu materiaali" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Mukautettu" @@ -1003,22 +998,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Tulostustilavuus" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "" @@ -1185,40 +1180,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ladataan laitteita..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Asetetaan näkymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ladataan käyttöliittymää..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "" @@ -1249,9 +1244,9 @@ msgstr "X (leveys)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1386,22 +1381,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Tulostimen tukema tulostuslangan nimellinen halkaisija. Materiaali ja/tai profiili korvaa tarkan halkaisijan." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Suuttimen X-siirtymä" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Suuttimen Y-siirtymä" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "" @@ -1422,41 +1427,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiaalit" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Tuntematon" @@ -1491,7 +1497,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " +msgid "Confirm uninstall" msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 @@ -1539,7 +1545,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "" @@ -1618,48 +1624,88 @@ msgid "Changelog" msgstr "Muutosloki" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Sulje" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Laiteohjelmisto on suoraan 3D-tulostimessa toimiva ohjelma. Laiteohjelmisto ohjaa askelmoottoreita, säätää lämpötilaa ja saa tulostimen toimimaan." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Uusien tulostimien mukana toimitettava laiteohjelmisto toimii, mutta uusissa versioissa on yleensä enemmän toimintoja ja parannuksia." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Päivitä laiteohjelmisto automaattisesti" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Lataa mukautettu laiteohjelmisto" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Valitse mukautettu laiteohjelmisto" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Laiteohjelmiston päivitys" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Päivitetään laiteohjelmistoa." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Laiteohjelmiston päivitys suoritettu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Laiteohjelmiston päivitys epäonnistui tuntemattoman virheen takia." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Laiteohjelmiston päivitys epäonnistui tietoliikennevirheen takia." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Laiteohjelmiston päivitys epäonnistui tiedoston lukemiseen tai kirjoittamiseen liittyvän virheen takia." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Laiteohjelmiston päivitys epäonnistui puuttuvan laiteohjelmiston takia." @@ -1669,22 +1715,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Yhdistä verkkotulostimeen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1695,18 +1741,18 @@ msgstr "" "\n" "Valitse tulostin alla olevasta luettelosta:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Lisää" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Muokkaa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1714,244 +1760,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Poista" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Päivitä" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Jos tulostinta ei ole luettelossa, lue verkkotulostuksen vianetsintäopas" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tyyppi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Laiteohjelmistoversio" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Osoite" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Tämän osoitteen tulostin ei ole vielä vastannut." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Yhdistä" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Tulostimen osoite" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Anna verkon tulostimen IP-osoite tai isäntänimi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Tulosta verkon kautta" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Tulosta" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Tulosta verkon kautta" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" +msgid "Printer selection" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Jonossa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Tulostetaan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Valmis" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Valmistellaan" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Vaatii toimenpiteitä" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Jonossa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Tulostetaan" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Keskeytä tulostus" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Valmis" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Valmistellaan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Vaatii toimenpiteitä" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Yhdistä tulostimeen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Lataa tulostimen määritys Curaan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Aktivoi määritys" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Lataa tulostimen määritys Curaan" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2042,17 +2144,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Jälkikäsittelykomentosarjat" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Lisää komentosarja" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Asetukset" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Muuta aktiivisia jälkikäsittelykomentosarjoja" @@ -2177,23 +2279,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Valitse asetukset" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Valitse tätä mallia varten mukautettavat asetukset" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Suodatin..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Näytä kaikki" @@ -2244,6 +2346,7 @@ msgid "Type" msgstr "Tyyppi" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "" @@ -2261,6 +2364,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2335,82 +2439,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Avaa" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Vie" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2452,36 +2480,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Siirry seuraavaan positioon" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Laiteohjelmiston päivitys" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Laiteohjelmisto on suoraan 3D-tulostimessa toimiva ohjelma. Laiteohjelmisto ohjaa askelmoottoreita, säätää lämpötilaa ja saa tulostimen toimimaan." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Uusien tulostimien mukana toimitettava laiteohjelmisto toimii, mutta uusissa versioissa on yleensä enemmän toimintoja ja parannuksia." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Päivitä laiteohjelmisto automaattisesti" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Lataa mukautettu laiteohjelmisto" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Valitse mukautettu laiteohjelmisto" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2669,7 +2667,7 @@ msgid "Customized" msgstr "Mukautettu" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Kysy aina" @@ -2817,6 +2815,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Tuo" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Vie" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2902,283 +2906,283 @@ msgid "Unit" msgstr "Yksikkö" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Yleiset" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Käyttöliittymä" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Kieli:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Valuutta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Teema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Viipaloi automaattisesti, kun asetuksia muutetaan." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Viipaloi automaattisesti" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Näyttöikkunan käyttäytyminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Näytä uloke" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomaa hiiren suuntaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Pakotetaanko kerros yhteensopivuustilaan?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Tiedostojen avaaminen ja tallentaminen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaalaa suuret mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaalaa erittäin pienet mallit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Projektitiedoston avaamisen oletustoimintatapa" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Projektitiedoston avaamisen oletustoimintatapa: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Avaa aina projektina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Tuo mallit aina" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Tietosuoja" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Lähetä (anonyymit) tulostustiedot" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Tulostimet" @@ -3200,7 +3204,7 @@ msgid "Connection:" msgstr "Yhteys:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Tulostinta ei ole yhdistetty." @@ -3226,7 +3230,7 @@ msgid "Aborting print..." msgstr "Keskeytetään tulostus..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiilit" @@ -3307,17 +3311,17 @@ msgid "Global Settings" msgstr "Yleiset asetukset" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Lisää tulostin" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Tulostimen nimi:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Lisää tulostin" @@ -3332,17 +3336,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Tietoja Curasta" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kokonaisvaltainen sulatettavan tulostuslangan 3D-tulostusratkaisu." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3351,102 +3355,122 @@ msgstr "" "Cura-ohjelman on kehittänyt Ultimaker B.V. yhteistyössä käyttäjäyhteisön kanssa.\n" "Cura hyödyntää seuraavia avoimeen lähdekoodiin perustuvia projekteja:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Graafinen käyttöliittymä" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Sovelluskehys" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Prosessien välinen tietoliikennekirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Ohjelmointikieli" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI-kehys" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI-kehyksen sidonnat" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ -sidontakirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Data Interchange Format" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Tieteellisen laskennan tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Nopeamman laskennan tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL-tiedostojen käsittelyn tukikirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Tukikirjasto 3MF-tiedostojen käsittelyyn" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Sarjatietoliikennekirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf-etsintäkirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Monikulmion leikkauskirjasto" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Fontti" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG-kuvakkeet" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -3456,7 +3480,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Profiili:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3467,53 +3491,53 @@ msgstr "" "\n" "Avaa profiilin hallinta napsauttamalla." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Haku…" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Kopioi arvo kaikkiin suulakepuristimiin" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Piilota tämä asetus" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 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:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pidä tämä asetus näkyvissä" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Määritä asetusten näkyvyys..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3534,17 +3558,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Riippuu seuraavista:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3555,7 +3579,7 @@ msgstr "" "\n" "Palauta profiilin arvo napsauttamalla." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3710,12 +3734,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Näytä" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -3725,12 +3749,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "" @@ -3793,17 +3817,44 @@ msgstr "" "Tulostuksen asennus ei käytössä\n" "G-code-tiedostoja ei voida muokata" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Suositeltu tulostuksen asennus

Tulosta valitun tulostimen, materiaalin ja laadun suositelluilla asetuksilla." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Mukautettu tulostuksen asennus

Tulosta hallitsemalla täysin kaikkia viipalointiprosessin vaiheita." @@ -3828,223 +3879,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Aikaa jäljellä arviolta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Vaihda koko näyttöön" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Kumoa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Tee &uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Lopeta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Määritä Curan asetukset..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "L&isää tulostin..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Tulostinten &hallinta..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Hallitse materiaaleja..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Hylkää tehdyt muutokset" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profiilien hallinta..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Näytä sähköinen &dokumentaatio" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Ilmoita &virheestä" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Tietoja..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Poista malli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ke&skitä malli alustalle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Ryhmittele mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Poista mallien ryhmitys" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Yhdistä mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Kerro malli..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Valitse kaikki mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Tyhjennä tulostusalusta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Lataa kaikki mallit uudelleen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Järjestä kaikki mallit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Järjestä valinta" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Avaa tiedosto(t)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Uusi projekti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Näytä moottorin l&oki" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Näytä määrityskansio" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "" @@ -4105,7 +4156,7 @@ msgid "Select the active output device" msgstr "Valitse aktiivinen tulostusväline" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Avaa tiedosto(t)" @@ -4125,145 +4176,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "Tie&dosto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Muokkaa" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Näytä" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Asetukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Tulostin" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Materiaali" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Aseta aktiiviseksi suulakepuristimeksi" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profiili" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Laa&jennukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "L&isäasetukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Ohje" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Avaa tiedosto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Asetukset" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Uusi projekti" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Haluatko varmasti aloittaa uuden projektin? Se tyhjentää alustan ja kaikki tallentamattomat asetukset." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Avaa tiedosto(t)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4273,11 +4324,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Tallenna projekti" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4348,37 +4394,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Asteittainen täyttö lisää täytön tiheyttä vähitellen yläosaa kohti." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Ota asteittainen käyttöön" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Muodosta tuki" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Valitse tukena käytettävä suulakepuristin. Näin mallin alle rakennetaan tukirakenteita estämään mallin painuminen tai tulostuminen ilmaan." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Alustan tarttuvuus" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Tarvitsetko apua tulosteiden parantamiseen?
Lue Ultimakerin vianmääritysoppaat" @@ -4540,6 +4586,16 @@ msgctxt "name" msgid "Changelog" msgstr "Muutosloki" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4890,16 +4946,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profiilin kirjoitin" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4930,6 +4976,14 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiilin lukija" +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Päivitä laiteohjelmisto" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Laiteohjelmiston päivitys" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Tulostus Doodle3D WiFi-Boxin avulla" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index 381991d5e4..07ccc2502e 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Z-koordinaatti sijainnille, jossa suutin esitäytetään tulostusta aloitettaessa." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 6c1decafbf..6a4e7390ad 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -1072,7 +1072,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "" #: fdmprinter.def.json @@ -1492,7 +1492,7 @@ msgstr "Täyttökuvio" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." msgstr "" #: fdmprinter.def.json @@ -1555,6 +1555,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Risti 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -3257,6 +3262,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "" +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3824,6 +3859,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Reunukseen käytettävien linjojen lukumäärä. Useampi reunuslinja parantaa kiinnitystä alustaan, mutta rajoittaa tehokasta tulostusaluetta." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index eb7aa05b2b..9b1fff4124 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-09-28 14:59+0200\n" "Last-Translator: Bothof \n" "Language-Team: French\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter ne prend pas en charge le mode non-texte." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Veuillez générer le G-Code avant d'enregistrer." +msgid "Please prepare G-code before exporting." +msgstr "Veuillez préparer le G-Code avant d'exporter." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -64,17 +64,18 @@ msgid "" "

{model_names}

\n" "

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

\n" "

View print quality guide

" -msgstr "" -"

Un ou plusieurs modèles 3D peuvent ne pas s'imprimer de manière optimale en raison de la taille du modèle et de la configuration matérielle :

\n" -"

{model_names}

\n" -"

Découvrez comment optimiser la qualité et la fiabilité de l'impression.

\n" -"

Consultez le guide de qualité d'impression

" +msgstr "

Un ou plusieurs modèles 3D peuvent ne pas s'imprimer de manière optimale en raison de la taille du modèle et de la configuration matérielle :

\n

{model_names}

\n

Découvrez comment optimiser la qualité et la fiabilité de l'impression.

\n

Consultez le guide de qualité d'impression

" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.py:32 msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Afficher le récapitulatif des changements" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Mettre à jour le firmware" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +86,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Le profil a été aplati et activé." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Impression par USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Imprimer via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Imprimer via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Connecté via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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 ?" @@ -137,7 +138,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ne prend pas en charge le mode texte." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" @@ -159,7 +160,7 @@ msgid "Save to Removable Drive {0}" msgstr "Enregistrer sur un lecteur amovible {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Aucun format de fichier n'est disponible pour écriture !" @@ -198,7 +199,7 @@ msgstr "Impossible d'enregistrer sur le lecteur {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Erreur" @@ -227,8 +228,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Avertissement" @@ -255,141 +256,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Lecteur amovible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimer sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprimer sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Connecté sur le réseau." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Connecté sur le réseau. Veuillez approuver la demande d'accès sur l'imprimante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Connecté sur le réseau. Pas d'accès pour commander l'imprimante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Accès à l'imprimante demandé. Veuillez approuver la demande sur l'imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Statut d'authentification" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Statut d'authentification" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Réessayer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Renvoyer la demande d'accès" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Accès à l'imprimante accepté" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Aucun accès pour imprimer avec cette imprimante. Impossible d'envoyer la tâche d'impression." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Demande d'accès" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Envoyer la demande d'accès à l'imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Impossible de démarrer une nouvelle tâche d'impression." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Un problème avec la configuration de votre Ultimaker empêche le démarrage de l'impression. Veuillez résoudre ce problème avant de continuer." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Configuration différente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Êtes-vous sûr(e) de vouloir imprimer avec la configuration sélectionnée ?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Envoi des données à l'imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Envoi des données" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +395,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Annuler" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Pas de PrintCore inséré dans la fente {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Aucun matériau inséré dans la fente {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "PrintCore différent (Cura : {cura_printcore_name}, Imprimante : {remote_printcore_name}) sélectionné pour l'extrudeuse {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Matériau différent (Cura : {0}, Imprimante : {1}) sélectionné pour l'extrudeuse {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Synchroniser avec votre imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Voulez-vous utiliser votre configuration d'imprimante actuelle dans Cura ?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Les PrintCores et / ou matériaux sur votre imprimante diffèrent de ceux de votre projet actuel. 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/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Connecté sur le réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Données envoyées" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Afficher sur le moniteur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Impression terminée" @@ -480,49 +476,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Connecter via le réseau" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Surveiller" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Impossible d'accéder aux informations de mise à jour." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "De nouvelles fonctionnalités sont disponibles pour votre {machine_name} ! Il est recommandé de mettre à jour le firmware sur votre imprimante." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Nouveau firmware %s disponible" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Comment effectuer la mise à jour" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Impossible d'accéder aux informations de mise à jour." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vue en couches" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura n'affiche pas les couches avec précision lorsque l'impression filaire est activée" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Vue simulation" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modifier le G-Code" @@ -536,32 +532,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Créer un volume dans lequel les supports ne sont pas imprimés." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura recueille des statistiques d'utilisation anonymes." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Collecte des données" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Plus d'informations" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Voir plus d'informations sur les données envoyées par Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Autoriser" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Autoriser Cura à envoyer des statistiques d'utilisation anonymes pour mieux prioriser les améliorations futures apportées à Cura. Certaines de vos préférences et paramètres sont envoyés, ainsi que la version du logiciel Cura et un hachage des modèles que vous découpez." @@ -596,56 +592,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Image GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossible de découper le matériau actuel, car celui-ci est incompatible avec la machine ou la configuration sélectionnée." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Impossible de découper" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Impossible de couper avec les paramètres actuels. Les paramètres suivants contiennent des erreurs : {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Impossible de couper en raison de certains paramètres par modèle. Les paramètres suivants contiennent des erreurs sur un ou plusieurs modèles : {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Impossible de couper car la tour primaire ou la (les) position(s) d'amorçage ne sont pas valides." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Impossible de couper car il existe des objets associés à l'extrudeuse désactivée %s." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Rien à couper car aucun des modèles ne convient au volume d'impression. Mettez à l'échelle ou faites pivoter les modèles pour les faire correspondre." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Traitement des couches" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informations" @@ -661,13 +657,13 @@ msgid "Configure Per Model Settings" msgstr "Configurer les paramètres par modèle" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Recommandé" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Personnalisé" @@ -679,7 +675,7 @@ msgid "3MF File" msgstr "Fichier 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Buse" @@ -705,18 +701,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Fichier G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analyse du G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Détails G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Assurez-vous que le g-code est adapté à votre imprimante et à la configuration de l'imprimante avant d'y envoyer le fichier. La représentation du g-code peut ne pas être exacte." @@ -727,16 +723,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profil Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistant de profil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistant de profil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +744,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Sélectionner les mises à niveau" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Mise à niveau du firmware" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +754,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Nivellement du plateau" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Paroi externe" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Parois internes" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Couche extérieure" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Remplissage" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Remplissage du support" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface du support" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Support" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Jupe" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Déplacement" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Rétractions" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Autre" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Inconnu" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Fichier {0} prédécoupé" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "La connexion a échoué" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Le fichier existe déjà" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +838,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Pas écrasé" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Le matériau sélectionné est incompatible avec la machine ou la configuration sélectionnée." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Matériau incompatible" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Paramètres mis à jour" @@ -902,8 +883,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +890,70 @@ msgstr "Échec de l'importation du profil depuis le fichier {0} or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Personnaliser le profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Impossible de trouver un type de qualité {0} pour la configuration actuelle." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +980,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Matériau personnalisé" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Personnalisé" @@ -1009,22 +1000,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Volume d'impression" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Impossible de créer une archive à partir du répertoire de données de l'utilisateur : {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Sauvegarde" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "A essayé de restaurer une sauvegarde Cura sans disposer de données ou de métadonnées appropriées." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "A essayé de restaurer une sauvegarde Cura qui ne correspond pas à votre version actuelle." @@ -1078,12 +1069,7 @@ msgid "" "

Backups can be found in the configuration folder.

\n" "

Please send us this Crash Report to fix the problem.

\n" " " -msgstr "" -"

Oups, un problème est survenu dans Ultimaker Cura.

\n" -"

Une erreur irrécupérable est survenue lors du démarrage. Elle peut avoir été causée par des fichiers de configuration incorrects. Nous vous suggérons de sauvegarder et de réinitialiser votre configuration.

\n" -"

Les sauvegardes se trouvent dans le dossier de configuration.

\n" -"

Veuillez nous envoyer ce rapport d'incident pour que nous puissions résoudre le problème.

\n" -" " +msgstr "

Oups, un problème est survenu dans Ultimaker Cura.

\n

Une erreur irrécupérable est survenue lors du démarrage. Elle peut avoir été causée par des fichiers de configuration incorrects. Nous vous suggérons de sauvegarder et de réinitialiser votre configuration.

\n

Les sauvegardes se trouvent dans le dossier de configuration.

\n

Veuillez nous envoyer ce rapport d'incident pour que nous puissions résoudre le problème.

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:102 msgctxt "@action:button" @@ -1116,10 +1102,7 @@ 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 "" -"

Une erreur fatale est survenue dans Cura. Veuillez nous envoyer ce rapport d'incident pour résoudre le problème

\n" -"

Veuillez utiliser le bouton « Envoyer rapport » pour publier automatiquement un rapport d'erreur sur nos serveurs

\n" -" " +msgstr "

Une erreur fatale est survenue dans Cura. Veuillez nous envoyer ce rapport d'incident pour résoudre le problème

\n

Veuillez utiliser le bouton « Envoyer rapport » pour publier automatiquement un rapport d'erreur sur nos serveurs

\n " #: /home/ruben/Projects/Cura/cura/CrashHandler.py:177 msgctxt "@title:groupbox" @@ -1199,40 +1182,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Envoyer rapport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Chargement des machines..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Préparation de la scène..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Chargement de l'interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Le modèle sélectionné était trop petit pour être chargé." @@ -1263,9 +1246,9 @@ msgstr "X (Largeur)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1383,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Le diamètre nominal de filament pris en charge par l'imprimante. Le diamètre exact sera remplacé par le matériau et / ou le profil." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Décalage buse X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Décalage buse Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Numéro du ventilateur de refroidissement" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Extrudeuse G-Code de démarrage" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Extrudeuse G-Code de fin" @@ -1436,41 +1429,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Impossible de se connecter à la base de données Cura Package. Veuillez vérifier votre connexion." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Matériaux" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Version" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Dernière mise à jour" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Auteur" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Téléchargements" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Inconnu" @@ -1505,8 +1499,8 @@ msgstr "Précédent" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Confirmer la désinstallation " +msgid "Confirm uninstall" +msgstr "Confirmer la désinstallation" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1547,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Matériaux génériques" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Installé" @@ -1584,10 +1578,7 @@ 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 "" -"Ce plug-in contient une licence.\n" -"Vous devez approuver cette licence pour installer ce plug-in.\n" -"Acceptez-vous les clauses ci-dessous ?" +msgstr "Ce plug-in contient une licence.\nVous devez approuver cette licence pour installer ce plug-in.\nAcceptez-vous les clauses ci-dessous ?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:54 msgctxt "@action:button" @@ -1635,48 +1626,88 @@ msgid "Changelog" msgstr "Récapitulatif des changements" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Fermer" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Mettre à jour le firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Le firmware est le logiciel fonctionnant directement dans votre imprimante 3D. Ce firmware contrôle les moteurs pas à pas, régule la température et surtout, fait que votre machine fonctionne." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Le firmware fourni avec les nouvelles imprimantes fonctionne, mais les nouvelles versions ont tendance à fournir davantage de fonctionnalités ainsi que des améliorations." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Mise à niveau automatique du firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Charger le firmware personnalisé" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Impossible de se connecter à l'imprimante ; échec de la mise à jour du firmware." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Échec de la mise à jour du firmware, car cette fonctionnalité n'est pas prise en charge par la connexion avec l'imprimante." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Sélectionner le firmware personnalisé" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Mise à jour du firmware" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Mise à jour du firmware en cours." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Mise à jour du firmware terminée." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Échec de la mise à jour du firmware en raison d'une erreur inconnue." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Échec de la mise à jour du firmware en raison d'une erreur de communication." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Échec de la mise à jour du firmware en raison d'une erreur d'entrée/de sortie." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Échec de la mise à jour du firmware en raison du firmware manquant." @@ -1686,44 +1717,41 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Accord utilisateur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Connexion existante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Ce groupe / cette imprimante a déjà été ajouté à Cura. Veuillez sélectionner un autre groupe / imprimante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Connecter à l'imprimante en réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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 :" +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\nSélectionnez votre imprimante dans la liste ci-dessous :" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Ajouter" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Modifier" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1759,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Supprimer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Rafraîchir" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Si votre imprimante n'apparaît pas dans la liste, lisez le guide de dépannage de l'impression en réseau" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Version du firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Adresse" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Cette imprimante n'est pas configurée pour héberger un groupe d'imprimantes." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Cette imprimante est l'hôte d'un groupe d'imprimantes %1." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "L'imprimante à cette adresse n'a pas encore répondu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Connecter" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Adresse de l'imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Saisissez l'adresse IP ou le nom d'hôte de votre imprimante sur le réseau." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Imprimer sur le réseau" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Sélection d'imprimantes" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Imprimer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Imprimer sur le réseau" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "En attente : imprimante non disponible" +msgid "Printer selection" +msgstr "Sélection d'imprimantes" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "En attente : première imprimante disponible" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "En attente : " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Déplacer l'impression en haut" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Déplacer l'impression en haut de la file d'attente" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Êtes-vous sûr de vouloir déplacer %1 en haut de la file d'attente ?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Effacer" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Supprimer l'impression" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Êtes-vous sûr de vouloir supprimer %1 ?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Gérer la file d'attente" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Mis en file d'attente" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Impression" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Gérer les imprimantes" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Non disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Injoignable" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Disponible" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Abandonné" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Terminé" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Préparation" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Mise en pause" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Reprise" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Action requise" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "En attente : imprimante non disponible" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "En attente : première imprimante disponible" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "En attente : " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Modification des configurations" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "L'imprimante assignée, %1, nécessite d'apporter la ou les modifications suivantes à la configuration :" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Remplacer" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Le fait de démarrer un travail d'impression avec une configuration incompatible peut endommager votre imprimante 3D. Êtes-vous sûr de vouloir remplacer la configuration et imprimer %1 ?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Remplacer la configuration et lancer l'impression" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Verre" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Aluminium" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Gérer la file d'attente" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Mis en file d'attente" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Impression" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Gérer les imprimantes" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Déplacer l'impression en haut" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Effacer" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Reprendre" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pause" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Abandonner" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Êtes-vous sûr de vouloir déplacer %1 en haut de la file d'attente ?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Déplacer l'impression en haut de la file d'attente" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Êtes-vous sûr de vouloir supprimer %1 ?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Supprimer l'impression" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Êtes-vous sûr de vouloir annuler %1 ?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Abandonner l'impression" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Êtes-vous sûr de vouloir annuler %1 ?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Abandonné" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Terminé" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Préparation" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Mise en pause" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "En pause" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Reprise" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Action requise" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Connecter à une imprimante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Charger la configuration de l'imprimante dans Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Activer la configuration" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Charger la configuration de l'imprimante dans Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2143,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de post-traitement" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Ajouter un script" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Paramètres" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Modifier les scripts de post-traitement actifs" @@ -2194,23 +2278,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modifier les paramètres de remplissage d'autres modèles" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Sélectionner les paramètres" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Sélectionner les paramètres pour personnaliser ce modèle" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrer..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Afficher tout" @@ -2261,6 +2345,7 @@ msgid "Type" msgstr "Type" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Groupe d'imprimantes" @@ -2278,6 +2363,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2438,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Ouvrir" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Précédent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Exporter" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Suivant" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Astuce" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00h 00min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Spécification de coût" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Total :" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Test d'impression" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Liste de contrôle" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2479,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Aller à la position suivante" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Mise à niveau du firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Le firmware est le logiciel fonctionnant directement dans votre imprimante 3D. Ce firmware contrôle les moteurs pas à pas, régule la température et surtout, fait que votre machine fonctionne." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Le firmware fourni avec les nouvelles imprimantes fonctionne, mais les nouvelles versions ont tendance à fournir davantage de fonctionnalités ainsi que des améliorations." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Mise à niveau automatique du firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Charger le firmware personnalisé" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Sélectionner le firmware personnalisé" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2666,9 +2646,7 @@ msgctxt "@text:window" msgid "" "You have customized some profile settings.\n" "Would you like to keep or discard those settings?" -msgstr "" -"Vous avez personnalisé certains paramètres du profil.\n" -"Souhaitez-vous conserver ces changements, ou les annuler ?" +msgstr "Vous avez personnalisé certains paramètres du profil.\nSouhaitez-vous conserver ces changements, ou les annuler ?" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -2686,7 +2664,7 @@ msgid "Customized" msgstr "Personnalisé" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Toujours me demander" @@ -2834,6 +2812,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importer" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Exporter" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2919,283 +2903,283 @@ msgid "Unit" msgstr "Unité" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Général" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Langue :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Devise :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Thème :" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Découper automatiquement" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportement Viewport" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Mettre en surbrillance les porte-à-faux" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 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:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Ouvrir et enregistrer des fichiers" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 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:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 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:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 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:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Toujours ouvrir comme projet" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Toujours importer les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profils" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 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:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Confidentialité" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 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:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Plus d'informations" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Expérimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Utiliser la fonctionnalité multi-plateau" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Imprimantes" @@ -3217,7 +3201,7 @@ msgid "Connection:" msgstr "Connexion :" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "L'imprimante n'est pas connectée." @@ -3243,7 +3227,7 @@ msgid "Aborting print..." msgstr "Abandon de l'impression..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profils" @@ -3324,17 +3308,17 @@ msgid "Global Settings" msgstr "Paramètres généraux" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Ajouter une imprimante" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nom de l'imprimante :" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Ajouter une imprimante" @@ -3349,121 +3333,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "À propos de Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "version : %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solution complète pour l'impression 3D par dépôt de filament fondu." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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 a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker.\n" -"Cura est fier d'utiliser les projets open source suivants :" +msgstr "Cura a été développé par Ultimaker B.V. en coopération avec la communauté Ultimaker.\nCura est fier d'utiliser les projets open source suivants :" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface utilisateur graphique" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Cadre d'application" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Générateur G-Code" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Bibliothèque de communication interprocess" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Langage de programmation" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Cadre IUG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Liens cadre IUG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Bibliothèque C/C++ Binding" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Format d'échange de données" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Prise en charge de la bibliothèque pour le calcul scientifique" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Prise en charge de la bibliothèque pour des maths plus rapides" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Prise en charge de la bibliothèque pour le traitement des fichiers STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Prise en charge de la bibliothèque pour le traitement des objets planaires" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Prise en charge de la bibliothèque pour le traitement des mailles triangulaires" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Prise en charge de la bibliothèque pour l'analyse de réseaux complexes" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Prise en charge de la bibliothèque pour le traitement des fichiers 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Prise en charge de la bibliothèque pour les métadonnées et le streaming de fichiers" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Bibliothèque de communication série" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bibliothèque de découverte ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliothèque de découpe polygone" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Bibliothèque Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Police" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Icônes SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Déploiement d'applications sur multiples distributions Linux" @@ -3473,73 +3475,67 @@ msgctxt "@label" msgid "Profile:" msgstr "Profil :" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" "\n" "Click to open the profile manager." -msgstr "" -"Certaines valeurs de paramètre / forçage sont différentes des valeurs enregistrées dans le profil. \n" -"\n" -"Cliquez pour ouvrir le gestionnaire de profils." +msgstr "Certaines valeurs de paramètre / forçage sont différentes des valeurs enregistrées dans le profil. \n\nCliquez pour ouvrir le gestionnaire de profils." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Rechercher..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Masquer ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Afficher ce paramètre" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurer la visibilité des paramètres..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Réduire tout" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Développer tout" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" "\n" "Click to make these settings visible." -msgstr "" -"Certains paramètres masqués utilisent des valeurs différentes de leur valeur normalement calculée.\n" -"\n" -"Cliquez pour rendre ces paramètres visibles." +msgstr "Certains paramètres masqués utilisent des valeurs différentes de leur valeur normalement calculée.\n\nCliquez pour rendre ces paramètres visibles." #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61 msgctxt "@label Header for list of settings." @@ -3551,37 +3547,31 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Touché par" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 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 "" -"Ce paramètre possède une valeur qui est différente du profil.\n" -"\n" -"Cliquez pour restaurer la valeur du profil." +msgstr "Ce paramètre possède une valeur qui est différente du profil.\n\nCliquez pour restaurer la valeur du profil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 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 "" -"Ce paramètre est normalement calculé mais il possède actuellement une valeur absolue définie.\n" -"\n" -"Cliquez pour restaurer la valeur calculée." +msgstr "Ce paramètre est normalement calculé mais il possède actuellement une valeur absolue définie.\n\nCliquez pour restaurer la valeur calculée." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:129 msgctxt "@label" @@ -3727,12 +3717,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Visualisation" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Position de la &caméra" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Plateau" @@ -3742,12 +3732,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Paramètres visibles" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Afficher tous les paramètres" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gérer la visibilité des paramètres..." @@ -3806,21 +3796,46 @@ msgctxt "@label:listbox" msgid "" "Print Setup disabled\n" "G-code files cannot be modified" -msgstr "" -"Configuration de l'impression désactivée\n" -"Les fichiers G-Code ne peuvent pas être modifiés" +msgstr "Configuration de l'impression désactivée\nLes fichiers G-Code ne peuvent pas être modifiés" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00h 00min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Spécification de temps" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Spécification de coût" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Total :" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Configuration de l'impression recommandée

Imprimer avec les paramètres recommandés pour l'imprimante, le matériau et la qualité sélectionnés." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Configuration de l'impression personnalisée

Imprimer avec un contrôle fin de chaque élément du processus de découpe." @@ -3845,223 +3860,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Durée restante estimée" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Passer en Plein écran" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annuler" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rétablir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Quitter" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vue 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vue de face" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vue du dessus" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vue latérale gauche" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vue latérale droite" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurer Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Ajouter une imprimante..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gérer les &imprimantes..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gérer les matériaux..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Ignorer les modifications actuelles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gérer les profils..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Afficher la &documentation en ligne" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Notifier un &bug" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "À propos de..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Supprimer le modèle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 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:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grouper les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Dégrouper les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Fusionner les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplier le modèle..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Sélectionner tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Supprimer les objets du plateau" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recharger tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Réorganiser tous les modèles" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Réorganiser la sélection" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Ouvrir le(s) fichier(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nouveau projet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Afficher le &journal du moteur..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Afficher le dossier de configuration" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Parcourir les paquets..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Déplier / replier la barre latérale" @@ -4122,7 +4137,7 @@ msgid "Select the active output device" msgstr "Sélectionner le périphérique de sortie actif" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Ouvrir le(s) fichier(s)" @@ -4142,145 +4157,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Fichier" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "Enregi&strer..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exporter..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exporter la sélection..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Modifier" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Visualisation" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Paramètres" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "Im&primante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Matériau" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Définir comme extrudeur actif" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Activer l'extrudeuse" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Désactiver l'extrudeuse" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "Plateau" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensions" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Boîte à outils" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "P&références" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Aide" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Ouvrir un fichier" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Paramètres" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Nouveau projet" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Êtes-vous sûr(e) de souhaiter lancer un nouveau projet ? Cela supprimera les objets du plateau ainsi que tous paramètres non enregistrés." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fermeture de Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Installer le paquet" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4290,11 +4305,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Enregistrer le projet" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4365,37 +4375,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Un remplissage graduel augmentera la quantité de remplissage vers le haut." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Permettre le remplissage graduel" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Générer les supports" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Sélectionnez l'extrudeur à utiliser comme support. Cela créera des structures de support sous le modèle afin de l'empêcher de s'affaisser ou de s'imprimer dans les airs." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Adhérence au plateau" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Besoin d'aide pour améliorer vos impressions ?
Lisez les Guides de dépannage Ultimaker" @@ -4557,6 +4567,16 @@ msgctxt "name" msgid "Changelog" msgstr "Récapitulatif des changements" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Fournit à une machine des actions permettant la mise à jour du firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Programme de mise à jour du firmware" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4907,16 +4927,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Générateur de profil Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permet aux fabricants de matériaux de créer de nouveaux matériaux et profils de qualité à l'aide d'une interface utilisateur ad hoc." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistant de profil d'impression" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4947,6 +4957,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lecteur de profil Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Veuillez générer le G-Code avant d'enregistrer." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistant de profil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistant de profil" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Mise à niveau du firmware" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Inconnu" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Aucun profil personnalisé à importer dans le fichier {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Le profil {0} contient des données incorrectes ; échec de l'importation." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Confirmer la désinstallation " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "En pause" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Précédent" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Suivant" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Astuce" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Test d'impression" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Liste de contrôle" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Mise à niveau du firmware" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permet aux fabricants de matériaux de créer de nouveaux matériaux et profils de qualité à l'aide d'une interface utilisateur ad hoc." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistant de profil d'impression" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Imprimer avec Doodle3D WiFi-Box" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index b2b54fbced..52969f511f 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: French\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Les coordonnées Z de la position à laquelle la buse s'amorce au début de l'impression." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ventilateur de refroidissement d'impression de l'extrudeuse" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Numéro du ventilateur de refroidissement d'impression associé à cette extrudeuse. Ne modifiez cette valeur par rapport à la valeur par défaut 0 que si vous utilisez un ventilateur de refroidissement d'impression différent pour chaque extrudeuse." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index b76aa532cb..87aa9d5a27 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -5,8 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.comPOT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 15:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: French\n" @@ -15,7 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.6\n" -"POT-Creation-Date: \n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -57,9 +57,7 @@ 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" @@ -71,9 +69,7 @@ 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" @@ -1077,7 +1073,7 @@ msgstr "Relier les polygones supérieurs / inférieurs" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "Relier les voies de couche extérieure supérieures / inférieures lorsqu'elles sont côte à côte. Pour le motif concentrique, ce paramètre réduit considérablement le temps de parcours, mais comme les liens peuvent se trouver à mi-chemin sur le remplissage, cette fonctionnalité peut réduire la qualité de la surface supérieure." #: fdmprinter.def.json @@ -1497,8 +1493,8 @@ msgstr "Motif de remplissage" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Motif du matériau de remplissage de l'impression. La ligne et le remplissage en zigzag changent de sens à chaque alternance de couche, réduisant ainsi les coûts matériels. Les motifs en grille, en triangle, trihexagonaux, cubiques, octaédriques, quart cubiques et concentriques sont entièrement imprimés sur chaque couche. Les remplissages cubique, quart cubique et octaédrique changent à chaque couche afin d'offrir une répartition plus égale de la solidité dans chaque direction." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Motif du matériau de remplissage de l'impression. La ligne et le remplissage en zigzag changent de sens à chaque alternance de couche, réduisant ainsi les coûts matériels. Les motifs en grille, en triangle, trihexagonaux, cubiques, octaédriques, quart cubiques et concentriques sont entièrement imprimés sur chaque couche. Les remplissages gyroïde, cubique, quart cubique et octaédrique changent à chaque couche afin d'offrir une répartition plus égale de la solidité dans chaque direction." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1556,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Entrecroisé 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroïde" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1630,9 +1631,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -3264,6 +3263,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Activer la bordure du support" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Générer un bord à l'intérieur des zones de remplissage du support de la première couche. Cette bordure est imprimée sous le support et non autour de celui-ci, ce qui augmente l'adhérence du support au plateau." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Largeur de la bordure du support" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Largeur de la bordure à imprimer sous le support. Une plus grande bordure améliore l'adhérence au plateau, mais demande un peu de matériau supplémentaire." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Nombre de lignes de la bordure du support" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Nombre de lignes utilisées pour la bordure du support. L'augmentation du nombre de lignes de bordure améliore l'adhérence au plateau, mais demande un peu de matériau supplémentaire." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3799,9 +3828,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -3833,6 +3860,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Le nombre de lignes utilisées pour une bordure. Un plus grand nombre de lignes de bordure renforce l'adhérence au plateau mais réduit également la zone d'impression réelle." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "La bordure remplace le support" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Appliquer la bordure à imprimer autour du modèle même si cet espace aurait autrement dû être occupé par le support, en remplaçant certaines régions de la première couche de support par des régions de la bordure." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5238,9 +5275,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5657,6 +5692,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Relier les voies de couche extérieure supérieures / inférieures lorsqu'elles sont côte à côte. Pour le motif concentrique, ce paramètre réduit considérablement le temps de parcours, mais comme les liens peuvent se trouver à mi-chemin sur le remplissage, cette fonctionnalité peut réduire la qualité de la surface supérieure." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Motif du matériau de remplissage de l'impression. La ligne et le remplissage en zigzag changent de sens à chaque alternance de couche, réduisant ainsi les coûts matériels. Les motifs en grille, en triangle, trihexagonaux, cubiques, octaédriques, quart cubiques et concentriques sont entièrement imprimés sur chaque couche. Les remplissages cubique, quart cubique et octaédrique changent à chaque couche afin d'offrir une répartition plus égale de la solidité dans chaque direction." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Concentrique 3D" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 7ce106e07c..d285cbfdc3 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-09-28 15:01+0200\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter non supporta la modalità non di testo." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Generare il codice G prima di salvare." +msgid "Please prepare G-code before exporting." +msgstr "Preparare il codice G prima dell’esportazione." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -64,17 +64,18 @@ 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/ChangeLogPlugin/ChangeLog.py:32 msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Visualizza registro modifiche" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Aggiornamento firmware" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +86,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Il profilo è stato appiattito e attivato." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Stampa USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Stampa tramite USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Stampa tramite USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Connesso tramite USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -137,7 +138,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter non supporta la modalità di testo." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacchetto formato Ultimaker" @@ -159,7 +160,7 @@ msgid "Save to Removable Drive {0}" msgstr "Salva su unità rimovibile {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Non ci sono formati di file disponibili per la scrittura!" @@ -198,7 +199,7 @@ msgstr "Impossibile salvare su unità rimovibile {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Errore" @@ -227,8 +228,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Avvertenza" @@ -255,141 +256,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unità rimovibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Stampa sulla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Stampa sulla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Collegato alla rete." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Collegato alla rete. Si prega di approvare la richiesta di accesso sulla stampante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Collegato alla rete. Nessun accesso per controllare la stampante." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Richiesto accesso alla stampante. Approvare la richiesta sulla stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Stato di autenticazione" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Stato di autenticazione" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Riprova" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Invia nuovamente la richiesta di accesso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Accesso alla stampante accettato" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Nessun accesso per stampare con questa stampante. Impossibile inviare il processo di stampa." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Richiesta di accesso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Invia la richiesta di accesso alla stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Impossibile avviare un nuovo processo di stampa." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "È presente un problema di configurazione della stampante che rende impossibile l’avvio della stampa. Risolvere il problema prima di continuare." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Mancata corrispondenza della configurazione" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Sei sicuro di voler stampare con la configurazione selezionata?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Invio dati alla stampante in corso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Invio dati" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +395,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Annulla" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Nessun PrintCore caricato nello slot {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Nessun materiale caricato nello slot {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "PrintCore diverso (Cura: {cura_printcore_name}, Stampante: {remote_printcore_name}) selezionata per estrusore {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Materiale diverso (Cura: {0}, Stampante: {1}) selezionato per l’estrusore {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Sincronizzazione con la stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Desideri utilizzare la configurazione corrente della tua stampante in Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "I PrintCore e/o i materiali sulla stampante differiscono da quelli contenuti nel tuo attuale progetto. Per ottenere i risultati migliori, sezionare sempre per i PrintCore e i materiali inseriti nella stampante utilizzata." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Collegato alla rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Dati inviati" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Visualizzazione in Controlla" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Stampa finita" @@ -480,49 +476,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Collega tramite rete" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Controlla" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Non è possibile accedere alle informazioni di aggiornamento." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Sono disponibili nuove funzioni per la {machine_name}! Si consiglia di aggiornare il firmware sulla stampante." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Nuovo firmware %s disponibile" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Modalità di aggiornamento" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Non è possibile accedere alle informazioni di aggiornamento." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Visualizzazione strato" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura non visualizza in modo accurato gli strati se la funzione Wire Printing è abilitata" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Vista simulazione" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modifica G-code" @@ -536,32 +532,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Crea un volume in cui i supporti non vengono stampati." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura raccoglie statistiche di utilizzo in forma anonima." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Acquisizione dati" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Per saperne di più" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Vedere ulteriori informazioni sui dati inviati da Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Consenti" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Consente a Cura di inviare in forma anonima statistiche d’uso, riguardanti alcune delle preferenze e impostazioni, la versione cura e una serie di modelli in sezionamento, per aiutare a dare priorità a miglioramenti futuri in Cura." @@ -596,56 +592,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Immagine GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossibile eseguire il sezionamento con il materiale corrente in quanto incompatibile con la macchina o la configurazione selezionata." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Sezionamento impossibile" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Impossibile eseguire il sezionamento con le impostazioni attuali. Le seguenti impostazioni presentano errori: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Impossibile eseguire il sezionamento a causa di alcune impostazioni per modello. Le seguenti impostazioni presentano errori su uno o più modelli: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Impossibile eseguire il sezionamento perché la torre di innesco o la posizione di innesco non sono valide." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Impossibile effettuare il sezionamento in quanto vi sono oggetti associati a Extruder %s disabilitato." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Nulla da sezionare in quanto nessuno dei modelli corrisponde al volume di stampa. Ridimensionare o ruotare i modelli secondo necessità." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Elaborazione dei livelli" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informazioni" @@ -661,13 +657,13 @@ msgid "Configure Per Model Settings" msgstr "Configura impostazioni per modello" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Consigliata" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizzata" @@ -679,7 +675,7 @@ msgid "3MF File" msgstr "File 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Ugello" @@ -705,18 +701,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "File G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Parsing codice G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Dettagli codice G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Verifica che il codice G sia idoneo alla tua stampante e alla sua configurazione prima di trasmettere il file. La rappresentazione del codice G potrebbe non essere accurata." @@ -727,16 +723,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profilo Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente profilo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente profilo" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +744,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Seleziona aggiornamenti" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Aggiorna firmware" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +754,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Livella piano di stampa" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parete esterna" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Pareti interne" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Rivestimento esterno" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Riempimento" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Riempimento del supporto" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interfaccia supporto" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Supporto" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Spostamenti" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrazioni" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Altro" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Sconosciuto" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "File pre-sezionato {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Login non riuscito" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Il file esiste già" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +838,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Non sottoposto a override" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Il materiale selezionato è incompatibile con la macchina o la configurazione selezionata." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Materiale incompatibile" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Impostazioni aggiornate" @@ -902,8 +883,6 @@ msgid "Export succeeded" msgstr "Esportazione riuscita" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +890,70 @@ msgstr "Impossibile importare il profilo da {0}: { #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 importarlo." +msgstr "La macchina definita nel profilo {0} ({1}) non corrisponde alla macchina corrente ({2}), impossibile importarla." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Profilo personalizzato" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Impossibile trovare un tipo qualità {0} per la configurazione corrente." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +980,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tutti i file (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Materiale personalizzato" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Personalizzata" @@ -1009,22 +1000,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Volume di stampa" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Impossibile creare un archivio dalla directory dei dati utente: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentativo di ripristinare un backup di Cura senza dati o metadati appropriati." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Tentativo di ripristinare un backup di Cura non corrispondente alla versione corrente." @@ -1078,12 +1069,7 @@ 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:102 msgctxt "@action:button" @@ -1116,10 +1102,7 @@ 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:177 msgctxt "@title:groupbox" @@ -1199,40 +1182,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Invia report" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Caricamento macchine in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Impostazione scena in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Caricamento interfaccia in corso..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Il modello selezionato è troppo piccolo per il caricamento." @@ -1263,9 +1246,9 @@ msgstr "X (Larghezza)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1383,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Diametro nominale del filamento supportato dalla stampante. Il diametro esatto verrà sovrapposto dal materiale e/o dal profilo." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Scostamento X ugello" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Scostamento Y ugello" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Numero ventola di raffreddamento" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Codice G avvio estrusore" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Codice G fine estrusore" @@ -1436,41 +1429,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Impossibile connettersi al database pacchetto Cura. Verificare la connessione." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Plugin" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiali" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Versione" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Ultimo aggiornamento" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autore" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Download" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Sconosciuto" @@ -1505,8 +1499,8 @@ msgstr "Indietro" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Conferma disinstalla " +msgid "Confirm uninstall" +msgstr "Conferma disinstalla" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1547,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Materiali generici" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Installa" @@ -1584,10 +1578,7 @@ 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.\n" -"Accetti i termini sotto riportati?" +msgstr "Questo plugin contiene una licenza.\nÈ necessario accettare questa licenza per poter installare il plugin.\nAccetti i termini sotto riportati?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:54 msgctxt "@action:button" @@ -1635,48 +1626,88 @@ msgid "Changelog" msgstr "Registro modifiche" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Chiudi" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Aggiornamento firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Il firmware è la parte di software eseguita direttamente sulla stampante 3D. Questo firmware controlla i motori passo-passo, regola la temperatura e, in ultima analisi, consente il funzionamento della stampante." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Il firmware inviato a corredo delle nuove stampanti funziona, tuttavia le nuove versioni tendono ad avere più funzioni ed ottimizzazioni." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Aggiorna automaticamente il firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Carica il firmware personalizzato" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Impossibile aggiornare il firmware: nessun collegamento con la stampante." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Impossibile aggiornare il firmware: il collegamento con la stampante non supporta l’aggiornamento del firmware." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Seleziona il firmware personalizzato" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Aggiornamento del firmware" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Aggiornamento firmware." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Aggiornamento del firmware completato." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Aggiornamento firmware non riuscito a causa di un errore sconosciuto." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Aggiornamento firmware non riuscito a causa di un errore di comunicazione." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Aggiornamento firmware non riuscito a causa di un errore di input/output." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Aggiornamento firmware non riuscito per firmware mancante." @@ -1686,44 +1717,41 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Contratto di licenza" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Collegamento esistente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Stampante/gruppo già aggiunto a Cura. Selezionare un’altra stampante o un altro gruppo." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Collega alla stampante in rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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:" +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:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Aggiungi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Modifica" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1759,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Rimuovi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Aggiorna" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se la stampante non è nell’elenco, leggere la guida alla risoluzione dei problemi per la stampa in rete" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Versione firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Indirizzo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Questa stampante non è predisposta per comandare un gruppo di stampanti." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Questa stampante comanda un gruppo di %1 stampanti." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "La stampante a questo indirizzo non ha ancora risposto." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Collega" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Indirizzo stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Inserire l’indirizzo IP o l’hostname della stampante sulla rete." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Stampa sulla rete" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Selezione stampante" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Stampa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Stampa sulla rete" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "In attesa: stampante non disponibile" +msgid "Printer selection" +msgstr "Selezione stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "In attesa della prima disponibile" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "In attesa: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Sposta in alto" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Sposta il processo di stampa in alto" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Sei sicuro di voler spostare 1% all’inizio della coda?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Cancella" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Cancella processo di stampa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Sei sicuro di voler cancellare %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Gestione coda di stampa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Coda di stampa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Stampa in corso" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Gestione stampanti" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Non disponibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Non raggiungibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Disponibile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Interrotto" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Terminato" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Preparazione in corso" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Messa in pausa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Ripresa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Richiede un'azione" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "In attesa: stampante non disponibile" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "In attesa della prima disponibile" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "In attesa: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Modifica configurazione" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "La stampante assegnata, %1, richiede le seguenti modifiche di configurazione:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Override" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "L’avvio di un processo di stampa con una configurazione non compatibile potrebbe danneggiare la stampante 3D. Sei sicuro di voler annullare la configurazione e stampare %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Annullare la configurazione e avviare la stampa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Vetro" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Alluminio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Gestione coda di stampa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Coda di stampa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Stampa in corso" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Gestione stampanti" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Sposta in alto" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Cancella" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Riprendi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pausa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Interrompi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Sei sicuro di voler spostare 1% all’inizio della coda?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Sposta il processo di stampa in alto" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Sei sicuro di voler cancellare %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Cancella processo di stampa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Sei sicuro di voler interrompere %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Interrompi la stampa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Sei sicuro di voler interrompere %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Interrotto" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Terminato" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Preparazione in corso" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Messa in pausa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "In pausa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Ripresa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Richiede un'azione" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Collega a una stampante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Carica la configurazione della stampante in Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Attiva la configurazione" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Carica la configurazione della stampante in Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2143,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Script di post-elaborazione" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Aggiungi uno script" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Impostazioni" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Modifica script di post-elaborazione attivi" @@ -2194,23 +2278,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modifica impostazioni per riempimento di altri modelli" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Seleziona impostazioni" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleziona impostazioni di personalizzazione per questo modello" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtro..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostra tutto" @@ -2261,6 +2345,7 @@ msgid "Type" msgstr "Tipo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Gruppo stampanti" @@ -2278,6 +2363,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2438,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Apri" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Precedente" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Esporta" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Avanti" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Suggerimento" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00h 00min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Indicazione di costo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Totale:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Prova di stampa" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista di controllo" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2479,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Spostamento alla posizione successiva" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Aggiorna firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Il firmware è la parte di software eseguita direttamente sulla stampante 3D. Questo firmware controlla i motori passo-passo, regola la temperatura e, in ultima analisi, consente il funzionamento della stampante." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Il firmware inviato a corredo delle nuove stampanti funziona, tuttavia le nuove versioni tendono ad avere più funzioni ed ottimizzazioni." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Aggiorna automaticamente il firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Carica il firmware personalizzato" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Seleziona il firmware personalizzato" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2666,9 +2646,7 @@ 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.\n" -"Mantenere o eliminare tali impostazioni?" +msgstr "Sono state personalizzate alcune impostazioni del profilo.\nMantenere o eliminare tali impostazioni?" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -2686,7 +2664,7 @@ msgid "Customized" msgstr "Valore personalizzato" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Chiedi sempre" @@ -2834,6 +2812,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importa" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Esporta" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2919,283 +2903,283 @@ msgid "Unit" msgstr "Unità" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Generale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interfaccia" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Lingua:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seziona automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento del riquadro di visualizzazione" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Visualizza sbalzo" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoom verso la direzione del mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Apertura e salvataggio file" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Ridimensiona i modelli troppo grandi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Ridimensiona i modelli eccessivamente piccoli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selezionare i modelli dopo il caricamento" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Apri sempre come progetto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importa sempre i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profili" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Elimina sempre le impostazioni modificate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Controlla aggiornamenti all’avvio" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Invia informazioni di stampa (anonime)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Ulteriori informazioni" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Sperimentale" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Stampanti" @@ -3217,7 +3201,7 @@ msgid "Connection:" msgstr "Collegamento:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "La stampante non è collegata." @@ -3243,7 +3227,7 @@ msgid "Aborting print..." msgstr "Interruzione stampa in corso..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profili" @@ -3324,17 +3308,17 @@ msgid "Global Settings" msgstr "Impostazioni globali" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Aggiungi stampante" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nome stampante:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Aggiungi stampante" @@ -3349,121 +3333,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Informazioni su Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "versione: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Soluzione end-to-end per la stampa 3D con filamento fuso." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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à.\n" -"Cura è orgogliosa di utilizzare i seguenti progetti open source:" +msgstr "Cura è stato sviluppato da Ultimaker B.V. in cooperazione con la comunità.\nCura è orgogliosa di utilizzare i seguenti progetti open source:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Interfaccia grafica utente" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Struttura applicazione" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Generatore codice G" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Libreria di comunicazione intra-processo" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Lingua di programmazione" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Struttura GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Vincoli struttura GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Libreria vincoli C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Formato scambio dati" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Libreria di supporto per calcolo scientifico" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Libreria di supporto per calcolo rapido" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Libreria di supporto per gestione file STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Libreria di supporto per gestione oggetti planari" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Libreria di supporto per gestione maglie triangolari" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Libreria di supporto per l’analisi di reti complesse" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Libreria di supporto per gestione file 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Libreria di supporto per metadati file e streaming" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Libreria di comunicazione seriale" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Libreria scoperta ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Libreria ritaglio poligono" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Libreria Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Font" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Icone SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Apertura applicazione distribuzione incrociata Linux" @@ -3473,73 +3475,67 @@ msgctxt "@label" msgid "Profile:" msgstr "Profilo:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" 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" -"\n" -"Fare clic per aprire la gestione profili." +msgstr "Alcuni valori di impostazione/esclusione sono diversi dai valori memorizzati nel profilo.\n\nFare clic per aprire la gestione profili." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Ricerca..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nascondi questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mantieni visibile questa impostazione" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configura visibilità delle impostazioni..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Comprimi tutto" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Espandi tutto" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" 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" -"\n" -"Fare clic per rendere visibili queste impostazioni." +msgstr "Alcune impostazioni nascoste utilizzano valori diversi dal proprio valore normale calcolato.\n\nFare clic per rendere visibili queste impostazioni." #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61 msgctxt "@label Header for list of settings." @@ -3551,37 +3547,31 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Influenzato da" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 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" -"\n" -"Fare clic per ripristinare il valore del profilo." +msgstr "Questa impostazione ha un valore diverso dal profilo.\n\nFare clic per ripristinare il valore del profilo." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 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" -"\n" -"Fare clic per ripristinare il valore calcolato." +msgstr "Questa impostazione normalmente viene calcolata, ma attualmente ha impostato un valore assoluto.\n\nFare clic per ripristinare il valore calcolato." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:129 msgctxt "@label" @@ -3727,12 +3717,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Visualizza" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posizione fotocamera" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&iano di stampa" @@ -3742,12 +3732,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Impostazioni visibili" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Mostra tutte le impostazioni" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gestisci Impostazione visibilità..." @@ -3806,21 +3796,46 @@ msgctxt "@label:listbox" msgid "" "Print Setup disabled\n" "G-code files cannot be modified" -msgstr "" -"Impostazione di stampa disabilitata\n" -"I file codice G non possono essere modificati" +msgstr "Impostazione di stampa disabilitata\nI file codice G non possono essere modificati" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00h 00min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Indicazioni di tempo" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Indicazione di costo" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Totale:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Impostazione di stampa consigliata

Stampa con le impostazioni consigliate per la stampante, il materiale e la qualità selezionati." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Impostazione di stampa personalizzata

Stampa con il controllo grana fine su ogni sezione finale del processo di sezionamento." @@ -3845,223 +3860,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Tempo residuo stimato" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Attiva/disattiva schermo intero" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annulla" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Ri&peti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Esci" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visualizzazione 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visualizzazione frontale" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visualizzazione superiore" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visualizzazione lato sinistro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visualizzazione lato destro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configura Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Aggiungi stampante..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gestione stampanti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gestione materiali..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Elimina le modifiche correnti" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gestione profili..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostra documentazione &online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Se&gnala un errore" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Informazioni..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Elimina modello" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "C&entra modello su piattaforma" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Raggruppa modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Separa modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Unisci modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Mo<iplica modello..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleziona tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Cancellare piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Ricarica tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Sistema tutti i modelli" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Sistema selezione" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Apri file..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuovo Progetto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Mostra &log motore..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostra cartella di configurazione" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Sfoglia i pacchetti..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Espandi/Riduci barra laterale" @@ -4122,7 +4137,7 @@ msgid "Select the active output device" msgstr "Seleziona l'unità di uscita attiva" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Apri file" @@ -4142,145 +4157,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&File" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Salva..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Esporta..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Esporta selezione..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Modifica" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Visualizza" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Impostazioni" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "S&tampante" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "Ma&teriale" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Imposta come estrusore attivo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Abilita estrusore" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Disabilita estrusore" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profilo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Es&tensioni" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Casella degli strumenti" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "P&referenze" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Help" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Impostazioni" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Nuovo progetto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Sei sicuro di voler aprire un nuovo progetto? Questo cancellerà il piano di stampa e tutte le impostazioni non salvate." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Chiusura di Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Installa il pacchetto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Apri file" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4290,11 +4305,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salva progetto" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4365,37 +4375,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Un riempimento graduale aumenterà gradualmente la quantità di riempimento verso l'alto." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Consenti variazione graduale" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Generazione supporto" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Seleziona l’estrusore da utilizzare per la stampa di strutture di supporto. Ciò consentirà di costruire strutture di supporto sotto il modello per evitare cedimenti del modello o di stampare a mezz'aria." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Adesione piano di stampa" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Serve aiuto per migliorare le tue stampe?
Leggi la Guida alla ricerca e riparazione guasti Ultimaker" @@ -4557,6 +4567,16 @@ msgctxt "name" msgid "Changelog" msgstr "Registro modifiche" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Fornisce azioni macchina per l’aggiornamento del firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Aggiornamento firmware" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4907,16 +4927,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Writer profilo Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Consente ai produttori di materiali di creare nuovi profili materiale e di qualità utilizzando una UI drop-in." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente profilo di stampa" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4947,6 +4957,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Lettore profilo Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Generare il codice G prima di salvare." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente profilo" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente profilo" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Aggiorna firmware" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Sconosciuto" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Nessun profilo personalizzato da importare nel file {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Questo profilo {0} contiene dati errati, impossibile importarlo." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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 importarlo." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Conferma disinstalla " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "In pausa" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Precedente" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Avanti" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Suggerimento" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Prova di stampa" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista di controllo" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Aggiorna firmware" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Consente ai produttori di materiali di creare nuovi profili materiale e di qualità utilizzando una UI drop-in." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente profilo di stampa" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Stampa con Doodle3D WiFi-Box" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index 3fa62440ea..aa170f18be 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Indica la coordinata Z della posizione in cui l’ugello si innesca all’avvio della stampa." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ventola di raffreddamento stampa estrusore" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Il numero di ventole di raffreddamento stampa abbinate a questo estrusore. Modificarlo dal valore predefinito 0 solo quando si ha una ventola di raffreddamento diversa per ciascun estrusore." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 135c07b4ab..e2d013f74c 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -5,8 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.comPOT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 15:02+0200\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" @@ -14,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: \n" "X-Generator: Poedit 2.0.6\n" #: fdmprinter.def.json @@ -57,9 +57,7 @@ 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" @@ -71,9 +69,7 @@ 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" @@ -1077,7 +1073,7 @@ msgstr "Collega poligoni superiori/inferiori" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "Collega i percorsi del rivestimento esterno superiore/inferiore quando corrono uno accanto all’altro. Per le configurazioni concentriche, l’abilitazione di questa impostazione riduce notevolmente il tempo di spostamento, tuttavia poiché i collegamenti possono aver luogo a metà del riempimento, con questa funzione la qualità della superficie superiore potrebbe risultare inferiore." #: fdmprinter.def.json @@ -1497,8 +1493,8 @@ msgstr "Configurazione di riempimento" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Configurazione del materiale di riempimento della stampa. Il riempimento a linea e a zig zag cambia direzione su strati alternati, riducendo il costo del materiale. Le configurazioni a griglia, a triangolo, tri-esagonali, cubiche, ottagonali, a quarto di cubo, incrociate e concentriche sono stampate completamente su ogni strato. Le configurazioni cubiche, a quarto di cubo e ottagonali variano per ciascuno strato per garantire una più uniforme distribuzione della forza in ogni direzione." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Configurazione del materiale di riempimento della stampa. Il riempimento a linea e a zig zag cambia direzione su strati alternati, riducendo il costo del materiale. Le configurazioni a griglia, a triangolo, tri-esagonali, cubiche, ottagonali, a quarto di cubo, incrociate e concentriche sono stampate completamente su ogni strato. Le configurazioni gyroid, cubiche, a quarto di cubo e ottagonali variano per ciascuno strato per garantire una più uniforme distribuzione della forza in ogni direzione." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1556,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Incrociata 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroid" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1630,9 +1631,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -3264,6 +3263,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Abilitazione brim del supporto" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Genera un brim entro le zone di riempimento del supporto del primo strato. Questo brim viene stampato al di sotto del supporto, non intorno ad esso. L’abilitazione di questa impostazione aumenta l’adesione del supporto al piano di stampa." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Larghezza del brim del supporto" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Corrisponde alla larghezza del brim da stampare al di sotto del supporto. Un brim più largo migliora l’adesione al piano di stampa, ma utilizza una maggiore quantità di materiale." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Numero di linee del brim del supporto" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Corrisponde al numero di linee utilizzate per il brim del supporto. Più linee brim migliorano l’adesione al piano di stampa, ma utilizzano una maggiore quantità di materiale." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3799,9 +3828,7 @@ 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.\n" -"Questa è la distanza minima. Più linee di skirt aumenteranno tale distanza." +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." #: fdmprinter.def.json msgctxt "skirt_brim_minimal_length label" @@ -3833,6 +3860,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Corrisponde al numero di linee utilizzate per un brim. Più linee brim migliorano l’adesione al piano di stampa, ma con riduzione dell'area di stampa." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Brim in sostituzione del supporto" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Abilita la stampa del brim intorno al modello anche se quello spazio dovrebbe essere occupato dal supporto. Sostituisce alcune zone del primo strato del supporto con zone del brim." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5238,9 +5275,7 @@ 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.\n" -"Ciò 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.\nCiò 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" @@ -5657,6 +5692,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Collega i percorsi del rivestimento esterno superiore/inferiore quando corrono uno accanto all’altro. Per le configurazioni concentriche, l’abilitazione di questa impostazione riduce notevolmente il tempo di spostamento, tuttavia poiché i collegamenti possono aver luogo a metà del riempimento, con questa funzione la qualità della superficie superiore potrebbe risultare inferiore." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Configurazione del materiale di riempimento della stampa. Il riempimento a linea e a zig zag cambia direzione su strati alternati, riducendo il costo del materiale. Le configurazioni a griglia, a triangolo, tri-esagonali, cubiche, ottagonali, a quarto di cubo, incrociate e concentriche sono stampate completamente su ogni strato. Le configurazioni cubiche, a quarto di cubo e ottagonali variano per ciascuno strato per garantire una più uniforme distribuzione della forza in ogni direzione." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "3D concentrica" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 80fefa2b42..13916ef1e2 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-09-28 15:19+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 14:58+0100\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" "Language: ja_JP\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter は非テキストモードはサポートしていません #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "保存する前に G-code を生成してください。" +msgid "Please prepare G-code before exporting." +msgstr "エクスポートする前にG-codeの準備をしてください。" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Changelogの表示" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "ファームウェアアップデート" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -86,27 +91,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "プロファイルが平らになり、アクティベートされました。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USBプリンティング" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "USBを使ってプリントする" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "USBを使ってプリントする" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "USBにて接続する" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USBプリントを実行しています。Cura を閉じるとこのプリントも停止します。実行しますか？" @@ -138,7 +143,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter はテキストモードをサポートしていません。" -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimakerフォーマットパッケージ" @@ -160,7 +165,7 @@ msgid "Save to Removable Drive {0}" msgstr "リムーバブルドライブ{0}に保存" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "書き出すために利用可能な形式のファイルがありません！" @@ -199,7 +204,7 @@ msgstr "リムーバブルドライブ{0}に保存することができません #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "エラー" @@ -228,8 +233,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -256,141 +261,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "リムーバブルドライブ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "ネットワーク上のプリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "ネットワークのプリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "ネットワーク上で接続。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "ネットワーク上で接続。プリンタへのリクエストを承認してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "ネットワーク上で接続。プリントを操作するアクセス権がありません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "プリンターへのアクセスが申請されました。プリンタへのリクエストを承認してください" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "認証ステータス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "認証ステータス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "再試行" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "アクセスリクエストを再送信" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "プリンターへのアクセスが承認されました" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "このプリンターへのアクセスが許可されていないため、プリントジョブの送信ができませんでした。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "アクセスのリクエスト" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "アクセスのリクエスト送信" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "新しいプリントジョブを開始できません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Ultimakerの設定に問題があるため、印刷が開始できません。問題を解消してからやり直してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "ミスマッチの構成" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "選択された構成にてプリントを開始してもいいですか。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." msgstr "プリンターの設定、キャリブレーションとCuraの構成にミスマッチがあります。プリンターに設置されたプリントコア及びフィラメントを元にCuraをスライスすることで最良の印刷結果を出すことができます。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "プリンターにプリントデータを送信中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "プリントデータを送信中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -400,78 +400,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "キャンセル" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "プリントコアがスロット{slot_number}に入っていません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "材料がスロット{slot_number}に入っていません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "エクストルーダー {extruder_id} に対して異なるプリントコア（Cura: {cura_printcore_name}, プリンター: {remote_printcore_name}）が選択されています。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "異なるフィラメントが入っています(Cura:{0}, プリンター{1})エクストルーダー{2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "プリンターと同期する" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Curaで設定しているプリンタ構成を使用されますか？" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "プリンターのプリントコア及びフィラメントが現在のプロジェクトと異なります。最善な印刷結果のために、プリンタに装着しているプリントコア、フィラメントに合わせてスライスして頂くことをお勧めします。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "ネットワーク上で接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "プリントジョブは正常にプリンターに送信されました。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "データを送信しました" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "モニター表示" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "プリント終了" @@ -481,49 +481,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "ネットワーク上にて接続" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "モニター" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "必要なアップデートの情報にアクセスできません。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "{machine_name} で利用可能な新しい機能があります。プリンターのファームウェアをアップデートしてください。" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "新しい利用可能な%sファームウェアのアップデートがあります" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "アップデートの仕方" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "必要なアップデートの情報にアクセスできません。" - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "レイヤービュー" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Curaはワイヤープリンティング設定中には正確にレイヤーを表示しません" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "シミュレーションビュー" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "G-codeを修正" @@ -537,32 +537,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "サポートが印刷されないボリュームを作成します。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Curaは、匿名化した利用統計を収集します。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "データを収集中" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "詳細" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Curaが送信するデータについて詳しくご覧ください。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "許可" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Curaが匿名化した利用統計を送信することを許可し、Curaの将来の改善を優先的に行うことに貢献します。プレファレンスと設定の一部、Curaのバージョン、スライスしているモデルのハッシュが送信されます。" @@ -597,56 +597,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF画像" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "選ばれたプリンターまたは選ばれたプリント構成が異なるため進行中の材料にてスライスを完了できません。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "スライスできません" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "現在の設定でスライスが完了できません。以下の設定にエラーがあります: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "モデル別の設定があるためスライスできません。1つまたは複数のモデルで以下の設定にエラーが発生しました：{error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "プライムタワーまたはプライム位置が無効なためスライスできません。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "無効な Extruder %s に関連付けられている造形物があるため、スライスできません。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "モデルのデータがビルトボリュームに入っていないためスライスできるものがありません。スケールやローテーションにて合うように設定してください。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "レイヤーを処理しています" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "インフォメーション" @@ -662,13 +662,13 @@ msgid "Configure Per Model Settings" msgstr "各モデル構成設定" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "推奨" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "カスタム" @@ -680,7 +680,7 @@ msgid "3MF File" msgstr "3MF ファイル" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "ノズル" @@ -706,18 +706,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Gファイル" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-codeを解析" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-codeの詳細" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "データファイルを送信する前に、プリンターとプリンターの構成設定にそのG-codeが適応しているか確認してください。G-codeの表示が適切でない場合があります。" @@ -728,16 +728,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Curaプロファイル" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "プロファイルアシスタント" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "プロファイルアシスタント" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -759,11 +749,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "アップグレードを選択する" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "ファームウェアをアップグレード" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -774,79 +759,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "ビルドプレートを調整する" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "アウターウォール" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "インナーウォール" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "スキン" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "インフィル" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "サポートイルフィル" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "サポートインターフェイス" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "サポート" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "スカート" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "移動" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "退却" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "他" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "不明" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "スライス前ファイル {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "ログインに失敗しました" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "すでに存在するファイルです" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -858,23 +843,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "上書きできません" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "選択されたフィラメントはプリンターとそのプリント構成に適応しておりません。" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "不適合フィラメント" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "設定が更新されました" @@ -889,7 +874,7 @@ msgstr "{0}にプロファイルを書き出すのに失敗 #, 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}にプロファイルを書き出すことに失敗しました。：ライタープラグイン失敗の報告。" +msgstr "{0}にプロファイルを書き出すことに失敗しました。：ライタープラグイン失敗の報告。" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143 #, python-brace-format @@ -903,8 +888,6 @@ msgid "Export succeeded" msgstr "書き出し完了" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -912,58 +895,70 @@ msgstr "{0}: {1}からプロファイル #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "ファイル{0}にはカスタムプロファイルがインポートされていません" +msgstr "ファイル{0}にはカスタムプロファイルがインポートされていません。" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "このプロファイル{0}には、正しくないデータが含まれていて、インポートできません。" +msgstr "このプロファイル{0}には、正しくないデータが含まれているため、インポートできません。" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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})と一致しませんので、インポートできませんでした。" +msgstr "プロファイル{0}の中で定義されているマシン({1})は、現在お使いのマシン({2})と一致しないため、インポートできませんでした。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "カスタムプロファイル" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "プロファイルはクオリティータイプが不足しています。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "進行中のプリント構成にあったクオリティータイプ{0}が見つかりませんでした。" -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -990,12 +985,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "全てのファイル" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "カスタムフィラメント" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "カスタム" @@ -1010,22 +1005,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "造形サイズ" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "ユーザーデータディレクトリからアーカイブを作成できません: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "バックアップ" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "適切なデータまたはメタデータがないのにCuraバックアップをリストアしようとしました。" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "現行バージョンと一致しないCuraバックアップをリストアしようとしました。" @@ -1200,40 +1195,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "レポート送信" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "プリンターを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "シーンをセットアップ中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "インターフェイスを読み込み中…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選択したモデルは読み込むのに小さすぎます。" @@ -1264,9 +1259,9 @@ msgstr "X（幅）" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1401,22 +1396,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "プリンターに対応したフィラメントの直径。正確な直径はフィラメント及びまたはプロファイルに変動します。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "ノズルオフセットX" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "ノズルオフセットY" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "冷却ファンの番号" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "エクストルーダーがG-Codeを開始する" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "エクストルーダーがG-Codeを終了する" @@ -1437,41 +1442,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Curaパッケージデータベースに接続できません。接続を確認してください。" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "プラグイン" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "マテリアル" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "バージョン" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "最終更新日" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "著者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "ダウンロード" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "不明" @@ -1506,8 +1512,8 @@ msgstr "戻る" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "アンインストール確認 " +msgid "Confirm uninstall" +msgstr "アンインストール確認" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1554,7 +1560,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "汎用材料" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "インストールした" @@ -1613,7 +1619,7 @@ msgstr "互換性" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLoadingPage.qml:16 msgctxt "@info" msgid "Fetching packages..." -msgstr "パッケージ取得中" +msgstr "パッケージ取得中…" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml:88 msgctxt "@label" @@ -1636,48 +1642,88 @@ msgid "Changelog" msgstr "Changelogの表示" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "閉める" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "ファームウェアアップデート" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターとして成すべき点を補います。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "配達時のファームウェアで動かすことはできますが、新しいバージョンの方がより改善され、便利なフィーチャーがついてきます。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "自動でファームウェアをアップグレード" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "カスタムファームウェアをアップロードする" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "プリンターと接続されていないため、ファームウェアをアップデートできません。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "プリンターとの接続はファームウェアのアップデートをサポートしていないため、ファームウェアをアップデートできません。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "カスタムファームウェアを選択する" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "ファームウェアアップデート" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "ファームウェアアップデート中。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "ファームウェアアップデート完了。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "不特定なエラーの発生によりファームウェアアップデート失敗しました。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "コミュニケーションエラーによりファームウェアアップデート失敗しました。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "インプット/アウトプットエラーによりファームウェアアップデート失敗しました。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "ファームウェアが見つからず、ファームウェアアップデート失敗しました。" @@ -1687,22 +1733,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "ユーザー用使用許諾契約" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "既存の接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "このプリンター/グループはすでにCuraに追加されています。別のプリンター/グループを選択しえください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "ネットワーク上で繋がったプリンターに接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1710,18 +1756,18 @@ msgid "" "Select your printer from the list below:" msgstr "ネットワーク接続にて直接プリントするためには、必ずケーブルまたはWifiネットワークにて繋がっていることを確認してください。Curaをプリンターに接続していない場合でも、USBメモリを使って直接プリンターにg-codeファイルをトランスファーできます。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "追加" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "編集" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1729,244 +1775,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "取り除く" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "更新" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "お持ちのプリンターがリストにない場合、ネットワーク・プリンティング・トラブルシューティング・ガイドを読んでください" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "タイプ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "ファームウェアバージョン" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "アドレス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "このプリンターは、プリンターのグループをホストするために設定されていません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "このプリンターは %1 プリンターのループのホストプリンターです。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "このアドレスのプリンターは応答していません。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "接続" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "プリンターアドレス" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "ネットワーク内のプリンターのIPアドレスまたはホストネームを入力してください。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "ネットワーク上のプリント" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "プリンターの選択" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "プリント" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "ネットワーク上のプリント" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "待ち時間: 利用できないプリンター" +msgid "Printer selection" +msgstr "プリンターの選択" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "待ち時間: 次の空き" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "待ち時間: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "最上位に移動" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "印刷ジョブを最上位に移動する" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "%1 をキューの最上位に移動しますか？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "削除" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "印刷ジョブの削除" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "%1 を削除しますか？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "キュー管理" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "順番を待つ" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "プリント中" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "プリンター管理" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "利用できません" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "到達不能" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "利用可能" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "中止しました" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "終了" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "準備中" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "一時停止中" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "再開" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "アクションが必要です" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "待ち時間: 利用できないプリンター" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "待ち時間: 次の空き" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "待ち時間: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "構成の変更" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "割り当てられたプリンター %1 には以下の構成変更が必要です。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "材料 ％1 を ％2 から %3 に変更します。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "%3 を 材料 %1 にロードします（これは上書きできません）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "プリントコア ％1 を ％2 から %3 に変更します。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "ビルドプレートを %1 に変更します（これは上書きできません）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "上書き" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "互換性のない構成で印刷ジョブを開始すると3Dプリンターを損傷することがあります。構成と印刷 ％1 を上書きしますか？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "構成を上書きしてから印刷を開始" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "ガラス" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "アルミニウム" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "キュー管理" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "順番を待つ" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "プリント中" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "プリンター管理" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "最上位に移動" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "削除" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "再開" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "一時停止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "中止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "%1 をキューの最上位に移動しますか？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "印刷ジョブを最上位に移動する" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "%1 を削除しますか？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "印刷ジョブの削除" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "%1 を中止してよろしいですか？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "プリント中止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "%1 を中止してよろしいですか？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "中止しました" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "終了" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "準備中" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "一時停止中" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "一時停止" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "再開" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "アクションが必要です" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "プリンターにつなぐ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "プリンターの構成をCuraに取り入れる" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "プリント構成をアクティベートする" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "プリンターの構成をCuraに取り入れる" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2057,17 +2159,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "スクリプトの処理後" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "スクリプトを加える" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "処理したスクリプトを変更する" @@ -2192,23 +2294,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "他のモデルのインフィルの設定を変更" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "設定を選択する" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "このモデルをカスタマイズする設定を選択する" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "フィルター…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "すべて表示する" @@ -2259,6 +2361,7 @@ msgid "Type" msgstr "タイプ" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "プリンターグループ" @@ -2276,6 +2379,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2456,6 @@ msgctxt "@action:button" msgid "Open" msgstr "開く" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "前" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "書き出す" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "次" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "ヒント" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00時間 00分" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "コスト仕様" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "合計:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "試し印刷" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "チェックリスト" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2497,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "次のポジションに移動" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "ファームウェアをアップグレード" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "ファームウェアとは直接お持ちの3Dプリンターを動かすソフトウェアです。このファームウェアはステップモーターを操作し、温度を管理し、プリンターとして成すべき点を補います。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "配達時のファームウェアで動かすことはできますが、新しいバージョンの方がより改善され、便利なフィーチャーがついてきます。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "自動でファームウェアをアップグレード" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "カスタムファームウェアをアップロードする" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "カスタムファームウェアを選択する" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2627,7 +2625,7 @@ msgstr "プリンターへの接続が切断されました" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:187 msgctxt "@label:MonitorStatus" msgid "Printing..." -msgstr "プリント中" +msgstr "プリント中…" #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:149 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:189 @@ -2639,7 +2637,7 @@ msgstr "一時停止しました" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:191 msgctxt "@label:MonitorStatus" msgid "Preparing..." -msgstr "準備中" +msgstr "準備中…" #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:154 msgctxt "@label:MonitorStatus" @@ -2684,7 +2682,7 @@ msgid "Customized" msgstr "カスタマイズ" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "毎回確認する" @@ -2832,6 +2830,12 @@ msgctxt "@action:button" msgid "Import" msgstr "取り込む" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "書き出す" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2858,12 +2862,12 @@ msgstr "フィラメントを取り込む" #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:286 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" -msgstr " %1フィラメントを取り込むことができない: %2" +msgstr "%1フィラメントを取り込むことができない: %2" #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:290 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" -msgstr "フィラメント%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 @@ -2879,7 +2883,7 @@ msgstr "フィラメントの書き出しに失敗しました %1!" msgid "Successfully exported material to %1" -msgstr "フィラメントの%1への書き出しが完了ました。" +msgstr "フィラメントの%1への書き出しが完了ました" #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 msgctxt "@title:tab" @@ -2917,283 +2921,283 @@ msgid "Unit" msgstr "ユニット" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "一般" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "インターフェイス" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "言語:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "通貨:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "テーマ:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "セッティングを変更すると自動にスライスします。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動的にスライスする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "ビューポイント機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "ディスプレイオーバーハング" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "アイテムを選択するとカメラが中心にきます" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Curaのデフォルトのズーム機能は変更できるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "カメラのズーム方向を反転する。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "ズームはマウスの方向に動くべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "マウスの方向にズームする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "モデルの距離が離れているように確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動的にモデルをビルドプレートに落とす" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-codeリーダーに注意メッセージを表示します。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-codeリーダーに注意メッセージ" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "レイヤーはコンパティビリティモードに強制されるべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "レイヤービューコンパティビリティモードを強制する。（再起動が必要）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "ファイルを開くまた保存" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "大きなモデルをスケールする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "極端に小さなモデルをスケールアップする" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "モデルはロード後に選択しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "ロード後にモデルを選択" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "プリンターの敬称をジョブネームに加える" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "プロジェクトファイルを保存時にサマリーを表示するべきか？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "プロジェクトを保存時にダイアログサマリーを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "プロジェクトファイルを開く際のデフォルト機能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "プロジェクトファイル開く際のデフォルト機能: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "常にプロジェクトとして開く" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "常にモデルを取り込む" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "常に変更した設定を廃棄する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "常に変更した設定を新しいプロファイルに送信する" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "プライバシー" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "スタート時にアップデートあるかどうかのチェック" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(不特定な) プリントインフォメーションを送信" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "詳細" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "実験" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "マルチビルドプレート機能を使用" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "プリンター" @@ -3215,7 +3219,7 @@ msgid "Connection:" msgstr "コネクション:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "このプリンターはつながっていません。" @@ -3241,7 +3245,7 @@ msgid "Aborting print..." msgstr "プリントを停止します…" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "プロファイル" @@ -3322,17 +3326,17 @@ msgid "Global Settings" msgstr "グローバル設定" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "プリンターを追加する" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "プリンター名:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "プリンターについて" @@ -3347,119 +3351,139 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Curaについて" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "バージョン: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熱溶解積層型3Dプリンティングのエンドtoエンドソリューション。" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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はUltimakerB.Vのコミュニティの協力によって開発され、Curaはオープンソースで使えることを誇りに思います:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "グラフィックユーザーインターフェイス" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "アプリケーションフレームワーク" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-codeの生成" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "インタープロセスコミュニケーションライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "プログラミング用語" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUIフレームワーク" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUIフレームワークバインディング" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ バインディングライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "データインターフェイスフォーマット" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "サイエンスコンピューティングを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "ファターマスを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STLファイルを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "平面対象物を操作するためのライブラリーサポート" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "参画メッシュを操作するためのライブラリーサポート" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "複雑なネットワークを分析するためのライブラリーサポート" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MFファイルを操作するためのライブラリーサポート" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "ファイルメタデータとストリーミングのためのライブラリーサポート" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "シリアルコミュニケーションライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConfディスカバリーライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "ポリゴンクリッピングライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTPライブラリー" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "フォント" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVGアイコン" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 分散アプリケーションの開発" @@ -3469,7 +3493,7 @@ msgctxt "@label" msgid "Profile:" msgstr "プロファイル:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3479,53 +3503,53 @@ msgstr "" "いくらかの設定プロファイルにある値とことなる場合無効にします。\n" "プロファイルマネージャーをクリックして開いてください。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "検索…" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "すべてのエクストルーダーの値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "すべてのエクストルーダーに対して変更された値をコピーする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "この設定を非表示にする" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "この設定を表示しない" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "常に見えるように設定する" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." -msgstr "視野のセッティングを構成する" +msgstr "視野のセッティングを構成する…" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "すべて折りたたむ" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "すべて展開する" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3545,17 +3569,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "次によって影響を受ける" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "この値は各エクストルーダーの値から取得します " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3565,7 +3589,7 @@ msgstr "" "この設定にプロファイルと異なった値があります。\n" "プロファイルの値を戻すためにクリックしてください。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3719,12 +3743,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&ビュー" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "カメラ位置 (&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "ビルドプレート (&B)" @@ -3734,15 +3758,15 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "ビジブル設定" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "すべての設定を表示" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." -msgstr "視野のセッティングを管理する" +msgstr "視野のセッティングを管理する…" # can’t enter japanese texts #: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:27 @@ -3802,17 +3826,44 @@ msgstr "" "プリントセットアップが無効\n" "G-codeファイルを修正することができません" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00時間 00分" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "時間仕様" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "コスト仕様" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "合計:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "おすすめプリントセットアップ

選択されたプリンターにておすすめの設定、フィラメント、質にてプリントしてください。" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "カスタムプリントセットアップ

スライス処理のきめ細かなコントロールにてプリントする。" @@ -3837,223 +3888,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "残り時間" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "留め金 フルスクリーン" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&取り消す" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&やりなおす" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&やめる" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3Dビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "フロントビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "トップビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左サイドビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右サイドビュー" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Curaを構成する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." -msgstr "＆プリンターを追加する" +msgstr "＆プリンターを追加する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." -msgstr "プリンターを管理する" +msgstr "プリンターを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." -msgstr "フィラメントを管理する" +msgstr "フィラメントを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&現在の設定/無効にプロファイルをアップデートする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&変更を破棄する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&今の設定/無効からプロファイルを作成する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." -msgstr "プロファイルを管理する" +msgstr "プロファイルを管理する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "オンラインドキュメントを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "報告＆バグ" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "アバウト..." # can’t enter japanese text -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "選択した複数のモデル" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "モデルを消去する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "プラットホームの中心にモデルを配置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&モデルグループ" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "モデルを非グループ化" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "モ&デルの合体" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&モデルを増倍する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "すべてのモデル選択" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "ビルドプレート上のクリア" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "すべてのモデルを読み込む" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "すべてのモデルをすべてのビルドプレートに配置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "すべてのモデルをアレンジする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "選択をアレンジする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "すべてのモデルのポジションをリセットする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "すべてのモデル＆変更点をリセットする" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&ファイルを開く(s)…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&新しいプロジェクト…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." -msgstr "エンジン＆ログを表示する" +msgstr "エンジン＆ログを表示する…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "コンフィグレーションのフォルダーを表示する" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "パッケージを見る…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "サイドバーを展開する/たたむ" @@ -4114,7 +4165,7 @@ msgid "Select the active output device" msgstr "アクティブなアウトプットデバイスを選択する" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "ファイルを開く" @@ -4134,145 +4185,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&ファイル" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&保存..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&エクスポート..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "選択エクスポート..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&編集" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&ビュー" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&プリンター" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&フィラメント" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "アクティブエクストルーダーとしてセットする" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "エクストルーダーを有効にする" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "エクストルーダーを無効にする" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "ビルドプレート (&B)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&プロファイル" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "拡張子" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&ツールボックス" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "プレファレンス" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "ヘルプ" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "このパッケージは再起動後にインストールされます。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "ファイルを開く" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" -msgstr "新しいプロジェクト…" +msgstr "新しいプロジェクト" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "新しいプロジェクトを開始しますか？この作業では保存していない設定やビルドプレートをクリアします。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura を閉じる" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura を終了しますか？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "パッケージをインストール" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "ファイルを開く(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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点のみ選んでください。" @@ -4282,11 +4333,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "プロジェクトを保存" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4357,37 +4403,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "グラデュアルインフィルはトップに向かうに従ってインフィルの量を増やします。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "グラデュアルを有効にする" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "サポートを生成します" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "オーバーハングがあるモデルにサポートを生成します。このサポート構造なしでは、プリント中にオーバーハングのパーツが崩壊してしまいます。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "サポートに使うエクストルーダーを選択してください。モデルの垂れや中空プリントを避けるためにモデルの下にサポート構造を生成します。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "ビルドプレートの接着" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "ブリムまたはラフトのプリントの有効化。それぞれ、プリントの周り、また造形物の下に底面を加え切り取りやすくします。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "プリントにヘルプが必要ですか？
Ultimakerトラブルシューティングガイドを読んでください" @@ -4549,6 +4595,16 @@ msgctxt "name" msgid "Changelog" msgstr "Changelog" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "ファームウェアアップデートのためのマシン操作を提供します。" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "ファームウェアアップデーター" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4899,16 +4955,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Curaプロファイルライター" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "材料メーカーがドロップインUIを使用して新しい材料と品質のプロファイルを作成できるようにします。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "プリントプロファイルアシスタント" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4939,6 +4985,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Curaプロファイルリーダー" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "保存する前に G-code を生成してください。" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "プロファイルアシスタント" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "プロファイルアシスタント" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "ファームウェアをアップグレード" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "不明" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "ファイル{0}にはカスタムプロファイルがインポートされていません" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "このプロファイル{0}には、正しくないデータが含まれていて、インポートできません。" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "プロファイル{0}の中で定義されているマシン({1})は、現在お使いのマシン({2})と一致しませんので、インポートできませんでした。" + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "アンインストール確認 " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "一時停止" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "前" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "次" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "ヒント" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "試し印刷" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "チェックリスト" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "ファームウェアをアップグレード" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "材料メーカーがドロップインUIを使用して新しい材料と品質のプロファイルを作成できるようにします。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "プリントプロファイルアシスタント" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Doodle3D WiFi-Boxでプリントする" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index c18a660997..95f0382823 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -5,8 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.comPOT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 15:24+0200\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" @@ -15,7 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.6\n" -"POT-Creation-Date: \n" #: fdmextruder.def.json msgctxt "machine_settings label" @@ -167,6 +167,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "印刷開始時にノズルがポジションを確認するZ座標。" +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "エクストルーダープリント冷却ファン" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "このエクストルーダーに関連付けられているプリント冷却ファンの数です。デフォルト値は0(ゼロ)です。各エクストルーダーに対してプリント冷却ファンが異なる場合にのみ変更します。" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index c584466616..3156e77288 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -5,8 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.comPOT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 15:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" @@ -16,7 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.0.6\n" -"POT-Creation-Date: \n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -61,9 +61,7 @@ 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" @@ -75,9 +73,7 @@ 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" @@ -1122,7 +1118,7 @@ msgstr "上層/底層ポリゴンに接合" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "互いに次に実行する上層/底層スキンパスに接合します。同心円のパターンの場合、この設定を有効にすることにより、移動時間が短縮されますが、インフィルまでの途中で接合があるため、この機能で上層面の品質が損なわれることがあります。" #: fdmprinter.def.json @@ -1326,9 +1322,7 @@ msgstr "ZシームX" #: fdmprinter.def.json msgctxt "z_seam_x description" msgid "The X coordinate of the position near where to start printing each part in a layer." -msgstr "" -"レイヤー内の各印刷を開始するX座\n" -"標の位置。" +msgstr "レイヤー内の各印刷を開始するX座\n標の位置。" #: fdmprinter.def.json msgctxt "z_seam_y label" @@ -1568,8 +1562,8 @@ msgstr "インフィルパターン" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "印刷用インフィル材料のパターン。代替層のラインとジグザグの面詰めスワップ方向、材料コストを削減します。グリッド、トライアングル、トライ六角、キュービック、オクテット、クォーターキュービック、クロスと同心円のパターンは、すべてのレイヤーを完全に印刷されます。キュービック、クォーターキュービック、オクテットのインフィルは、各レイヤーを変更して各方向の強度をより均等な分布にします。" +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "印刷用インフィル材料のパターン。代替層のラインとジグザグの面詰めスワップ方向、材料コストを削減します。グリッド、トライアングル、トライ六角、キュービック、オクテット、クォーターキュービック、クロスと同心円のパターンは、すべてのレイヤーを完全に印刷されます。ジャイロイド、キュービック、クォーターキュービック、オクテットのインフィルは、各レイヤーを変更して各方向の強度をより均等な分布にします。" #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1634,6 +1628,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "3Dクロス" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "ジャイロイド" + # msgstr "クロス3D" #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" @@ -1706,9 +1705,7 @@ 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" -"この機能は、インフィルポリゴン接合と組み合わせて、構成が正しい場合、移動または引き戻しが必要なく、すべてのインフィルを1つの押出経路に接続することができます。" +msgstr "インフィルエリア周辺に外壁を追加します。このような壁は、上層/底層ラインにたるみを作ります。つまり、一部の外壁材料の費用で同じ品質を実現するためには、必要な上層/底層スキンが少ないことを意味します。\nこの機能は、インフィルポリゴン接合と組み合わせて、構成が正しい場合、移動または引き戻しが必要なく、すべてのインフィルを1つの押出経路に接続することができます。" #: fdmprinter.def.json msgctxt "sub_div_rad_add label" @@ -1811,9 +1808,7 @@ msgstr "インフィル優先" #: fdmprinter.def.json msgctxt "infill_before_walls description" msgid "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface." -msgstr "" -"壁より前にインフィルをプリントします　はじめに壁をプリントするとより精密な壁になりますが、オーバーハングのプリントは悪化します\n" -"はじめにインフィルをプリントすると丈夫な壁になりますが、インフィルの模様が時折表面から透けて表れます。" +msgstr "壁より前にインフィルをプリントします　はじめに壁をプリントするとより精密な壁になりますが、オーバーハングのプリントは悪化します\nはじめにインフィルをプリントすると丈夫な壁になりますが、インフィルの模様が時折表面から透けて表れます。" #: fdmprinter.def.json msgctxt "min_infill_area label" @@ -3366,6 +3361,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "対応するインフィルラインの向きです。サポートインフィルパターンは平面で回転します。" +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "サポートブリムを有効にする" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "最初の層のインフィルエリア内ブリムを生成します。このブリムは、サポートの周囲ではなく、サポートの下に印刷されます。この設定を有効にすると、サポートのビルドプレートへの吸着性が高まります。" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "サポートブリムの幅" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "サポートの下に印刷されるブリムの幅。ブリムが大きいほど、追加材料の費用でビルドプレートへの接着性が強化されます。" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "サポートブリムのライン数" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "サポートブリムに使用される線の数。ブリムの線数を増やすと、追加材料の費用でビルドプレートへの接着性が強化されます。" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3929,9 +3954,7 @@ 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" @@ -3963,6 +3986,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "ブリムに使用される線数。ブリムの線数は、ビルドプレートへの接着性を向上させるだけでなく、有効な印刷面積を減少させる。" +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "ブリム交換サポート" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "スペースがサポートで埋まっている場合でも、モデルの周辺にブリムを印刷します。これにより、サポートの最初の層の一部のエリアがブリムになります。" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5808,6 +5841,14 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。" +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "互いに次に実行する上層/底層スキンパスに接合します。同心円のパターンの場合、この設定を有効にすることにより、移動時間が短縮されますが、インフィルまでの途中で接合があるため、この機能で上層面の品質が損なわれることがあります。" + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "印刷用インフィル材料のパターン。代替層のラインとジグザグの面詰めスワップ方向、材料コストを削減します。グリッド、トライアングル、トライ六角、キュービック、オクテット、クォーターキュービック、クロスと同心円のパターンは、すべてのレイヤーを完全に印刷されます。キュービック、クォーターキュービック、オクテットのインフィルは、各レイヤーを変更して各方向の強度をより均等な分布にします。" + # msgstr "同心円" #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index a97c5cf05b..6f32d46cd7 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-09-28 14:25+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:00+0100\n" "Last-Translator: Jinbuhm Kim \n" "Language-Team: Jinbum Kim , Korean \n" "Language: ko_KR\n" @@ -48,8 +48,8 @@ msgstr "GCodeWriter는 텍스트가 아닌 모드는 지원하지 않습니다." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "저장하기 전에 G-code를 생성하십시오." +msgid "Please prepare G-code before exporting." +msgstr "내보내기 전에 G-code를 준비하십시오." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "변경 내역 표시" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "펌웨어 업데이트" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "프로파일이 병합되고 활성화되었습니다." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB 프린팅" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "USB를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "USB를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "USB를 통해 연결" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USB 인쇄가 진행 중입니다. Cura를 닫으면 인쇄도 중단됩니다. 계속하시겠습니까?" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter는 텍스트 모드는 지원하지 않습니다." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 포맷 패키지" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "이동식 드라이브 {0}에 저장" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "쓸 수있는 파일 형식이 없습니다!" @@ -198,7 +203,7 @@ msgstr "이동식 드라이브 {0}: {1} 에 저장할 수 없습니다 :" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "오류" @@ -227,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "경고" @@ -255,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "이동식 드라이브" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "네트워크를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "네트워크를 통해 프린팅" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "네트워크를 통해 연결됨." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "네트워크를 통해 연결되었습니다. 프린터의 접근 요청을 승인하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "네트워크를 통해 연결되었습니다. 프린터를 제어할 수 있는 권한이 없습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "요청된 프린터에 대한 액세스. 프린터에서 요청을 승인하십시오" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "인증 상태" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "인증 상태" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "재시도" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "접근 요청 다시 보내기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "허용 된 프린터에 대한 접근 허용" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "이 프린터로 프린팅 할 수 없습니다. 프린팅 작업을 보낼 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "접근 요청" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "프린터에 접근 요청 보내기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "새 프린팅 작업을 시작할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Ultimaker의 설정에 문제가 있어 프린팅을 시작할 수 없습니다. 계속하기 전에 이 문제를 해결하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "일치하지 않는 구성" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "선택한 구성으로 프린팅 하시겠습니까?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." msgstr "프린터와 Cura의 설정이 일치하지 않습니다. 최상의 결과를 얻으려면 프린터에 삽입 된 PrintCores 및 재료로 슬라이싱을 하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "프린터로 데이터 보내기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "데이터 전송 중" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "취소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "{slot_number} 슬롯에 로드 된 프린터코어가 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "{slot_number}에 로드 된 재료가 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "익스트루더 {extruder_id}에 대해 다른 프린터코어 (Cura : {cura_printcore_name}, 프린터 : {remote_printcore_name})가 선택되었습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "익스트루더 {2}에 다른 재료 (Cura : {0}, Printer : {1})가 선택됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "프린터와 동기화" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Cura에서 현재 프린터 구성을 사용 하시겠습니까?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "프린터의 PrintCores와 재료는 현재 프로젝트 내의 재료와 다릅니다. 최상의 결과를 얻으려면 프린터에 삽입 된 PrintCores 및 재료로 슬라이싱 하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "네트워크를 통해 연결됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "출력 작업이 프린터에 성공적으로 보내졌습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "데이터 전송 됨" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "모니터에서 보기" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "프린팅이 완료됨" @@ -480,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "네트워크를 통해 연결" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "모니터" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "업데이트 정보에 액세스 할 수 없습니다." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "{machine_name}의 새로운 기능을 사용할 수 있습니다! 프린터의 펌웨어를 업데이트하는 것이 좋습니다." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "새로운 %s 펌웨어를 사용할 수 있습니다" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "업데이트하는 방법" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "업데이트 정보에 액세스 할 수 없습니다." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "레이어 뷰" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "와이어 프린팅이 활성화되어 있을 때 Cura는 레이어를 정확하게 표시하지 않습니다" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "시뮬레이션 뷰" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "G 코드 수정" @@ -536,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "서포트가 프린팅되지 않는 볼륨을 만듭니다." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura는 익명의 사용 통계를 수집합니다." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "데이터 수집" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "추가 정보" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Cura가 전송하는 데이터에 대한 추가 정보를 확인하십시오." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "허용" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Cura가 익명의 사용 통계를 보내 Cura에 대한 향후 개선을 우선화하는 데 도움을 줍니다. Cura 버전과 슬라이싱하는 모델의 해쉬 등 일부 환경설정 값이 발송됩니다." @@ -596,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF 이미지" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "선택한 소재 또는 구성과 호환되지 않기 때문에 현재 소재로 슬라이스 할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "슬라이스 할 수 없습니다" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "현재 설정으로 슬라이스 할 수 없습니다. 다음 설정에는 오류가 있습니다 : {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "일부 모델별 설정으로 인해 슬라이스할 수 없습니다. 하나 이상의 모델에서 다음 설정에 오류가 있습니다. {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "프라임 타워 또는 위치가 유효하지 않아 슬라이스 할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "비활성화된 익스트루더 %s(와)과 연결된 개체가 있기 때문에 슬라이스할 수 없습니다." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "어떤 모델도 빌드 볼륨에 맞지 않으므로 슬라이스 할 수 없습니다. 크기에 맞게 모델을 회전하거나 회전하십시오." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "레이어 처리 중" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "정보" @@ -661,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "모델 별 설정 구성" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "추천" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "사용자 정의" @@ -679,7 +679,7 @@ msgid "3MF File" msgstr "3MF 파일" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "노즐" @@ -705,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G 파일" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G 코드 파싱" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-코드 세부 정보" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "파일을 보내기 전에 g-코드가 프린터 및 프린터 구성에 적합한 지 확인하십시오. g-코드가 정확하지 않을 수 있습니다." @@ -727,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 프로파일" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "프로파일 어시스턴트" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "프로파일 어시스턴트" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "업그레이드 선택" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "펌웨어 업그레이드" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "레벨 빌드 플레이트" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "외벽" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "내벽" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "스킨" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "내부채움" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "내부채움 서포트" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "지원하는 인터페이스" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "서포트" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "스커트" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "움직임 경로" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "리트랙션" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "다른" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "알 수 없음" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "미리 슬라이싱한 파일 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "로그인 실패" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "파일이 이미 있습니다" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "재정의되지 않음" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "선택한 재료가 선택한 기기 또는 구성과 호환되지 않습니다." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "호환되지 않는 재료" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "설정이 업데이트되었습니다" @@ -902,8 +887,6 @@ msgid "Export succeeded" msgstr "내보내기 완료" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +894,70 @@ msgstr "{0}: {1} 에서 프로파일을 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "{0} 로 가져올 사용자 정의 프로파일이 없습니다" +msgstr "{0}(으)로 가져올 사용자 정의 프로파일이 없습니다" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "프로파일 {0} 에는 정확하지 않은 데이터가 포함되어 있으므로, 불러올 수 없습니다." +msgstr "프로파일 {0}에는 정확하지 않은 데이터가 포함되어 있으므로, 불러올 수 없습니다." #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 "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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "사용자 정의 프로파일" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "프로파일에 품질 타입이 누락되었습니다." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "현재 구성에 대해 품질 타입 {0}을 찾을 수 없습니다." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "모든 파일 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "사용자 정의 소재" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "사용자 정의" @@ -1009,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "출력물 크기" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "사용자 데이터 디렉터리에서 압축 파일을 만들 수 없습니다: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "백업" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "적절한 데이터 또는 메타 데이터 없이 Cura 백업을 복원하려고 시도했습니다." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "현재 버전과 일치하지 않는 Cura 백업을 복원하려고 시도했습니다." @@ -1199,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "보고서 전송" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "기기로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "장면 설정 중..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "인터페이스 로드 중 ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "선택한 모델이 너무 작아서 로드할 수 없습니다." @@ -1263,9 +1258,9 @@ msgstr "X (너비)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "프린터가 지원하는 필라멘트의 직경. 정확한 직경은 소재 및 / 또는 프로파일에 의해 덮어써집니다." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "노즐 오프셋 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "노즐 오프셋 Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "냉각 팬 번호" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "익스트루더 시작 Gcode" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "익스트루더 종료 Gcode" @@ -1436,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Cura 패키지 데이터베이스에 연결할 수 없습니다. 연결을 확인하십시오." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "플러그인" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "재료" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "버전" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "마지막으로 업데이트한 날짜" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "원작자" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "다운로드" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "알 수 없는" @@ -1505,8 +1511,8 @@ msgstr "뒤로" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "제거 확인 " +msgid "Confirm uninstall" +msgstr "제거 확인" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1531,7 +1537,7 @@ msgstr "확인" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxFooter.qml:17 msgctxt "@info" msgid "You will need to restart Cura before changes in packages have effect." -msgstr "패키지의 변경 사항이 적용되기 전에 Cura를 다시 시작해야 합니다" +msgstr "패키지의 변경 사항이 적용되기 전에 Cura를 다시 시작해야 합니다." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxFooter.qml:34 msgctxt "@info:button" @@ -1553,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "일반 재료" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "설치됨" @@ -1635,48 +1641,88 @@ msgid "Changelog" msgstr "변경 내역" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "닫기" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "펌웨어 업데이트" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "펌웨어는 3D 프린터에서 직접 실행되는 소프트웨어입니다. 이 펌웨어는 스텝 모터를 제어하고 온도를 조절하며 프린터를 작동시킵니다." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "새 프린터와 함께 제공되는 펌웨어는 작동하지만 새로운 버전은 더 많은 기능과 향상된 기능을 제공하는 경향이 있습니다." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "펌웨어 자동 업그레이드" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "사용자 정의 펌웨어 업로드" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "프린터와 연결되지 않아 펌웨어를 업데이트할 수 없습니다." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "프린터와 연결이 펌웨어 업그레이드를 지원하지 않아 펌웨어를 업데이트할 수 없습니다." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "사용자 정의 펌웨어 선택" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "펌웨어 업데이트" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "펌웨어 업데이트 중." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "펌웨어 업데이트가 완료되었습니다." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "알 수 없는 오류로 인해 펌웨어 업데이트에 실패했습니다." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "통신 오류로 인해 펌웨어 업데이트에 실패했습니다." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "입/출력 오류로 인해 펌웨어 업데이트에 실패했습니다." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "펌웨어 누락으로 인해 펌웨어 업데이트에 실패했습니다." @@ -1686,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "사용자 계약" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "기존 연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "이 프린터/그룹은 이미 Cura에 추가되었습니다. 다른 프린터/그룹을 선택하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "네트워크 프린터에 연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1712,18 +1758,18 @@ msgstr "" "\n" "아래 목록에서 프린터를 선택하십시오:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "추가" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "편집" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "제거" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "새로고침" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "프린터가 목록에 없으면 네트워크 프린팅 문제 해결 가이드를 읽어보십시오" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "유형" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "펌웨어 버전" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "주소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "이 프린터는 프린터 그룹을 호스트하도록 설정되어 있지 않습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "이 프린터는 1%개 프린터 그룹의 호스트입니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "이 주소의 프린터가 아직 응답하지 않았습니다." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "프린터 주소" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "네트워크에 프린터의 IP 주소 또는 호스트 이름을 입력하십시오." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "확인" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "네트워크를 통해 프린팅" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "프린터 선택" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "프린트" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "네트워크를 통해 프린팅" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "대기: 사용할 수 없는 프린터" +msgid "Printer selection" +msgstr "프린터 선택" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "대기: 첫 번째로 사용 가능" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "대기: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "맨 위로 이동" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "인쇄 작업을 맨 위로 이동" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "%1(을)를 대기열의 맨 위로 이동하시겠습니까?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "삭제" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "인쇄 작업 삭제" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "%1(을)를 삭제하시겠습니까?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "대기열 관리" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "대기 중" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "프린팅" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "프린터 관리" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "사용 불가" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "연결할 수 없음" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "유효한" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "중단됨" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "끝마친" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "준비중인" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "일시 정지 중" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "다시 시작" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "조치가 필요함" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "대기: 사용할 수 없는 프린터" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "대기: 첫 번째로 사용 가능" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "대기: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "구성 변경" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "할당된 프린터 %1의 구성을 다음과 같이 변경해야 합니다:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "재료 %1을(를) %2에서 %3(으)로 변경합니다." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "%3을(를) 재료 %1(으)로 로드합니다(이 작업은 무효화할 수 없음)." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "PrintCore %1을(를) %2에서 %3(으)로 변경합니다." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "빌드 플레이트를 %1(으)로 변경합니다(이 작업은 무효화할 수 없음)." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "무시하기" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "호환되지 않는 구성이 있는 인쇄 작업을 시작하면 3D 프린터가 손상될 수 있습니다. 구성을 재정의하고 %1을(를) 인쇄하시겠습니까?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "구성 재정의 및 인쇄 시작" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "유리" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "알루미늄" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "대기열 관리" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "대기 중" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "프린팅" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "프린터 관리" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "맨 위로 이동" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "삭제" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "재개" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "중지" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "중단" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "%1(을)를 대기열의 맨 위로 이동하시겠습니까?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "인쇄 작업을 맨 위로 이동" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "%1(을)를 삭제하시겠습니까?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "인쇄 작업 삭제" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "%1(을)를 정말로 중지하시겠습니까?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "프린팅 중단" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "%1(을)를 정말로 중지하시겠습니까?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "중단됨" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "끝마친" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "준비중인" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "일시 정지 중" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "일시 중지됨" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "다시 시작" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "조치가 필요함" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "프린터에 연결" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Cura에 프린터 설정 로드" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "설정 활성화" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Cura에 프린터 설정 로드" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "후처리 스크립트" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "스크립트 추가" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "설정" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "활성 사후 처리 스크립트 변경" @@ -2102,7 +2204,7 @@ msgstr "이미지 변환 ..." #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:33 msgctxt "@info:tooltip" msgid "The maximum distance of each pixel from \"Base.\"" -msgstr "\"Base\"에서 각 픽셀까지의 최대 거리" +msgstr "\"Base\"에서 각 픽셀까지의 최대 거리." #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:38 msgctxt "@action:label" @@ -2194,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "다른 모델의 내부채움에 대한 설정 수정" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "설정 선택" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "이 모델에 맞게 사용자 정의 설정을 선택하십시오" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "필터..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "모두 보이기" @@ -2261,6 +2363,7 @@ msgid "Type" msgstr "유형" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "프린터 그룹" @@ -2278,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2350,82 +2454,6 @@ msgctxt "@action:button" msgid "Open" msgstr "열기" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "이전" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "내보내기" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "다음" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "팁" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00시간 00분" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "비용 사양" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "총계:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "인쇄 실험" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "체크리스트" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2467,36 +2495,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "다음 위치로 이동" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "펌웨어 업그레이드" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "펌웨어는 3D 프린터에서 직접 실행되는 소프트웨어입니다. 이 펌웨어는 스텝 모터를 제어하고 온도를 조절하며 프린터를 작동시킵니다." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "새 프린터와 함께 제공되는 펌웨어는 작동하지만 새로운 버전은 더 많은 기능과 향상된 기능을 제공하는 경향이 있습니다." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "펌웨어 자동 업그레이드" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "사용자 정의 펌웨어 업로드" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "사용자 정의 펌웨어 선택" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2684,7 +2682,7 @@ msgid "Customized" msgstr "사용자 정의" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "항상 묻기" @@ -2832,6 +2830,12 @@ msgctxt "@action:button" msgid "Import" msgstr "가져오기" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "내보내기" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2917,283 +2921,283 @@ msgid "Unit" msgstr "단위" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "일반" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "인터페이스" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "언어:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "통화:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "테마:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "설정이 변경되면 자동으로 슬라이싱 합니다." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "자동으로 슬라이싱" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "뷰포트 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "오버행 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "항목을 선택하면 카메라를 중앙에 위치" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "큐라의 기본 확대 동작을 반전시켜야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "카메라 줌의 방향을 반전시키기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "확대가 마우스 방향으로 이동해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "마우스 방향으로 확대" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "모델이 분리되어 있는지 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "모델을 빌드 플레이트에 자동으로 놓기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "g-code 리더에 주의 메시지를 표시하기." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "g-code 리더의 주의 메시지" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "레이어가 호환 모드로 강제 설정되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "레이어 뷰 호환성 모드로 전환 (다시 시작해야 함)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "파일 열기 및 저장" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "큰 모델의 사이즈 수정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "매우 작은 모델의 크기 조정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "모델을 로드한 후에 선택해야 합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "로드된 경우 모델 선택" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "작업 이름에 기기 접두어 추가" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "프로젝트 파일을 저장할 때 요약이 표시되어야합니까?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "프로젝트 저장시 요약 대화 상자 표시" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "프로젝트 파일을 열 때 기본 동작" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "프로젝트 파일을 열 때 기본 동작 " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "항상 프로젝트로 열기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "항상 모델 가져 오기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "프로파일" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "항상 변경된 설정 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "항상 변경된 설정을 새 프로파일로 전송" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "보안" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "시작시 업데이트 확인" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(익명) 프린터 정보 보내기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "추가 정보" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "실험적 설정" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "다수의 빌드 플레이트 사용하기" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "프린터" @@ -3215,7 +3219,7 @@ msgid "Connection:" msgstr "연결:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "프린터가 연결되어 있지 않습니다." @@ -3241,7 +3245,7 @@ msgid "Aborting print..." msgstr "프린팅 중단 중 ..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "프로파일" @@ -3322,17 +3326,17 @@ msgid "Global Settings" msgstr "전역 설정" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "프린터 추가" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "프린터 이름 :" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "프린터 추가" @@ -3347,17 +3351,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Cura 소개" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "버전: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "3D 프린팅을 위한 엔드 투 엔트 솔루션." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3366,102 +3370,122 @@ msgstr "" "Cura는 커뮤니티와 공동으로 Ultimaker B.V.에 의해 개발되었습니다.\n" "Cura는 다음의 오픈 소스 프로젝트를 사용합니다:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "그래픽 사용자 인터페이스" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "애플리케이션 프레임 워크" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "GCode 생성기" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "프로세스간 통신 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "프로그래밍 언어" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI 프레임 워크" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 프레임 워크 바인딩" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C ++ 바인딩 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "데이터 교환 형식" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "과학 컴퓨팅을 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "더 빠른 수학연산을 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL 파일 처리를 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "평면 개체 처리를 위한 지원 라이브러리" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "삼각형 메쉬 처리를 위한 지원 라이브러리" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "복잡한 네트워크 분석을 위한 지원 라이브러리" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MF 파일 처리를 위한 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "파일 메타데이터 및 스트리밍을 위한 지원 라이브러리" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "직렬 통신 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf discovery 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "다각형 클리핑 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 라이브러리" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "폰트" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG 아이콘" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 교차 배포 응용 프로그램 배포" @@ -3471,7 +3495,7 @@ msgctxt "@label" msgid "Profile:" msgstr "프로파일:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3482,53 +3506,53 @@ msgstr "" "\n" "프로파일 매니저를 열려면 클릭하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "찾기..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "모든 익스트루더에 값 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "변경된 사항을 모든 익스트루더에 복사" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "이 설정 숨기기" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "이 설정을 표시하지 않음" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "이 설정을 계속 표시하십시오" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "설정 보기..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "모두 축소" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "모두 확장" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3549,17 +3573,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "영향을 받다" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "이 값은 익스트루더마다 결정됩니다 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3570,7 +3594,7 @@ msgstr "" "\n" "프로파일 값을 복원하려면 클릭하십시오." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3725,12 +3749,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "보기(&V)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "카메라 위치(&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "빌드 플레이트(&B)" @@ -3740,12 +3764,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "표시 설정" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "모든 설정 보기" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "보기 설정 관리..." @@ -3806,17 +3830,44 @@ msgstr "" "프린팅 설정 사용 안 함\n" "G-코드 파일은 수정할 수 없습니다" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00시간 00분" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "시간 사양" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "비용 사양" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "총계:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "권장 프린팅 설정

선택한 프린터, 재료 및 품질에 대한 권장 설정으로 프린팅하십시오." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "사용자 정의 프린팅 설정

미세하게 슬라이싱 설정을 조절하여 프린팅하십시오." @@ -3841,220 +3892,220 @@ msgctxt "@label" msgid "Estimated time left" msgstr "예상 남은 시간" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "전채 화면 전환" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "되돌리기(&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "다시하기(&R)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "종료(&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "앞에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "위에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "왼쪽에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "오른쪽에서 보기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura 구성 ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "프린터 추가..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "프린터 관리 ..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "재료 관리..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "현재 설정으로로 프로파일 업데이트" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "현재 변경 사항 무시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "현재 설정으로 프로파일 생성..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "프로파일 관리..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "온라인 문서 표시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "버그 리포트" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "소개..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "선택한 모델 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "선택한 모델 중심에 놓기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "선택한 모델 복제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "모델 삭제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "플랫폼중심에 모델 위치하기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "모델 그룹화" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "모델 그룹 해제" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "모델 합치기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "모델 복제..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "모든 모델 선택" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "빌드 플레이트 지우기" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "모든 모델 다시 로드" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "모든 모델을 모든 빌드 플레이트에 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "모든 모델 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "선택한 모델 정렬" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "모든 모델의 위치 재설정" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "모든 모델의 변환 재설정" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "파일 열기..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "새로운 프로젝트..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "엔진 로그 표시..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "설정 폴더 표시" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "패키지 찾아보기..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "사이드바 확장/축소" @@ -4115,7 +4166,7 @@ msgid "Select the active output device" msgstr "활성 출력 장치 선택" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "파일 열기" @@ -4135,145 +4186,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "파일" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "저장(&S)..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "내보내기(&E)..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "내보내기 선택..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "편집(&E)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "보기(&V)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "설정(&S)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "프린터(&P)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "재료(&M)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "활성 익스트루더로 설정" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "익스트루더 사용" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "익스트루더 사용하지 않음" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "빌드 플레이트(&B)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "프로파일(&P)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "확장 프로그램(&X)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "도구 상자(&T)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "환경설정(&R)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "도움말(&H)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "다시 시작한 후에 이 패키지가 설치됩니다." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "설정" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "새 프로젝트" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "새 프로젝트를 시작 하시겠습니까? 빌드 플레이트 및 저장하지 않은 설정이 지워집니다." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura 닫기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Cura를 정말로 종료하시겠습니까?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "패키지 설치" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "파일 열기" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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-코드 파일을 열려면 하나만 선택하십시오." @@ -4283,11 +4334,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "프로젝트 저장" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4358,37 +4404,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "점차적인 내부채움은 점차적으로 빈 공간 채우기의 양을 증가시킵니다." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "점진적으로 사용" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "서포트 생성" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "오버행이 있는 모델 서포트를 생성합니다. 이러한 구조가 없으면 이러한 부분이 프린팅 중에 붕괴됩니다." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "서포트에 사용할 익스트루더를 선택하십시오. 이렇게 하면 모형 아래에 지지 구조가 만들어져 모델이 중간 공기에서 처지거나 프린팅되는 것을 방지합니다." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "빌드 플레이트 고정" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "브림이나 라프트를 사용합니다. 이렇게하면 출력물 주변이나 아래에 평평한 영역이 추가되어 나중에 쉽게 자를 수 있습니다." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "프린팅물 개선에 도움이 필요하십니까?Ultimaker Troubleshooting Guides 읽기" @@ -4442,7 +4488,7 @@ msgstr "재료" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:543 msgctxt "@label" msgid "Use glue with this material combination" -msgstr "이 재료 조합과 함께 접착제를 사용하십시오." +msgstr "이 재료 조합과 함께 접착제를 사용하십시오" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:575 msgctxt "@label" @@ -4549,6 +4595,16 @@ msgctxt "name" msgid "Changelog" msgstr "변경 내역" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "펌웨어 업데이트를 위한 기계 동작을 제공합니다." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "펌웨어 업데이터" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4632,7 +4688,7 @@ msgstr "이동식 드라이브 출력 장치 플러그인" #: UM3NetworkPrinting/plugin.json msgctxt "description" msgid "Manages network connections to Ultimaker 3 printers." -msgstr "Ultimaker 3 프린터에 대한 네트워크 연결을 관리합니다" +msgstr "Ultimaker 3 프린터에 대한 네트워크 연결을 관리합니다." #: UM3NetworkPrinting/plugin.json msgctxt "name" @@ -4899,16 +4955,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 프로파일 작성자" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "재료 제조사가 드롭 인 UI를 사용하여 새로운 재료와 품질 프로파일을 만들 수 있게 합니다." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "프린트 프로파일 어시스턴트" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4939,6 +4985,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 프로파일 리더" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "저장하기 전에 G-code를 생성하십시오." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "프로파일 어시스턴트" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "프로파일 어시스턴트" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "펌웨어 업그레이드" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "알 수 없음" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "{0} 로 가져올 사용자 정의 프로파일이 없습니다" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "프로파일 {0} 에는 정확하지 않은 데이터가 포함되어 있으므로, 불러올 수 없습니다." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "The machine defined in profile {0} ({1}) doesn’t match with your current machine ({2}), could not import it." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "제거 확인 " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "일시 중지됨" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "이전" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "다음" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "팁" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "인쇄 실험" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "체크리스트" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "펌웨어 업그레이드" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "재료 제조사가 드롭 인 UI를 사용하여 새로운 재료와 품질 프로파일을 만들 수 있게 합니다." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "프린트 프로파일 어시스턴트" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Doodle3D WiFi-Box로 프린팅" diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index b3cf7e0e9d..bbfe9429fb 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Jinbuhm Kim \n" "Language-Team: Jinbum Kim , Korean \n" @@ -168,6 +168,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "프린팅이 시작될 때 노즐이 시작하는 위치의 Z 좌표입니다." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "익스트루더 프린팅 냉각 팬" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "이 익스트루더와 관련된 프린팅 냉각 팬의 개수. 각 익스트루더마다 다른 프린팅 냉각 팬이 있을 때만 기본값 0에서 변경하십시오." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index adddd9e5c1..37392395ef 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-10-01 14:10+0100\n" "Last-Translator: Jinbuhm Kim \n" "Language-Team: Jinbum Kim , Korean \n" @@ -58,9 +58,7 @@ 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" @@ -72,9 +70,7 @@ 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" @@ -1078,7 +1074,7 @@ msgstr "상단/하단 다각형 연결" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "스킨 경로가 나란히 이어지는 상단/하단 스킨 경로를 연결합니다. 동심원 패턴의 경우 이 설정을 사용하면 이동 시간이 크게 감소하지만, 내부채움의 중간에 연결될 수 있기 때문에 이 기능은 상단 표면 품질을 저하시킬 수 있습니다." #: fdmprinter.def.json @@ -1498,8 +1494,8 @@ msgstr "내부채움 패턴" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "프린트 내부채움 재료의 패턴입니다. 선과 지그재그 내부채움이 레이어를 하나 걸러서 방향을 바꾸므로 재료비가 절감됩니다. 격자, 삼각형, 삼-육각형, 입방체, 옥텟, 쿼터 큐빅, 십자, 동심원 패턴이 레이어마다 프린팅됩니다. 입방체, 4분 입방체, 옥텟 내부채움이 레이어마다 변경되므로 각 방향으로 힘이 더 균등하게 분산됩니다." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "프린트 충진 재료의 패턴입니다. 선과 갈지자형 충진이 레이어를 하나 걸러서 방향을 바꾸므로 재료비가 절감됩니다. 격자, 삼각형, 삼육각형, 입방체, 옥텟, 4분 입방체, 십자, 동심원 패턴이 레이어마다 완전히 인쇄됩니다. 자이로이드, 입방체, 4분 입방체, 옥텟 충진이 레이어마다 변경되므로 각 방향으로 힘이 더 균등하게 분산됩니다." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1561,6 +1557,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "십자형 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "자이로이드" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1631,9 +1632,7 @@ 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" @@ -3265,6 +3264,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "서포트에 대한 내부채움 패턴 방향. 서포트 내부채움 패턴은 수평면에서 회전합니다." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "서포트 브림 사용" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "첫 번째 레이어의 서포트 내부채움 영역 내에서 브림을 생성합니다. 이 브림은 서포트 주변이 아니라 아래에 인쇄됩니다. 이 설정을 사용하면 빌드 플레이트에 대한 서포트력이 향상됩니다." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "서포트 브림 폭" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "서포트 아래를 인쇄하기 위한 브림 폭. 브림이 커질수록 추가 재료가 소요되지만 빌드 플레이트에 대한 접착력이 향상됩니다." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "서포트 브림 라인 수" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "서포트 브림에 사용되는 라인의 수. 브림 라인이 많아질수록 추가 재료가 소요되지만 빌드 플레이트에 대한 접착력이 향상됩니다." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3800,9 +3829,7 @@ 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" @@ -3834,6 +3861,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "브림에 사용되는 선의 수입니다. 더 많은 브림 선이 빌드 플레이트에 대한 접착력을 향상 시키지만 유효 프린트 영역도 감소시킵니다." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "브림이 서포트 대체" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "서포트가 차지할 공간이더라도 모델 주변에 브림이 인쇄되도록 합니다. 이렇게 하면 서포트의 첫 번째 레이어 영역 일부가 브림 영역으로 대체됩니다." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5656,6 +5693,14 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다." +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "스킨 경로가 나란히 이어지는 상단/하단 스킨 경로를 연결합니다. 동심원 패턴의 경우 이 설정을 사용하면 이동 시간이 크게 감소하지만, 내부채움의 중간에 연결될 수 있기 때문에 이 기능은 상단 표면 품질을 저하시킬 수 있습니다." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "프린트 내부채움 재료의 패턴입니다. 선과 지그재그 내부채움이 레이어를 하나 걸러서 방향을 바꾸므로 재료비가 절감됩니다. 격자, 삼각형, 삼-육각형, 입방체, 옥텟, 쿼터 큐빅, 십자, 동심원 패턴이 레이어마다 프린팅됩니다. 입방체, 4분 입방체, 옥텟 내부채움이 레이어마다 변경되므로 각 방향으로 힘이 더 균등하게 분산됩니다." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "동심원 3D" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index c26da0d505..60b7671e6c 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -5,16 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-01 11:30+0100\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:03+0100\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" @@ -46,8 +48,8 @@ msgstr "GCodeWriter ondersteunt geen non-tekstmodus." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Genereer G-code voordat u het bestand opslaat." +msgid "Please prepare G-code before exporting." +msgstr "Bereid voorafgaand aan het exporteren G-code voor." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -73,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Wijzigingenlogboek Weergeven" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Firmware bijwerken" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -83,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profiel is platgemaakt en geactiveerd." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB-printen" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Printen via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Via USB Printen" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Aangesloten via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -135,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ondersteunt geen tekstmodus." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" @@ -157,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "Opslaan op Verwisselbaar Station {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Er zijn geen bestandsindelingen beschikbaar om te schrijven!" @@ -196,7 +203,7 @@ msgstr "Kan niet opslaan op verwisselbaar station {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Fout" @@ -225,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Waarschuwing" @@ -253,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Verwisselbaar Station" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Printen via netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Printen via netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Via het netwerk verbonden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Via het netwerk verbonden. Keur de aanvraag goed op de printer." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Via het netwerk verbonden. Kan de printer niet beheren." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Er is een toegangsaanvraag voor de printer verstuurd. Keur de aanvraag goed op de printer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Verificatiestatus" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Verificatiestatus" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Opnieuw proberen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "De toegangsaanvraag opnieuw verzenden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Toegang tot de printer is geaccepteerd" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Kan geen toegang verkrijgen om met deze printer te printen. Kan de printtaak niet verzenden." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Toegang aanvragen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Toegangsaanvraag naar de printer verzenden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Er kan geen nieuwe taak worden gestart." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Er is een probleem met de configuratie van de Ultimaker waardoor het niet mogelijk is het printen te starten. Los het probleem op voordat u verder gaat." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "De configuratie komt niet overeen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Weet u zeker dat u met de geselecteerde configuratie wilt printen?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 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:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Gegevens Verzenden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -397,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Annuleren" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Er is geen PrintCore geladen in de sleuf {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Er is geen materiaal geladen in de sleuf {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "Er is een afwijkende PrintCore (Cura: {cura_printcore_name}, printer: {remote_printcore_name}) geselecteerd voor de extruder {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Afwijkend materiaal (Cura: {0}, Printer: {1}) geselecteerd voor de extruder {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Synchroniseren met de printer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Wilt u uw huidige printerconfiguratie gebruiken in Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "De PrintCores en/of materialen in de printer wijken af van de PrintCores en/of materialen in uw huidige project. Slice voor het beste resultaat altijd voor de PrintCores en materialen die in de printer zijn ingevoerd." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" -msgstr "Via het netwerk verbonden." +msgstr "Via het netwerk verbonden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Gegevens verzonden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "In monitor weergeven" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Print klaar" @@ -478,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Verbinding Maken via Netwerk" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Controleren" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Geen toegang tot update-informatie." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Er zijn nieuwe functies beschikbaar voor uw {machine_name}! Het wordt aanbevolen de firmware van uw printer bij te werken." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Nieuwe firmware voor %s beschikbaar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Instructies voor bijwerken" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Geen toegang tot update-informatie." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Laagweergave" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Als draadprinten is ingeschakeld, geeft Cura lagen niet nauwkeurig weer" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Simulatieweergave" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "G-code wijzigen" @@ -534,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Maak een volume waarin supportstructuren niet worden geprint." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura verzamelt geanonimiseerde gebruiksstatistieken." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Gegevens verzamelen" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Meer informatie" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Lees meer over welke gegevens Cura verzendt." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Toestaan" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Cura toestaan geanonimiseerde gebruiksstatistieken te verzenden om toekomstige verbeteringen aan Cura te helpen prioriteren. Onder de verzonden gegevens bevindt zich informatie over uw voorkeuren en instellingen, de Cura-versie en een selectie van de modellen die u slicet." @@ -594,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF-afbeelding" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Met het huidige materiaal is slicen niet mogelijk, omdat het materiaal niet compatibel is met de geselecteerde machine of configuratie." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Kan niet slicen" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Met de huidige instellingen is slicing niet mogelijk. De volgende instellingen bevatten fouten: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Slicing is niet mogelijk vanwege enkele instellingen per model. De volgende instellingen bevatten fouten voor een of meer modellen: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Slicen is niet mogelijk omdat de terugduwpijler of terugduwpositie(s) ongeldig zijn." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Slicen is niet mogelijk omdat er objecten gekoppeld zijn aan uitgeschakelde Extruder %s." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Er valt niets te slicen omdat geen van de modellen in het bouwvolume past. Schaal of roteer de modellen totdat deze passen." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Lagen verwerken" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informatie" @@ -659,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "Instellingen per Model configureren" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Aanbevolen" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Aangepast" @@ -677,7 +679,7 @@ msgid "3MF File" msgstr "3MF-bestand" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" @@ -703,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G-bestand" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-code parseren" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Details van de G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Zorg ervoor dat de G-code geschikt is voor uw printer en de printerconfiguratie voordat u het bestand verzendt. Mogelijk is de weergave van de G-code niet nauwkeurig." @@ -725,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiel" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profielassistent" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profielassistent" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -756,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Upgrades selecteren" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Firmware-upgrade Uitvoeren" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -771,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Platform kalibreren" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Buitenwand" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Binnenwanden" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Skin" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Vulling" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Supportvulling" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Verbindingsstructuur" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Supportstructuur" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Beweging" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Intrekkingen" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Overig(e)" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Onbekend" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Vooraf geslicet bestand {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Inloggen mislukt" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Het Bestand Bestaat Al" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -855,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Niet overschreven" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Het geselecteerde materiaal is niet compatibel met de geselecteerde machine of configuratie." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Niet-compatibel materiaal" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "De instellingen zijn bijgewerkt" @@ -900,8 +887,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -909,58 +894,70 @@ msgstr "Kan het profiel niet importeren uit {0}: { #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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." +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Aangepast profiel" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Kan geen kwaliteitstype {0} vinden voor de huidige configuratie." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -987,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Bestanden (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Aangepast materiaal" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Aangepast" @@ -1007,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Werkvolume" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Kan geen archief maken van gegevensmap van gebruiker: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Back-up" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Geprobeerd een Cura-back-up te herstellen zonder correcte gegevens of metadata." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Geprobeerd een Cura-back-up te herstellen die niet overeenkomt met uw huidige versie." @@ -1197,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapport verzenden" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Machines laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Scene instellen..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Interface laden..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Het geselecteerde model is te klein om te laden." @@ -1261,9 +1258,9 @@ msgstr "X (Breedte)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1351,7 +1348,7 @@ msgstr "Hoogte rijbrug" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:238 msgctxt "@tooltip" msgid "The height difference between the tip of the nozzle and the gantry system (X and Y axes). Used to prevent collisions between previous prints and the gantry when printing \"One at a Time\"." -msgstr "Het hoogteverschil tussen de punt van de nozzle en het rijbrugsysteem (X- en Y-as). Wordt tijdens \"een voor een\"-printen gebruikt om botsingen tussen eerder geprinte voorwerpen en het rijbrugsysteem te voorkomen" +msgstr "Het hoogteverschil tussen de punt van de nozzle en het rijbrugsysteem (X- en Y-as). Wordt tijdens \"een voor een\"-printen gebruikt om botsingen tussen eerder geprinte voorwerpen en het rijbrugsysteem te voorkomen." #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:257 msgctxt "@label" @@ -1398,22 +1395,47 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "De nominale diameter van het filament dat wordt ondersteund door de printer. De exacte diameter wordt overschreven door het materiaal en/of het profiel." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Nozzle-offset X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Nozzle-offset Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Nummer van koelventilator" + +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-13 17:41+0200\n" +"PO-Revision-Date: 2016-09-29 13:44+0200\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Start-G-code van Extruder" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Eind-G-code van Extruder" @@ -1434,41 +1456,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Kan geen verbinding maken met de Cura Package-database. Controleer uw verbinding." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Invoegtoepassingen" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materialen" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Versie" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Laatst bijgewerkt" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Auteur" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Onbekend" @@ -1503,8 +1526,8 @@ msgstr "Terug" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Bevestig de-installeren " +msgid "Confirm uninstall" +msgstr "De-installeren bevestigen" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1551,7 +1574,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Standaard materialen" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Geïnstalleerd" @@ -1633,48 +1656,88 @@ msgid "Changelog" msgstr "Wijzigingenlogboek" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Sluiten" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Firmware bijwerken" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Firmware is de software die direct op de 3D-printer wordt uitgevoerd. Deze firmware bedient de stappenmotoren, regelt de temperatuur en zorgt er in feite voor dat de printer doet wat deze moet doen." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "De firmware die bij nieuwe printers wordt geleverd, werkt wel, maar nieuwe versies hebben vaak meer functies en verbeteringen." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Firmware-upgrade Automatisch Uitvoeren" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Aangepaste Firmware Uploaden" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Kan de firmware niet bijwerken omdat er geen verbinding met de printer is." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Kan de firmware niet bijwerken omdat de verbinding met de printer geen ondersteuning biedt voor het uitvoeren van een firmware-upgrade." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Aangepaste firmware selecteren" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Firmware-update" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "De firmware wordt bijgewerkt." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "De firmware-update is voltooid." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Firmware-update mislukt door een onbekende fout." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Firmware-update mislukt door een communicatiefout." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Firmware-update mislukt door een invoer-/uitvoerfout." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Firmware-update mislukt door ontbrekende firmware." @@ -1684,22 +1747,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Gebruikersovereenkomst" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Bestaande verbinding" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Deze printer/groep is al aan Cura toegevoegd. Selecteer een andere printer/groep." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Verbinding Maken met Printer in het Netwerk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1710,18 +1773,18 @@ msgstr "" "\n" "Selecteer uw printer in de onderstaande lijst:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Toevoegen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Bewerken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1729,244 +1792,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Verwijderen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Vernieuwen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Raadpleeg de handleiding voor probleemoplossing bij printen via het netwerk als uw printer niet in de lijst wordt vermeld" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Firmwareversie" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Deze printer is niet ingesteld voor het hosten van een groep printers." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Deze printer is de host voor een groep van %1 printers." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "De printer op dit adres heeft nog niet gereageerd." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Verbinden" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Printeradres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Voer het IP-adres of de hostnaam van de printer in het netwerk in." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Printen via netwerk" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Printerselectie" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Printen" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Printen via netwerk" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Wachten op: Niet-beschikbare printer" +msgid "Printer selection" +msgstr "Printerselectie" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Wachten op: Eerst beschikbare" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Wachten op: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Plaats bovenaan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Plaats printtaak bovenaan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Weet u zeker dat u %1 bovenaan de wachtrij wilt plaatsen?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Verwijderen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Printtaak verwijderen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Weet u zeker dat u %1 wilt verwijderen?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Wachtrij beheren" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "In wachtrij" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Printen" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Printers beheren" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Niet beschikbaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Niet bereikbaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Beschikbaar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Afgebroken" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Gereed" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Voorbereiden" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Pauzeren" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Hervatten" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Handeling nodig" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Wachten op: Niet-beschikbare printer" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Wachten op: Eerst beschikbare" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Wachten op: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Configuratiewijziging" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "Voor de toegewezen printer, 1%, is/zijn de volgende configuratiewijziging/configuratiewijzigingen vereist:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Overschrijven" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Als u een printtaak met een incompatibele configuratie start, kan dit leiden tot schade aan de 3D-printer. Weet u zeker dat u de configuratie en print %1 wilt overschrijven?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Configuratie overschrijven en printen starten" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Glas" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Aluminium" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Wachtrij beheren" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "In wachtrij" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Printen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Printers beheren" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Plaats bovenaan" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Verwijderen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Hervatten" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pauzeren" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Afbreken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Weet u zeker dat u %1 bovenaan de wachtrij wilt plaatsen?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Plaats printtaak bovenaan" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Weet u zeker dat u %1 wilt verwijderen?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Printtaak verwijderen" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Weet u zeker dat u %1 wilt afbreken?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Printen afbreken" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Weet u zeker dat u %1 wilt afbreken?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Afgebroken" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Gereed" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Voorbereiden" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Pauzeren" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Gepauzeerd" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Hervatten" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Handeling nodig" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Verbinding maken met een printer" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "De configuratie van de printer in Cura laden" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Configuratie Activeren" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "De configuratie van de printer in Cura laden" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2057,17 +2176,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts voor Nabewerking" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Een script toevoegen" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Instellingen" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Actieve scripts voor nabewerking wijzigen" @@ -2085,12 +2204,12 @@ msgstr "Cura verzendt anonieme gegevens naar Ultimaker om de printkwaliteit en g #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:101 msgctxt "@text:window" msgid "I don't want to send these data" -msgstr "Ik wil deze gegevens niet verzenden." +msgstr "Ik wil deze gegevens niet verzenden" #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:111 msgctxt "@text:window" msgid "Allow sending these data to Ultimaker and help us improve Cura" -msgstr "Verzenden van deze gegevens naar Ultimaker toestaan en ons helpen Cura te verbeteren." +msgstr "Verzenden van deze gegevens naar Ultimaker toestaan en ons helpen Cura te verbeteren" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:19 msgctxt "@title:window" @@ -2130,7 +2249,7 @@ msgstr "Breedte (mm)" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:103 msgctxt "@info:tooltip" msgid "The depth in millimeters on the build plate" -msgstr "De diepte op het platform in millimeters." +msgstr "De diepte op het platform in millimeters" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:108 msgctxt "@action:label" @@ -2192,23 +2311,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Instellingen aanpassen voor vulling van andere modellen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Instellingen selecteren" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Instellingen Selecteren om Dit Model Aan te Passen" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filteren..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Alles weergeven" @@ -2259,6 +2378,7 @@ msgid "Type" msgstr "Type" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Printergroep" @@ -2276,6 +2396,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2350,82 +2471,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Openen" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Vorige" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Exporteren" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Volgende" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Tip" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00u 00min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Kostenspecificatie" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Totaal:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1 m / ~ %2 g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1 m / ~ %2 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Print experiment" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Checklist" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2435,7 +2480,7 @@ msgstr "Printerupgrades Selecteren" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:38 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker 2." -msgstr "Selecteer eventuele upgrades die op deze Ultimaker 2 zijn uitgevoerd" +msgstr "Selecteer eventuele upgrades die op deze Ultimaker 2 zijn uitgevoerd." #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:47 msgctxt "@label" @@ -2467,36 +2512,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Beweeg Naar de Volgende Positie" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Firmware-upgrade Uitvoeren" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Firmware is de software die direct op de 3D-printer wordt uitgevoerd. Deze firmware bedient de stappenmotoren, regelt de temperatuur en zorgt er in feite voor dat de printer doet wat deze moet doen." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "De firmware die bij nieuwe printers wordt geleverd, werkt wel, maar nieuwe versies hebben vaak meer functies en verbeteringen." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Firmware-upgrade Automatisch Uitvoeren" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Aangepaste Firmware Uploaden" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Aangepaste firmware selecteren" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2684,7 +2699,7 @@ msgid "Customized" msgstr "Aangepast" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Altijd vragen" @@ -2832,6 +2847,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importeren" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Exporteren" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2847,7 +2868,7 @@ msgstr "Verwijderen Bevestigen" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:240 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." +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 @@ -2917,283 +2938,283 @@ msgid "Unit" msgstr "Eenheid" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Algemeen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Taal:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch slicen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Gedrag kijkvenster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Overhang weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 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:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellen gescheiden houden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Bestanden openen en opslaan" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Grote modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extreem kleine modellen schalen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modellen selecteren wanneer ze geladen zijn" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Machinevoorvoegsel toevoegen aan taaknaam" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Altijd als project openen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Altijd modellen importeren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profielen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Gewijzigde instellingen altijd verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bij starten op updates controleren" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonieme) printgegevens verzenden" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Meer informatie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Experimenteel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Functionaliteit voor meerdere platformen gebruiken" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Printers" @@ -3215,7 +3236,7 @@ msgid "Connection:" msgstr "Verbinding:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Er is geen verbinding met de printer." @@ -3241,7 +3262,7 @@ msgid "Aborting print..." msgstr "Printen afbreken..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profielen" @@ -3322,17 +3343,17 @@ msgid "Global Settings" msgstr "Algemene Instellingen" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Printer Toevoegen" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Printernaam:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Printer Toevoegen" @@ -3347,17 +3368,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Over Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "versie: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "End-to-end-oplossing voor fused filament 3D-printen." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3366,102 +3387,122 @@ 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/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafische gebruikersinterface (GUI)" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Toepassingskader" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-code-generator" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "InterProcess Communication-bibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Programmeertaal" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI-kader" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Bindingen met GUI-kader" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Bindingenbibliotheek C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Indeling voor gegevensuitwisseling" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Ondersteuningsbibliotheek voor wetenschappelijke berekeningen" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Ondersteuningsbibliotheek voor snellere berekeningen" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Ondersteuningsbibliotheek voor het verwerken van STL-bestanden" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Ondersteuningsbibliotheek voor het verwerken van tweedimensionale objecten" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Ondersteuningsbibliotheek voor het verwerken van driehoekig rasters" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Ondersteuningsbibliotheek voor de analyse van complexe netwerken" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Ondersteuningsbibliotheek voor het verwerken van 3MF-bestanden" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Ondersteuningsbibliotheek voor bestandsmetadata en streaming" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Seriële-communicatiebibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf-detectiebibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Bibliotheek met veelhoeken" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP-bibliotheek" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Lettertype" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG-pictogrammen" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementatie van Linux-toepassing voor kruisdistributie" @@ -3471,7 +3512,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Profiel:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3482,53 +3523,53 @@ msgstr "" "\n" "Klik om het profielbeheer te openen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Zoeken..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Deze instelling verbergen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Deze instelling zichtbaar houden" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Zichtbaarheid Instelling Configureren..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Alles samenvouwen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Alles uitvouwen" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3549,17 +3590,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Beïnvloed door" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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" +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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3570,7 +3611,7 @@ msgstr "" "\n" "Klik om de waarde van het profiel te herstellen." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3725,12 +3766,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "Beel&d" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Camerapositie" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Platform" @@ -3740,12 +3781,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Zichtbare instellingen" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Alle instellingen weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Instelling voor zichtbaarheid beheren..." @@ -3808,17 +3849,44 @@ msgstr "" "Instelling voor printen uitgeschakeld\n" "G-code-bestanden kunnen niet worden aangepast" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00u 00min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Tijdspecificatie" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Kostenspecificatie" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Totaal:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Aanbevolen instellingen voor printen

Print met de aanbevolen instellingen voor de geselecteerde printer en kwaliteit, en het geselecteerde materiaal." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Aangepaste instellingen voor printen

Print met uiterst precieze controle over elk detail van het slice-proces." @@ -3843,223 +3911,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Geschatte resterende tijd" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Volledig Scherm In-/Uitschakelen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Ongedaan &Maken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Opnieuw" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Afsluiten" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-weergave" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Weergave voorzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Weergave bovenzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Weergave linkerzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Weergave rechterzijde" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura Configureren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Printer Toevoegen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Pr&inters Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialen Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Hui&dige wijzigingen verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profielen Beheren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online &Documentatie Weergeven" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Een &Bug Rapporteren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Over..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Model Verwijderen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Model op Platform Ce&ntreren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modellen &Groeperen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Groeperen van Modellen Opheffen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modellen Samen&voegen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Model verveelvoudigen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modellen Selecteren" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Platform Leegmaken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modellen Opnieuw Laden" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle modellen schikken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Selectie schikken" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modelposities Herstellen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modeltransformaties Herstellen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Bestand(en) &openen..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nieuw project..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Engine-&logboek Weergeven..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Open Configuratiemap" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Door packages bladeren..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Zijbalk uitbreiden/samenvouwen" @@ -4120,7 +4188,7 @@ msgid "Select the active output device" msgstr "Actief Uitvoerapparaat Selecteren" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Bestand(en) openen" @@ -4140,145 +4208,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Bestand" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Opslaan..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exporteren..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Selectie Exporteren..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "B&ewerken" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "Beel&d" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "In&stellingen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Printer" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Materiaal" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Instellen als Actieve Extruder" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Extruder inschakelen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder uitschakelen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Platform" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profiel" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensies" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "Werkse&t" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "Voo&rkeuren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Help" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Bestand Openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Instellingen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Nieuw project" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Weet u zeker dat u een nieuw project wilt starten? Hiermee wordt het platform leeggemaakt en worden eventuele niet-opgeslagen instellingen verwijderd." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura afsluiten" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Package installeren" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Bestand(en) openen" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4288,11 +4356,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Project opslaan" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4363,37 +4426,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Met geleidelijke vulling neemt de hoeveelheid vulling naar boven toe." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Geleidelijke vulling" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Support genereren" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Selecteren welke extruder voor support wordt gebruikt. Deze optie zorgt ervoor dat onder het model ondersteuning wordt geprint, om te voorkomen dat dit doorzakt of dat er midden in de lucht moet worden geprint." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Hechting aan platform" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Hebt u hulp nodig om betere prints te krijgen?
Lees de Ultimaker Troubleshooting Guides (Handleiding voor probleemoplossing)" @@ -4478,7 +4541,7 @@ msgstr "Huidig platform schikken" #: MachineSettingsAction/plugin.json msgctxt "description" msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." -msgstr "Biedt een manier om de machine-instellingen (zoals bouwvolume, maat nozzle, enz.) te wijzigen" +msgstr "Biedt een manier om de machine-instellingen (zoals bouwvolume, maat nozzle, enz.) te wijzigen." #: MachineSettingsAction/plugin.json msgctxt "name" @@ -4555,6 +4618,16 @@ msgctxt "name" msgid "Changelog" msgstr "Wijzigingenlogboek" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Biedt machineacties voor het bijwerken van de firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Firmware-updater" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4578,7 +4651,7 @@ msgstr "USB-printen" #: UserAgreement/plugin.json msgctxt "description" msgid "Ask the user once if he/she agrees with our license." -msgstr "Vraag de gebruiker één keer of deze akkoord gaat met de licentie" +msgstr "Vraag de gebruiker één keer of deze akkoord gaat met de licentie." #: UserAgreement/plugin.json msgctxt "name" @@ -4638,7 +4711,7 @@ msgstr "Invoegtoepassing voor Verwijderbaar uitvoerapparaat" #: UM3NetworkPrinting/plugin.json msgctxt "description" msgid "Manages network connections to Ultimaker 3 printers." -msgstr "Hiermee beheert u netwerkverbindingen naar Ultimaker 3-printers" +msgstr "Hiermee beheert u netwerkverbindingen naar Ultimaker 3-printers." #: UM3NetworkPrinting/plugin.json msgctxt "name" @@ -4773,7 +4846,7 @@ msgstr "Hiermee worden configuraties bijgewerkt van Cura 2.5 naar Cura 2.6." #: VersionUpgrade/VersionUpgrade25to26/plugin.json msgctxt "name" msgid "Version Upgrade 2.5 to 2.6" -msgstr "Versie-upgrade van 2.5 naar 2.6." +msgstr "Versie-upgrade van 2.5 naar 2.6" #: VersionUpgrade/VersionUpgrade27to30/plugin.json msgctxt "description" @@ -4813,7 +4886,7 @@ msgstr "Hiermee worden configuraties bijgewerkt van Cura 2.6 naar Cura 2.7." #: VersionUpgrade/VersionUpgrade26to27/plugin.json msgctxt "name" msgid "Version Upgrade 2.6 to 2.7" -msgstr "Versie-upgrade van 2.6 naar 2.7." +msgstr "Versie-upgrade van 2.6 naar 2.7" #: VersionUpgrade/VersionUpgrade21to22/plugin.json msgctxt "description" @@ -4833,7 +4906,7 @@ msgstr "Hiermee worden configuraties bijgewerkt van Cura 2.2 naar Cura 2.4." #: VersionUpgrade/VersionUpgrade22to24/plugin.json msgctxt "name" msgid "Version Upgrade 2.2 to 2.4" -msgstr "Versie-upgrade van 2.2 naar 2.4." +msgstr "Versie-upgrade van 2.2 naar 2.4" #: ImageReader/plugin.json msgctxt "description" @@ -4905,16 +4978,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profielschrijver" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Maakt het fabrikanten mogelijk nieuwe materiaal- en kwaliteitsprofielen aan te maken met behulp van een drop-in-gebruikersinterface." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Profielassistent afdrukken" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4945,6 +5008,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura-profiellezer" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Genereer G-code voordat u het bestand opslaat." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profielassistent" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profielassistent" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Firmware-upgrade Uitvoeren" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Er is geen aangepast profiel om in het bestand {0} te importeren" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Dit profiel {0} bevat incorrecte gegevens. Kan het profiel niet importeren." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Bevestig de-installeren " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Gepauzeerd" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Vorige" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Volgende" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Tip" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1 m / ~ %2 g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1 m / ~ %2 g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Print experiment" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Checklist" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Firmware-upgrade Uitvoeren" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Maakt het fabrikanten mogelijk nieuwe materiaal- en kwaliteitsprofielen aan te maken met behulp van een drop-in-gebruikersinterface." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Profielassistent afdrukken" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Printen via Doodle3D WiFi-Box" @@ -6165,25 +6308,6 @@ msgstr "Cura-profiellezer" #~ msgid "Extruder Temperature: %1/%2°C" #~ msgstr "Extrudertemperatuur: %1/%2°C" -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#~ msgctxt "@label" -#~ msgid "" -#~ msgstr "" -#~ "Project-Id-Version: PACKAGE VERSION\n" -#~ "Report-Msgid-Bugs-To: \n" -#~ "POT-Creation-Date: 2016-09-13 17:41+0200\n" -#~ "PO-Revision-Date: 2016-09-29 13:44+0200\n" -#~ "Last-Translator: FULL NAME \n" -#~ "Language-Team: LANGUAGE \n" -#~ "Language: \n" -#~ "MIME-Version: 1.0\n" -#~ "Content-Type: text/plain; charset=UTF-8\n" -#~ "Content-Transfer-Encoding: 8bit\n" - #~ msgctxt "@label" #~ msgid "Bed Temperature: %1/%2°C" #~ msgstr "Printbedtemperatuur: %1/%2°C" diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index f7fd1717b0..9dfe5e859e 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "De Z-coördinaat van de positie waar filament in de nozzle wordt teruggeduwd aan het begin van het printen." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Printkoelventilator van extruder" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Het nummer van de bij deze extruder behorende printkoelventilator. Verander de standaardwaarde 0 alleen als u voor elke extruder een andere printkoelventilator hebt." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 5853829744..1733d1830e 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -5,16 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-01 14:10+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 15:03+0100\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -547,7 +548,7 @@ msgstr "Maximale Acceleratie X" #: fdmprinter.def.json msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" -msgstr "De maximale acceleratie van de motor in de X-richting." +msgstr "De maximale acceleratie van de motor in de X-richting" #: fdmprinter.def.json msgctxt "machine_max_acceleration_y label" @@ -697,7 +698,7 @@ msgstr "Minimale Doorvoersnelheid" #: fdmprinter.def.json msgctxt "machine_minimum_feedrate description" msgid "The minimal movement speed of the print head." -msgstr "De minimale bewegingssnelheid van de printkop" +msgstr "De minimale bewegingssnelheid van de printkop." #: fdmprinter.def.json msgctxt "machine_feeder_wheel_diameter label" @@ -747,7 +748,7 @@ msgstr "Lijnbreedte" #: fdmprinter.def.json msgctxt "line_width description" msgid "Width of a single line. Generally, the width of each line should correspond to the width of the nozzle. However, slightly reducing this value could produce better prints." -msgstr "De breedte van een enkele lijn. Over het algemeen dient de breedte van elke lijn overeen te komen met de breedte van de nozzle. Wanneer deze waarde echter iets wordt verlaagd, resulteert dit in betere prints" +msgstr "De breedte van een enkele lijn. Over het algemeen dient de breedte van elke lijn overeen te komen met de breedte van de nozzle. Wanneer deze waarde echter iets wordt verlaagd, resulteert dit in betere prints." #: fdmprinter.def.json msgctxt "wall_line_width label" @@ -1076,8 +1077,8 @@ msgstr "Boven-/onderkant Polygonen Verbinden" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Skinpaden aan boven-/onderkant verbinden waar ze naast elkaar lopen. Met deze instelling wordt bij concentrische patronen de bewegingstijd aanzienlijk verkort. Dit kan echter ten koste gaan van de kwaliteit van de bovenste laag aangezien de verbindingen in het midden van de vulling kunnen komen te liggen." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Verbind skinpaden aan de boven-/onderkant waar ze naast elkaar lopen. Met deze instelling wordt bij concentrische patronen de bewegingstijd aanzienlijk verkort. Dit kan echter ten koste gaan van de kwaliteit van de bovenste laag aangezien de verbindingen in het midden van de vulling kunnen komen te liggen." #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1496,8 +1497,8 @@ msgstr "Vulpatroon" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Het patroon van het vulmateriaal van de print. De lijn- en zigzagvulling veranderen per vullaag van richting, waardoor wordt bespaard op materiaalkosten. De raster-, driehoeks-, tri-hexagonale, kubische, achtvlaks-, afgeknotte kubus-, kruis- en concentrische patronen worden elke laag volledig geprint. Kubische, afgeknotte kubus- en achtvlaksvullingen veranderen elke laag voor een meer gelijke krachtsverdeling in elke richting." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Het patroon van het vulmateriaal van de print. De lijn- en zigzagvulling veranderen per vullaag van richting, waardoor wordt bespaard op materiaalkosten. De raster-, driehoeks-, tri-hexagonale, kubische, achtvlaks-, afgeknotte kubus-, kruis- en concentrische patronen worden elke laag volledig geprint. Gyroïde, kubische, afgeknotte kubus- en achtvlaksvullingen veranderen elke laag voor een meer gelijke krachtverdeling in elke richting." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1559,6 +1560,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Kruis 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroïde" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1629,7 +1635,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" @@ -1859,7 +1867,7 @@ msgstr "Standaard printtemperatuur" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "De standaardtemperatuur waarmee wordt geprint. Dit moet overeenkomen met de basistemperatuur van een materiaal. Voor alle andere printtemperaturen moet een offset worden gebruikt die gebaseerd is op deze waarde." +msgstr "De standaardtemperatuur waarmee wordt geprint. Dit moet overeenkomen met de basistemperatuur van een materiaal. Voor alle andere printtemperaturen moet een offset worden gebruikt die gebaseerd is op deze waarde" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1919,7 +1927,7 @@ msgstr "Standaardtemperatuur platform" #: fdmprinter.def.json msgctxt "default_material_bed_temperature description" msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value" -msgstr "De standaardtemperatuur die wordt gebruikt voor het verwarmde platform. Dit moet overeenkomen met de basistemperatuur van een platform. Voor alle andere printtemperaturen moet een offset worden gebruikt die is gebaseerd op deze waarde." +msgstr "De standaardtemperatuur die wordt gebruikt voor het verwarmde platform. Dit moet overeenkomen met de basistemperatuur van een platform. Voor alle andere printtemperaturen moet een offset worden gebruikt die is gebaseerd op deze waarde" #: fdmprinter.def.json msgctxt "material_bed_temperature label" @@ -2009,7 +2017,7 @@ msgstr "Intrekken bij laagwisseling" #: fdmprinter.def.json msgctxt "retract_at_layer_change description" msgid "Retract the filament when the nozzle is moving to the next layer." -msgstr "Trek het filament in wanneer de nozzle naar de volgende laag beweegt. " +msgstr "Trek het filament in wanneer de nozzle naar de volgende laag beweegt." #: fdmprinter.def.json msgctxt "retraction_amount label" @@ -2379,7 +2387,7 @@ msgstr "Maximale Snelheid voor het Afstemmen van Doorvoer" #: fdmprinter.def.json msgctxt "speed_equalize_flow_max description" msgid "Maximum print speed when adjusting the print speed in order to equalize flow." -msgstr "Maximale printsnelheid tijdens het aanpassen van de printsnelheid om de doorvoer af te stemmen" +msgstr "Maximale printsnelheid tijdens het aanpassen van de printsnelheid om de doorvoer af te stemmen." #: fdmprinter.def.json msgctxt "acceleration_enabled label" @@ -3261,6 +3269,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Supportbrim inschakelen" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Genereer een brim binnen de supportvulgebieden van de eerste laag. Deze brim wordt niet rondom maar onder de supportstructuur geprint. Als u deze instelling inschakelt, hecht de supportstructuur beter aan het platform." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Breedte supportbrim" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "De breedte van de brim die onder de support wordt geprint. Een bredere brim kost meer materiaal, maar hecht beter aan het platform." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Aantal supportbrimlijnen" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Het aantal lijnen dat voor de supportbrim wordt gebruikt. Meer brimlijnen zorgen voor betere hechting aan het platform, maar kosten wat extra materiaal." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3830,6 +3868,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Het aantal lijnen dat voor een brim wordt gebruikt. Meer lijnen zorgen voor betere hechting aan het platform, maar verkleinen uw effectieve printgebied." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Brim vervangt supportstructuur" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Dwing af dat de brim rond het model wordt geprint, zelfs als deze ruimte anders door supportstructuur zou worden ingenomen. Hierdoor worden enkele gebieden van de eerste supportlaag vervangen door brimgebieden." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5654,6 +5702,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Skinpaden aan boven-/onderkant verbinden waar ze naast elkaar lopen. Met deze instelling wordt bij concentrische patronen de bewegingstijd aanzienlijk verkort. Dit kan echter ten koste gaan van de kwaliteit van de bovenste laag aangezien de verbindingen in het midden van de vulling kunnen komen te liggen." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Het patroon van het vulmateriaal van de print. De lijn- en zigzagvulling veranderen per vullaag van richting, waardoor wordt bespaard op materiaalkosten. De raster-, driehoeks-, tri-hexagonale, kubische, achtvlaks-, afgeknotte kubus-, kruis- en concentrische patronen worden elke laag volledig geprint. Kubische, afgeknotte kubus- en achtvlaksvullingen veranderen elke laag voor een meer gelijke krachtsverdeling in elke richting." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Concentrisch 3D" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 5003eee692..2d11edabff 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-09-21 20:52+0200\n" "Last-Translator: 'Jaguś' Paweł Jagusiak, Andrzej 'anraf1001' Rafalski and Jakub 'drzejkopf' Świeciński\n" "Language-Team: reprapy.pl\n" @@ -48,8 +48,8 @@ msgstr "Zapisywacz G-code nie obsługuje trybu nietekstowego." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Wygeneruj G-code przed zapisem." +msgid "Please prepare G-code before exporting." +msgstr "" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Pokaż Dziennik" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profil został spłaszczony i aktywowany." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Drukowanie USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Drukuj przez USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Drukuj przez USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Połączono przez USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "Zapisywacz skompresowanego G-code nie obsługuje trybu tekstowego." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pakiet Formatu Ultimaker" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "Zapisz na dysk wymienny {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Nie ma żadnych formatów plików do zapisania!" @@ -198,7 +203,7 @@ msgstr "Nie można zapisać na wymiennym dysku {0}: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Błąd" @@ -227,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Ostrzeżenie" @@ -255,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Dysk wymienny" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Drukuj przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Drukuj przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Połączono przez sieć." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Połączono przez sieć. Proszę zatwierdzić żądanie dostępu na drukarce." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Połączono przez sieć. Brak dostępu do sterowania drukarką." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Wymagany dostęp do drukarki. Proszę zatwierdzić prośbę na drukarce" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Status uwierzytelniania" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Status Uwierzytelniania" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Spróbuj ponownie" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Prześlij ponownie żądanie dostępu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Dostęp do drukarki został zaakceptowany" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Brak dostępu do tej drukarki. Nie można wysłać zadania drukowania." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Poproś o dostęp" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Wyślij żądanie dostępu do drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Nie można uruchomić nowego zadania drukowania." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Wystąpił problem z konfiguracją twojego Ultimaker'a, przez który nie można rozpocząć wydruku. Proszę rozwiąż te problemy przed kontynuowaniem." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Niedopasowana konfiguracja" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Czy na pewno chcesz drukować z wybraną konfiguracją?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Wysyłanie danych do drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Wysyłanie danych" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Anuluj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Brak Printcore'a w slocie {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Brak załadowanego materiału w slocie {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "Inny PrintCore (Cura: {cura_printcore_name}, Drukarka: {remote_printcore_name}) wybrany dla extrudera {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Różne materiały (Cura: {0}, Drukarka: {1}) wybrane do dzyszy {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Synchronizuj się z drukarką" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Czy chcesz używać bieżącej konfiguracji drukarki w programie Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "PrintCore'y i/lub materiały w drukarce różnią się od tych w obecnym projekcie. Dla najlepszego rezultatu, zawsze tnij dla wybranych PrinCore'ów i materiałów, które są umieszczone w drukarce." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Połączone przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Dane Wysłane" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Zobacz w Monitorze" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Drukowanie zakończone" @@ -480,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Połącz przez sieć" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Monitor" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Nie można uzyskać dostępu do informacji o aktualizacji." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Nowe funkcje są dostępne dla twojej {machine_name}! Rekomendowane jest zaktualizowanie oprogramowania drukarki." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Nowe oprogramowanie %s jest dostępne" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Jak zaktualizować" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Nie można uzyskać dostępu do informacji o aktualizacji." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Widok warstwy" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura nie wyświetla dokładnie warstw kiedy drukowanie przewodowe jest włączone" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Widok symulacji" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modyfikuj G-Code" @@ -536,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Stwórz obszar, w którym podpory nie będą drukowane." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura zbiera anonimowe dane statystyczne." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Zbieranie Danych" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Więcej informacji" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Zobacz więcej informacji o tym, jakie dane przesyła Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Zezwól" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Zezwól Cura na wysyłanie anonimowych danych statystycznych, aby pomóc w wyborze przyszłych usprawnień Cura. Część twoich ustawień i preferencji jest wysyłana, a także wersja Cury i kod modelu który tniesz." @@ -596,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Obraz GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Nie można pociąć z obecnym materiałem, ponieważ nie jest on kompatybilny z wybraną maszyną lub konfiguracją." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Nie można pociąć" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Nie można pociąć z bieżącymi ustawieniami. Następujące ustawienia mają błędy: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Nie można pokroić przez ustawienia osobne dla modelu. Następujące ustawienia mają błędy w jednym lub więcej modeli: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Nie można pociąć, ponieważ wieża czyszcząca lub jej pozycja(e) są niewłaściwe." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Nie można pociąć, ponieważ obecne są obiekty powiązane z wyłączonym ekstruderem %s." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Nic do pocięcia, ponieważ żaden z modeli nie pasuje do obszaru roboczego. Proszę o przeskalowanie lub obrócenie modelu, żeby pasował." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Przetwarzanie warstw" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informacja" @@ -661,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "Konfiguruj ustawienia każdego modelu z osobna" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Zalecane" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Niestandardowe" @@ -679,7 +679,7 @@ msgid "3MF File" msgstr "Plik 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Dysza" @@ -705,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Plik G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analizowanie G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Szczegóły G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Przed wysłaniem pliku upewnij się, że G-code jest odpowiedni do konfiguracji drukarki. Przedstawienie G-kodu może nie być dokładne." @@ -727,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profile Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Asystent Profilu" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Asystent Profilu" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Wybierz aktualizacje" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Uaktualnij oprogramowanie układowe" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Wypoziomuj stół" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Zewnętrzna ściana" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Ściany wewnętrzne" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Skin" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Wypełnienie" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Wypełnienie podpór" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Łączenie podpory" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Podpory" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Obwódka" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Ruch jałowy" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrakcja" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Inny" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Nieznany" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Plik pocięty wcześniej {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Plik już istnieje" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Nie zastąpione" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Wybrany materiał jest niezgodny z wybranym urządzeniem lub konfiguracją." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Niekompatybilny Materiał" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Ustawienia zostały zaaktualizowane" @@ -902,8 +887,6 @@ msgid "Export succeeded" msgstr "Eksport udany" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +894,70 @@ msgstr "Nie udało się zaimportować profilu z {0}: or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "Brak niestandardowego profilu do zaimportowania do pliku {0}" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "Ten profil {0} zawiera błędne dane, nie można go zaimportować." +msgstr "" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 "Maszyna zdefiniowana w profilu {0} ({1}) nie zgadza się z obecnie wybraną maszyną ({2}), nie można tego zaimportować." +msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Niestandardowy profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilowi brakuje typu jakości." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Nie można znaleźć typu jakości {0} dla bieżącej konfiguracji." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Wszystkie Pliki (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Niestandardowy materiał" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Niestandardowy" @@ -1009,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Obszar Roboczy" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Nie można utworzyć archiwum z folderu danych użytkownika: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Kopia zapasowa" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Podjęto próbę przywrócenia kopii zapasowej Cura na podstawie niepoprawnych danych lub metadanych." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Podjęto próbę przywrócenia kopii zapasowej Cura, która nie odpowiada obecnej wersji programu." @@ -1199,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Wyślij raport" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ładowanie drukarek..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Ustawianie sceny ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ładowanie interfejsu ..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Wybrany model był zbyta mały do załadowania." @@ -1263,9 +1258,9 @@ msgstr "X (Szerokość)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Nominalna średnica filamentu wspierana przez drukarkę. Dokładna średnica będzie nadpisana przez materiał i/lub profil." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Korekcja dyszy X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Korekcja dyszy Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Początkowy G-code Ekstrudera" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Końcowy G-code Ekstrudera" @@ -1436,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Nie można połączyć się z bazą danych pakietów Cura. Sprawdź swoje połączenie z internetem." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Wtyczki" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiał" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Wersja" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Ostatnia aktualizacja" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Pobrań" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Nieznany" @@ -1505,8 +1511,8 @@ msgstr "Powrót" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Potwierdź odinstalowanie " +msgid "Confirm uninstall" +msgstr "" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Materiały Podstawowe" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Zainstalowano" @@ -1635,48 +1641,88 @@ msgid "Changelog" msgstr "Dziennik" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Zamknij" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Oprogramowanie ukłądowe jest częścią oprogramowania działającego bezpośrednio na drukarce 3D. Oprogramowanie to steruje silnikami krokowymi, reguluje temperaturę i ostatecznie sprawia, że drukarka działa." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Oprogramowanie ukłądowe dostarczane z nowymi drukarkami działa, ale nowe wersje mają zazwyczaj więcej funkcji i ulepszeń." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Automatycznie uaktualnij oprogramowanie" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Prześlij niestandardowe oprogramowanie" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Wybierz niestandardowe oprogramowanie" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Aktualizacja oprogramowania układowego" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Aktualizowanie oprogramowania." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Aktualizacja oprogramowania zakończona." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Aktualizacja oprogramowania nie powiodła się z powodu nieznanego błędu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Aktualizacja oprogramowania nie powiodła się z powodu błędu komunikacji." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Aktualizacja oprogramowania nie powiodła się z powodu błędu wejścia / wyjścia." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Aktualizacja oprogramowania nie powiodła się z powodu utraconego oprogramowania." @@ -1686,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Zgoda Użytkownika" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Istniejące Połączenie" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Ta drukarka/grupa jest już dodana do Cura. Proszę wybierz inną drukarkę/grupę." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Połącz się z drukarką sieciową" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1712,18 +1758,18 @@ msgstr "" "\n" "Wybierz drukarkę z poniższej listy:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Dodaj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Edycja" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Usunąć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Odśwież" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Jeżeli twojej drukarki nie ma na liście, przeczytaj poradnik o problemach z drukowaniem przez sieć" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Rodzaj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Wersja oprogramowania" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Ta drukarka nie jest skonfigurowana jako host dla grupy drukarek." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Ta drukarka jest hostem grupy %1 drukarek." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Drukarka pod tym adresem jeszcze nie odpowiedziała." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Połącz" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Adres drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Wpisz adres IP lub nazwę hosta drukarki w sieci." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Drukuj przez sieć" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Wybór drukarki" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Drukuj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Drukuj przez sieć" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Oczekiwanie na: Niedostępną drukarkę" +msgid "Printer selection" +msgstr "Wybór drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Oczekiwanie na: Pierwszą dostępną" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Oczekiwanie na: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Przesuń na początek" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Przesuń zadanie drukowania na początek" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Czy jesteś pewien, że chcesz przesunąć %1 na początek kolejki?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Usuń" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Usuń zadanie drukowania" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Czy jesteś pewien, że chcesz usunąć %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Zarządzaj kolejką" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "W kolejce" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Drukowanie" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Zarządzaj drukarkami" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Niedostępny" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Nieosiągalny" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Dostępny" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Anulowano" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Zakończono" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Przygotowywanie" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Wstrzymywanie" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Wznawianie" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Konieczne są działania" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Oczekiwanie na: Niedostępną drukarkę" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Oczekiwanie na: Pierwszą dostępną" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Oczekiwanie na: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Zarządzaj kolejką" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "W kolejce" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Drukowanie" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Zarządzaj drukarkami" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Przesuń na początek" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Usuń" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Ponów" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Wstrzymaj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Anuluj" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Czy jesteś pewien, że chcesz przesunąć %1 na początek kolejki?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Przesuń zadanie drukowania na początek" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Czy jesteś pewien, że chcesz usunąć %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Usuń zadanie drukowania" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Czy jesteś pewien, że chcesz anulować %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Anuluj wydruk" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Czy jesteś pewien, że chcesz anulować %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Anulowano" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Zakończono" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Przygotowywanie" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Wstrzymywanie" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Wstrzymana" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Wznawianie" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Konieczne są działania" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Podłącz do drukarki" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Załaduj konfigurację drukarki do Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Uaktywnij konfigurację" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Załaduj konfigurację drukarki do Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Skrypty post-processingu" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Dodaj skrypt" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Ustawienia" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Zmień aktywne skrypty post-processingu" @@ -2194,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modyfikuj ustawienia wypełnienia innych modeli" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Wybierz ustawienia" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Wybierz Ustawienia, aby dostosować ten model" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtr..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Pokaż wszystko" @@ -2261,6 +2363,7 @@ msgid "Type" msgstr "Typ" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupa drukarek" @@ -2278,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2352,82 +2456,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Otwórz" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Poprzedni" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Eksportuj" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Następny" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Końcówka" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00godz. 00min." - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Szacowanie kosztów" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Razem:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Próbny wydruk" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista kontrolna" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2469,36 +2497,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Przejdź do następnego położenia" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Uaktualnij oprogramowanie" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Oprogramowanie ukłądowe jest częścią oprogramowania działającego bezpośrednio na drukarce 3D. Oprogramowanie to steruje silnikami krokowymi, reguluje temperaturę i ostatecznie sprawia, że drukarka działa." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Oprogramowanie ukłądowe dostarczane z nowymi drukarkami działa, ale nowe wersje mają zazwyczaj więcej funkcji i ulepszeń." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Automatycznie uaktualnij oprogramowanie" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Prześlij niestandardowe oprogramowanie" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Wybierz niestandardowe oprogramowanie" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2686,7 +2684,7 @@ msgid "Customized" msgstr "Dostosowane" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Zawsze pytaj o to" @@ -2834,6 +2832,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importuj" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Eksportuj" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2919,283 +2923,283 @@ msgid "Unit" msgstr "Jednostka" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Ogólny" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interfejs" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Język:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Waluta:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Motyw:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Tnij automatycznie podczas zmiany ustawień." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatyczne Cięcie" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Zachowanie okna edycji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Wyświetl zwis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Odwróć kierunek zoomu kamery." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Przybliżaj w kierunku myszy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Otwieranie i zapisywanie plików" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaluj duże modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaluj bardzo małe modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Zaznaczaj modele po załadowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Zawsze pytaj" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Zawsze otwieraj jako projekt" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Zawsze importuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Zawsze odrzucaj wprowadzone zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Prywatność" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Wyślij (anonimowe) informacje o drukowaniu" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Więcej informacji" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Eksperymentalne" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Drukarki" @@ -3217,7 +3221,7 @@ msgid "Connection:" msgstr "Połączenie:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Drukarka nie jest podłączona." @@ -3243,7 +3247,7 @@ msgid "Aborting print..." msgstr "Przerywanie drukowania..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" @@ -3324,17 +3328,17 @@ msgid "Global Settings" msgstr "Ustawienia ogólne" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Dodaj drukarkę" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nazwa drukarki:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Dodaj drukarkę" @@ -3349,17 +3353,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "O Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "version: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kompletne rozwiązanie do druku przestrzennego." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3368,102 +3372,122 @@ msgstr "" "Cura jest rozwijana przez firmę Ultimaker B.V. we współpracy ze społecznością.\n" "Cura z dumą korzysta z następujących projektów open source:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Graficzny interfejs użytkownika" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Struktura aplikacji" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Generator g-code" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteka komunikacji międzyprocesowej" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Język programowania" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Framework GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Powiązania Frameworka GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteka Powiązań C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Format wymiany danych" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Wsparcie biblioteki do obliczeń naukowych" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Wsparcie biblioteki dla szybszej matematyki" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Wsparcie biblioteki do obsługi plików STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Wsparcie biblioteki do obsługi plików 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteka komunikacji szeregowej" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Bilbiotek poszukująca Zeroconf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteka edytująca pola" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteka Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Czcionka" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Ikony SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Wdrożenie aplikacji pomiędzy dystrybucjami Linux" @@ -3473,7 +3497,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Profil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3484,53 +3508,53 @@ msgstr "" "\n" "Kliknij, aby otworzyć menedżer profili." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Szukanie..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ukryj tę opcję" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nie pokazuj tej opcji" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pozostaw tę opcję widoczną" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Skonfiguruj widoczność ustawień ..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Schowaj wszystkie" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Rozwiń wszystkie" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3551,17 +3575,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Pod wpływem" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3572,7 +3596,7 @@ msgstr "" "\n" "Kliknij, aby przywrócić wartość z profilu." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3727,12 +3751,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Widok" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Pozycja kamery" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&ole robocze" @@ -3742,12 +3766,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Widoczne Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Pokaż Wszystkie Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Ustaw Widoczność Ustawień..." @@ -3810,17 +3834,44 @@ msgstr "" "Konfiguracja wydruku jest wyłączona\n" "Pliki G-code nie mogą zostać zmodyfikowane" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00godz. 00min." + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Specyfikacja czasu" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Szacowanie kosztów" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Razem:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Zalecana konfiguracja wydruku

Drukowanie z zalecanymi ustawieniami dla wybranej drukarki, materiału i jakości." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Niestandardowa konfiguracja wydruku

Drukowanie z precyzyjną kontrolą nad każdym elementem procesu cięcia." @@ -3845,223 +3896,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Szacowany czas pozostały" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Przełącz tryb pełnoekranowy" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Cofnij" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Ponów" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Zamknij" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Widok 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Widok z przodu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Widok z góry" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Widok z lewej strony" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Widok z prawej strony" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Konfiguruj Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Dodaj drukarkę..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Zarządzaj drukarkami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Zarządzaj materiałami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Odrzuć bieżące zmiany" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Zarządzaj profilami..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Pokaż dokumentację internetową" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Zgłoś błąd" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "O..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Usuń model" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Wyśrodkuj model na platformie" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grupuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozgrupuj modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Połącz modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Powiel model..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Wybierz wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Wyczyść stół" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Przeładuj wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Ułóż wszystkie modele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Wybór ułożenia" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Zresetuj wszystkie pozycje modelu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Zresetuj wszystkie przekształcenia modelu" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Otwórz plik(i)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nowy projekt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Pokaż &dziennik silnika..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Pokaż folder konfiguracji" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Przeglądaj pakiety..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Rozłóż/Schowaj Pasek Boczny" @@ -4122,7 +4173,7 @@ msgid "Select the active output device" msgstr "Wybierz aktywne urządzenie wyjściowe" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Otwórz plik(i)" @@ -4142,145 +4193,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Cura Ultimaker" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Plik" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Zapisz..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Eksportuj..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Eksportuj Zaznaczenie..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Edytuj" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Widok" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Drukarka" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Materiał" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Ustaw jako aktywną głowicę" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Włącz Ekstruder" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Wyłącz Ekstruder" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Pole robocze" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "&Rozszerzenia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Narzędzia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "Preferencje" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "P&omoc" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Otwórz plik" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Ustawienia" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Nowy projekt" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Czy na pewno chcesz rozpocząć nowy projekt? Spowoduje to wyczyszczenie stołu i niezapisanych ustawień." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Zamykanie Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Instaluj pakiety" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Otwórz plik(i)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4290,11 +4341,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Zapisz projekt" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4365,37 +4411,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Stopniowe wypełnienie stopniowo zwiększa ilość wypełnień w górę." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Włącz stopniowane" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Generuj podpory" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Wybierz, który ekstruder ma służyć do drukowania podpór. Powoduje to tworzenie podpór poniżej modelu, aby zapobiec spadaniu lub drukowaniu modelu w powietrzu." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Popraw przycz. modelu" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Potrzebujesz pomocy w ulepszaniu wydruków?
Przeczytaj instrukcje dotyczące rozwiązywania problemów" @@ -4557,6 +4603,16 @@ msgctxt "name" msgid "Changelog" msgstr "Lista zmian" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4907,16 +4963,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profile Writer" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Pozwala twórcą materiałów na tworzenie nowych profili materiałów i jakości używając rozwijanego menu." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Asystent Profilów Druku" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4947,6 +4993,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Czytnik Profili Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Wygeneruj G-code przed zapisem." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Asystent Profilu" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Asystent Profilu" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Uaktualnij oprogramowanie układowe" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Nieznany" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Brak niestandardowego profilu do zaimportowania do pliku {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Ten profil {0} zawiera błędne dane, nie można go zaimportować." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "Maszyna zdefiniowana w profilu {0} ({1}) nie zgadza się z obecnie wybraną maszyną ({2}), nie można tego zaimportować." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Potwierdź odinstalowanie " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Wstrzymana" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Poprzedni" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Następny" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Końcówka" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Próbny wydruk" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista kontrolna" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Uaktualnij oprogramowanie" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Pozwala twórcą materiałów na tworzenie nowych profili materiałów i jakości używając rozwijanego menu." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Asystent Profilów Druku" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Drukuj z Doodle3D WiFi-Box" diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 80605978ce..02527d4849 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-03-30 20:33+0200\n" "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n" "Language-Team: reprapy.pl\n" @@ -168,6 +168,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Współrzędna Z, w której dysza jest czyszczona na początku wydruku." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index a8b07e032c..a684c98068 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-21 21:52+0200\n" "Last-Translator: 'Jaguś' Paweł Jagusiak, Andrzej 'anraf1001' Rafalski and Jakub 'drzejkopf' Świeciński\n" "Language-Team: reprapy.pl\n" @@ -16,7 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.1.1\n" -"POT-Creation-Date: \n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1078,8 +1077,8 @@ msgstr "Połącz Górne/Dolne Wieloboki" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Łączy górne/dolne ścieżki powłoki, gdy są one prowadzone obok siebie. Przy wzorze koncentrycznym, załączenie tego ustawienia znacznie zredukuje czas ruchów jałowych, ale ze względu na to, że połączenie może nastąpić w połowie drogi ponad wypełnieniem, ta fukncja może pogorszyć jakość górnej powierzchni." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "" #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1498,8 +1497,8 @@ msgstr "Wzór Wypełn." #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Wzór materiału wypełniającego wydruk. Linie i zygzaki zmieniają kierunek na przemiennych warstwach, redukując koszty materiału. Kratka, trójkąty, tri-sześciokąt, sześcienne, ośmiościenne, ćwierć sześcienny i koncentryczny wzór są drukowane w pełni na każdej warstwie. Sześcienne, ćwierć sześcienne i czworościenne wypełnienie zmienia się co każdą warstwę, aby zapewnić równy rozkład siły w każdym kierunku." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "" #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1561,6 +1560,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Krzyż 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -2783,9 +2787,7 @@ msgstr "Tryb Kombinowania" #: fdmprinter.def.json msgctxt "retraction_combing description" msgid "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is off, the material will retract and the nozzle moves in a straight line to the next point. It is also possible to avoid combing over top/bottom skin areas and also to only comb within the infill. Note that the 'Within Infill' option behaves exactly like the 'Not in Skin' option in earlier Cura releases." -msgstr "" -"Kombinowanie utrzymuje dyszę w już zadrukowanych obszarach podczas ruchu jałowego. Powoduje to nieco dłuższe ruchy jałowe, ale zmniejsza potrzebę retrakcji. Jeśli kombinowanie jest wyłączone, materiał się cofa, a dysza przemieszcza się w linii prostej do następnego punktu. Można też unikać kombinowania na górnych/dolnych obszarach powłoki, a także kombinować tylko wewnątrz wypełnienia. Opcja \"Wewnątrz Wypełnienia\" wymusza takie samo zachowanie, jak opcja \"Nie w Powłoce\" we wcześniejszych " -"wydaniach Cura." +msgstr "Kombinowanie utrzymuje dyszę w już zadrukowanych obszarach podczas ruchu jałowego. Powoduje to nieco dłuższe ruchy jałowe, ale zmniejsza potrzebę retrakcji. Jeśli kombinowanie jest wyłączone, materiał się cofa, a dysza przemieszcza się w linii prostej do następnego punktu. Można też unikać kombinowania na górnych/dolnych obszarach powłoki, a także kombinować tylko wewnątrz wypełnienia. Opcja \"Wewnątrz Wypełnienia\" wymusza takie samo zachowanie, jak opcja \"Nie w Powłoce\" we wcześniejszych wydaniach Cura." #: fdmprinter.def.json msgctxt "retraction_combing option off" @@ -3267,6 +3269,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3836,6 +3868,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Liczba linii używana dla obrysu. Więcej linii obrysu poprawia przyczepność do stołu, ale zmniejsza rzeczywiste pole wydruku." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5660,6 +5702,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Łączy górne/dolne ścieżki powłoki, gdy są one prowadzone obok siebie. Przy wzorze koncentrycznym, załączenie tego ustawienia znacznie zredukuje czas ruchów jałowych, ale ze względu na to, że połączenie może nastąpić w połowie drogi ponad wypełnieniem, ta fukncja może pogorszyć jakość górnej powierzchni." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Wzór materiału wypełniającego wydruk. Linie i zygzaki zmieniają kierunek na przemiennych warstwach, redukując koszty materiału. Kratka, trójkąty, tri-sześciokąt, sześcienne, ośmiościenne, ćwierć sześcienny i koncentryczny wzór są drukowane w pełni na każdej warstwie. Sześcienne, ćwierć sześcienne i czworościenne wypełnienie zmienia się co każdą warstwę, aby zapewnić równy rozkład siły w każdym kierunku." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Koncentryczny 3D" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index c6cc088249..73b8d759ce 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 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-01 03:20-0300\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 02:20-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 2.0.6\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" @@ -47,8 +48,8 @@ msgstr "O GCodeWriter não suporta modo binário." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Por favor gere o G-Code antes de salvar." +msgid "Please prepare G-code before exporting." +msgstr "Por favor prepare o G-Code antes de exportar." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -74,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Exibir registro de alterações" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Atualizar Firmware" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -84,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "O perfil foi achatado & ativado." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Impressão USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Imprimir pela USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Imprimir pela USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Conectado via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -136,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "O GCodeGzWriter não suporta modo binário." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacote de Formato da Ultimaker" @@ -158,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "Salvar em Unidade Removível {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Não há formatos de arquivo disponíveis com os quais escrever!" @@ -197,7 +203,7 @@ 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/cura/Settings/CuraContainerRegistry.py:133 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -226,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -254,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unidade Removível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprime pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Conectado pela rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Conectado pela rede. Por favor aprove a requisição de acesso na impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Conectado pela rede. Sem acesso para controlar a impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Acesso à impressora solicitado. Por favor aprove a requisição na impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Status da autenticação" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Status da Autenticação" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Tentar novamente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Reenvia o pedido de acesso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Acesso à impressora confirmado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Sem acesso para imprimir por esta impressora. Incapaz de enviar o trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Solicitar acesso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Envia pedido de acesso à impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Incapaz de iniciar novo trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Há um problema com a configuração de sua Ultimaker, o que torna impossível iniciar a impressão. Por favor resolva este problema antes de continuar." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Configuração conflitante" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Tem certeza que quer imprimir com a configuração selecionada?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Enviando dados à impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Enviando Dados" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -398,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Printcore não carregado no slot {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Nenhum material carregado no slot {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" -msgstr "PrintCore Diferente (Cura: {cure_printcore_name}, Impressora: {remote_printcore_name}) selecionado para o extrusor {extruder_id}" +msgstr "PrintCore Diferente (Cura: {cura_printcore_name}, Impressora: {remote_printcore_name}) selecionado para o extrusor {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Material diferente (Cura: {0}, Impressora: {1}) selecionado para o extrusor {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Sincronizar com a impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Deseja usar a configuração atual de sua impressora no Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Os PrintCores e/ou materiais da sua impressora diferem dos que estão dentro de seu projeto atual. Para melhores resultados, sempre fatie para os PrintCores e materiais que estão na sua impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Conectado pela rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Dados Enviados" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver no Monitor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Impressão Concluída" @@ -479,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Conectar pela rede" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Monitor" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Não foi possível acessar informação de atualização." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Novos recursos estão disponível para sua {machine_name}! Recomenda-se atualizar o firmware da impressora." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Novo firmware de %s disponível" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Como atualizar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Não foi possível acessar informação de atualização." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Visão de Camadas" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "O Cura não mostra as camadas corretamente quando Impressão em Arame estiver habilitada" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Visão Simulada" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modificar G-Code" @@ -535,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Cria um volume em que os suportes não são impressos." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "O Cura coleta estatísticas anônimas de uso." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Coletando Dados" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Ver mais informações sobre os dados enviados pelo Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Permitir" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Permite que o Cura envie estatísticas anônimas de uso para ajudar a priorizar futuras melhorias ao software. Algumas de suas preferências e ajustes são enviados junto à versão atual do Cura e um hash dos modelos que estão sendo fatiados." @@ -595,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Imagem GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Incapaz de fatiar com o material atual visto que é incompatível com a máquina ou configuração selecionada." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Incapaz de fatiar" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Incapaz de fatiar com os ajustes atuais. Os seguintes ajustes têm erros: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Incapaz de fatiar devido a alguns ajustes por modelo. Os seguintes ajustes têm erros em um dos modelos ou mais: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Incapaz de fatiar porque a torre de purga ou posição de purga são inválidas." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Incapaz de fatiar porque há objetos associados com o Extrusor desabilitado %s." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Nada a fatiar porque nenhum dos modelos cabe no volume de impressão. Por favor redimensione ou rotacione os modelos para caberem." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Processando Camadas" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informação" @@ -660,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "Configurar ajustes por Modelo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -678,7 +679,7 @@ msgid "3MF File" msgstr "Arquivo 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Bico" @@ -704,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Arquivo G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Interpretando G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Detalhes do G-Code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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." @@ -726,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente de Perfil" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -757,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Selecionar Atualizações" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Atualizar Firmware" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -772,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Nivelar mesa" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parede Externa" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes Internas" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Contorno" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Preenchimento" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Preenchimento de Suporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface de Suporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Suporte" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt (Saia)" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Percurso" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrações" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Desconhecido" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Arquivo pré-fatiado {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Login falhou" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -856,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Não sobreposto" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "O material selecionado é incompatível com a máquina ou configuração selecionada." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Material Incompatível" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes atualizados" @@ -901,8 +887,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -910,58 +894,70 @@ msgstr "Falha ao importa perfil de {0}: {1} or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "Não há perfil personalizado para importar no arquivo {0}" +msgstr "Não há perfil personalizado a importar no arquivo {0}" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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." +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Não foi possível encontrar tipo de qualidade {0} para a configuração atual." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -988,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos Os Arquivos (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -1008,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Volume de Impressão" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não pude criar arquivo do diretório de dados de usuário: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentativa de restauração de backup do Cura sem dados ou metadados apropriados." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Tentativa de restauração de backup do Cura que não corresponde à versão atual." @@ -1198,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Carregando máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando cena..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Carregando interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado é pequenos demais para carregar." @@ -1262,9 +1258,9 @@ msgstr "X (largura)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1399,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "O diâmetro nominal do filamento suportado pela impressora. O diâmetro exato será sobreposto pelo material e/ou perfil." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Deslocamento X do Bico" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Deslocamento Y do Bico" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Número da Ventoinha de Resfriamento" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "G-Code Inicial do Extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "G-Code Final do Extrusor" @@ -1435,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Não foi possível conectar-se à base de dados de Pacotes do Cura. Por favor verifique sua conexão." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Complementos" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Versão" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Última atualização" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Downloads" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" @@ -1504,8 +1511,8 @@ msgstr "Voltar" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Confirme a deinstalação" +msgid "Confirm uninstall" +msgstr "Confirme a desinstalação" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1552,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Materiais Genéricos" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Instalado" @@ -1634,48 +1641,88 @@ msgid "Changelog" msgstr "Registro de alterações" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Fechar" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Atualizar Firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "O firmware é o software rodando diretamente no maquinário de sua impressora 3D. Este firmware controla os motores de passo, regula a temperatura e é o que faz a sua impressora funcionar." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "O firmware que já vêm embutido nas novas impressoras funciona, mas novas versões costumam ter mais recursos, correções e melhorias." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Automaticamente atualizar Firmware" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Carregar Firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "O firmware não pode ser atualizado porque não há conexão com a impressora." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "O firmware não pode ser atualizado porque a conexão com a impressora não suporta atualização de firmware." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Selecionar firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Atualização do Firmware" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Atualizando firmware." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Atualização do Firmware completada." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "A atualização de Firmware falhou devido a um erro desconhecido." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "A atualização de firmware falhou devido a um erro de comunicação." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "A atualização de firmware falhou devido a um erro de entrada e saída." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "A atualização de firmware falhou devido a firmware não encontrado." @@ -1685,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Termos de Acordo do Usuário" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Conexão Existente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Esta impressora ou grupo já foi adicionada ao Cura. Por favor selecione outra impressora ou grupo." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Conectar a Impressora de Rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1711,18 +1758,18 @@ msgstr "" "\n" "Selecione sua impressora da lista abaixo:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1730,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Remover" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Atualizar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se sua impressora não está listada, leia o guia de resolução de problemas de impressão em rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Endereço" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impressora não está configurada para hospedar um grupo de impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impressora é a hospedeira de um grupo de %1 impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "A impressora neste endereço ainda não respondeu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Conectar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Introduza o endereço IP ou hostname da sua impressora na rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "Ok" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Imprimir pela rede" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Seleção de impressora" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Imprimir" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Imprimir pela rede" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Aguardando por: Impressora indisponível" +msgid "Printer selection" +msgstr "Seleção de impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Aguardando por: A primeira disponível" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Aguardando por: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Mover para o topo" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Move o trabalho de impressão para o topo da fila" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Você tem certeza que quer mover %1 para o topo da fila?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Remover" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Remover trabalho de impressão" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Você tem certeza que quer remover %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Gerenciar fila" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Enfileirados" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Imprimindo" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Gerenciar impressoras" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Não disponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Inacessível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Disponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Abortado" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Finalizado" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Preparando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Pausando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Continuando" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Necessária uma ação" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Aguardando por: Impressora indisponível" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Aguardando por: A primeira disponível" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Aguardando por: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Alteração de configuração" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "A impressora atribuída, %1, requer as seguintes alterações de configuração:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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 contém configuração de material desconhecida." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Sobrepôr" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Iniciar um trabalho de impressão com configuração incompatível pode danificar sua impressora 3D. Voce tem certeza que quer sobrepôr a configuração e imprimir %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Sobrepôr configuração e iniciar impressão" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Vidro" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Alumínio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Gerenciar fila" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Enfileirados" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Imprimindo" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Gerenciar impressoras" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Mover para o topo" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Remover" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Continuar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Pausar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Abortar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Você tem certeza que quer mover %1 para o topo da fila?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Move o trabalho de impressão para o topo da fila" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Você tem certeza que quer remover %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Remover trabalho de impressão" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Você tem certeza que quer abortar %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Abortar impressão" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Você tem certeza que quer abortar %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Abortado" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Finalizado" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Preparando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Pausando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Pausado" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Continuando" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Necessária uma ação" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" -msgstr "Conecta a uma impressora." +msgstr "Conecta a uma impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Carrega a configuração da impressora no Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Ativar Configuração" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Carrega a configuração da impressora no Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2058,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de Pós-Processamento" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Adicionar um script" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Troca os scripts de pós-processamento ativos" @@ -2193,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modificar ajustes para preenchimento de outros modelos" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Selecionar ajustes" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Exibir tudo" @@ -2260,6 +2363,7 @@ msgid "Type" msgstr "Tipo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de Impressora" @@ -2277,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2351,82 +2456,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Abrir" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Próximo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Dica" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00h 00min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Especificação de custo" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Total:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Imprimir experimento" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificação" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2468,36 +2497,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Mover pra a Posição Seguinte" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Atualizar Firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "O firmware é o software rodando diretamente no maquinário de sua impressora 3D. Este firmware controla os motores de passo, regula a temperatura e é o que faz a sua impressora funcionar." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "O firmware que já vêm embutido nas novas impressoras funciona, mas novas versões costumam ter mais recursos, correções e melhorias." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Automaticamente atualizar Firmware" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Carregar Firmware personalizado" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Selecionar firmware personalizado" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2604,7 +2603,7 @@ msgstr "Tudo está em ordem! A verificação terminou." #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:119 msgctxt "@label:MonitorStatus" msgid "Not connected to a printer" -msgstr "Não conectado a nenhuma impressora." +msgstr "Não conectado a nenhuma impressora" #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:123 msgctxt "@label:MonitorStatus" @@ -2685,7 +2684,7 @@ msgid "Customized" msgstr "Personalizado" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" @@ -2833,6 +2832,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importar" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2918,283 +2923,283 @@ msgid "Unit" msgstr "Unidade" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Fatiar automaticamente quando mudar ajustes." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Fatiar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da área de visualização" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Exibir seções pendentes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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." +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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Ampliar na direção do mouse" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" -msgstr "Automaticamente fazer os modelos caírem na mesa de impressão." +msgstr "Automaticamente fazer os modelos caírem na mesa de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrindo e salvando arquivos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos minúsculos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar modelos ao carregar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " -msgstr "Comportamento default ao abrir um arquivo de projeto" +msgstr "Comportamento default ao abrir um arquivo de projeto: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Sempre me perguntar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Sempre abrir como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Sempre importar modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 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:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" -msgstr "Enviar informação (anônima) de impressão." +msgstr "Enviar informação (anônima) de impressão" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" @@ -3216,7 +3221,7 @@ msgid "Connection:" msgstr "Conexão:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "A impressora não está conectada." @@ -3242,7 +3247,7 @@ msgid "Aborting print..." msgstr "Abortando impressão..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" @@ -3323,17 +3328,17 @@ msgid "Global Settings" msgstr "Ajustes globais" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nome da Impressora:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Adicionar Impressora" @@ -3348,17 +3353,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Sobre o Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "versão: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Solução completa para impressão 3D com filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3367,102 +3372,122 @@ msgstr "" "Cura é desenvolvido pela Ultimaker B.V. em cooperação com a comunidade.\n" "Cura orgulhosamente usa os seguintes projetos open-source:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface Gráfica de usuário" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Framework de Aplicações" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Gerador de G-Code" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicação interprocessos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Linguagem de Programação" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Ligações da Framework Gráfica" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de Ligações C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de Intercâmbio de Dados" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Bibliteca de suporte para computação científica" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de suporte para matemática acelerada" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de suporte para manuseamento de arquivos STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de suporte para manuseamento de arquivos 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicação serial" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de descoberta 'ZeroConf'" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recorte de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca de HTTP Python" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Fonte" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação de aplicação multidistribuição em Linux" @@ -3472,7 +3497,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Perfil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3483,53 +3508,53 @@ msgstr "" "\n" "Clique para abrir o gerenciador de perfis." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Buscar..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não exibir este ajuste" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter este ajuste visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar a visibilidade dos ajustes..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Encolher Todos" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Expandir Todos" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3538,7 +3563,7 @@ msgid "" msgstr "" "Alguns ajustes ocultados usam valores diferentes de seu valor calculado normal.\n" "\n" -"Clique para tornar estes ajustes visíveis. " +"Clique para tornar estes ajustes visíveis." #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:61 msgctxt "@label Header for list of settings." @@ -3550,17 +3575,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Afetado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " -msgstr "O valor é resolvido de valores específicos de cada extrusor" +msgstr "O valor é resolvido de valores específicos de cada extrusor " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3571,7 +3596,7 @@ msgstr "" "\n" "Clique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3631,7 +3656,7 @@ msgstr "A temperatura-alvo do hotend. O hotend vai aquecer ou esfriar na direç #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:98 msgctxt "@tooltip" msgid "The current temperature of this hotend." -msgstr "A temperatura atual deste hotend" +msgstr "A temperatura atual deste hotend." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:172 msgctxt "@tooltip of temperature input" @@ -3726,12 +3751,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ver" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Posição da &câmera" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Plataforma de Impressão (&B)" @@ -3741,12 +3766,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Ajustes Visíveis" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Mostrar Todos Os Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gerenciar Visibilidade dos Ajustes..." @@ -3809,17 +3834,44 @@ msgstr "" "Configuração de Impressão desabilitada\n" "Arquivos G-Code não podem ser modificados" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00h 00min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Especificação de tempo" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Especificação de custo" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Total:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Configuração Recomendada de Impressão

Imprimir com os ajustes recomendados para a impressora, material e qualidade selecionados." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Configuração de Impressão Personalizada

Imprimir com controle fino sobre cada parte do processo de fatiamento." @@ -3844,223 +3896,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Tempo restante estimado" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar Tela Cheia" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Desfazer (&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Sair (&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visão &3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visão Frontal" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visão Superior" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visão do Lado Esquerdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visão do Lado Direito" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar Impressoras..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar Materiais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar ajustes atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfis..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Exibir &Documentação Online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Relatar um &Bug" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Remover Modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntralizar Modelo na Mesa" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Esvaziar a Mesa de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar Todos Os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Posicionar Todos os Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Posicionar Seleção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Abrir Arquiv&o(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Exibir o Registro do Motor de Fatiamento (&L)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Exibir Pasta de Configuração" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Navegar pacotes..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Expandir/Encolher Barra Lateral" @@ -4121,7 +4173,7 @@ msgid "Select the active output device" msgstr "Selecione o dispositivo de saída ativo" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" @@ -4141,145 +4193,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "Arquivo (&F)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Salvar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar Seleção..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Editar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Ver" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "Aju&stes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "Im&pressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Material" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Definir Como Extrusor Ativo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Habilitar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desabilitar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "Plataforma de Impressão (&B)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensões" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "Ferramen&tas" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "P&referências" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "Ajuda (&H)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Abrir arquivo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Novo projeto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Tem certeza que quer iniciar novo projeto? Isto esvaziará a mesa de impressão e quaisquer ajustes não salvos." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechando o Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir Arquivo(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4289,11 +4341,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Salvar Projeto" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4357,44 +4404,44 @@ msgstr "Você modificou alguns ajustes de perfil. Se você quiser alterá-los, u #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:541 msgctxt "@label" msgid "Infill" -msgstr "Preenchimento:" +msgstr "Preenchimento" #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:777 msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Preenchimento gradual aumentará gradualmente a quantidade de preenchimento em direção ao topo." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Habilitar gradual" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Gerar Suportes" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Selecione qual extrusor a usar para o suporte. Isto construirá estruturas de suportes abaixo do modelo para prevenir que o modelo desabe ou seja impresso no ar." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Aderência à Mesa de Impressão" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Precisa de ajuda para melhorar sua impressões?
Leia os Guias de Resolução de Problema da Ultimaker" @@ -4449,7 +4496,7 @@ msgstr "Material" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:543 msgctxt "@label" msgid "Use glue with this material combination" -msgstr "Use cola com esta combinação de materiais." +msgstr "Use cola com esta combinação de materiais" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:575 msgctxt "@label" @@ -4556,6 +4603,16 @@ msgctxt "name" msgid "Changelog" msgstr "Registro de Alterações" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4789,7 +4846,7 @@ msgstr "Atualização de Versão de 2.7 para 3.0" #: VersionUpgrade/VersionUpgrade34to35/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 3.4 to Cura 3.5." -msgstr "Atualiza configurações do Cura 3.4 para o Cura 3.5" +msgstr "Atualiza configurações do Cura 3.4 para o Cura 3.5." #: VersionUpgrade/VersionUpgrade34to35/plugin.json msgctxt "name" @@ -4906,16 +4963,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de Perfis do Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente de Perfil de Impressão" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4946,6 +4993,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis do Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Por favor gere o G-Code antes de salvar." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de Perfil" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Atualizar Firmware" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Desconhecido" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Não há perfil personalizado para importar no arquivo {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Confirme a deinstalação" + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Pausado" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Próximo" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Dica" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Imprimir experimento" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificação" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Atualizar Firmware" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite que fabricantes de material criem novos perfis de material e qualidade usando uma interface drop-in." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente de Perfil de Impressão" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Imprimir com a WiFi-Box do Doodle3D" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index 87eb768e57..10db723a69 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-02 05:00-0300\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 04:00-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -167,6 +167,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "A coordenada Z da posição onde o bico faz a purga no início da impressão." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ventoinha de Refrigeração da Impressão" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "O número da ventoinha de refrigeração da impressão associada a este extrusor. Somente altere o valor default de 0 quando você tiver uma ventoinha diferente para cada extrusor." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index a352af777e..bd55d331ae 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-02 06:30-0300\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-10-06 04:30-0300\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 2.0.6\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -458,7 +459,7 @@ msgstr "ID do Bico" #: fdmprinter.def.json msgctxt "machine_nozzle_id description" msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"." -msgstr "O identificador do bico para o carro extrusor, tais como \"AA 0.4\" ou \"BB 0.8\"" +msgstr "O identificador do bico para o carro extrusor, tais como \"AA 0.4\" ou \"BB 0.8.\"" #: fdmprinter.def.json msgctxt "machine_nozzle_size label" @@ -548,7 +549,7 @@ msgstr "Aceleração Máxima em X" #: fdmprinter.def.json msgctxt "machine_max_acceleration_x description" msgid "Maximum acceleration for the motor of the X-direction" -msgstr "A aceleração máxima para o motor da impressora na direção X." +msgstr "A aceleração máxima para o motor da impressora na direção X" #: fdmprinter.def.json msgctxt "machine_max_acceleration_y label" @@ -598,7 +599,7 @@ msgstr "Jerk Default nos eixos X-Y" #: fdmprinter.def.json msgctxt "machine_max_jerk_xy description" msgid "Default jerk for movement in the horizontal plane." -msgstr "O valor default de jerk para movimentos no plano horizontal" +msgstr "O valor default de jerk para movimentos no plano horizontal." #: fdmprinter.def.json msgctxt "machine_max_jerk_z label" @@ -1077,8 +1078,8 @@ msgstr "Conectar Polígonos do Topo e Base" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Conectar camihos de contorno do topo e base onde se situarem próximos. Habilitar para o padrão concêntrico reduzirá bastante o tempo de percurso, mas visto que as conexões podem acontecer sobre o preenchimento no meio do caminho, este recurso pode reduzir a qualidade da superfície superior." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Conectar caminhos de contorno da base e topo quando estiverem próximos entre si. Para o padrão concêntrico, habilitar este ajuste reduzirá bastante o tempo de percurso, mas por as conexões poderem acontecer no meio do preenchimento, este recurso pode reduzir a qualidade da superfície superior." #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1497,8 +1498,8 @@ msgstr "Padrão de Preenchimento" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "O padrão do material de preenchimento da impressão. Preenchimento de Linhas e Ziguezague trocam direções em camadas alternadas, reduzindo custo do material. Os padrões de Grade, Triângulo, Tri-Hexágono, Cúbico, Octeto, Quarto Cúbico, Cruzado e Concêntrico são totalmente impressos em cada camada. Os preenchimentos Cúbico, Quarto Cúbico e Octeto mudam em cada camada para prover uma distribuição mais uniforme de forças em cada direção." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "O padrão do material de preenchimento da impressão. Os preenchimentos de linha e ziguezague mudam de direção em camadas alternadas, reduzindo o custo do material. Os padrões de grade, triângulo, tri-hexágono, cúbico, octeto, quarto cúbico, cruzado e concêntrico são impressos em totalidade a cada camada. Os padrões giróide, cúbico, quarto cúbico e octeto mudam a cada camada para prover uma distribuição mais igualitária de força em cada direção." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1561,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Cruzado 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Giróide" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1862,7 +1868,7 @@ msgstr "Temperatura Default de Impressão" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "A temperatura default usada para a impressão. Esta deve ser a temperatura \"base\" de um material. Todas as outras temperaturas de impressão devem usar diferenças baseadas neste valor." +msgstr "A temperatura default usada para a impressão. Esta deve ser a temperatura \"base\" de um material. Todas as outras temperaturas de impressão devem usar diferenças baseadas neste valor" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1952,7 +1958,7 @@ msgstr "Tendência à Aderência" #: fdmprinter.def.json msgctxt "material_adhesion_tendency description" msgid "Surface adhesion tendency." -msgstr "Tendência de aderência da superfície" +msgstr "Tendência de aderência da superfície." #: fdmprinter.def.json msgctxt "material_surface_energy label" @@ -2002,7 +2008,7 @@ msgstr "Habilitar Retração" #: fdmprinter.def.json msgctxt "retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area. " -msgstr "Retrai o filamento quando o bico está se movendo sobre uma área não impressa." +msgstr "Retrai o filamento quando o bico está se movendo sobre uma área não impressa. " #: fdmprinter.def.json msgctxt "retract_at_layer_change label" @@ -3264,6 +3270,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Habilitar Brim de Suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Gera o brim dentro das regiões de preenchimento de suporte da primeira camada. Este brim é impresso sob o suporte, não em volta dele. Habilitar este ajuste aumenta a aderência de suporte à mesa de impressão." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Largura do Brim de Suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "A largura do brim a ser impresso sob o suporte. Um brim mais largo melhora a aderência à mesa de impressão, ao custo de material extra." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Número de Filetes do Brim de Suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "O número de filetes usado para o brim de suporte. Mais filetes melhoram a aderência na mesa de impressão, ao custo de material extra." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3512,7 +3548,7 @@ msgstr "Densidade da Base do Suporte" #: fdmprinter.def.json msgctxt "support_bottom_density description" msgid "The density of the floors of the support structure. A higher value results in better adhesion of the support on top of the model." -msgstr "A densidade das bases da estrutura de suporte. Um valor maior resulta em melhor aderência do suporte no topo da superfície" +msgstr "A densidade das bases da estrutura de suporte. Um valor maior resulta em melhor aderência do suporte no topo da superfície." #: fdmprinter.def.json msgctxt "support_bottom_line_distance label" @@ -3637,7 +3673,7 @@ msgstr "Sobrepor Velocidade de Ventoinha" #: fdmprinter.def.json msgctxt "support_fan_enable description" msgid "When enabled, the print cooling fan speed is altered for the skin regions immediately above the support." -msgstr "Quando habilitado, a velocidade da ventoinha de resfriamento é alterada para as regiões de contorno imediatamente acima do suporte" +msgstr "Quando habilitado, a velocidade da ventoinha de resfriamento é alterada para as regiões de contorno imediatamente acima do suporte." #: fdmprinter.def.json msgctxt "support_supported_skin_fan_speed label" @@ -3833,6 +3869,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "O número de linhas usada para o brim. Mais linhas de brim melhoram a aderência à mesa, mas também reduzem a área efetiva de impressão." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Brim Substitui Suporte" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Força que o brim seja impresso em volta do modelo mesmo se este espaço fosse ser ocupado por suporte. Isto substitui algumas regiões da primeira camada de suporte por regiões de brim." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -3901,7 +3947,7 @@ msgstr "Espessura da Camada Superior do Raft" #: fdmprinter.def.json msgctxt "raft_surface_thickness description" msgid "Layer thickness of the top raft layers." -msgstr "Espessura de camada das camadas superiores do raft" +msgstr "Espessura de camada das camadas superiores do raft." #: fdmprinter.def.json msgctxt "raft_surface_line_width label" @@ -5071,7 +5117,7 @@ msgstr "A distância média entre os pontos aleatórios introduzidos em cada seg #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset label" msgid "Flow rate compensation max extrusion offset" -msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo." +msgstr "Deslocamento de extrusão máxima da compensação de taxa de fluxo" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" @@ -5657,6 +5703,14 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Conectar camihos de contorno do topo e base onde se situarem próximos. Habilitar para o padrão concêntrico reduzirá bastante o tempo de percurso, mas visto que as conexões podem acontecer sobre o preenchimento no meio do caminho, este recurso pode reduzir a qualidade da superfície superior." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "O padrão do material de preenchimento da impressão. Preenchimento de Linhas e Ziguezague trocam direções em camadas alternadas, reduzindo custo do material. Os padrões de Grade, Triângulo, Tri-Hexágono, Cúbico, Octeto, Quarto Cúbico, Cruzado e Concêntrico são totalmente impressos em cada camada. Os preenchimentos Cúbico, Quarto Cúbico e Octeto mudam em cada camada para prover uma distribuição mais uniforme de forças em cada direção." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Concêntrico 3D" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 5c5abfe44f..bcfa154d11 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" "PO-Revision-Date: 2018-10-01 13:15+0100\n" "Last-Translator: Paulo Miranda \n" "Language-Team: Paulo Miranda , Portuguese \n" @@ -48,8 +48,8 @@ msgstr "O GCodeWriter não suporta modo sem texto." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Crie um G-code antes de guardar." +msgid "Please prepare G-code before exporting." +msgstr "Prepare um G-code antes de exportar." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -65,17 +65,18 @@ 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/ChangeLogPlugin/ChangeLog.py:32 msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Mostrar Lista das Alterações de cada Versão" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Atualizar firmware" + # rever! # flatten -ver contexto! # nivelar? @@ -89,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "O perfil foi nivelado & ativado." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Impressão USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Imprimir por USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Imprimir por USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Ligado via USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -141,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "O GCodeGzWriter não suporta modo de texto." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Arquivo Ultimaker Format" @@ -165,7 +166,7 @@ msgstr "Guardar no Disco Externo {0}" # rever! # contexto #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Não existem quaisquer formatos disponíveis para gravar o ficheiro!" @@ -204,7 +205,7 @@ 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/cura/Settings/CuraContainerRegistry.py:133 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Erro" @@ -236,8 +237,8 @@ msgstr "Ejetar Disco Externo {0}" # Atenção? #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:151 #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:163 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -264,97 +265,92 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Disco Externo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Imprimir através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Imprimir através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Ligado através da rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Ligado através da rede. Por favor aprove o pedido de acesso, na impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Ligado através da rede. Sem autorização para controlar a impressora." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Acesso à impressora solicitado. Por favor aprove o pedido de acesso, na impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Estado da autenticação" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Estado da autenticação" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Tentar de Novo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Reenviar a solicitação de acesso" # rever! # aceite? -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Acesso à impressora confirmado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Sem autorização para imprimir com esta impressora. Não foi possível enviar o trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Solicitar Acesso" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Enviar pedido de acesso para a impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Não é possível iniciar um novo trabalho de impressão." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Existe um problema com a configuração da sua Ultimaker, o qual impede o inicio da impressão. Por favor resolva este problema antes de continuar." @@ -362,48 +358,48 @@ msgstr "Existe um problema com a configuração da sua Ultimaker, o qual impede # rever! # ver contexto! pode querer dizer # Configuração incompatível -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Divergência de Configuração" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Tem a certeza de que deseja imprimir com a configuração selecionada?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "A enviar dados para a impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "A Enviar Dados" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -413,74 +409,74 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Nenhum PrintCore instalado na ranhura {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Nenhum material carregado na ranhura {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "PrintCore diferente (Cura: {cura_printcore_name}, Impressora: {remote_printcore_name}) selecionado para o extrusor {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Material diferente (Cura: {0}, Impressora: {1}) selecionado para o extrusor {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Sincronizar com a impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Deseja utilizar a configuração atual da impressora no Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Os núcleos de impressão e/ou materiais na sua impressora são diferentes dos definidos no seu projeto atual. 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/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "Ligado através da rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Dados Enviados" # rever! # contexto -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Ver no Monitor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, python-brace-format msgctxt "@info:status" msgid "The print job '{job_name}' was finished." @@ -488,7 +484,7 @@ msgstr "O trabalho de impressão '{job_name}' terminou." # rever! # Concluída? -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Impressão terminada" @@ -498,49 +494,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ligar Através da Rede" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Monitorizar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Não foi possível aceder às informações de atualização." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Estão disponíveis novas funcionalidades para a impressora {machine_name}! É recomendado atualizar o firmware da impressora." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Novo firmware para %s está disponível" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Como atualizar" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Não foi possível aceder às informações de atualização." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vista Camadas" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Quando a opção \"Wire Printing\" está ativa, o Cura não permite visualizar as camadas de uma forma precisa" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Visualização por Camadas" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Modificar G-code" @@ -554,32 +550,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Criar um volume dentro do qual não são impressos suportes." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "O Cura recolhe, de forma anónima, estatísticas sobre as opções usadas." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "A Recolher Dados" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Mais informação" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Saiba mais sobre que informação o Cura envia." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Permitir" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Permitir que o Cura envie de forma anónima, estatísticas sobre as opções usadas, para nos ajudar a estabelecer as prioridades para os futuros desenvolvimentos do Cura. São enviadas apenas algumas das preferências e definições usadas, a versão do Cura e um valor \"hash\" dos modelos que está a seccionar." @@ -614,39 +610,39 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "Imagem GIF" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Não é possível seccionar com o material atual, uma vez que é incompatível com a impressora ou configuração selecionada." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Não é possível Seccionar" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Não é possível seccionar com as definições atuais. As seguintes definições apresentam erros: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Não é possível seccionar devido a algumas definições por modelo. As seguintes definições apresentam erros num ou mais modelos: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Não é possível seccionar porque a torre de preparação ou a(s) posição(ões) de preparação é(são) inválidas." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." @@ -658,18 +654,18 @@ msgstr "Não é possível seccionar porque existem objetos associados à extruso # contido pelo # se adapta? # cabem no...? -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Sem conteúdo para seccionar porque nenhum dos modelos está dentro do volume de construção. Por favor redimensione, mova ou rode os modelos para os adaptar ao volume de construção." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "A Processar Camadas" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Informações" @@ -685,13 +681,13 @@ msgid "Configure Per Model Settings" msgstr "Configurar definições individuais Por-Modelo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Recomendado" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" @@ -703,7 +699,7 @@ msgid "3MF File" msgstr "Ficheiro 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" @@ -729,18 +725,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Ficheiro G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "A analisar G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Detalhes do G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Certifique-se de que este g-code é apropriado para a sua impressora e respetiva configuração, antes de enviar o ficheiro para a impressora. A representação do g-code poderá não ser exata." @@ -751,16 +747,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Assistente de perfis" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Assistente de perfis" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -782,11 +768,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Selecionar atualizações" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Atualizar firmware" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -797,79 +778,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Nivelar base de construção" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parede Exterior" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes Interiores" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Revestimento" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Enchimento" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Enchimento dos Suportes" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface dos Suportes" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Suportes" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Contorno" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Deslocação" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrações" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Outro" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Desconhecido" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Ficheiro pré-seccionado {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Falha no início de sessão" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Ficheiro Já Existe" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -881,23 +862,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Manter" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "O material selecionado é incompatível com a máquina ou a configuração selecionada." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Material incompatível" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Definições atualizadas" @@ -926,8 +907,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -935,58 +914,70 @@ msgstr "Falha ao importar perfil de {0}: {1} or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "O ficheiro {0} não contém qualquer perfil personalizado para importar" +msgstr "Nenhum perfil personalizado para importar no ficheiro {0}" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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}), e não foi possível importá-la." +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Não foi possível encontrar um tipo de qualidade {0} para a configuração atual." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -1015,12 +1006,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos os Ficheiros (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -1035,22 +1026,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Volume de construção" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não é possível criar um arquivo a partir do directório de dados do utilizador: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentou restaurar um Cura backup sem existirem dados ou metadados correctos." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Tentou restaurar um Cura backup que não corresponde á sua versão actual." @@ -1105,12 +1096,7 @@ 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? @@ -1145,10 +1131,7 @@ 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:177 msgctxt "@title:groupbox" @@ -1230,40 +1213,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "A carregar máquinas..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "A configurar cenário..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "A carregar interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "O modelo selecionado era demasiado pequeno para carregar." @@ -1294,9 +1277,9 @@ msgstr "X (Largura)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1431,22 +1414,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "O diâmetro nominal do filamento suportado pela impressora. O diâmetro exato será substituído pelo material e/ou perfil." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Desvio X do Nozzle" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Desvio Y do Nozzle" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Número de ventoinha de arrefecimento" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "G-code Inicial do Extrusor" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "G-code Final do Extrusor" @@ -1467,41 +1460,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Não foi possível aceder á base de dados de Pacotes do Cura. Por favor verifique a sua ligação." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Plug-ins" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Versão" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Actualizado em" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Autor" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Transferências" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" @@ -1536,8 +1530,8 @@ msgstr "Anterior" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Confirmar desinstalação " +msgid "Confirm uninstall" +msgstr "Confirmar desinstalação" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1584,7 +1578,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Materiais genéricos" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Instalado" @@ -1615,10 +1609,7 @@ 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.\n" -"Concorda 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.\nConcorda com os termos abaixo?" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml:54 msgctxt "@action:button" @@ -1666,48 +1657,89 @@ msgid "Changelog" msgstr "Lista das Alterações" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Fechar" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Atualizar firmware" + +# rever! +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "O firmware é o software que é executado diretamente na sua impressora 3D. Este firmware controla os motores de passo, regula a temperatura e basicamente assegura o funcionamento da sua impressora." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "O firmware que é expedido com as novas impressoras funciona corretamente, mas as novas versões costumam ter mais funcionalidades e melhorias." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Atualizar firmware automaticamente" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Carregar firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "O firmware não pode ser atualizado por não existir ligação com a impressora." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "O firmware não pode ser atualizado porque a ligação com a impressora não suporta a atualização de firmware." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Selecionar firmware personalizado" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Atualização de firmware" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "A atualizar firmware." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Atualização de firmware concluída." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "A atualização de firmware falhou devido a um erro desconhecido." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "A atualização de firmware falhou devido a um erro de comunicação." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "A atualização de firmware falhou devido a um erro de entrada/saída." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "A atualização de firmware falhou devido à ausência de firmware." @@ -1717,44 +1749,41 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Contrato de Utilizador" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Ligação Existente" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Esta impressora/grupo já foi adicionada ao Cura. Por favor selecione outra impressora/grupo." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Ligar a uma Impressora em Rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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:" +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:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1762,246 +1791,302 @@ msgctxt "@action:button" msgid "Remove" msgstr "Remover" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Atualizar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se a sua impressora não estiver na lista, por favor, consulte o guia de resolução de problemas de impressão em rede" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Versão de Firmware" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Endereço" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Esta impressora não está configurada para alojar um grupo de impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Esta impressora aloja um grupo de %1 impressoras." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "A impressora neste endereço ainda não respondeu." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Ligar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Introduza o endereço IP ou o hostname da sua impressora na rede." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Imprimir Através da Rede" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Seleção de Impressora" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Imprimir" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Imprimir Através da Rede" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "A aguardar: Impressora indisponível" +msgid "Printer selection" +msgstr "Seleção de Impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "A aguardar: Primeira disponível" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "A aguardar: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "Mover para o topo" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Mover trabalho de impressão para o topo" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Tem a certeza de que pretende mover %1 para o topo da fila?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Eliminar" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Eliminar trabalho de impressão" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Tem a certeza de que pretende eliminar %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Gerir fila" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Em fila" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "A Imprimir" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Gerir impressoras" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Não disponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Inacessível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Disponível" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 -msgctxt "@label" -msgid "Resume" -msgstr "Retomar" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 -msgctxt "@label" -msgid "Pause" -msgstr "Colocar em pausa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 -msgctxt "@label" -msgid "Abort" -msgstr "Cancelar" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 -msgctxt "@window:title" -msgid "Abort print" -msgstr "Cancelar impressão" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Tem a certeza de que deseja cancelar %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 msgctxt "@label:status" msgid "Aborted" msgstr "Cancelado" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 msgctxt "@label:status" msgid "Finished" msgstr "Impressão terminada" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 msgctxt "@label:status" msgid "Preparing" msgstr "A preparar" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 msgctxt "@label:status" msgid "Pausing" msgstr "A colocar em pausa" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Em Pausa" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 msgctxt "@label:status" msgid "Resuming" msgstr "A Recomeçar" # rever! # ver contexto! -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 msgctxt "@label:status" msgid "Action required" msgstr "Ação necessária" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "A aguardar: Impressora indisponível" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "A aguardar: Primeira disponível" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "A aguardar: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Configuração alterada" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "A impressora atribuída %1 requer as seguintes alterações de configuração:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "Substituir o núcleo de impressão %1 de %2 para %3." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "Alterar placa de construção para %1 (isto não pode ser substituído)." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Ignorar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Iniciar um trabalho de impressão com uma configuração incompatível pode danificar a impressora 3D. Tem a certeza de que pretende ignorar a configuração e imprimir %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Ignorar configuração e iniciar impressão" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Vidro" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Alumínio" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Gerir fila" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Em fila" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "A Imprimir" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Gerir impressoras" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Mover para o topo" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Eliminar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 +msgctxt "@label" +msgid "Resume" +msgstr "Retomar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 +msgctxt "@label" +msgid "Pause" +msgstr "Colocar em pausa" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 +msgctxt "@label" +msgid "Abort" +msgstr "Cancelar" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Tem a certeza de que pretende mover %1 para o topo da fila?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Mover trabalho de impressão para o topo" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Tem a certeza de que pretende eliminar %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Eliminar trabalho de impressão" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Tem a certeza de que deseja cancelar %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 +msgctxt "@window:title" +msgid "Abort print" +msgstr "Cancelar impressão" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Ligar a uma impressora" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Importar a configuração da impressora para o Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Ativar Configuração" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Importar a configuração da impressora para o Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2098,17 +2183,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de pós-processamento" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Adicionar um script" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Definições" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Alterar scripts de pós-processamento ativos" @@ -2234,23 +2319,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Modificar definições do enchimento de outros modelos" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Selecionar definições" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar definições a personalizar para este modelo" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar tudo" @@ -2301,6 +2386,7 @@ msgid "Type" msgstr "Tipo" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo da Impressora" @@ -2318,6 +2404,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2394,82 +2481,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Abrir" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Anterior" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Exportar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Seguinte" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Sugestão" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00h00min" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Especificação de custos" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Total:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1 m / ~ %2 g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1 m / ~ %2 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Experimento de impressão" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Lista de verificação" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2511,37 +2522,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Avançar para Posição Seguinte" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Atualizar Firmware" - -# rever! -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "O firmware é o software que é executado diretamente na sua impressora 3D. Este firmware controla os motores de passo, regula a temperatura e basicamente assegura o funcionamento da sua impressora." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "O firmware que é expedido com as novas impressoras funciona corretamente, mas as novas versões costumam ter mais funcionalidades e melhorias." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Atualizar firmware automaticamente" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Carregar firmware personalizado" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Selecionar firmware personalizado" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2716,9 +2696,7 @@ 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.\n" -"Gostaria de manter ou descartar essas alterações?" +msgstr "Alterou algumas das definições do perfil.\nGostaria de manter ou descartar essas alterações?" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:110 msgctxt "@title:column" @@ -2736,7 +2714,7 @@ msgid "Customized" msgstr "Personalizado" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Perguntar sempre isto" @@ -2884,6 +2862,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Importar" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Exportar" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2969,287 +2953,287 @@ msgid "Unit" msgstr "Unidade" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Idioma:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seccionar automaticamente" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da janela" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar Saliências (Overhangs)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 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:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir e guardar ficheiros" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos demasiado grandes" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos extremamente pequenos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar os modelos depois de abertos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir sempre como projeto" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar sempre modelos" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar sempre definições alteradas" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 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:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Mais informação" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Experimental" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" @@ -3271,7 +3255,7 @@ msgid "Connection:" msgstr "Ligação:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "A impressora não está ligada." @@ -3297,7 +3281,7 @@ msgid "Aborting print..." msgstr "A cancelar impressão..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" @@ -3378,17 +3362,17 @@ msgid "Global Settings" msgstr "Definições Globais" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Nome da Impressora:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Adicionar Impressora" @@ -3403,124 +3387,142 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Sobre o Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "versão: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "A Solução completa para a impressão 3D por filamento fundido." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 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.\n" -"O 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.\nO Cura tem o prazer de utilizar os seguintes projetos open source:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Interface gráfica do utilizador" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Framework da aplicação" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Gerador de G-code" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Biblioteca de comunicação interprocessual" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Linguagem de programação" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI framework" # rever! # use eng programing terms? -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Ligações de estrutura da GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "Biblioteca de ligações C/C++" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Formato de intercâmbio de dados" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Biblioteca de apoio para computação científica" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Biblioteca de apoio para cálculos mais rápidos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Biblioteca de apoio para processamento de ficheiros STL" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Biblioteca de apoio para processamento de objetos planos" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Biblioteca de apoio para processamento de malhas triangulares" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Biblioteca de apoio para análise de redes complexas" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Biblioteca de apoio para processamento de ficheiros 3MF" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Biblioteca de apoio para transmissões de fluxo e metadados de ficheiros" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Biblioteca de comunicação em série" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Biblioteca de deteção ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Biblioteca de recortes de polígonos" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Biblioteca de HTTP Python" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Tipo de letra" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" # rever! -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação da aplicação de distribuição cruzada Linux" @@ -3530,59 +3532,56 @@ msgctxt "@label" msgid "Profile:" msgstr "Perfil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" 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" -"\n" -"Clique para abrir o gestor de perfis." +msgstr "Alguns valores de definição/substituição são diferentes dos valores armazenados no perfil.\n\nClique para abrir o gestor de perfis." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Procurar..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Esconder esta definição" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 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:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter esta definição visível" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidade das definições..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Esconder Tudo" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Mostrar Tudo" @@ -3591,16 +3590,13 @@ msgstr "Mostrar Tudo" # ocultas? # escondidas? # valor normal? automatico? -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" 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" -"\n" -"Clique para tornar estas definições visíveis." +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." # rever! # Afeta? @@ -3617,7 +3613,7 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Modificado Por" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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." @@ -3626,32 +3622,26 @@ 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 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" -"\n" -"Clique para restaurar o valor do perfil." +msgstr "Esta definição tem um valor que é diferente do perfil.\n\nClique para restaurar o valor do perfil." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 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" -"\n" -"Clique para restaurar o valor calculado." +msgstr "Normalmente, o valor desta definição é calculado, mas atualmente tem definido um valor diferente.\n\nClique para restaurar o valor calculado." #: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/ManualPrinterControl.qml:129 msgctxt "@label" @@ -3803,12 +3793,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Visualizar" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posição da câmara" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Base de impressão" @@ -3818,12 +3808,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Definições Visíveis" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Mostrar Todas as Definições" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gerir Visibilidade das Definições..." @@ -3884,21 +3874,46 @@ msgctxt "@label:listbox" msgid "" "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" +msgstr "Configuração da Impressão desativada\nOs ficheiros G-code não podem ser modificados" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00h00min" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Especificação de tempo" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Especificação de custos" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Total:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Configuração de Impressão Recomendada

Imprimir com as definições recomendadas para a Impressora, Material e Qualidade selecionadas." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Configuração de Impressão Personalizada

Imprimir com um controlo detalhado de todas as definições específicas de cada uma das etapas do processo de seccionamento." @@ -3923,225 +3938,225 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Tempo restante estimado" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar para ecrã inteiro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Desfazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Sair" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista 3D" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista Frente" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista Cima" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista Lado Esquerdo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista Lado Direito" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gerir Im&pressoras..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gerir Materiais..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar alterações atuais" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gerir Perfis..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentação online" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Reportar um &erro" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Apagar Modelo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar Modelo na Base" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Agrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Combinar Modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Limpar base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Dispor todos os modelos" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Dispor seleção" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir Ficheiro(s)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Mostrar ®isto de motor..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar pasta de configuração" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Procurar pacotes..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Mostrar/Esconder Barra Lateral" @@ -4209,7 +4224,7 @@ msgid "Select the active output device" msgstr "Selecione o dispositivo de saída" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir ficheiro(s)" @@ -4229,145 +4244,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Ficheiro" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Guardar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar seleção..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Editar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Visualizar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Definições" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Impressora" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Material" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Definir como Extrusor Ativo" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Ativar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desativar Extrusor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Base de construção" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Perfil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "E&xtensões" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Toolbox" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "P&referências" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Ajuda" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Abrir ficheiro" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Definições" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Novo projeto" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Tem a certeza de que deseja iniciar um novo projeto? Isto irá apagar tudo na base de construção assim como quaisquer definições que não tenham sido guardadas." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Fechar Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir ficheiro(s)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4377,11 +4392,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Guardar projeto" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4452,12 +4462,12 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "O enchimento gradual irá aumentar progressivamente a densidade do enchimento em direção ao topo." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Enchimento Gradual" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Criar Suportes" @@ -4465,7 +4475,7 @@ msgstr "Criar Suportes" # rever! # collapse ? # desmoronar? desabar? -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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." @@ -4475,22 +4485,22 @@ msgstr "Criar estruturas para suportar partes do modelo, suspensas ou com saliê # sagging? deformar? # Isto irá construir estruturas de suporte debaixo do modelo para impedir a deformação de partes suspensas do modelo ou que a impressão seja feita no ar. # a utilizar? usado? -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Selecionar qual o extrusor usado para imprimir os suportes. Isto irá construir estruturas de suporte por debaixo do modelo para impedir que as partes suspensas do modelo se deformem ou que sejam impressas no ar." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Aderência à Base" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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 (Brim) ou Raft. Isto irá adicionar, respectivamente, uma área plana em torno ou sob a base do seu objeto, que são fáceis de retirar posteriormente." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Precisa de ajuda para melhorar as suas impressões?
Por favor leia os Guias Ultimaker de Resolução de Problemas" @@ -4657,6 +4667,16 @@ msgctxt "name" msgid "Changelog" msgstr "Lista das Alterações" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Disponibiliza as ações da máquina para atualizar o firmware." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Atualizador de firmware" + # rever! # contexto! # flattend - aplanado? nivelado? limpo? basico? @@ -5018,16 +5038,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de perfis Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Permite aos fabricantes de materiais criar novos materiais e perfis de qualidade utilizando uma IU de fácil acesso." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Assistente de perfis de impressão" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -5058,6 +5068,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Leitor de Perfis Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Crie um G-code antes de guardar." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de perfis" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Assistente de perfis" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Atualizar firmware" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Desconhecido" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "O ficheiro {0} não contém qualquer perfil personalizado para importar" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ 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}), e não foi possível importá-la." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Confirmar desinstalação " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Em Pausa" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Seguinte" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Sugestão" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1 m / ~ %2 g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1 m / ~ %2 g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Experimento de impressão" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Lista de verificação" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Atualizar Firmware" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Permite aos fabricantes de materiais criar novos materiais e perfis de qualidade utilizando uma IU de fácil acesso." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Assistente de perfis de impressão" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Imprimir com a Doodle3D WiFi-Box" diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index 1d66fdb2f9..6d0d26b34c 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Paulo Miranda \n" "Language-Team: Paulo Miranda , Portuguese \n" @@ -168,6 +168,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "A coordenada Z da posição onde o nozzle é preparado ao iniciar a impressão." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ventoinha de arrefecimento de impressão do Extrusor" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "O número de ventoinhas de arrefecimento de impressão associadas a este extrusor. Apenas alterar o valor predefinido de 0 quando tiver uma ventoinha de arrefecimento de impressão diferente para cada extrusor." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index b3f44a22fd..4e33fedb36 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-10-01 14:15+0100\n" "Last-Translator: Paulo Miranda \n" "Language-Team: Paulo Miranda , Portuguese \n" @@ -58,9 +58,7 @@ 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" @@ -72,9 +70,7 @@ 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" @@ -1098,7 +1094,7 @@ msgstr "Ligar polígonos superiores/inferiores" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." msgstr "Ligar caminhos de revestimento superiores/inferiores quando as trajetórias são paralelas. Para o padrão concêntrico, ativar esta definição reduz consideravelmente o tempo de deslocação mas, uma vez que as ligações podem suceder num ponto intermediário sobre o enchimento, esta funcionalidade pode reduzir a qualidade da superfície superior." #: fdmprinter.def.json @@ -1556,18 +1552,10 @@ msgctxt "infill_pattern label" msgid "Infill Pattern" msgstr "Padrão de Enchimento" -# of the print -# da impressão? da peça? -# A direção do -# No enchimento com Linha e Ziguezague a direção é invertida em camadas alternadas -# invertido? rodado? -# padrões - ?geometricos?? -# alterados? mudam? movidos? delocados? -# fornecer uma? permitir uma? #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "O padrão geométrico do enchimento da impressão. A direção do enchimento com Linhas e Ziguezague é invertida em camadas alternadas, reduzindo os custos em material. Os padrões em Grelha, Triângulo, Tri-Hexágono, Cúbico, Octeto, Quarto Cúbico, Cruz e Concêntrico são totalmente impressos em cada camada. Os enchimentos Cúbico, Quarto Cúbico e Octeto são deslocados em cada camada para permitir uma distribuição mais uniforme da resistência em cada direção." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "O padrão do material de enchimento da impressão. A direção de troca de enchimento de linha e ziguezague em camadas alternadas, reduzindo os custos de material. Os padrões de grelha, triângulo, tri-hexágono, cubo, octeto, quarto cúbico, cruz e concêntrico são totalmente impressos em cada camada. Os enchimentos Gyroid, cúbico, quarto cúbico e octeto são alterados a cada camada para fornecer uma distribuição mais uniforme da resistência em cada direção." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1629,6 +1617,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Cruz 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroid" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -3401,6 +3394,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Ativar borda de suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Gera uma borda dentro das regiões de enchimento do suporte da primeira camada. Esta borda é impressa na parte por baixo do suporte e não em torno do mesmo. Ativar esta definição aumenta a aderência do suporte à placa de construção." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Largura da borda do suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "A largura da borda para imprimir na parte por baixo do suporte. Uma borda mais larga melhora a aderência à placa de construção à custa de algum material adicional." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Contagem de linhas da borda do suporte" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "O número de linhas utilizado para a borda do suporte. Uma borda com mais linhas melhora a aderência à placa de construção à custa de algum material adicional." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3942,9 +3965,7 @@ 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.\n" -"Esta é 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.\nEsta é 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" @@ -3976,6 +3997,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "O número de linhas utilizado para uma aba. Um maior número de linhas da aba melhora a aderência à base de construção, mas também reduz a área de impressão efetiva." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "A borda substitui o suporte" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Aplicar a borda para ser impressa em torno do modelo, mesmo se esse espaço fosse ocupado de outra forma pelo suporte. Isto substitui algumas regiões da primeira camada do suporte por regiões de borda." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5423,9 +5454,7 @@ 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.\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." +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." #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5842,6 +5871,22 @@ 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 "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Ligar caminhos de revestimento superiores/inferiores quando as trajetórias são paralelas. Para o padrão concêntrico, ativar esta definição reduz consideravelmente o tempo de deslocação mas, uma vez que as ligações podem suceder num ponto intermediário sobre o enchimento, esta funcionalidade pode reduzir a qualidade da superfície superior." + +# of the print +# da impressão? da peça? +# A direção do +# No enchimento com Linha e Ziguezague a direção é invertida em camadas alternadas +# invertido? rodado? +# padrões - ?geometricos?? +# alterados? mudam? movidos? delocados? +# fornecer uma? permitir uma? +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "O padrão geométrico do enchimento da impressão. A direção do enchimento com Linhas e Ziguezague é invertida em camadas alternadas, reduzindo os custos em material. Os padrões em Grelha, Triângulo, Tri-Hexágono, Cúbico, Octeto, Quarto Cúbico, Cruz e Concêntrico são totalmente impressos em cada camada. Os enchimentos Cúbico, Quarto Cúbico e Octeto são deslocados em cada camada para permitir uma distribuição mais uniforme da resistência em cada direção." + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "Concêntrico 3D" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index c343202511..c5fe8b331f 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-01 13:25+0100\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:29+0100\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 @@ -48,8 +48,8 @@ msgstr "Средство записи G-кода (GCodeWriter) не поддер #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Сгенерируйте G-код перед сохранением." +msgid "Please prepare G-code before exporting." +msgstr "Подготовьте G-код перед экспортом." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Показать журнал изменений" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Обновить прошивку" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Профиль был нормализован и активирован." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "Печать через USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "Печатать через USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "Печатать через USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "Подключено через USB" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "Выполняется печать через USB, закрытие Cura остановит эту печать. Вы уверены?" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "Средство записи G-кода с расширением GZ (GCodeGzWriter) не поддерживает текстовый режим." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Пакет формата Ultimaker" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "Сохранить на внешний носитель {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Ни один из форматов файлов не доступен для записи!" @@ -198,7 +203,7 @@ msgstr "Невозможно сохранить на внешний носите #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Ошибка" @@ -227,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Внимание" @@ -255,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Внешний носитель" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Печать через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Печать через сеть" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Подключен по сети." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Подключен по сети. Пожалуйста, подтвердите запрос на принтере." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Подключен по сети. Нет доступа к управлению принтером." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "Запрошен доступ к принтеру. Пожалуйста, подтвердите запрос на принтере" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Состояние аутентификации" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Состояние аутентификации" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Повторить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Послать запрос доступа ещё раз" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Доступ к принтеру получен" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Нет доступа к использованию этого принтера. Невозможно отправить задачу на печать." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Запросить доступ" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Отправить запрос на доступ к принтеру" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Не удалось начать новое задание печати." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Возникла проблема конфигурации Ultimaker, из-за которой невозможно начать печать. Перед продолжением работы решите возникшую проблему." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Несовпадение конфигурации" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Вы уверены, что желаете печатать с использованием выбранной конфигурации?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." msgstr "Есть несовпадение между конфигурацией или калибровкой принтера и Cura. Для лучшего результата, всегда производите слайсинг для PrintCore и материала, которые установлены в вашем принтере." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Отправка данных на принтер" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Отправка данных" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "Отмена" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Модуль экструдера PrintCore не загружен в слот {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Материал не загружен в слот {slot_number}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "Другой модуль экструдера PrintCore (Cura: {cura_printcore_name}, принтер: {remote_printcore_name}) выбран для экструдера {extruder_id}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Разный материал (Cura: {0}, Принтер: {1}) выбран для экструдера {2}" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Синхронизация с вашим принтером" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Желаете использовать текущую конфигурацию принтера в Cura?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Модуль PrintCore и/или материал в вашем принтере отличается от тех, что вы используете в текущем проекте. Для наилучшего результата всегда указывайте правильный модуль PrintCore и материалы, которые вставлены в ваш принтер." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" -msgstr "Подключен по сети." +msgstr "Подключен по сети" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "Задание печати успешно отправлено на принтер." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Данные отправлены" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Просмотр на мониторе" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Печать завершена" @@ -480,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Подключиться через сеть" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Монитор" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Не могу получить информацию об обновлениях." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "Для {machine_name} доступны новые функции! Рекомендуется обновить встроенное программное обеспечение принтера." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Доступна новая прошивка %s" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Порядок обновления" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Не могу получить информацию об обновлениях." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Просмотр слоёв" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "Cura не аккуратно отображает слои при использовании печати через кабель" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Вид моделирования" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "Изменить G-код" @@ -536,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Создание объема без печати элементов поддержки." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura собирает анонимизированную статистику об использовании." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Сбор данных" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Дополнительно" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "Ознакомьтесь с дополнительной информацией о данных, отправляемых Cura." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "Разрешить" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Разрешить Cura отправлять анонимизированную статистику об использовании, чтобы помочь назначить приоритеты будущим улучшениям в Cura. Отправлены некоторые ваши настройки и параметры, включая версию Cura и хэш моделей, разделяемых на слои." @@ -596,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF изображение" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Невозможно нарезать модель, используя текущий материал, так как он несовместим с выбранной машиной или конфигурацией." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Невозможно нарезать" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Не могу выполнить слайсинг на текущих настройках. Проверьте следующие настройки: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Не удалось выполнить слайсинг из-за настроек модели. Следующие настройки ошибочны для одной или нескольких моделей: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Слайсинг невозможен, так как черновая башня или её позиция неверные." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Невозможно разделить на слои из-за наличия объектов, связанных с отключенным экструдером %s." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Нечего нарезать, так как ни одна модель не попадает в объём принтера. Пожалуйста, отмасштабируйте или поверните модель." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Обработка слоёв" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Информация" @@ -661,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "Правка параметров модели" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Рекомендованная" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Своя" @@ -679,7 +679,7 @@ msgid "3MF File" msgstr "Файл 3MF" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Сопло" @@ -705,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "Файл G" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "Обработка G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "Параметры G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Перед отправкой G-code на принтер удостоверьтесь в его соответствии вашему принтеру и его настройкам. Возможны неточности в G-code." @@ -727,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Профиль Cura" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Помощник по профилю" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Помощник по профилю" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Выбор обновлений" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Обновление прошивки" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Выравнивание стола" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Внешняя стенка" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Внутренние стенки" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Покрытие" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Заполнение" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Заполнение поддержек" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Связующий слой поддержек" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Поддержки" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Юбка" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Перемещение" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Откаты" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Другое" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Неизвестно" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Предообратка файла {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Вход не выполнен" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Файл уже существует" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Не переопределен" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Выбранный материал несовместим с выбранным принтером или конфигурацией." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Несовместимый материал" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Настройки обновлены" @@ -902,8 +887,6 @@ msgid "Export succeeded" msgstr "Экспорт успешно завершен" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +894,70 @@ msgstr "Невозможно импортировать профиль из or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Собственный профиль" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "У профайла отсутствует тип качества." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Невозможно найти тип качества {0} для текущей конфигурации." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Все файлы (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Собственный материал" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Своё" @@ -1009,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Объём печати" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Не удалось создать архив из каталога с данными пользователя: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Резервное копирование" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Попытка восстановить резервную копию Cura при отсутствии необходимых данных или метаданных." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Попытка восстановить резервную копию Cura, не совпадающую с вашей текущей версией." @@ -1199,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Отправить отчёт" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Загрузка принтеров..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Настройка сцены..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Загрузка интерфейса..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Выбранная модель слишком мала для загрузки." @@ -1263,9 +1258,9 @@ msgstr "X (Ширина)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "мм" @@ -1400,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Номинальный диаметр материала, поддерживаемый принтером. Точный диаметр будет указан в материале и/или в профиле." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Смещение сопла по оси X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Смещение сопла по оси Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Номер охлаждающего вентилятора" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Стартовый G-код экструдера" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Завершающий G-код экструдера" @@ -1436,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Не удалось подключиться к базе данных пакета Cura. Проверьте свое подключение." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Плагины" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Материалы" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Версия" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Последнее обновление" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Автор" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "Загрузки" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Неизвестно" @@ -1485,7 +1491,7 @@ msgstr "Обновить" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:31 msgctxt "@action:button" msgid "Updating" -msgstr "Обновление..." +msgstr "Обновление" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml:46 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml:32 @@ -1505,8 +1511,8 @@ msgstr "Назад" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Подтвердить удаление " +msgid "Confirm uninstall" +msgstr "Подтвердить удаление" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Универсальные материалы" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Установлено" @@ -1635,48 +1641,88 @@ msgid "Changelog" msgstr "Журнал изменений" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Закрыть" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Обновить прошивку" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Прошивка является программным обеспечением, которое работает на плате вашего 3D принтера. Прошивка управляет шаговыми моторами, регулирует температуру и, в конечном счёте, обеспечивает работу вашего принтера." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Поставляемая с новыми принтерами прошивка работоспособна, но обновления предоставляют больше возможностей и усовершенствований." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Автоматическое обновление прошивки" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Залить собственную прошивку" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Невозможно обновить прошивку, так как нет подключения к принтеру." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Невозможно обновить прошивку, так как подключение к принтеру не поддерживает функцию обновления прошивки." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Выбрать собственную прошивку" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Обновление прошивки" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Обновление прошивки." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Обновление прошивки завершено." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Обновление прошивки не удалось из-за неизвестной ошибки." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Обновление прошивки не удалось из-за ошибки связи." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Обновление прошивки не удалось из-за ошибки ввода-вывода." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "Обновление прошивки не удалось из-за её отсутствия." @@ -1686,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Пользовательское соглашение" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Текущее подключение" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Этот принтер/группа уже добавлен (-а) в Cura. Выберите другой (-ую) принтер/группу." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Подключение к сетевому принтеру" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1712,18 +1758,18 @@ msgstr "" "\n" "Укажите ваш принтер в списке ниже:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Добавить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Правка" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Удалить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Обновить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Если ваш принтер отсутствует в списке, обратитесь к руководству по решению проблем с сетевой печатью" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Тип" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Версия прошивки" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Адрес" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Данный принтер не настроен для управления группой принтеров." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Данный принтер управляет группой из %1 принтера (-ов)." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Принтер по этому адресу ещё не отвечал." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Подключить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Адрес принтера" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "Введите IP-адрес принтера или его имя в сети." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "OK" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Печать через сеть" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Выбор принтера" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Печать" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Печать через сеть" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Ожидание: недоступный принтер" +msgid "Printer selection" +msgstr "Выбор принтера" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Ожидание: первое доступное" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Ожидание: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "переместить в начало" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Переместить задание печати в начало очереди" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "Вы уверены, что хотите переместить %1 в начало очереди?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Удалить" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Удалить задание печати" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "Вы уверены, что хотите удалить %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Управление очередью" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Запланировано" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Печать" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Управление принтерами" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Недоступно" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Недостижимо" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Доступен" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Прервано" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Завершено" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Подготовка" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Приостановка" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Возобновляется" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Необходимое действие" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Ожидание: недоступный принтер" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Ожидание: первое доступное" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Ожидание: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Изменение конфигурации" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "Для назначенного принтера %1 требуются следующие изменения конфигурации:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "Изменить материал %1 с %2 на %3." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "Загрузите %3 как материал %1 (переопределение этого действия невозможно)." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +msgctxt "@label" +msgid "Change print core %1 from %2 to %3." +msgstr "Изменить экструдер %1 с %2 на %3." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "Заменить рабочий стол на %1 (переопределение этого действия невозможно)." + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Переопределить" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Начало задания печати с несовместимой конфигурацией может привести к повреждению 3D-принтера. Действительно переопределить конфигурацию и печатать %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Переопределить конфигурацию и начать печать" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Стекло" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Алюминий" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Управление очередью" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Запланировано" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Печать" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Управление принтерами" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "Переместить в начало" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Удалить" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Продолжить" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Пауза" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Прервать" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "Вы уверены, что хотите переместить %1 в начало очереди?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Переместить задание печати в начало очереди" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "Вы уверены, что хотите удалить %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Удалить задание печати" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "Вы уверены, что хотите прервать %1?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Прервать печать" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "Вы уверены, что хотите прервать %1?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Прервано" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Завершено" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Подготовка" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Приостановка" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Приостановлено" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Возобновляется" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Необходимое действие" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Подключение к принтеру" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Загрузка конфигурации принтера в Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Активировать конфигурацию" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Загрузка конфигурации принтера в Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Скрипты пост-обработки" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Добавить скрипт" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Параметры" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Изменить активные скрипты пост-обработки" @@ -2194,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Изменять настройки для заполнения других моделей" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Выберите параметры" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Выберите параметр для изменения этой модели" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Фильтр..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Показать всё" @@ -2261,6 +2363,7 @@ msgid "Type" msgstr "Тип" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Группа принтеров" @@ -2278,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2354,82 +2458,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Открыть" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Предыдущий" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Экспорт" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Следующий" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "Кончик" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00 ч 00 мин" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Настройка расчета стоимости" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 м" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 г" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Итого:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1 м / ~ %2 г / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1 м / ~ %2 г" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Пробная печать" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Контрольный список" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2471,36 +2499,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Перейти к следующей позиции" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Обновление прошивки" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Прошивка является программным обеспечением, которое работает на плате вашего 3D принтера. Прошивка управляет шаговыми моторами, регулирует температуру и, в конечном счёте, обеспечивает работу вашего принтера." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Поставляемая с новыми принтерами прошивка работоспособна, но обновления предоставляют больше возможностей и усовершенствований." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Автоматическое обновление прошивки" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Залить собственную прошивку" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Выбрать собственную прошивку" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2688,7 +2686,7 @@ msgid "Customized" msgstr "Свой" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Всегда спрашивать меня" @@ -2836,6 +2834,12 @@ msgctxt "@action:button" msgid "Import" msgstr "Импорт" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Экспорт" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2921,283 +2925,283 @@ msgid "Unit" msgstr "Единица" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Общее" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Интерфейс" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Язык:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Валюта:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Тема:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Нарезать автоматически при изменении настроек." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Нарезать автоматически" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Поведение окна" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Отобразить нависания" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Центрировать камеру на выбранном объекте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Следует ли инвертировать стандартный способ увеличения в Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Инвертировать направление увеличения камеры." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Увеличивать по мере движения мышкой?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Увеличивать по движению мышки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Удостовериться, что модели размещены рядом" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Автоматически опускать модели на стол" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Показывать предупреждающее сообщение в средстве считывания G-кода." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Предупреждающее сообщение в средстве считывания G-кода" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Должен ли слой быть переведён в режим совместимости?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Просматривать слои в режиме совместимости (требуется перезапуск)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Открытие и сохранение файлов" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Масштабировать большие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Масштабировать очень маленькие модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Выбрать модели после их загрузки?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Выбрать модели при загрузке" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Добавить префикс принтера к имени задачи" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Показывать сводку при сохранении файла проекта?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Показывать сводку при сохранении проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Стандартное поведение при открытии файла проекта" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Стандартное поведение при открытии файла проекта: " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Всегда открывать как проект" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Всегда импортировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Профили" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Всегда сбрасывать измененные настройки" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Всегда передавать измененные настройки новому профилю" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Приватность" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Проверять обновления при старте" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Отправлять (анонимно) информацию о печати" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Дополнительная информация" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Экспериментальное" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "Использовать функционал нескольких рабочих столов" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Принтеры" @@ -3219,7 +3223,7 @@ msgid "Connection:" msgstr "Соединение:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Принтер не подключен." @@ -3245,7 +3249,7 @@ msgid "Aborting print..." msgstr "Прерывание печати…" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Профили" @@ -3326,17 +3330,17 @@ msgid "Global Settings" msgstr "Общие параметры" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Добавление принтера" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Имя принтера:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Добавить принтер" @@ -3351,17 +3355,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "О Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "версия: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Полное решение для 3D печати методом наплавления материала." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3370,102 +3374,122 @@ msgstr "" "Cura разработана компанией Ultimaker B.V. совместно с сообществом.\n" "Cura использует следующие проекты с открытым исходным кодом:" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Графический интерфейс пользователя" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Фреймворк приложения" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "Генератор G-кода" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "Библиотека межпроцессного взаимодействия" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Язык программирования" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "Фреймворк GUI" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "Фреймворк GUI, интерфейс" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ библиотека интерфейса" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Формат обмена данными" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Вспомогательная библиотека для научных вычислений" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Вспомогательная библиотека для быстрых расчётов" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "Вспомогательная библиотека для работы с STL файлами" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Вспомогательная библиотека для работы с плоскими объектами" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Вспомогательная библиотека для работы с треугольными сетками" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Вспомогательная библиотека для анализа сложных сетей" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "Вспомогательная библиотека для работы с 3MF файлами" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Вспомогательная библиотека для метаданных файла и потоковой передачи" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Библиотека последовательного интерфейса" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "Библиотека ZeroConf" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Библиотека обрезки полигонов" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Библиотека Python HTTP" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Шрифт" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "Иконки SVG" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Развертывание приложений для различных дистрибутивов Linux" @@ -3475,7 +3499,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Профиль:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3486,53 +3510,53 @@ msgstr "" "\n" "Нажмите для открытия менеджера профилей." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Поиск..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Скопировать значение для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Копировать все измененные значения для всех экструдеров" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Спрятать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Не показывать этот параметр" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Оставить этот параметр видимым" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Видимость параметров…" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Свернуть все" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Развернуть все" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3553,17 +3577,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "Зависит от" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "Значение получается из параметров каждого экструдера " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3574,7 +3598,7 @@ msgstr "" "\n" "Щёлкните для восстановления значения из профиля." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3729,12 +3753,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "Вид" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Положение камеры" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Рабочий стол" @@ -3744,12 +3768,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Видимые параметры" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Показывать все настройки" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Управление видимостью настроек…" @@ -3814,17 +3838,44 @@ msgstr "" "Настройка принтера отключена\n" "G-code файлы нельзя изменять" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00 ч 00 мин" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Настройка расчета времени" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Настройка расчета стоимости" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 м" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 г" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Итого:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Рекомендованные параметры печати

Печатайте с рекомендованными параметрами для выбранных принтера, материала и качества." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Свои параметры печати

Печатайте с полным контролем над каждой особенностью процесса слайсинга." @@ -3849,107 +3900,107 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Осталось примерно" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Полный экран" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Отмена" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Возврат" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Выход" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Трехмерный вид" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Вид спереди" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Вид сверху" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Вид слева" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Вид справа" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Настроить Cura…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "Добавить принтер..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Управление принтерами..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Управление материалами…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Создать профиль из текущих параметров…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Управление профилями..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Показать онлайн документацию" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Отправить отчёт об ошибке" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "О Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" @@ -3957,7 +4008,7 @@ msgstr[0] "Удалить выбранную модель" msgstr[1] "Удалить выбранные модели" msgstr[2] "Удалить выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" @@ -3965,7 +4016,7 @@ msgstr[0] "Центрировать выбранную модель" msgstr[1] "Центрировать выбранные модели" msgstr[2] "Центрировать выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" @@ -3973,102 +4024,102 @@ msgstr[0] "Размножить выбранную модель" msgstr[1] "Размножить выбранные модели" msgstr[2] "Размножить выбранные модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Удалить модель" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Поместить модель по центру" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Сгруппировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Разгруппировать модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Объединить модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Дублировать модель..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Выбрать все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Очистить стол" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Перезагрузить все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Выровнять все модели по всем рабочим столам" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Выровнять все модели" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Выровнять выбранные" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Сбросить позиции всех моделей" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Сбросить преобразования всех моделей" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Открыть файл(ы)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "Новый проект..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Показать журнал движка..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Показать конфигурационный каталог" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Обзор пакетов..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Развернуть/свернуть боковую панель" @@ -4129,7 +4180,7 @@ msgid "Select the active output device" msgstr "Выберите активное целевое устройство" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Открыть файл(ы)" @@ -4149,145 +4200,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "Файл" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Сохранить…" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Экспорт…" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Экспорт выбранного…" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "Правка" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "Вид" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "Параметры" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "Принтер" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "Материал" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Установить как активный экструдер" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Включить экструдер" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Отключить экструдер" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "Рабочий стол" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "Профиль" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Расширения" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Панель инструментов" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "Настройки" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "Справка" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Этот пакет будет установлен после перезапуска." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Открыть файл" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Параметры" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Новый проект" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Вы действительно желаете начать новый проект? Это действие очистит область печати и сбросит все несохранённые настройки." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Закрытие Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "Вы уверены, что хотите выйти из Cura?" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Установить пакет" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Открыть файл(ы)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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-кодом. Вы можете открыть только один файл за раз. Измените свой выбор, пожалуйста." @@ -4297,11 +4348,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Сохранить проект" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4372,37 +4418,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Постепенное заполнение будет постепенно увеличивать объём заполнения по направлению вверх." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Постепенное" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Генерация поддержек" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "Генерация структур для поддержки нависающих частей модели. Без этих структур такие части будут складываться во время печати." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Выбирает, какой экструдер следует использовать для поддержек. Будут созданы поддерживающие структуры под моделью для предотвращения проседания краёв или печати в воздухе." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Тип прилипания к столу" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "Разрешает печать каймы или подложки. Это добавляет плоскую область вокруг или под вашим объектом, которую легко удалить после печати." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Требуется помощь в улучшении вашей печати?
Обратитесь к Руководству Ultimaker по решению проблем" @@ -4565,6 +4611,16 @@ msgctxt "name" msgid "Changelog" msgstr "Журнал изменений" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Обеспечение действий принтера для обновления прошивки." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Средство обновления прошивки" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4588,7 +4644,7 @@ msgstr "Печать через USB" #: UserAgreement/plugin.json msgctxt "description" msgid "Ask the user once if he/she agrees with our license." -msgstr "Запрашивает согласие пользователя с условиями лицензии" +msgstr "Запрашивает согласие пользователя с условиями лицензии." #: UserAgreement/plugin.json msgctxt "name" @@ -4648,7 +4704,7 @@ msgstr "Плагин для работы с внешним носителем" #: UM3NetworkPrinting/plugin.json msgctxt "description" msgid "Manages network connections to Ultimaker 3 printers." -msgstr "Управляет сетевыми соединениями с принтерами Ultimaker 3" +msgstr "Управляет сетевыми соединениями с принтерами Ultimaker 3." #: UM3NetworkPrinting/plugin.json msgctxt "name" @@ -4915,16 +4971,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Запись профиля Cura" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Позволяет производителям материалов создавать новые профили материалов и качества с помощью дружественного интерфейса." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Помощник по профилю печати" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4955,6 +5001,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Чтение профиля Cura" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Сгенерируйте G-код перед сохранением." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Помощник по профилю" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Помощник по профилю" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Обновление прошивки" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Неизвестно" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "Отсутствует собственный профиль для импорта в файл {0}" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Данный профиль {0} содержит неверные данные, поэтому его невозможно импортировать." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "Принтер, заданный в профиле {0} ({1}), не совпадает с вашим текущим принтером ({2}), поэтому его невозможно импортировать." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Подтвердить удаление " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Приостановлено" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Предыдущий" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Следующий" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "Кончик" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1 м / ~ %2 г / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1 м / ~ %2 г" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Пробная печать" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Контрольный список" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Обновление прошивки" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Позволяет производителям материалов создавать новые профили материалов и качества с помощью дружественного интерфейса." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Помощник по профилю печати" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Печать через Doodle3D WiFi-Box" diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index d9cd6287de..65e6698016 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" @@ -168,6 +168,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Позиция кончика сопла на оси Z при старте печати." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Охлаждающий вентилятор экструдера, используемый во время печати" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Номер охлаждающего вентилятора, используемого при печати и ассоциированного с этим экструдером. Применяемое по умолчанию значение 0 следует менять только при наличии другого охлаждающего вентилятора, используемого при печати, для каждого экструдера." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 36904625d8..58dde033be 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-01 14:15+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 15:29+0100\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: fdmprinter.def.json @@ -1078,8 +1078,8 @@ msgstr "Соединение верхних/нижних полигонов" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Соединение верхних/нижних путей оболочки на участках, где они проходят рядом. При использовании концентрического шаблона активация данной настройки значительно сокращает время перемещения, но, учитывая возможность наличия соединений на полпути над заполнением, эта функция может ухудшить качество верхней оболочки." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Соединение верхних/нижних путей оболочки на участках, где они проходят рядом. При использовании концентрического шаблона активация данной настройки значительно сокращает время перемещения, но, учитывая возможность наличия соединений на полпути над заполнением, эта функция может ухудшить качество верхней поверхности." #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1419,7 +1419,7 @@ msgstr "Границы разглаживания" #: fdmprinter.def.json msgctxt "ironing_inset description" msgid "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print." -msgstr "Расстояние от краёв модели. Разглаживание от края до края может выразится в загибании краёв при печати." +msgstr "Расстояние от краёв модели. Разглаживание от края до края может выразиться в загибании краёв при печати." #: fdmprinter.def.json msgctxt "speed_ironing label" @@ -1498,8 +1498,8 @@ msgstr "Шаблон заполнения" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Шаблон заполняющего материала печати. Линейное и зигзагообразное заполнение меняет направление на чередующихся слоях, снижая расходы на материал. Шаблоны «сетка», «треугольник», «шестигранник из треугольников», «куб», «восьмигранник», «четверть куба», «крестовое», «концентрическое» полностью печатаются в каждом слое. Шаблоны заполнения «куб», «четверть куба», «восьмигранник» меняются в каждом слое, чтобы обеспечить более равномерное распределение прочности в каждом направлении." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Шаблон заполняющего материала печати. Линейное и зигзагообразное заполнение меняет направление на чередующихся слоях, снижая расходы на материал. Шаблоны «сетка», «треугольник», «шестигранник из треугольников», «куб», «восьмигранник», «четверть куба», «крестовое», «концентрическое» полностью печатаются в каждом слое. Шаблоны заполнения «гироид», «куб», «четверть куба» и «восьмигранник» меняются в каждом слое, чтобы обеспечить более равномерное распределение прочности в каждом направлении." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1561,6 +1561,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Крестовое 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Гироид" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1631,7 +1636,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" @@ -1861,7 +1868,7 @@ msgstr "Температура сопла" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "Стандартная температура сопла, используемая при печати. Значением должна быть \"базовая\" температура для материала. Все другие температуры печати должны быть выражены смещениями от основного значения." +msgstr "Стандартная температура сопла, используемая при печати. Значением должна быть \"базовая\" температура для материала. Все другие температуры печати должны быть выражены смещениями от основного значения" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -3011,7 +3018,7 @@ msgstr "Обычная скорость вентилятора на слое" #: fdmprinter.def.json msgctxt "cool_fan_full_layer description" msgid "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number." -msgstr "Слой, на котором вентилятор должен вращаться с обыкновенной скорость. Если определена обычная скорость для вентилятора на высоте, это значение вычисляется и округляется до целого." +msgstr "Слой, на котором вентилятор должен вращаться с обыкновенной скоростью. Если определена обычная скорость для вентилятора на высоте, это значение вычисляется и округляется до целого." #: fdmprinter.def.json msgctxt "cool_min_layer_time label" @@ -3263,6 +3270,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "Ориентация шаблона заполнения для поддержек. Шаблон заполнения поддержек вращается в горизонтальной плоскости." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Разрешить кайму поддержек" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "Создайте кайму внутри участков заполнения поддержек первого слоя. Эта кайма печатается под поддержкой, а не вокруг нее. Включение этого параметра увеличивает адгезию поддержки к рабочему столу." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Ширина каймы поддержки" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Ширина каймы для печати под поддержкой. При увеличении каймы улучшается адгезия к рабочему столу и увеличивается расход материала." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Количество линий каймы поддержки" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Количество линий, используемых для каймы поддержки. При увеличении линий каймы улучшается адгезия к рабочему столу и увеличивается расход материала." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3391,7 +3428,7 @@ msgstr "Степень заполнения поддержек" #: fdmprinter.def.json msgctxt "gradual_support_infill_steps description" msgid "Number of times to reduce the support infill density by half when getting further below top surfaces. Areas which are closer to top surfaces get a higher density, up to the Support Infill Density." -msgstr "Количество раз, на которое на половину можно уменьшать плотность заполнения поддержек при прохоже вглубь структуры от поверхности. Области ближе к оболочке имеют большую плотность, вплоть до значения \"Плотность заполнения поддержек\"." +msgstr "Количество раз, на которое на половину можно уменьшать плотность заполнения поддержек при проходе вглубь структуры от поверхности. Области ближе к оболочке имеют большую плотность, вплоть до значения \"Плотность заполнения поддержек\"." #: fdmprinter.def.json msgctxt "gradual_support_infill_step_height label" @@ -3832,6 +3869,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Количество линий, используемых для печати каймы. Большее количество линий каймы улучшает прилипание к столу, но уменьшает эффективную область печати." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Кайма заменяет поддержку" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "Принудительная печать каймы вокруг модели, даже если пространство в ином случае было бы занято поддержкой. При этом некоторые участки первого слоя поддержки заменяются участками каймы." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -4520,7 +4567,7 @@ msgstr "Сглаживает спиральные контуры для умен #: fdmprinter.def.json msgctxt "relative_extrusion label" msgid "Relative Extrusion" -msgstr "Отностительная экструзия" +msgstr "Относительная экструзия" #: fdmprinter.def.json msgctxt "relative_extrusion description" @@ -4955,7 +5002,7 @@ msgstr "Максимальный угол спагетти заполнения" #: fdmprinter.def.json msgctxt "spaghetti_max_infill_angle description" msgid "The maximum angle w.r.t. the Z axis of the inside of the print for areas which are to be filled with spaghetti infill afterwards. Lowering this value causes more angled parts in your model to be filled on each layer." -msgstr "Максимальный угол по отношению к оси Z внутри печатаемого объёма для заполняемых областей. Уменьшение этого значения приводит к тому, что более наклонённый части вашей модели будут заполнены на каждом слое." +msgstr "Максимальный угол по отношению к оси Z внутри печатаемого объёма для заполняемых областей. Уменьшение этого значения приводит к тому, что более наклонённые части вашей модели будут заполнены на каждом слое." #: fdmprinter.def.json msgctxt "spaghetti_max_height label" @@ -5259,7 +5306,7 @@ msgstr "Падение (КП)" #: fdmprinter.def.json msgctxt "wireframe_fall_down description" msgid "Distance with which the material falls down after an upward extrusion. This distance is compensated for. Only applies to Wire Printing." -msgstr "Расстояние с которой материал падает вниз после восходящего выдавливания. Расстояние компенсируется. Применяется только при каркасной печати." +msgstr "Расстояние, с которого материал падает вниз после восходящего выдавливания. Расстояние компенсируется. Применяется только при каркасной печати." #: fdmprinter.def.json msgctxt "wireframe_drag_along label" @@ -5379,7 +5426,7 @@ msgstr "Разница между высотой следующего слоя #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold label" msgid "Adaptive layers threshold" -msgstr "Порог для адаптивных слове" +msgstr "Порог для адаптивных слоев" #: fdmprinter.def.json msgctxt "adaptive_layer_height_threshold description" @@ -5624,7 +5671,7 @@ msgstr "X позиция объекта" #: fdmprinter.def.json msgctxt "mesh_position_x description" msgid "Offset applied to the object in the x direction." -msgstr "Смещение, применяемое к объект по оси X." +msgstr "Смещение, применяемое к объекту по оси X." #: fdmprinter.def.json msgctxt "mesh_position_y label" @@ -5634,7 +5681,7 @@ msgstr "Y позиция объекта" #: fdmprinter.def.json msgctxt "mesh_position_y description" msgid "Offset applied to the object in the y direction." -msgstr "Смещение, применяемое к объект по оси Y." +msgstr "Смещение, применяемое к объекту по оси Y." #: fdmprinter.def.json msgctxt "mesh_position_z label" @@ -5644,7 +5691,7 @@ msgstr "Z позиция объекта" #: fdmprinter.def.json msgctxt "mesh_position_z description" msgid "Offset applied to the object in the z direction. With this you can perform what was used to be called 'Object Sink'." -msgstr "Смещение, применяемое к объект по оси Z. Это позволяет выполнять операцию, ранее известную как проваливание объекта под поверхность стола." +msgstr "Смещение, применяемое к объекту по оси Z. Это позволяет выполнять операцию, ранее известную как проваливание объекта под поверхность стола." #: fdmprinter.def.json msgctxt "mesh_rotation_matrix label" @@ -5654,7 +5701,15 @@ msgstr "Матрица вращения объекта" #: fdmprinter.def.json msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." -msgstr "Матрица преобразования, применяемая к модели при её загрузки из файла." +msgstr "Матрица преобразования, применяемая к модели при её загрузке из файла." + +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Соединение верхних/нижних путей оболочки на участках, где они проходят рядом. При использовании концентрического шаблона активация данной настройки значительно сокращает время перемещения, но, учитывая возможность наличия соединений на полпути над заполнением, эта функция может ухудшить качество верхней оболочки." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Шаблон заполняющего материала печати. Линейное и зигзагообразное заполнение меняет направление на чередующихся слоях, снижая расходы на материал. Шаблоны «сетка», «треугольник», «шестигранник из треугольников», «куб», «восьмигранник», «четверть куба», «крестовое», «концентрическое» полностью печатаются в каждом слое. Шаблоны заполнения «куб», «четверть куба», «восьмигранник» меняются в каждом слое, чтобы обеспечить более равномерное распределение прочности в каждом направлении." #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 30368056cf..f801db7f78 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -5,16 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-01 13:40+0100\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:33+0100\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" @@ -46,8 +48,8 @@ msgstr "GCodeWriter metin dışı modu desteklemez." #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "Lütfen kaydetmeden önce G-code oluşturun." +msgid "Please prepare G-code before exporting." +msgstr "Lütfen dışa aktarmadan önce G-code'u hazırlayın." #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -73,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "Değişiklik Günlüğünü Göster" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "Aygıt Yazılımını Güncelle" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -83,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "Profil düzleştirilmiş ve aktifleştirilmiştir." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB yazdırma" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "USB ile yazdır" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "USB ile yazdır" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "USB ile bağlı" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 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?" @@ -135,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter yazı modunu desteklemez." -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Biçim Paketi" @@ -157,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "Çıkarılabilir Sürücüye Kaydediliyor {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Yazılacak dosya biçimleri mevcut değil!" @@ -166,7 +173,7 @@ msgstr "Yazılacak dosya biçimleri mevcut değil!" #, python-brace-format msgctxt "@info:progress Don't translate the XML tags !" msgid "Saving to Removable Drive {0}" -msgstr "Çıkarılabilir Sürücü {0} Üzerine Kaydediliyor " +msgstr "Çıkarılabilir Sürücü {0} Üzerine Kaydediliyor" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:94 msgctxt "@info:title" @@ -196,7 +203,7 @@ msgstr "Çıkarılabilir aygıta {0} kaydedilemedi: {1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "Hata" @@ -225,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "Uyarı" @@ -253,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Çıkarılabilir Sürücü" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "Ağ üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "Ağ üzerinden yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "Ağ üzerinden bağlandı." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "Ağ üzerinden bağlandı. Lütfen yazıcıya erişim isteğini onaylayın." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "Ağ üzerinden bağlandı. Yazıcıyı kontrol etmek için erişim yok." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "İstenen yazıcıya erişim. Lütfen yazıcı isteğini onaylayın" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "Kimlik doğrulama durumu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "Kimlik Doğrulama Durumu" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "Yeniden dene" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "Erişim talebini yeniden gönder" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "Kabul edilen yazıcıya erişim" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "Bu yazıcıyla yazdırmaya erişim yok. Yazdırma işi gönderilemedi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "Erişim Talep Et" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "Yazıcıya erişim talebi gönder" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "Yeni bir yazdırma işi başlatılamıyor." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Ultimaker’ın yapılandırmasında yazdırmayı başlatmayı imkansız kılan bir sorun var. Devam etmeden önce lütfen bu sorunu çözün." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "Uyumsuz yapılandırma" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "Seçilen yapılandırma ile yazdırmak istediğinizden emin misiniz?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." 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:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "Veriler yazıcıya gönderiliyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "Veri gönderiliyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -397,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "İptal Et" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "{slot_number} yuvasına Printcore yüklenmedi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "{slot_number} yuvasına malzeme yüklenmedi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "Farklı PrintCore (Cura: {cura_printcore_name}, Yazıcı: ekstruder {extruder_id} için {remote_printcore_name}) seçildi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "Farklı malzeme (Cura: {0}, Yazıcı: {1}), ekstrüder {2} için seçildi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "Yazıcınız ile eşitleyin" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "Cura’da geçerli yazıcı yapılandırmanızı kullanmak istiyor musunuz?" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "Yazıcınızda bulunan PrintCore’lar ve/veya malzemeler geçerli projenizde bulunandan farklı. 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/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" -msgstr "Ağ üzerinden bağlandı." +msgstr "Ağ üzerinden bağlandı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 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:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "Veri Gönderildi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "Monitörde Görüntüle" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "Baskı tamamlandı" @@ -478,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "Ağ ile Bağlan" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "Görüntüle" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "Güncelleme bilgilerine erişilemedi." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "{machine_name} adlı cihazınız için yeni özellikler var! Yazıcınızın fabrika yazılımını güncellemeniz önerilir." -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "Yeni %s bellenimi mevcut" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "Nasıl güncellenir" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "Güncelleme bilgilerine erişilemedi." - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Katman görünümü" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" -msgstr "Tel Yazma etkinleştirildiğinde, Cura katmanları doğru olarak görüntülemez." +msgstr "Tel Yazma etkinleştirildiğinde, Cura katmanları doğru olarak görüntülemez" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "Simülasyon Görünümü" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "GCode Değiştir" @@ -534,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "Desteklerin yazdırılmadığı bir hacim oluşturun." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura anonimleştirilmiş kullanım istatistikleri toplar." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "Veri Toplanıyor" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "Daha fazla bilgi" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." -msgstr "Cura’nın gönderdiği veriler hakkında daha fazla bilgi alın" +msgstr "Cura’nın gönderdiği veriler hakkında daha fazla bilgi alın." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "İzin Verme" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "Programın gelecek sürümlerinin iyileştirilmesine yardımcı olmak için Cura’ya anonimleştirilmiş kullanım istatistikleri gönderme izni verin. Tercih ve ayarlarınızın bazıları, Cura sürümü ve dilimlere ayırdığınız modellerin sağlaması gönderilir." @@ -594,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF Resmi" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Mevcut malzeme, seçilen makine veya yapılandırma ile uyumlu olmadığından mevcut malzeme ile dilimlenemedi." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "Dilimlenemedi" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Geçerli ayarlarla dilimlenemiyor. Şu ayarlarda hata var: {0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Modele özgü ayarlar nedeniyle dilimlenemedi. Şu ayarlar bir veya daha fazla modelde hataya yol açıyor: {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "İlk direk veya ilk konum(lar) geçersiz olduğu için dilimlenemiyor." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Etkisizleştirilmiş Extruder %s ile ilgili nesneler olduğundan dilimleme yapılamıyor." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "Modeller yapı hacmine sığmadığı için dilimlenecek bir şey yok. Lütfen sığdırmak için modelleri ölçeklendirin veya döndürün." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "Katmanlar İşleniyor" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "Bilgi" @@ -651,7 +653,7 @@ msgstr "Bilgi" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:14 msgctxt "@label" msgid "Per Model Settings" -msgstr "Model Başına Ayarlar " +msgstr "Model Başına Ayarlar" #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:15 msgctxt "@info:tooltip" @@ -659,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "Model Başına Ayarları Yapılandır" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "Önerilen Ayarlar" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "Özel" @@ -677,7 +679,7 @@ msgid "3MF File" msgstr "3MF Dosyası" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "Nozül" @@ -703,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G Dosyası" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-code ayrıştırma" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-code Ayrıntıları" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "Dosya göndermeden önce g-code’un yazıcınız ve yazıcı yapılandırmanız için uygun olduğundan emin olun. G-code temsili doğru olmayabilir." @@ -725,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura Profili" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "Profil Asistanı" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "Profil Asistanı" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -756,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Yükseltmeleri seçin" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "Aygıt Yazılımını Yükselt" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -771,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "Yapı levhasını dengele" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Dış Duvar" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "İç Duvarlar" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Yüzey Alanı" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Dolgu" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Destek Dolgusu" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Destek Arayüzü" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Destek" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Etek" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "Hareket" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "Geri Çekmeler" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "Diğer" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "Bilinmiyor" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "Önceden dilimlenmiş dosya {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "Giriş başarısız" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "Dosya Zaten Mevcut" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -855,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "Geçersiz kılınmadı" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "Seçilen malzeme, seçilen makine veya yapılandırma ile uyumlu değil." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "Uyumsuz Malzeme" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "Ayarlar güncellendi" @@ -900,8 +887,6 @@ 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:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -909,58 +894,70 @@ msgstr "{0} dosyasından profil içe aktarımı başarısı #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "Bu profil {0} yanlış veri içermekte, içeri aktarılamadı." +msgstr "Bu {0} profili yanlış veri içeriyor, içeri aktarılamadı." #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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} profilinde tanımlanan makine ({1}), mevcut makinenizle ({2}) eşleşmiyor, içe aktarılamadı." +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "Özel profil" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 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:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "Mevcut yapılandırma için bir kalite tipi {0} bulunamıyor." -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -987,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tüm Dosyalar (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "Özel Malzeme" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "Özel" @@ -1007,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "Yapı Disk Bölümü" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Kullanıcı veri dizininden arşiv oluşturulamadı: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "Yedekle" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Uygun veri veya meta veri olmadan Cura yedeği geri yüklenmeye çalışıldı." -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "Geçerli sürümünüzle eşleşmeyen bir Cura yedeği geri yüklenmeye çalışıldı." @@ -1197,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapor gönder" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Makineler yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Görünüm ayarlanıyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Arayüz yükleniyor..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "Seçilen model yüklenemeyecek kadar küçüktü." @@ -1261,9 +1258,9 @@ msgstr "X (Genişlik)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1398,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "Yazıcı tarafından desteklenen nominal filaman çapı. Tam çap malzeme ve/veya profil tarafından etkisiz kılınacaktır." -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "Nozül X ofseti" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "Nozül Y ofseti" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "Soğutma Fanı Numarası" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "Ekstruder G-Code'u Başlatma" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "Ekstruder G-Code'u Sonlandırma" @@ -1434,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "Cura Paket veri tabanına bağlanılamadı. Lütfen bağlantınızı kontrol edin." #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "Eklentiler" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "Malzemeler" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "Sürüm" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "Son güncelleme" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "Yazar" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "İndirmeler" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "Bilinmiyor" @@ -1503,8 +1511,8 @@ msgstr "Geri" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "Kaldırmayı onayla " +msgid "Confirm uninstall" +msgstr "Kaldırmayı onayla" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1551,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "Genel Materyaller" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "Yüklü" @@ -1633,48 +1641,88 @@ msgid "Changelog" msgstr "Değişiklik Günlüğü" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "Kapat" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "Aygıt Yazılımını Güncelle" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "Aygıt yazılımı doğrudan 3B yazıcı üzerinden çalışan bir yazılım parçasıdır. Bu aygıt yazılımı adım motorlarını kontrol eder, sıcaklığı düzenler ve sonunda yazıcının çalışmasını sağlar." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "Yeni yazıcıları olan aygıt yazılımı gönderimi yararlı olmaktadır, ancak yeni sürümler daha fazla özellik ve geliştirmeye eğilimlidir." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "Aygıt Yazılımını otomatik olarak yükselt" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Özel Aygıt Yazılımı Yükle" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "Yazıcı ile bağlantı kurulmadığı için aygıt yazılımı güncellenemiyor." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "Yazıcı bağlantısı aygıt yazılımını yükseltmeyi desteklemediği için aygıt yazılımı güncellenemiyor." + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Özel aygıt yazılımı seçin" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "Aygıt Yazılımı Güncellemesi" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "Aygıt yazılımı güncelleniyor." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "Aygıt yazılımı güncellemesi tamamlandı." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "Bilinmeyen bir hata nedeniyle aygıt yazılımı güncellemesi başarısız oldu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "Bir iletişim hatası nedeniyle aygıt yazılımı güncellemesi başarısız oldu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "Bir girdi/çıktı hatası nedeniyle aygıt yazılımı güncellemesi başarısız oldu." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" 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." @@ -1684,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "Kullanıcı Anlaşması" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "Mevcut Bağlantı" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "Bu yazıcı/grup Cura’ya zaten eklenmiş. Lütfen başka bir yazıcı/grup seçin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "Ağ Yazıcısına Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1710,18 +1758,18 @@ msgstr "" "\n" "Aşağıdaki listeden yazıcınızı seçin:" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "Ekle" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "Düzenle" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1729,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "Kaldır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "Yenile" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Yazıcınız listede yoksa ağ yazdırma sorun giderme kılavuzunu okuyun" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "Tür" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "Üretici yazılımı sürümü" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "Adres" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "Bu yazıcı, bir yazıcı grubunu barındırmak için ayarlı değildir." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "Bu yazıcı, %1 yazıcı grubunun ana makinesidir." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "Bu adresteki yazıcı henüz yanıt vermedi." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "Yazıcı Adresi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "IP adresini veya yazıcınızın ağ üzerindeki ana bilgisayar adını girin." -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "Tamam" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "Ağ üzerinden yazdır" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "Yazıcı seçimi" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "Yazdır" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "Ağ üzerinden yazdır" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "Bekleniyor: Kullanım dışı yazıcı" +msgid "Printer selection" +msgstr "Yazıcı seçimi" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "Bekleniyor: İlk mevcut olan" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "Bekleniyor: " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "En üste taşı" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "Yazdırma işini en üste taşı" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "%1 öğesini kuyruğun en üstüne taşımak ister misiniz?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "Sil" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "Yazdırma işini sil" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "%1 öğesini silmek istediğinizden emin misiniz?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "Kuyruğu yönet" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "Kuyrukta" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "Yazdırma" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "Yazıcıları yönet" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "Mevcut değil" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "Ulaşılamıyor" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "Mevcut" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "Durduruldu" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "Tamamlandı" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "Hazırlanıyor" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "Duraklatılıyor" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "Devam ediliyor" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "Eylem gerekli" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "Bekleniyor: Kullanım dışı yazıcı" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "Bekleniyor: İlk mevcut olan" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "Bekleniyor: " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "Yapılandırma değişikliği" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "Atanan yazıcı %1, aşağıdaki yapılandırma değişikliklerini gerektiriyor:" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +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/PrintJobInfoBlock.qml:378 +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/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +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/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "Geçersiz kıl" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "Bir yazdırma işini uyumsuz bir yapılandırmayla başlatmak 3D yazıcınıza zarar verebilir. Yapılandırmayı geçersiz kılmak ve %1 öğesini yazdırmak istediğinizden emin misiniz?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "Yapılandırmayı geçersiz kıl ve yazdırmayı başlat" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "Cam" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "Alüminyum" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "Kuyruğu yönet" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "Kuyrukta" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "Yazdırma" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "Yazıcıları yönet" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "En üste taşı" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "Sil" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "Devam et" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "Duraklat" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "Durdur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "%1 öğesini kuyruğun en üstüne taşımak ister misiniz?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "Yazdırma işini en üste taşı" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "%1 öğesini silmek istediğinizden emin misiniz?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "Yazdırma işini sil" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "%1 öğesini durdurmak istediğinizden emin misiniz?" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "Yazdırmayı durdur" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "%1 öğesini durdurmak istediğinizden emin misiniz?" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "Durduruldu" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "Tamamlandı" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "Hazırlanıyor" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "Duraklatılıyor" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "Duraklatıldı" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "Devam ediliyor" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "Eylem gerekli" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "Yazıcıya Bağlan" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "Yazıcı yapılandırmasını Cura’ya yükle" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "Yapılandırmayı Etkinleştir" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "Yazıcı yapılandırmasını Cura’ya yükle" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2057,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "Son İşleme Dosyaları" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "Dosya ekle" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "Ayarlar" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "Etkin son işleme dosyalarını değiştir" @@ -2155,7 +2259,7 @@ msgstr "Daha koyu olan daha yüksek" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:149 msgctxt "@info:tooltip" msgid "The amount of smoothing to apply to the image." -msgstr "Resme uygulanacak düzeltme miktarı" +msgstr "Resme uygulanacak düzeltme miktarı." #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:154 msgctxt "@action:label" @@ -2192,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "Diğer modellerle doldurma ayarlarını değiştir" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "Ayarları seçin" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Bu modeli Özelleştirmek için Ayarları seçin" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrele..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "Tümünü göster" @@ -2259,6 +2363,7 @@ msgid "Type" msgstr "Tür" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "Yazıcı Grubu" @@ -2276,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2350,82 +2456,6 @@ msgctxt "@action:button" msgid "Open" msgstr "Aç" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "Önceki" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "Dışa Aktar" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "Sonraki" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "İpucu" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00sa 00dk" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "Maliyet koşulları" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1 m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "Toplam:" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1 m / ~ %2 g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1 m / ~ %2 g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "Yazdırma denemesi" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "Kontrol listesi" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2467,36 +2497,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "Sonraki Konuma Taşı" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "Aygıt Yazılımını Yükselt" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "Aygıt yazılımı doğrudan 3B yazıcı üzerinden çalışan bir yazılım parçasıdır. Bu aygıt yazılımı adım motorlarını kontrol eder, sıcaklığı düzenler ve sonunda yazıcının çalışmasını sağlar." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "Yeni yazıcıları olan aygıt yazılımı gönderimi yararlı olmaktadır, ancak yeni sürümler daha fazla özellik ve geliştirmeye eğilimlidir." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "Aygıt Yazılımını otomatik olarak yükselt" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "Özel Aygıt Yazılımı Yükle" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "Özel aygıt yazılımı seçin" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2642,7 +2642,7 @@ msgstr "Hazırlanıyor..." #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:154 msgctxt "@label:MonitorStatus" msgid "Please remove the print" -msgstr "Lütfen yazıcıyı çıkarın " +msgstr "Lütfen yazıcıyı çıkarın" #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:325 msgctxt "@label" @@ -2684,7 +2684,7 @@ msgid "Customized" msgstr "Özelleştirilmiş" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Her zaman sor" @@ -2832,6 +2832,12 @@ msgctxt "@action:button" msgid "Import" msgstr "İçe Aktar" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "Dışa Aktar" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2917,283 +2923,283 @@ msgid "Unit" msgstr "Birim" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "Genel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "Arayüz" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "Dil:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "Para Birimi:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 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:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "Otomatik olarak dilimle" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "Görünüm şekli" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "Dışarıda kalan alanı göster" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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." +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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 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:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 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:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 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:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 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:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 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:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 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:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 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:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 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:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 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:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 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:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "Dosyaların açılması ve kaydedilmesi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "Büyük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Çok küçük modelleri ölçeklendirin" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 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:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Yüklendiğinde modelleri seç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 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:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 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:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 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:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 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:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 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:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Her zaman proje olarak aç" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "Her zaman modelleri içe aktar" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "Profiller" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 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:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 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:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "Gizlilik" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 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:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonim) yazdırma bilgisi gönder" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "Daha fazla bilgi" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "Deneysel" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 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:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "Yazıcılar" @@ -3215,7 +3221,7 @@ msgid "Connection:" msgstr "Bağlantı:" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "Yazıcı bağlı değil." @@ -3241,7 +3247,7 @@ msgid "Aborting print..." msgstr "Yazdırma durduruluyor..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiller" @@ -3322,17 +3328,17 @@ msgid "Global Settings" msgstr "Küresel Ayarlar" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "Yazıcı Ekle" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "Yazıcı Adı:" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "Yazıcı Ekle" @@ -3347,17 +3353,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "Cura hakkında" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "sürüm: %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "Kaynaşık filaman 3B yazdırma için kalıcı çözüm." -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3366,102 +3372,122 @@ 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/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "Grafik kullanıcı arayüzü" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "Uygulama çerçevesi" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-code oluşturucu" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "İşlemler arası iletişim kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "Programlama dili" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI çerçevesi" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI çerçeve bağlantıları" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C/C++ Bağlantı kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "Veri değişim biçimi" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "Bilimsel bilgi işlem için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "Daha hızlı matematik için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "STL dosyalarının işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "Düzlemsel nesnelerin işlenmesi için destek kitaplığı" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "Üçgen birleşimlerin işlenmesi için destek kitaplığı" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "Karmaşık ağların analizi için destek kitaplığı" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "3MF dosyalarının işlenmesi için destek kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "Dosya meta verileri ve akış için destek kitaplığı" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "Seri iletişim kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf keşif kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "Poligon kırpma kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP kitaplığı" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "Yazı tipi" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG simgeleri" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux çapraz-dağıtım uygulama dağıtımı" @@ -3471,7 +3497,7 @@ msgctxt "@label" msgid "Profile:" msgstr "Profil:" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3482,53 +3508,53 @@ msgstr "" "\n" "Profil yöneticisini açmak için tıklayın." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "Ara..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 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:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 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:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Bu ayarı gizle" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Bu ayarı gösterme" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 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:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Görünürlük ayarını yapılandır..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "Tümünü Daralt" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "Tümünü Genişlet" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3549,17 +3575,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr ".........den etkilenir" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 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:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3570,7 +3596,7 @@ msgstr "" "\n" "Profil değerini yenilemek için tıklayın." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3725,12 +3751,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kamera konumu" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Yapı levhası" @@ -3740,12 +3766,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Görünür ayarlar" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "Tüm Ayarları Göster" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Ayar Görünürlüğünü Yönet..." @@ -3808,17 +3834,44 @@ msgstr "" "Yazdırma Ayarı devre dışı\n" "G-code dosyaları üzerinde değişiklik yapılamaz" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00sa 00dk" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "Zaman Özellikleri" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "Maliyet koşulları" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1 m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1 g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "Toplam:" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "Önerilen Yazıcı Ayarları

Seçilen yazıcı, malzeme ve kalite için önerilen ayarları kullanarak yazdırın." -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "Özel Yazıcı Ayarları

Dilimleme işleminin her bir bölümünü detaylıca kontrol ederek yazdırın." @@ -3843,223 +3896,223 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Kalan tahmini süre" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Tam Ekrana Geç" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Geri Al" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Yinele" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Çıkış" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3 Boyutlu Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Önden Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Yukarıdan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Sol Taraftan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Sağ Taraftan Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura’yı yapılandır..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Yazıcı Ekle..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Yazıcıları Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Malzemeleri Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 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:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 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:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 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:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profilleri Yönet..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Çevrimiçi Belgeleri Göster" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Hata Bildir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Hakkında..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 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:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 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:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 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:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modeli Sil" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modeli Platformda Ortala" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelleri Gruplandır" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Model Grubunu Çöz" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Modelleri Birleştir" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Modeli Çoğalt..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Tüm modelleri Seç" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Yapı Levhasını Temizle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Tüm Modelleri Yeniden Yükle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 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:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Tüm Modelleri Düzenle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Seçimi Düzenle" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 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:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 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:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Dosya Aç..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Yeni Proje..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Motor Günlüğünü Göster..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 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:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "Paketlere gözat..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "Kenar Çubuğunu Genişlet/Daralt" @@ -4120,7 +4173,7 @@ msgid "Select the active output device" msgstr "Etkin çıkış aygıtını seçin" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "Dosya aç" @@ -4140,145 +4193,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Dosya" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "&Kaydet..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Dışa Aktar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Seçimi Dışa Aktar..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "Düz&enle" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "&Görünüm" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "&Ayarlar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "&Yazıcı" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "&Malzeme" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "Etkin Ekstruder olarak ayarla" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "Ekstruderi Etkinleştir" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Ekstruderi Devre Dışı Bırak" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "&Yapı levhası" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "&Profil" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "Uzantılar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&Araç kutusu" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "Tercihler" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "&Yardım" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 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:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "Dosya Aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "Ayarlar" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "Yeni proje" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "Yeni bir proje başlatmak istediğinizden emin misiniz? Bu işlem yapı levhasını ve kaydedilmemiş tüm ayarları silecektir." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "Cura Kapatılıyor" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 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:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "Paketi Kur" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "Dosya Aç" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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." @@ -4288,11 +4341,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "Projeyi Kaydet" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4363,37 +4411,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "Kademeli dolgu, yukarıya doğru dolgu miktarını kademeli olarak yükselecektir." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "Kademeli özelliği etkinleştir" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "Oluşturma Desteği" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "Destek için kullanacağınız ekstruderi seçin. Bu, modelin havadayken düşmesini veya yazdırılmasını önlemek için modelin altındaki destekleyici yapıları güçlendirir." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "Yapı Levhası Yapıştırması" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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." -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "Yazıcı çıktılarınızı iyileştirmek için yardıma mı ihtiyacınız var?
Ultimaker Sorun Giderme Kılavuzlarını okuyun" @@ -4555,6 +4603,16 @@ msgctxt "name" msgid "Changelog" msgstr "Değişiklik Günlüğü" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "Aygıt yazılımını güncellemeye yönelik makine eylemleri sağlar." + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "Aygıt Yazılımı Güncelleyici" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4578,7 +4636,7 @@ msgstr "USB yazdırma" #: UserAgreement/plugin.json msgctxt "description" msgid "Ask the user once if he/she agrees with our license." -msgstr "Kullanıcıya bir kez lisansımızı kabul edip etmediğini sorun" +msgstr "Kullanıcıya bir kez lisansımızı kabul edip etmediğini sorun." #: UserAgreement/plugin.json msgctxt "name" @@ -4638,7 +4696,7 @@ msgstr "Çıkarılabilir Sürücü Çıkış Cihazı Eklentisi" #: UM3NetworkPrinting/plugin.json msgctxt "description" msgid "Manages network connections to Ultimaker 3 printers." -msgstr "Ultimaker 3 yazıcıları için ağ bağlantılarını yönetir" +msgstr "Ultimaker 3 yazıcıları için ağ bağlantılarını yönetir." #: UM3NetworkPrinting/plugin.json msgctxt "name" @@ -4905,16 +4963,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profili Yazıcı" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "Malzeme üreticilerine bir drop-in UI kullanarak yeni malzeme ve kalite profili oluşturma imkanı sunar." - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "Baskı Profili Asistanı" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4945,6 +4993,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura Profil Okuyucu" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "Lütfen kaydetmeden önce G-code oluşturun." + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "Profil Asistanı" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "Profil Asistanı" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "Aygıt Yazılımını Yükselt" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "Bilinmiyor" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "{0} dosyasında içe aktarılabilecek özel profil yok" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "Bu profil {0} yanlış veri içermekte, içeri aktarılamadı." + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "{0} profilinde tanımlanan makine ({1}), mevcut makinenizle ({2}) eşleşmiyor, içe aktarılamadı." + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "Kaldırmayı onayla " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "Duraklatıldı" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "Önceki" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "Sonraki" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "İpucu" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1 m / ~ %2 g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1 m / ~ %2 g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "Yazdırma denemesi" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "Kontrol listesi" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "Aygıt Yazılımını Yükselt" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "Malzeme üreticilerine bir drop-in UI kullanarak yeni malzeme ve kalite profili oluşturma imkanı sunar." + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "Baskı Profili Asistanı" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "Doodle3D WiFi-Box ile yazdır" diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index 9bb0d492af..f9519e7e68 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" @@ -166,6 +166,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "Nozül yazdırma işlemini başlatmaya hazırlandığında konumun Z koordinatı." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "Ekstrüder Yazıcı Soğutma Fanı" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "Bu ekstrüdere bağlı yazıcı soğutma fanı sayısı. Yalnızca her bir ekstrüder için farklı yazıcı soğutma fanınız varsa bunu 0 varsayılan değeri olarak değiştirin." + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 6c70eb70e9..955eab686a 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -5,16 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-01 14:20+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 15:36+0100\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -1076,8 +1077,8 @@ msgstr "Üst/Alt Poligonları Bağla" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "Üst/alt yüzey yollarını yan yana ise bağla. Eş merkezli şekil için bu ayarı etkinleştirmek hareket süresini önemli ölçüde kısaltır; ancak bağlantılar dolgunun üzerinde meydana gelebileceğinden bu özellik üst yüzeyin kalitesini düşürebilir." +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Üst/alt yüzey yollarını yan yana ise bağla. Eş merkezli şekil için bu ayarı etkinleştirmek, hareket süresini önemli ölçüde kısaltır ancak bağlantılar dolgunun üzerinde meydana gelebileceğinden bu özellik üst yüzeyin kalitesini düşürebilir." #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1496,8 +1497,8 @@ msgstr "Dolgu Şekli" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "Baskının dolgu malzemesinin şeklidir. Hat ve zikzak dolgu, farklı katmanlar üzerinde yön değiştirerek malzeme maliyetini azaltır. Izgara, üçgen, üçlü altıgen, kübik, sekizlik, çeyrek kübik, çapraz ve eşmerkezli şekiller, her katmana tam olarak basılır. Kübik, çeyrek kübik ve sekizlik dolgu, her yönde daha eşit bir kuvvet dağılımı sağlamak için her katmanda değişir." +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "Baskının dolgu malzemesinin şeklidir. Hat ve zikzak dolgu, farklı katmanlar üzerinde yön değiştirerek malzeme maliyetini azaltır. Izgara, üçgen, üçlü altıgen, kübik, sekizlik, çeyrek kübik, çapraz ve eşmerkezli şekiller, her katmana tam olarak basılır. Gyroid, kübik, çeyrek kübik ve sekizlik dolgu, her yönde daha eşit bir kuvvet dağılımı sağlamak için her katmanda değişir." #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1559,6 +1560,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "Çapraz 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "Gyroid" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1629,7 +1635,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" @@ -1859,7 +1867,7 @@ msgstr "Varsayılan Yazdırma Sıcaklığı" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "Yazdırma için kullanılan varsayılan sıcaklık. Bu sıcaklık malzemenin “temel” sıcaklığı olmalıdır. Diğer tüm yazıcı sıcaklıkları bu değere dayanan ofsetler kullanmalıdır." +msgstr "Yazdırma için kullanılan varsayılan sıcaklık. Bu sıcaklık malzemenin “temel” sıcaklığı olmalıdır. Diğer tüm yazıcı sıcaklıkları bu değere dayanan ofsetler kullanmalıdır" #: fdmprinter.def.json msgctxt "material_print_temperature label" @@ -1889,7 +1897,7 @@ msgstr "İlk Yazdırma Sıcaklığı" #: fdmprinter.def.json msgctxt "material_initial_print_temperature description" msgid "The minimal temperature while heating up to the Printing Temperature at which printing can already start." -msgstr "Yazdırmanın başlayacağı Yazdırma Sıcaklığına ulaşırken görülen minimum sıcaklık" +msgstr "Yazdırmanın başlayacağı Yazdırma Sıcaklığına ulaşırken görülen minimum sıcaklık." #: fdmprinter.def.json msgctxt "material_final_print_temperature label" @@ -1919,7 +1927,7 @@ msgstr "Varsayılan Yapı Levhası Sıcaklığı" #: fdmprinter.def.json msgctxt "default_material_bed_temperature description" msgid "The default temperature used for the heated build plate. This should be the \"base\" temperature of a build plate. All other print temperatures should use offsets based on this value" -msgstr "Isınan yapı levhası için kullanılan varsayılan sıcaklık. Bu sıcaklık yapı levhasının “temel” sıcaklığı olmalıdır. Diğer tüm yazıcı sıcaklıkları bu değere dayanan ofsetler kullanmalıdır." +msgstr "Isınan yapı levhası için kullanılan varsayılan sıcaklık. Bu sıcaklık yapı levhasının “temel” sıcaklığı olmalıdır. Diğer tüm yazıcı sıcaklıkları bu değere dayanan ofsetler kullanmalıdır" #: fdmprinter.def.json msgctxt "material_bed_temperature label" @@ -2009,7 +2017,7 @@ msgstr "Katman Değişimindeki Geri Çekme" #: fdmprinter.def.json msgctxt "retract_at_layer_change description" msgid "Retract the filament when the nozzle is moving to the next layer." -msgstr "Nozül bir sonraki katmana doğru hareket ettiğinde filamanı geri çekin. " +msgstr "Nozül bir sonraki katmana doğru hareket ettiğinde filamanı geri çekin." #: fdmprinter.def.json msgctxt "retraction_amount label" @@ -3261,6 +3269,36 @@ msgctxt "support_infill_angle 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." +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "Destek Kenarını Etkinleştir" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "İlk katmanın destek dolgu alanı içinde bir kenar oluşturun. Bu kenar, desteğin çevresine değil, altına yazdırılır. Bu ayarı etkinleştirmek, desteğin baskı tablasına yapışma alanını artırır." + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "Destek Kenar Genişliği" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "Desteğin altına yazdırılacak kenarın genişliği. Daha geniş kenar, ekstra malzeme karşılığında baskı tablasına daha fazla alanın yapışacağı anlamına gelir." + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "Destek Kenar Hattı Sayısı" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "Bir destek kenarı için kullanılan hatların sayısı. Daha fazla kenar hattı, ekstra malzeme karşılığında baskı tablasına daha fazla alanın yapışacağı anlamına gelir." + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3439,7 +3477,7 @@ msgstr "Destek Arayüzü Kalınlığı" #: fdmprinter.def.json msgctxt "support_interface_height description" msgid "The thickness of the interface of the support where it touches with the model on the bottom or the top." -msgstr "Alt veya üst kısımdaki modele değdiği yerde destek arayüzü kalınlığı" +msgstr "Alt veya üst kısımdaki modele değdiği yerde destek arayüzü kalınlığı." #: fdmprinter.def.json msgctxt "support_roof_height label" @@ -3830,6 +3868,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "Bir kenar için kullanılan hatların sayısı Daha fazla kenar hattı yapı levhasına yapışmayı artırmanın yanı sıra etkin yazdırma alanını da azaltır." +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Kenar, Desteği Değiştirir" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "İlgili alan üzerinde destek olsa bile kenarı modelin çevresine yazdırmaya zorlayın. Desteğin ilk katmanının bazı alanlarını kenar alanları ile değiştirir." + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -4108,7 +4156,7 @@ msgstr "Radye Fan Hızı" #: fdmprinter.def.json msgctxt "raft_fan_speed description" msgid "The fan speed for the raft." -msgstr "Radye için fan hızı" +msgstr "Radye için fan hızı." #: fdmprinter.def.json msgctxt "raft_surface_fan_speed label" @@ -4118,7 +4166,7 @@ msgstr "Radye Üst Fan Hızı" #: fdmprinter.def.json msgctxt "raft_surface_fan_speed description" msgid "The fan speed for the top raft layers." -msgstr "Üst radye katmanları için fan hızı" +msgstr "Üst radye katmanları için fan hızı." #: fdmprinter.def.json msgctxt "raft_interface_fan_speed label" @@ -4128,7 +4176,7 @@ msgstr "Radyenin Orta Fan Hızı" #: fdmprinter.def.json msgctxt "raft_interface_fan_speed description" msgid "The fan speed for the middle raft layer." -msgstr "Radyenin orta katmanı için fan hızı" +msgstr "Radyenin orta katmanı için fan hızı." #: fdmprinter.def.json msgctxt "raft_base_fan_speed label" @@ -4138,7 +4186,7 @@ msgstr "Radyenin Taban Fan Hızı" #: fdmprinter.def.json msgctxt "raft_base_fan_speed description" msgid "The fan speed for the base raft layer." -msgstr "Radyenin taban katmanı için fan hızı" +msgstr "Radyenin taban katmanı için fan hızı." #: fdmprinter.def.json msgctxt "dual label" @@ -4178,7 +4226,7 @@ msgstr "İlk Direk Boyutu" #: fdmprinter.def.json msgctxt "prime_tower_size description" msgid "The width of the prime tower." -msgstr "İlk Direk Genişliği" +msgstr "İlk Direk Genişliği." #: fdmprinter.def.json msgctxt "prime_tower_min_volume label" @@ -5652,7 +5700,15 @@ msgstr "Bileşim Rotasyon Matrisi" #: fdmprinter.def.json 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" +msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." + +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "Üst/alt yüzey yollarını yan yana ise bağla. Eş merkezli şekil için bu ayarı etkinleştirmek hareket süresini önemli ölçüde kısaltır; ancak bağlantılar dolgunun üzerinde meydana gelebileceğinden bu özellik üst yüzeyin kalitesini düşürebilir." + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "Baskının dolgu malzemesinin şeklidir. Hat ve zikzak dolgu, farklı katmanlar üzerinde yön değiştirerek malzeme maliyetini azaltır. Izgara, üçgen, üçlü altıgen, kübik, sekizlik, çeyrek kübik, çapraz ve eşmerkezli şekiller, her katmana tam olarak basılır. Kübik, çeyrek kübik ve sekizlik dolgu, her yönde daha eşit bir kuvvet dağılımı sağlamak için her katmanda değişir." #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 3c8f4b35a8..cecca58cdd 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-01 13:45+0100\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:38+0100\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" "Language: zh_CN\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.13\n" +"X-Generator: Poedit 2.0.6\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" @@ -48,8 +48,8 @@ msgstr "GCodeWriter 不支持非文本模式。" #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "保存之前，请生成 G-code。" +msgid "Please prepare G-code before exporting." +msgstr "导出前请先准备 G-code。" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "显示更新日志" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "更新固件" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "配置文件已被合并并激活。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB 联机打印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "通过 USB 联机打印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "通过 USB 联机打印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "通过 USB 连接" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "正在进行 USB 打印，关闭 Cura 将停止此打印。您确定吗？" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter 不支持文本模式。" -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式包" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "保存到可移动磁盘 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "没有可进行写入的文件格式！" @@ -198,7 +203,7 @@ msgstr "无法保存到可移动磁盘 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "错误" @@ -227,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -255,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "可移动磁盘" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "通过网络打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "通过网络打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "已通过网络连接。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "已通过网络连接。请在打印机上接受访问请求。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "已通过网络连接，但没有打印机的控制权限。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" -msgstr "已发送打印机访问请求，请在打印机上批准该请求。" +msgstr "已发送打印机访问请求，请在打印机上批准该请求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "身份验证状态" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "身份验证状态" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "重试" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "重新发送访问请求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "打印机接受了访问请求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "无法使用本打印机进行打印，无法发送打印作业。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "请求访问" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "向打印机发送访问请求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "无法启动新的打印作业。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Ultimaker 配置存在问题，导致无法开始打印。请解决此问题，然后再继续。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "配置不匹配" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "您确定要使用所选配置进行打印吗？" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." msgstr "打印机的配置或校准与 Cura 之间不匹配。为了获得最佳打印效果，请务必切换打印头和打印机中插入的材料。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "向打印机发送数据" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "正在发送数据" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "取消" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "插槽 {slot_number} 中未加载 Printcore" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "插槽 {slot_number} 中未加载材料" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "为挤出机 {extruder_id} 选择了不同的 PrintCore（Cura: {cura_printcore_name}，打印机：{remote_printcore_name}）" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "您为挤出机 {2} 选择了不同的材料（Cura：{0}，打印机：{1}）" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "与您的打印机同步" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "您想在 Cura 中使用当前的打印机配置吗？" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "打印机上的打印头和/或材料与当前项目中的不同。 为获得最佳打印效果，请始终使用已插入打印机的打印头和材料进行切片。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" -msgstr "已通过网络连接。" +msgstr "已通过网络连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "打印作业已成功发送到打印机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "数据已发送" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "在监控器中查看" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "打印完成" @@ -480,49 +480,49 @@ msgctxt "@action" msgid "Connect via Network" msgstr "通过网络连接" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "监控" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "无法获取更新信息。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "您的 {machine_name} 有新功能可用！ 建议您更新打印机上的固件。" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "新 %s 固件可用" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "如何更新" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "无法获取更新信息。" - #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "分层视图" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "当单线打印（Wire Printing）功能开启时，Cura 将无法准确地显示打印层（Layers）" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "仿真视图" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "修改 G-Code 文件" @@ -536,32 +536,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "创建一个不打印支撑的体积。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura 将收集匿名的使用统计数据。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "正在收集数据" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "详细信息" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "请参阅更多关于Cura发送的数据的信息。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "允许" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "允许 Cura 发送匿名的使用统计数据，以帮助确定将来 Cura 的改进优先顺序。已发送您的一些偏好和设置，Cura 版本和您正在切片的模型的散列值。" @@ -596,56 +596,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF 图像" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "无法使用当前材料进行切片，因为该材料与所选机器或配置不兼容。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "无法切片" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "无法使用当前设置进行切片。以下设置存在错误：{0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "因部分特定模型设置而无法切片。 以下设置在一个或多个模型上存在错误： {error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "无法切片（原因：主塔或主位置无效）。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "无法切片，因为存在与已禁用挤出机 %s 相关联的对象。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "无法执行，因为没有一个模型符合成形空间体积。请缩放或旋转模型以适应打印平台。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "正在处理层" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "信息" @@ -661,13 +661,13 @@ msgid "Configure Per Model Settings" msgstr "设置对每个模型的单独设定" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "推荐" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "自定义" @@ -679,7 +679,7 @@ msgid "3MF File" msgstr "3MF 文件" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "喷嘴" @@ -705,18 +705,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G 文件" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "解析 G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-code 详细信息" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "发送文件之前，请确保 G-code 适用于当前打印机和打印机配置。当前 G-code 文件可能不准确。" @@ -727,16 +727,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 配置文件" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "配置文件助手" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "配置文件助手" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -758,11 +748,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "选择升级" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "升级固件" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -773,79 +758,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "调平打印平台" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "外壁" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "内壁" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "表层" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "填充" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "支撑填充" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "支撑接触面" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "支撑" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "移动" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "回抽" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "未知" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "预切片文件 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "登录失败" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "文件已存在" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -857,23 +842,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "未覆盖" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "所选材料与所选机器或配置不兼容。" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "不兼容材料" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "设置已更新" @@ -902,8 +887,6 @@ msgid "Export succeeded" msgstr "导出成功" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -911,58 +894,70 @@ msgstr "无法从 {0} 导入配置文件： {1}< #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:190 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "没有可供导入文件 {0} 的自定义配置文件" +msgstr "没有可导入文件 {0} 的自定义配置文件" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "此配置文件 {0} 包含错误数据，无法导入。" +msgstr "此配置文件 {0} 包含错误数据，无法导入。" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "自定义配置文件" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "配置文件缺少打印质量类型定义。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "无法为当前配置找到质量类型 {0}。" -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -989,12 +984,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有文件 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "自定义材料" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "自定义" @@ -1009,22 +1004,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "成形空间体积" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "不能从用户数据目录创建存档: {}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "备份" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "试图在没有适当数据或元数据的情况下恢复Cura备份。" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "试图恢复与您当前版本不匹配的Cura备份。" @@ -1199,40 +1194,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "发送报告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在载入打印机..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在设置场景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在载入界面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "所选模型过小，无法加载。" @@ -1263,9 +1258,9 @@ msgstr "X (宽度)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1400,22 +1395,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "打印机所支持耗材的公称直径。 材料和/或配置文件将覆盖精确直径。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "喷嘴偏移 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "喷嘴偏移 Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "冷却风扇数量" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "挤出机的开始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "挤出机的结束 G-code" @@ -1436,41 +1441,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "无法连接到Cura包数据库。请检查您的连接。" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "插件" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "材料" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "版本" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "更新日期" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "作者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "下载项" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "未知" @@ -1505,8 +1511,8 @@ msgstr "背部" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "确认卸载 " +msgid "Confirm uninstall" +msgstr "确认卸载" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1553,7 +1559,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "通用材料" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "安装" @@ -1635,48 +1641,88 @@ msgid "Changelog" msgstr "更新日志" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "关闭" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "更新固件" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "固件是直接在 3D 打印机上运行的一个软件。此固件控制步进电机，调节温度并最终使打印机正常工作。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "新打印机出厂配备的固件完全可以正常使用，但新版本往往具有更多的新功能和改进。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "自动升级固件" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "上传自定义固件" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "未连接打印机，无法更新固件。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "与打印机间的连接不支持固件更新，因此无法更新固件。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "选择自定义固件" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "固件升级" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "更新固件中..." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "固件更新已完成。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "由于未知错误，固件更新失败。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "由于通信错误，导致固件升级失败。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "由于输入/输出错误，导致固件升级失败。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "由于固件丢失，导致固件升级失败。" @@ -1686,22 +1732,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "用户协议" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "现有连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "此打印机/打印机组已添加到 Cura。请选择其他打印机/打印机组。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "连接到网络打印机" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1712,18 +1758,18 @@ msgstr "" "\n" "从以下列表中选择您的打印机：" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "添加" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "编辑" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1731,244 +1777,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "删除" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "刷新" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "如果您的打印机未列出，请阅读网络打印故障排除指南" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "类型" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "固件版本" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "地址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "这台打印机未设置为运行一组打印机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "这台打印机是一组共 %1 台打印机的主机。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "该网络地址的打印机尚未响应。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "打印机网络地址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "输入打印机在网络上的 IP 地址或主机名。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "确定" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "通过网络打印" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "打印机选择" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "通过网络打印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "等待：不可用的打印机" +msgid "Printer selection" +msgstr "打印机选择" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "等待：第一个可用的" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "等待： " - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "移至顶部" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "将打印作业移至顶部" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "您确定要将 %1 移至队列顶部吗？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "删除" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "删除打印作业" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "您确定要删除 %1 吗？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "管理队列" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "已排队" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "打印" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "管理打印机" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "不可用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "无法连接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "可用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "已中止" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "已完成" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "准备" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "暂停" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "恢复" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "需要采取行动" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "等待：不可用的打印机" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "等待：第一个可用的" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "等待： " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "配置更改" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "分配的打印机 %1 需要以下配置更改：" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "将材料 %1 从 %2 更改为 %3。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "将 %3 作为材料 %1 进行加载（此操作无法覆盖）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "将打印平台更改为 %1（此操作无法覆盖）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "覆盖" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "使用不兼容的配置启动打印作业可能会损坏 3D 打印机。您确定要覆盖配置并打印 %1 吗？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "覆盖配置并开始打印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "玻璃" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "铝" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "管理队列" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "已排队" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "打印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "管理打印机" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "移至顶部" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "删除" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "恢复" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "暂停" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "中止" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "您确定要将 %1 移至队列顶部吗？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "将打印作业移至顶部" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "您确定要删除 %1 吗？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "删除打印作业" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "您确定要中止 %1 吗？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "中止打印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "您确定要中止 %1 吗？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "已中止" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "已完成" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "准备" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "暂停" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "已暂停" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "恢复" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "需要采取行动" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "连接到打印机" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "将打印机配置导入 Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "应用配置" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "将打印机配置导入 Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2059,17 +2161,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "后期处理脚本" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "添加一个脚本" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "设置" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "更改目前启用的后期处理脚本" @@ -2102,7 +2204,7 @@ msgstr "转换图像..." #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:33 msgctxt "@info:tooltip" msgid "The maximum distance of each pixel from \"Base.\"" -msgstr "每个像素与底板的最大距离。" +msgstr "每个像素与底板的最大距离" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:38 msgctxt "@action:label" @@ -2132,7 +2234,7 @@ msgstr "宽度 (mm)" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:103 msgctxt "@info:tooltip" msgid "The depth in millimeters on the build plate" -msgstr "打印平台深度，以毫米为单位。" +msgstr "打印平台深度，以毫米为单位" #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:108 msgctxt "@action:label" @@ -2194,23 +2296,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "修改其他模型填充物的设置" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "选择设置" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "选择对此模型的自定义设置" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "筛选…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "显示全部" @@ -2261,6 +2363,7 @@ msgid "Type" msgstr "类型" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "打印机组" @@ -2278,6 +2381,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2350,82 +2454,6 @@ msgctxt "@action:button" msgid "Open" msgstr "打开" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "上一步" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "导出" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "下一步" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "提示" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00 小时 00 分" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "成本规定" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "总计：" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "打印试验" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "检查表" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2467,36 +2495,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "移动到下一个位置" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "升级固件" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "固件是直接在 3D 打印机上运行的一个软件。此固件控制步进电机，调节温度并最终使打印机正常工作。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "新打印机出厂配备的固件完全可以正常使用，但新版本往往具有更多的新功能和改进。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "自动升级固件" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "上传自定义固件" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "选择自定义固件" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2525,7 +2523,7 @@ msgstr "开始打印机检查" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:80 msgctxt "@label" msgid "Connection: " -msgstr "连接：" +msgstr "连接： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:89 msgctxt "@info:status" @@ -2540,7 +2538,7 @@ msgstr "未连接" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:99 msgctxt "@label" msgid "Min endstop X: " -msgstr "X Min 限位开关：" +msgstr "X Min 限位开关： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:109 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:130 @@ -2561,17 +2559,17 @@ msgstr "未检查" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:120 msgctxt "@label" msgid "Min endstop Y: " -msgstr "Y Min 限位开关：" +msgstr "Y Min 限位开关： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:141 msgctxt "@label" msgid "Min endstop Z: " -msgstr "Z Min 限位开关：" +msgstr "Z Min 限位开关： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:163 msgctxt "@label" msgid "Nozzle temperature check: " -msgstr "检查喷嘴温度：" +msgstr "检查喷嘴温度： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:187 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:248 @@ -2684,7 +2682,7 @@ msgid "Customized" msgstr "自定义" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "总是询问" @@ -2832,6 +2830,12 @@ msgctxt "@action:button" msgid "Import" msgstr "导入" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "导出" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2917,283 +2921,283 @@ msgid "Unit" msgstr "单位" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "接口" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "语言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "币种：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "主题：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "当设置被更改时自动进行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "自动切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "视区行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "显示悬垂（Overhang）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "当项目被选中时，自动对中视角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要令 Cura 的默认缩放操作反转吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反转视角变焦方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟随鼠标方向进行缩放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟随鼠标方向缩放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "确保每个模型都保持分离" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自动下降模型到打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 G-code 读取器中显示警告信息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 读取器中的警告信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "层视图要强制进入兼容模式吗？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "强制层视图兼容模式（需要重新启动）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "打开并保存文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "缩小过大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大过小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型是否应该在加载后被选中？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "选择模型时加载" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "将机器前缀添加到作业名称中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "保存项目文件时是否显示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "保存项目时显示摘要对话框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "打开项目文件时的默认行为" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " -msgstr "打开项目文件时的默认行为：" +msgstr "打开项目文件时的默认行为： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "总是询问" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "始终作为一个项目打开" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "始终导入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 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:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "总是舍失更改的设置" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "总是将更改的设置传输至新配置文件" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "隐私" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "启动时检查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）发送打印信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "详细信息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "实验性" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "使用多打印平台功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "打印机" @@ -3215,7 +3219,7 @@ msgid "Connection:" msgstr "连接：" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "尚未连接到打印机。" @@ -3241,7 +3245,7 @@ msgid "Aborting print..." msgstr "中止打印..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "配置文件" @@ -3322,17 +3326,17 @@ msgid "Global Settings" msgstr "全局设置" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "新增打印机" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "打印机名称：" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "新增打印机" @@ -3347,17 +3351,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "关于 Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "版本： %1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熔丝 3D 打印技术的的端对端解决方案。" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3366,102 +3370,122 @@ msgstr "" "Cura 由 Ultimaker B.V. 与社区合作开发。\n" "Cura 使用以下开源项目：" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "图形用户界面" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "应用框架" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-code 生成器" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "进程间通信交互使用库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "编程语言" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI 框架" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 框架绑定" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C / C++ 绑定库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "数据交换格式" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "科学计算支持库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "高速运算支持库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "用于处理 STL 文件的支持库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "用于处理平面对象的支持库" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "用于处理三角网格的支持库" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "用于分析复杂网络的支持库" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "用于处理 3MF 文件的支持库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "用于文件元数据和流媒体的支持库" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "串口通讯库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf 发现库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "多边形剪辑库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 库" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "字体" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG 图标" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 交叉分布应用程序部署" @@ -3471,7 +3495,7 @@ msgctxt "@label" msgid "Profile:" msgstr "配置文件：" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3482,53 +3506,53 @@ msgstr "" "\n" "点击打开配置文件管理器。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "搜索..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "将值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "将所有修改值复制到所有挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隐藏此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再显示此设置" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此设置可见" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "配置设定可见性..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "全部折叠" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "全部展开" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3547,19 +3571,19 @@ msgstr "影响" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:66 msgctxt "@label Header for list of settings." msgid "Affected By" -msgstr "受影响项目：" +msgstr "受影响项目" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " -msgstr "该值将会根据每一个挤出机的设置而确定" +msgstr "该值将会根据每一个挤出机的设置而确定 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3570,7 +3594,7 @@ msgstr "" "\n" "单击以恢复配置文件的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3725,12 +3749,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "视图(&V)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "摄像头位置(&C)" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "打印平台(&B)" @@ -3738,14 +3762,14 @@ msgstr "打印平台(&B)" #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 msgctxt "@action:inmenu" msgid "Visible Settings" -msgstr "可见设置：" +msgstr "可见设置" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "显示所有设置" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "管理设置可见性..." @@ -3806,17 +3830,44 @@ msgstr "" "打印设置已禁用\n" "G-code 文件无法被修改" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00 小时 00 分" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "时间规格" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "成本规定" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "总计：" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "推荐的打印设置

使用针对所选打印机、材料和质量的推荐设置进行打印。" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "自定义打印设置

对切片过程中的每一个细节进行精细控制。" @@ -3841,220 +3892,220 @@ msgctxt "@label" msgid "Estimated time left" msgstr "预计剩余时间" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切换完整界面" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "撤销(&U)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "重做(&R)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出(&Q)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "正视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "顶视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右视图" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "配置 Cura…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增打印机(&A)…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理打印机(&I)..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "管理材料…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "舍弃当前更改（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "从当前设置 / 重写值创建配置文件（&C）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理配置文件.." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "显示在线文档(&D)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 反馈(&B)" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "关于…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "删除所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "居中所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "复制所选模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "删除模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "使模型居于平台中央（&N）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "绑定模型（&G）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "拆分模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "合并模型（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "复制模型…（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "选择所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新载入所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "将所有模型编位到所有打印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "编位所有的模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "为所选模型编位" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "复位所有模型的位置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "复位所有模型的变动" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "打开文件（&O）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建项目（&N）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "显示引擎日志（&L）..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "显示配置文件夹" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "浏览包……" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "展开/折叠侧边栏" @@ -4115,7 +4166,7 @@ msgid "Select the active output device" msgstr "选择活动的输出装置" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "打开文件" @@ -4135,145 +4186,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "文件(&F)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "保存(&S)..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "导出(&E)..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "导出选择..." -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "编辑（&E）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "视图(&V)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "设置(&S)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "打印机（&P）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "材料（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "设为主要挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "启用挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "禁用挤出机" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "打印平台(&B)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "配置文件（&P）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "扩展(&X)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "&工具箱" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "偏好设置（&R）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "帮助(&H)" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "这个包将在重新启动后安装。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "设置" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "新建项目" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "你确定要开始一个新项目吗？这将清除打印平台及任何未保存的设置。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "关闭 Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "您确定要退出 Cura 吗？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "安装包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "打开文件" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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 文件，请仅选择一个。" @@ -4283,11 +4334,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "保存项目" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4358,37 +4404,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "渐层填充（Gradual infill）将随着打印高度的提升而逐渐加大填充密度。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "启用渐层" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "生成支撑" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 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/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "选择用于支撑的挤出机。该挤出机将在模型之下建立支撑结构，以防止模型下垂或在空中打印。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "打印平台附着" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 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。这将在您的对象周围或下方添加一个容易切断的平面区域。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "需要帮助改善您的打印？
阅读 Ultimaker 故障排除指南" @@ -4432,7 +4478,7 @@ msgstr "引擎日志" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:70 msgctxt "@label" msgid "Printer type" -msgstr "打印机类型：" +msgstr "打印机类型" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:376 msgctxt "@label" @@ -4549,6 +4595,16 @@ msgctxt "name" msgid "Changelog" msgstr "更新日志" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "为固件更新提供操作选项。" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "固件更新程序" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4662,7 +4718,7 @@ msgstr "固件更新检查程序" #: SimulationView/plugin.json msgctxt "description" msgid "Provides the Simulation view." -msgstr "提供仿真视图" +msgstr "提供仿真视图。" #: SimulationView/plugin.json msgctxt "name" @@ -4899,16 +4955,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 配置文件写入器" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "允许材料制造商使用下拉式 UI 创建新的材料和质量配置文件。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "打印配置文件助手" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4939,6 +4985,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 配置文件读取器" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "保存之前，请生成 G-code。" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "配置文件助手" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "配置文件助手" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "升级固件" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "未知" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "没有可供导入文件 {0} 的自定义配置文件" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "此配置文件 {0} 包含错误数据，无法导入。" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "配置文件 {0} ({1}) 中定义的机器与当前机器 ({2}) 不匹配，无法导入。" + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "确认卸载 " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "已暂停" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "上一步" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "下一步" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "提示" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "打印试验" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "检查表" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "升级固件" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "允许材料制造商使用下拉式 UI 创建新的材料和质量配置文件。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "打印配置文件助手" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "使用 Doodle3D WiFi-Box 打印" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index e72bf45a2b..cddfeae984 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 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" "PO-Revision-Date: 2018-09-28 14:25+0100\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" @@ -168,6 +168,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "打印开始时，喷头在 Z 轴坐标上的起始位置." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "挤出机打印冷却风扇" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "打印冷却风扇的数量与该挤出机有关。仅在每个挤出机都对应不同的打印冷却风扇时，对默认值 0 进行更改。" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 41b2b736de..3a85b1b454 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-01 14:20+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 15:38+0100\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.13\n" +"X-Generator: Poedit 2.0.6\n" "Plural-Forms: nplurals=1; plural=0;\n" #: fdmprinter.def.json @@ -84,7 +84,7 @@ msgstr "材料 GUID" #: fdmprinter.def.json msgctxt "material_guid description" msgid "GUID of the material. This is set automatically. " -msgstr "材料 GUID，此项为自动设置。" +msgstr "材料 GUID，此项为自动设置。 " #: fdmprinter.def.json msgctxt "material_diameter label" @@ -239,7 +239,7 @@ msgstr "挤出机组数目。 挤出机组是指进料装置、鲍登管和喷 #: fdmprinter.def.json msgctxt "extruders_enabled_count label" msgid "Number of Extruders that are enabled" -msgstr "已启用的挤出机数目。" +msgstr "已启用的挤出机数目" #: fdmprinter.def.json msgctxt "extruders_enabled_count description" @@ -554,7 +554,7 @@ msgstr "X 轴方向电机的最大加速度" #: fdmprinter.def.json msgctxt "machine_max_acceleration_y label" msgid "Maximum Acceleration Y" -msgstr " 轴最大加速度" +msgstr "轴最大加速度" #: fdmprinter.def.json msgctxt "machine_max_acceleration_y description" @@ -854,7 +854,7 @@ msgstr "单一支撑底板走线宽度。" #: fdmprinter.def.json msgctxt "prime_tower_line_width label" msgid "Prime Tower Line Width" -msgstr "装填塔走线宽度。" +msgstr "装填塔走线宽度" #: fdmprinter.def.json msgctxt "prime_tower_line_width description" @@ -1078,8 +1078,8 @@ msgstr "连接顶部/底部多边形" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "在顶部/底部皮肤路径互相紧靠运行的地方连接它们。对于同心图案，启用此设置可大大减少空驶时间，但因为连接可在填充中途发生，此功能可能会降低顶部表面质量。" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "在顶部/底部皮肤路径互相紧靠运行的地方连接它们。对于同心图案，启用此设置可大大减少空驶时间，但由于连接可在填充中途发生，此功能可能会降低顶部表面质量。" #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1498,8 +1498,8 @@ msgstr "填充图案" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "打印填充材料的图案。线条和锯齿形填充在交替层上交换方向，从而降低材料成本。网格、三角形、内六角、立方体、八角形、四面体、交叉和同心图案在每层完整打印。立方体、四面体和八角形填充随每层变化，以在各个方向提供更均衡的强度分布。" +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "打印填充材料的图案。线条和锯齿形填充在交替层上交换方向，从而降低材料成本。网格、三角形、内六角、立方体、八角形、四面体、交叉和同心图案在每层完整打印。螺旋二十四面体、立方体、四面体和八角形填充随每层变化，以在各个方向提供更均衡的强度分布。" #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1561,6 +1561,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "交叉 3D" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "螺旋二十四面体" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -1631,7 +1636,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" @@ -3263,6 +3270,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "用于支撑的填充图案的方向。支撑填充图案在水平面中旋转。" +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "启用支撑 Brim" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "在第一层的支撑填充区域内生成一个 Brim。此 Brim 在支撑下方打印，而非周围。启用此设置会增强支撑与打印平台的附着。" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "支撑 Brim 宽度" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "在支撑下方要打印的 Brim 的宽度。较大的 Brim 可增强与打印平台的附着，但也会增加一些额外材料成本。" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "支撑 Brim 走线次数" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "用于支撑 Brim 的走线数量。更多 Brim 走线可增强与打印平台的附着，但也会增加一些额外材料成本。" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3832,6 +3869,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "brim 所用走线数量。 更多 brim 走线可增强与打印平台的附着，但也会减少有效打印区域。" +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "Brim 替换支撑" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "强制围绕模型打印 Brim，即使该空间本该由支撑占据。此操作会将第一层的某些支撑区域替换为 Brim 区域。" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5656,6 +5703,14 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "在顶部/底部皮肤路径互相紧靠运行的地方连接它们。对于同心图案，启用此设置可大大减少空驶时间，但因为连接可在填充中途发生，此功能可能会降低顶部表面质量。" + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "打印填充材料的图案。线条和锯齿形填充在交替层上交换方向，从而降低材料成本。网格、三角形、内六角、立方体、八角形、四面体、交叉和同心图案在每层完整打印。立方体、四面体和八角形填充随每层变化，以在各个方向提供更均衡的强度分布。" + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "立体同心圆" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 3658a7f2b2..c27349ffe3 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" +"Project-Id-Version: Cura 3.6\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2018-09-19 17:07+0200\n" -"PO-Revision-Date: 2018-10-02 10:25+0100\n" +"POT-Creation-Date: 2018-10-29 15:01+0100\n" +"PO-Revision-Date: 2018-11-06 15:39+0100\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.0.6\n" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" @@ -48,8 +48,8 @@ msgstr "G-code 寫入器不支援非文字模式。" #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:73 #: /home/ruben/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:89 msgctxt "@warning:status" -msgid "Please generate G-code before saving." -msgstr "請在儲存前產出 G-code。" +msgid "Please prepare G-code before exporting." +msgstr "匯出前請先將 G-code 準備好。" #: /home/ruben/Projects/Cura/plugins/ModelChecker/ModelChecker.py:30 msgctxt "@info:title" @@ -75,6 +75,11 @@ msgctxt "@item:inmenu" msgid "Show Changelog" msgstr "顯示更新日誌" +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.py:25 +msgctxt "@action" +msgid "Update Firmware" +msgstr "更新韌體" + #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:23 msgctxt "@item:inmenu" msgid "Flatten active settings" @@ -85,27 +90,27 @@ msgctxt "@info:status" msgid "Profile has been flattened & activated." msgstr "列印參數已被合併並啟用。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:40 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:32 msgctxt "@item:inmenu" msgid "USB printing" msgstr "USB 連線列印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:41 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:33 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print via USB" msgstr "透過 USB 連線列印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:42 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:34 msgctxt "@info:tooltip" msgid "Print via USB" msgstr "透過 USB 連線列印" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:83 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:69 msgctxt "@info:status" msgid "Connected via USB" msgstr "透過 USB 連接" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:103 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:92 msgctxt "@label" msgid "A USB print is in progress, closing Cura will stop this print. Are you sure?" msgstr "USB 列印正在進行中，關閉 Cura 將停止此列印工作。你確定要繼續嗎？" @@ -137,7 +142,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "G-code GZ 寫入器不支援非文字模式。" -#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:38 +#: /home/ruben/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式的封包" @@ -159,7 +164,7 @@ msgid "Save to Removable Drive {0}" msgstr "儲存到行動裝置 {0}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:64 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:131 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:133 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "沒有可供寫入的檔案格式！" @@ -198,7 +203,7 @@ msgstr "無法儲存到行動裝置 {0}：{1}" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:137 #: /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:1567 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1607 msgctxt "@info:title" msgid "Error" msgstr "錯誤" @@ -227,8 +232,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/CuraApplication.py:1557 -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1651 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1597 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1695 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -255,141 +260,136 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "行動裝置" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:86 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:88 msgctxt "@action:button Preceded by 'Ready to'." msgid "Print over network" msgstr "網路連線列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:75 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:87 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:74 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 msgctxt "@properties:tooltip" msgid "Print over network" msgstr "網路連線列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:88 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:87 msgctxt "@info:status" msgid "Connected over the network." msgstr "已透過網路連接。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:91 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:90 msgctxt "@info:status" msgid "Connected over the network. Please approve the access request on the printer." msgstr "已透過網路連接。請在印表機上接受存取請求。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:93 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:92 msgctxt "@info:status" msgid "Connected over the network. No access to control the printer." msgstr "已透過網路連接，但沒有印表機的控制權限。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:98 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:97 msgctxt "@info:status" msgid "Access to the printer requested. Please approve the request on the printer" msgstr "已發送印表機存取請求，請在印表機上批准該請求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:101 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:100 msgctxt "@info:title" msgid "Authentication status" msgstr "認証狀態" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 -msgctxt "@info:status" -msgid "" -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:110 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:114 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:102 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:108 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:112 msgctxt "@info:title" msgid "Authentication Status" msgstr "認証狀態" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:103 msgctxt "@action:button" msgid "Retry" msgstr "重試" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:106 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:104 msgctxt "@info:tooltip" msgid "Re-send the access request" msgstr "重新發送存取請求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:109 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:107 msgctxt "@info:status" msgid "Access to the printer accepted" msgstr "印表機接受了存取請求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:111 msgctxt "@info:status" msgid "No access to print with this printer. Unable to send print job." msgstr "無法使用本印表機進行列印，無法發送列印作業。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:29 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:73 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:113 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:33 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:70 msgctxt "@action:button" msgid "Request Access" msgstr "請求存取" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:117 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:28 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:115 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:34 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:71 msgctxt "@info:tooltip" msgid "Send access request to the printer" msgstr "向印表機發送存取請求" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:200 msgctxt "@label" msgid "Unable to start a new print job." msgstr "無法開始新的列印作業。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:202 msgctxt "@label" msgid "There is an issue with the configuration of your Ultimaker, which makes it impossible to start the print. Please resolve this issues before continuing." msgstr "Ultimaker 的設定有問題導致無法開始列印。請在繼續之前解決這個問題。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:210 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:208 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:230 msgctxt "@window:title" msgid "Mismatched configuration" msgstr "設定不匹配" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:222 msgctxt "@label" msgid "Are you sure you wish to print with the selected configuration?" msgstr "你確定要使用所選設定進行列印嗎？" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:226 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:224 msgctxt "@label" msgid "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." msgstr "印表機的設定或校正與 Cura 之間不匹配。為了獲得最佳列印效果，請使用印表機的 PrintCores 和耗材設定進行切片。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:253 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:197 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:251 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:199 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:260 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:216 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:232 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:258 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:218 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 msgctxt "@info:status" msgid "Sending data to printer" msgstr "正在向印表機發送資料" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:261 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:217 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:233 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:259 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:219 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:235 msgctxt "@info:title" msgid "Sending Data" msgstr "發送資料中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:262 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:234 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:260 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:236 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml:18 #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:80 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:378 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:381 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:20 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:143 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:391 @@ -399,78 +399,78 @@ msgctxt "@action:button" msgid "Cancel" msgstr "取消" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:325 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:323 #, python-brace-format msgctxt "@info:status" msgid "No Printcore loaded in slot {slot_number}" msgstr "Slot {slot_number} 中沒有載入 Printcore" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:331 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:329 #, python-brace-format msgctxt "@info:status" msgid "No material loaded in slot {slot_number}" msgstr "Slot {slot_number} 中沒有載入耗材" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:354 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:352 #, python-brace-format msgctxt "@label" msgid "Different PrintCore (Cura: {cura_printcore_name}, Printer: {remote_printcore_name}) selected for extruder {extruder_id}" msgstr "擠出機 {extruder_id} 選擇了不同的 PrintCore（Cura：{cura_printcore_name}，印表機：{remote_printcore_name}）" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:363 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:361 #, python-brace-format msgctxt "@label" msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}" msgstr "擠出機 {2} 選擇了不同的耗材（Cura：{0}，印表機：{1}）" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:547 msgctxt "@window:title" msgid "Sync with your printer" msgstr "與你的印表機同步" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:549 msgctxt "@label" msgid "Would you like to use your current printer configuration in Cura?" msgstr "你想在 Cura 中使用目前的印表機設定嗎？" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:553 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py:551 msgctxt "@label" msgid "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." msgstr "印表機上的 PrintCores 和/或耗材與目前專案中的不同。為獲得最佳列印效果，請使用目前印表機的 PrintCores 和耗材設定進行切片。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:89 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:91 msgctxt "@info:status" msgid "Connected over the network" msgstr "透過網路連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:310 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:303 msgctxt "@info:status" msgid "Print job was successfully sent to the printer." msgstr "列印作業已成功傳送到印表機。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:312 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:305 msgctxt "@info:title" msgid "Data Sent" msgstr "資料傳送" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:313 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:306 msgctxt "@action:button" msgid "View in Monitor" msgstr "使用監控觀看" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:420 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:422 #, 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:422 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:424 #, 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:423 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py:425 msgctxt "@info:status" msgid "Print finished" msgstr "列印已完成" @@ -480,50 +480,50 @@ msgctxt "@action" msgid "Connect via Network" msgstr "透過網路連接" -#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:12 +#: /home/ruben/Projects/Cura/plugins/MonitorStage/__init__.py:13 msgctxt "@item:inmenu" msgid "Monitor" msgstr "監控" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:68 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:119 +msgctxt "@info" +msgid "Could not access update information." +msgstr "無法存取更新資訊。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:17 #, python-brace-format msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!" msgid "New features are available for your {machine_name}! It is recommended to update the firmware on your printer." msgstr "你的 {machine_name} 有新功能可用！建議更新印表機韌體。" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:72 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:21 #, python-format msgctxt "@info:title The %s gets replaced with the printer name." msgid "New %s firmware available" msgstr "有新 %s 韌體可用" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:75 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:27 msgctxt "@action:button" msgid "How to update" msgstr "如何更新" -#: /home/ruben/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py:91 -msgctxt "@info" -msgid "Could not access update information." -msgstr "無法存取更新資訊。" - # Added manually to fix a string that was changed after string freeze. #: /home/ruben/Projects/Cura/plugins/SimulationView/__init__.py:14 msgctxt "@item:inlistbox" msgid "Layer view" msgstr "分層檢視" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:102 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:113 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled" msgstr "當鐵絲網列印（Wire Printing）功能開啟時，Cura 將無法準確地顯示列印層（Layers）" -#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:103 +#: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.py:114 msgctxt "@info:title" msgid "Simulation View" msgstr "模擬檢視" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:28 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:35 msgid "Modify G-Code" msgstr "修改 G-Code 檔案" @@ -537,32 +537,32 @@ msgctxt "@info:tooltip" msgid "Create a volume in which supports are not printed." msgstr "建立一塊不列印支撐的空間。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 msgctxt "@info" msgid "Cura collects anonymized usage statistics." msgstr "Cura 以匿名方式蒐集使用狀況統計資料。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:46 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:55 msgctxt "@info:title" msgid "Collecting Data" msgstr "收集資料中" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:48 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:57 msgctxt "@action:button" msgid "More info" msgstr "更多資訊" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:49 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:58 msgctxt "@action:tooltip" msgid "See more information on what data Cura sends." msgstr "檢視更多關於 Cura 傳送資料的資訊。" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:51 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:60 msgctxt "@action:button" msgid "Allow" msgstr "允許" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:52 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:61 msgctxt "@action:tooltip" msgid "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing." msgstr "允許 Cura 以匿名方式傳送使用狀況統計資料，用來協助 Cura 的未來改善工作。你的部份偏好設定和參數，Cura 的版本及你切片模型的雜湊值會被傳送。" @@ -597,56 +597,56 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF 圖片" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "無法使用目前耗材切片，因為它與所選機器或設定不相容。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:333 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:364 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:388 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:397 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:406 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:415 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:332 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 msgctxt "@info:title" msgid "Unable to slice" msgstr "無法切片" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:363 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:362 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "無法使用目前設定進行切片。以下設定存在錯誤：{0}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "因部份模型設定問題無法進行切片。部份模型的下列設定有錯誤：{error_labels}" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:396 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:395 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "無法切片（原因：換料塔或主位置無效）。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:405 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:404 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "有物件使用了被停用的擠出機 %s ，因此無法進行切片。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:414 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 msgctxt "@info:status" msgid "Nothing to slice because none of the models fit the build volume. Please scale or rotate models to fit." msgstr "沒有模型可進行切片，因為模型超出了列印範圍。請縮放或旋轉模型, 讓模型可置入列印範圍。" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:49 -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:50 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:status" msgid "Processing Layers" msgstr "正在處理層" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:242 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:255 msgctxt "@info:title" msgid "Information" msgstr "資訊" @@ -662,13 +662,13 @@ msgid "Configure Per Model Settings" msgstr "設定對每個模型的單獨設定" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:175 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:575 msgctxt "@title:tab" msgid "Recommended" msgstr "推薦" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:177 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:580 msgctxt "@title:tab" msgid "Custom" msgstr "自訂選項" @@ -680,7 +680,7 @@ msgid "3MF File" msgstr "3MF 檔案" #: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:190 -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:711 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:714 msgctxt "@label" msgid "Nozzle" msgstr "噴頭" @@ -706,18 +706,18 @@ msgctxt "@item:inlistbox" msgid "G File" msgstr "G 檔案" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:317 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:324 msgctxt "@info:status" msgid "Parsing G-code" msgstr "正在解析 G-code" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:319 -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:466 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:326 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:474 msgctxt "@info:title" msgid "G-code Details" msgstr "G-code 細項設定" -#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:464 +#: /home/ruben/Projects/Cura/plugins/GCodeReader/FlavorParser.py:472 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 "發送檔案之前，請確保 G-code 適用於目前印表機和印表機設定。目前 G-code 檔案可能不準確。" @@ -728,16 +728,6 @@ msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 列印參數" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:12 -msgctxt "@item:inmenu" -msgid "Profile Assistant" -msgstr "參數助手" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/__init__.py:17 -msgctxt "@item:inlistbox" -msgid "Profile Assistant" -msgstr "參數助手" - #: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:26 msgctxt "@item:inlistbox" msgid "3MF file" @@ -759,11 +749,6 @@ msgctxt "@action" msgid "Select upgrades" msgstr "選擇升級" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12 -msgctxt "@action" -msgid "Upgrade Firmware" -msgstr "升級韌體" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.py:14 msgctxt "@action" msgid "Checkup" @@ -774,79 +759,79 @@ msgctxt "@action" msgid "Level build plate" msgstr "調平列印平台" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:98 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "外壁" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:99 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "內壁" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:100 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "表層" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:101 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "填充" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:102 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "支撐填充" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:103 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "支撐介面" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:104 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "支撐" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:105 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "外圍" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:106 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:90 msgctxt "@tooltip" msgid "Travel" msgstr "移動" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:107 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:91 msgctxt "@tooltip" msgid "Retractions" msgstr "回抽" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:108 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:92 msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:229 -msgctxt "@label unknown material" -msgid "Unknown" -msgstr "未知" - -#: /home/ruben/Projects/Cura/cura/PrintInformation.py:314 +#: /home/ruben/Projects/Cura/cura/PrintInformation.py:310 #, python-brace-format msgctxt "@label" msgid "Pre-sliced file {0}" msgstr "預切片檔案 {0}" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:186 +#: /home/ruben/Projects/Cura/cura/API/Account.py:71 +msgctxt "@info:title" +msgid "Login failed" +msgstr "登入失敗" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:201 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:121 msgctxt "@title:window" msgid "File Already Exists" msgstr "檔案已經存在" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:187 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:202 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:122 #, python-brace-format msgctxt "@label Don't translate the XML tag !" @@ -858,23 +843,23 @@ msgctxt "@menuitem" msgid "Not overridden" msgstr "不覆寫" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:120 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:117 msgctxt "@info:status" msgid "The selected material is incompatible with the selected machine or configuration." msgstr "所選耗材與所選機器或設定不相容。" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:121 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:118 msgctxt "@info:title" msgid "Incompatible Material" msgstr "不相容的耗材" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:863 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:866 #, 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:865 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:868 msgctxt "@info:title" msgid "Settings updated" msgstr "設定更新" @@ -903,8 +888,6 @@ msgid "Export succeeded" msgstr "匯出成功" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:170 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:313 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Failed to import profile from {0}: {1}" @@ -912,58 +895,70 @@ msgstr "無法從 {0} 匯入列印參數：{1} or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "No custom profile to import in file {0}" -msgstr "檔案 {0} 內無自訂參數可匯入" +msgstr "檔案 {0} 內沒有自訂列印參數可匯入" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:194 +#, 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 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." -msgstr "此列印參數 {0} 含有錯誤的資料，無法導入。" +msgstr "列印參數 {0} 含有不正確的資料，無法匯入。" #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:241 #, python-brace-format -msgctxt "@info:status Don't translate the XML tags or !" +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}) 不匹配，無法匯入。" +msgstr "列印參數 {0} 內定義的機器（{1}）與你目前的機器（{2}）不匹配， 無法匯入。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:316 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:312 +#, 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:315 #, 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:318 #, 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:321 #, 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:340 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:339 msgctxt "@label" msgid "Custom profile" msgstr "自訂列印參數" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:356 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:355 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "列印參數缺少列印品質類型定義。" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:370 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:369 #, python-brace-format msgctxt "@info:status" msgid "Could not find a quality type {0} for the current configuration." msgstr "無法為目前設定找到品質類型 {0}。" -#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:59 +#: /home/ruben/Projects/Cura/cura/ObjectsModel.py:63 #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" @@ -990,12 +985,12 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有檔案 (*)" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:609 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:636 msgctxt "@label" msgid "Custom Material" msgstr "自訂耗材" -#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:610 +#: /home/ruben/Projects/Cura/cura/Machines/MaterialManager.py:637 msgctxt "@label" msgid "Custom" msgstr "自訂" @@ -1010,22 +1005,22 @@ msgctxt "@info:title" msgid "Build Volume" msgstr "列印範圍" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:97 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:98 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "無法從使用者資料目錄建立備份檔：{}" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:102 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:103 msgctxt "@info:title" msgid "Backup" msgstr "備份" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:112 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:113 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "嘗試復原沒有正確資料或 meta data 的 Cura 備份。" -#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/ruben/Projects/Cura/cura/Backups/Backup.py:123 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that does not match your current version." msgstr "嘗試復原版本不符的 Cura 備份。" @@ -1200,40 +1195,40 @@ msgctxt "@action:button" msgid "Send report" msgstr "送出報告" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:454 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:473 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在載入印表機..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:748 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:775 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在設定場景..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:784 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:811 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在載入介面…" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:997 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1037 #, 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:1556 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1596 #, 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:1566 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1606 #, 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:1650 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1694 msgctxt "@info:status" msgid "The selected model was too small to load." msgstr "選擇的模型太小無法載入。" @@ -1264,9 +1259,9 @@ msgstr "X (寬度)" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:237 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:402 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:420 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:432 -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:857 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:428 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:440 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:896 msgctxt "@label" msgid "mm" msgstr "mm" @@ -1401,22 +1396,32 @@ msgctxt "@tooltip" msgid "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile." msgstr "印表機所支援的耗材直徑。實際列印的耗材直徑由耗材和/或列印參數提供。" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:419 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:427 msgctxt "@label" msgid "Nozzle offset X" msgstr "噴頭偏移 X" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:439 msgctxt "@label" msgid "Nozzle offset Y" msgstr "噴頭偏移 Y" +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:451 +msgctxt "@label" +msgid "Cooling Fan Number" +msgstr "冷卻風扇數量" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:452 msgctxt "@label" +msgid "" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:472 +msgctxt "@label" msgid "Extruder Start G-code" msgstr "擠出機起始 G-code" -#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:470 +#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:490 msgctxt "@label" msgid "Extruder End G-code" msgstr "擠出機結束 G-code" @@ -1437,41 +1442,42 @@ msgid "Could not connect to the Cura Package database. Please check your connect msgstr "無法連上 Cura 軟體包資料庫。請檢查你的網路連線。" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:38 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:26 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:28 msgctxt "@title:tab" msgid "Plugins" msgstr "外掛" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml:75 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:42 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:66 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:551 msgctxt "@title:tab" msgid "Materials" msgstr "耗材" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:80 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:79 msgctxt "@label" msgid "Version" msgstr "版本" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:86 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:85 msgctxt "@label" msgid "Last updated" msgstr "最後更新時間" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:92 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:91 msgctxt "@label" msgid "Author" msgstr "作者" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:98 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:97 msgctxt "@label" msgid "Downloads" msgstr "下載" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:117 -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:159 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:255 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:116 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml:158 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:258 msgctxt "@label" msgid "Unknown" msgstr "未知" @@ -1506,8 +1512,8 @@ msgstr "返回" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:20 msgctxt "@title:window" -msgid "Confirm uninstall " -msgstr "移除確認 " +msgid "Confirm uninstall" +msgstr "移除確認" #: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" @@ -1554,7 +1560,7 @@ msgctxt "@label" msgid "Generic Materials" msgstr "通用耗材" -#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:54 +#: /home/ruben/Projects/Cura/plugins/Toolbox/resources/qml/ToolboxHeader.qml:56 msgctxt "@title:tab" msgid "Installed" msgstr "已安裝" @@ -1636,48 +1642,88 @@ msgid "Changelog" msgstr "更新日誌" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37 -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:84 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:56 -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:464 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:508 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:53 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:467 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:514 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:121 -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:166 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" msgid "Close" msgstr "關閉" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:31 +msgctxt "@title" +msgid "Update Firmware" +msgstr "更新韌體" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:39 +msgctxt "@label" +msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." +msgstr "韌體是直接在 3D 印表機上運行的一個軟體。此韌體控制步進馬達，調節溫度讓印表機正常運作。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:46 +msgctxt "@label" +msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." +msgstr "新印表機出廠配備的韌體完全可以正常使用，但新版本往往具有更多的新功能和改進。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:58 +msgctxt "@action:button" +msgid "Automatically upgrade Firmware" +msgstr "自動升級韌體" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:69 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "上傳自訂韌體" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:83 +msgctxt "@label" +msgid "Firmware can not be updated because there is no connection with the printer." +msgstr "因為沒有與印表機連線，無法更新韌體。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:91 +msgctxt "@label" +msgid "Firmware can not be updated because the connection with the printer does not support upgrading firmware." +msgstr "因為連線的印表機不支援更新韌體，無法更新韌體。" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:98 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "選擇自訂韌體" + +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:119 msgctxt "@title:window" msgid "Firmware Update" msgstr "韌體更新" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:143 msgctxt "@label" msgid "Updating firmware." msgstr "更新韌體中..." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:44 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:145 msgctxt "@label" msgid "Firmware update completed." msgstr "韌體更新已完成。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:46 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:147 msgctxt "@label" msgid "Firmware update failed due to an unknown error." msgstr "由於未知錯誤，韌體更新失敗。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:48 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:149 msgctxt "@label" msgid "Firmware update failed due to an communication error." msgstr "由於通訊錯誤，導致韌體更新失敗。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:151 msgctxt "@label" msgid "Firmware update failed due to an input/output error." msgstr "由於輸入/輸出錯誤，導致韌體更新失敗。" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52 +#: /home/ruben/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:153 msgctxt "@label" msgid "Firmware update failed due to missing firmware." msgstr "由於韌體遺失，導致韌體更新失敗。" @@ -1687,22 +1733,22 @@ msgctxt "@title:window" msgid "User Agreement" msgstr "使用者授權" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:43 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:46 msgctxt "@window:title" msgid "Existing Connection" msgstr "目前連線中" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:45 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:48 msgctxt "@message:text" msgid "This printer/group is already added to Cura. Please select another printer/group." msgstr "此印表機/群組已加入 Cura。請選擇另一個印表機/群組。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:62 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:65 msgctxt "@title:window" msgid "Connect to Networked Printer" msgstr "連接到網路印表機" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:72 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:75 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" @@ -1713,18 +1759,18 @@ msgstr "" "\n" "從以下列表中選擇你的印表機：" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:82 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:85 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:42 msgctxt "@action:button" msgid "Add" msgstr "增加" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:92 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:95 msgctxt "@action:button" msgid "Edit" msgstr "編輯" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:103 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:106 #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:128 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:117 @@ -1732,244 +1778,300 @@ msgctxt "@action:button" msgid "Remove" msgstr "移除" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:111 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:114 msgctxt "@action:button" msgid "Refresh" msgstr "刷新" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:204 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:207 msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "如果你的印表機未被列出，請閱讀網路列印故障排除指南" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:231 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:234 msgctxt "@label" msgid "Type" msgstr "類型" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:268 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:271 msgctxt "@label" msgid "Firmware version" msgstr "韌體版本" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:280 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:283 msgctxt "@label" msgid "Address" msgstr "位址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:302 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:305 msgctxt "@label" msgid "This printer is not set up to host a group of printers." msgstr "此印表機未被設定為管理印表機群組。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:306 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:309 msgctxt "@label" msgid "This printer is the host for a group of %1 printers." msgstr "此印表機為 %1 印表機群組的管理者。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:316 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:319 msgctxt "@label" msgid "The printer at this address has not yet responded." msgstr "該網路位址的印表機尚無回應。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:39 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:324 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:42 msgctxt "@action:button" msgid "Connect" msgstr "連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:335 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:338 msgctxt "@title:window" msgid "Printer Address" msgstr "印表機網路位址" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:358 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@alabel" msgid "Enter the IP address or hostname of your printer on the network." msgstr "輸入印表機在網路上的 IP 位址或主機名。" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:387 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:390 #: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:132 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181 msgctxt "@action:button" msgid "OK" msgstr "確定" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:34 -msgctxt "@title:window" -msgid "Print over network" -msgstr "網路連線列印" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:65 -msgctxt "@label" -msgid "Printer selection" -msgstr "印表機選擇" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:105 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:44 msgctxt "@action:button" msgid "Print" msgstr "列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:142 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:47 +msgctxt "@title:window" +msgid "Print over network" +msgstr "網路連線列印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:79 msgctxt "@label" -msgid "Waiting for: Unavailable printer" -msgstr "等待：印表機無法使用" +msgid "Printer selection" +msgstr "印表機選擇" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:144 -msgctxt "@label" -msgid "Waiting for: First available" -msgstr "等待：第一可用" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:148 -msgctxt "@label" -msgid "Waiting for: " -msgstr "等待：" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 -msgctxt "@label" -msgid "Move to top" -msgstr "移至頂端" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:234 -msgctxt "@window:title" -msgid "Move print job to top" -msgstr "將列印作業移至最頂端" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:236 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to move %1 to the top of the queue?" -msgstr "你確定要將 %1 移至隊列的頂端嗎？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:245 -msgctxt "@label" -msgid "Delete" -msgstr "刪除" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:264 -msgctxt "@window:title" -msgid "Delete print job" -msgstr "刪除列印作業" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:266 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to delete %1?" -msgstr "你確定要刪除 %1 嗎？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:32 -msgctxt "@label link to connect manager" -msgid "Manage queue" -msgstr "管理隊列" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:54 -msgctxt "@label" -msgid "Queued" -msgstr "已排入隊列" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:44 -msgctxt "@label" -msgid "Printing" -msgstr "列印中" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:54 -msgctxt "@label link to connect manager" -msgid "Manage printers" -msgstr "管理印表機" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:212 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:173 msgctxt "@label" msgid "Not available" msgstr "無法使用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:215 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:175 msgctxt "@label" msgid "Unreachable" msgstr "無法連接" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:221 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml:180 msgctxt "@label" msgid "Available" msgstr "可用" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:37 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:44 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:46 +msgctxt "@label:status" +msgid "Aborted" +msgstr "已中斷" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:39 +msgctxt "@label:status" +msgid "Finished" +msgstr "已完成" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:42 +msgctxt "@label:status" +msgid "Preparing" +msgstr "正在準備" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:48 +msgctxt "@label:status" +msgid "Pausing" +msgstr "暫停中" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:52 +msgctxt "@label:status" +msgid "Resuming" +msgstr "繼續" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrinterCardProgressBar.qml:54 +msgctxt "@label:status" +msgid "Action required" +msgstr "需要採取的動作" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:213 +msgctxt "@label" +msgid "Waiting for: Unavailable printer" +msgstr "等待：印表機無法使用" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:215 +msgctxt "@label" +msgid "Waiting for: First available" +msgstr "等待：第一可用" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:217 +msgctxt "@label" +msgid "Waiting for: " +msgstr "等待： " + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:299 +msgctxt "@label" +msgid "Configuration change" +msgstr "設定更動" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:365 +msgctxt "@label" +msgid "The assigned printer, %1, requires the following configuration change(s):" +msgstr "分配的印表機 %1 需要下列的設定更動：" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:367 +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/PrintJobInfoBlock.qml:375 +msgctxt "@label" +msgid "Change material %1 from %2 to %3." +msgstr "將耗材 %1 從 %2 改成 %3。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:378 +msgctxt "@label" +msgid "Load %3 as material %1 (This cannot be overridden)." +msgstr "將 %3 做為耗材 %1 載入（無法覆寫）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:381 +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/PrintJobInfoBlock.qml:384 +msgctxt "@label" +msgid "Change build plate to %1 (This cannot be overridden)." +msgstr "將列印平台改成 %1（無法覆寫）。" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:404 +msgctxt "@label" +msgid "Override" +msgstr "覆寫" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:432 +msgctxt "@label" +msgid "Starting a print job with an incompatible configuration could damage your 3D printer. Are you sure you want to override the configuration and print %1?" +msgstr "使用不相容的設定啟動列印工作可能會損壞你的 3D 印表機。你確定要覆寫設定並列印 %1 嗎？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:435 +msgctxt "@window:title" +msgid "Override configuration configuration and start print" +msgstr "覆寫設定並開始列印" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:466 +msgctxt "@label" +msgid "Glass" +msgstr "玻璃" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml:469 +msgctxt "@label" +msgid "Aluminum" +msgstr "鋁" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:39 +msgctxt "@label link to connect manager" +msgid "Manage queue" +msgstr "管理隊列" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterMonitorItem.qml:60 +msgctxt "@label" +msgid "Queued" +msgstr "已排入隊列" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:36 +msgctxt "@label" +msgid "Printing" +msgstr "列印中" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:49 +msgctxt "@label link to connect manager" +msgid "Manage printers" +msgstr "管理印表機" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:115 +msgctxt "@label" +msgid "Move to top" +msgstr "移至頂端" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:124 +msgctxt "@label" +msgid "Delete" +msgstr "刪除" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:289 msgctxt "@label" msgid "Resume" msgstr "繼續" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:416 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:137 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:284 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:293 msgctxt "@label" msgid "Pause" msgstr "暫停" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:444 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:146 msgctxt "@label" msgid "Abort" msgstr "中斷" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:464 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:178 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to move %1 to the top of the queue?" +msgstr "你確定要將 %1 移至隊列的頂端嗎？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:179 +msgctxt "@window:title" +msgid "Move print job to top" +msgstr "將列印作業移至最頂端" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:188 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to delete %1?" +msgstr "你確定要刪除 %1 嗎？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:189 +msgctxt "@window:title" +msgid "Delete print job" +msgstr "刪除列印作業" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:198 +msgctxt "@label %1 is the name of a print job." +msgid "Are you sure you want to abort %1?" +msgstr "你確定要中斷 %1 嗎？" + +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml:199 #: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:335 msgctxt "@window:title" msgid "Abort print" msgstr "中斷列印" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:466 -msgctxt "@label %1 is the name of a print job." -msgid "Are you sure you want to abort %1?" -msgstr "你確定要中斷 %1 嗎？" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:665 -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:673 -msgctxt "@label:status" -msgid "Aborted" -msgstr "已中斷" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:667 -msgctxt "@label:status" -msgid "Finished" -msgstr "已完成" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:670 -msgctxt "@label:status" -msgid "Preparing" -msgstr "正在準備" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:675 -msgctxt "@label:status" -msgid "Pausing" -msgstr "暫停中" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:677 -msgctxt "@label:status" -msgid "Paused" -msgstr "已暫停" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:679 -msgctxt "@label:status" -msgid "Resuming" -msgstr "繼續" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml:681 -msgctxt "@label:status" -msgid "Action required" -msgstr "需要採取的動作" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:38 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:43 msgctxt "@info:tooltip" msgid "Connect to a printer" msgstr "連接到印表機" -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:117 -msgctxt "@info:tooltip" -msgid "Load the configuration of the printer into Cura" -msgstr "將印表機設定載入 Cura" - -#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:118 +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:121 msgctxt "@action:button" msgid "Activate Configuration" msgstr "啟用設定" +#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml:122 +msgctxt "@info:tooltip" +msgid "Load the configuration of the printer into Cura" +msgstr "將印表機設定載入 Cura" + #: /home/ruben/Projects/Cura/plugins/SimulationView/SimulationView.qml:130 msgctxt "@label" msgid "Color scheme" @@ -2060,17 +2162,17 @@ msgctxt "@label" msgid "Post Processing Scripts" msgstr "後處理腳本" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:225 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:227 msgctxt "@action" msgid "Add a script" msgstr "添加一個腳本" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:271 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:273 msgctxt "@label" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:474 +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:477 msgctxt "@info:tooltip" msgid "Change active post-processing scripts" msgstr "更改目前啟用的後處理腳本" @@ -2195,23 +2297,23 @@ msgctxt "@label" msgid "Modify settings for infill of other models" msgstr "修改其他模型的填充設定" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:341 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:347 msgctxt "@action:button" msgid "Select settings" msgstr "選擇設定" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:383 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:389 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "選擇對此模型的自訂設定" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:431 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:437 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:98 msgctxt "@label:textbox" msgid "Filter..." msgstr "篩選…" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:445 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:451 msgctxt "@label:checkbox" msgid "Show all" msgstr "顯示全部" @@ -2262,6 +2364,7 @@ msgid "Type" msgstr "類型" #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 msgctxt "@action:label" msgid "Printer Group" msgstr "印表機群組" @@ -2279,6 +2382,7 @@ 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/WorkspaceSummaryDialog.qml:120 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:220 msgctxt "@action:label" msgid "Name" @@ -2351,82 +2455,6 @@ msgctxt "@action:button" msgid "Open" msgstr "開啟" -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:34 -msgctxt "@action:button" -msgid "Previous" -msgstr "前一個" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:138 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 -msgctxt "@action:button" -msgid "Export" -msgstr "匯出" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorTabControls.qml:140 -msgctxt "@action:button" -msgid "Next" -msgstr "下一個" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageCategoryView.qml:163 -msgctxt "@label" -msgid "Tip" -msgstr "提示" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:80 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:341 -msgctxt "@label Hours and minutes" -msgid "00h 00min" -msgstr "00 小時 00 分" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:142 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:441 -msgctxt "@label" -msgid "Cost specification" -msgstr "成本明細" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:147 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:156 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 -msgctxt "@label m for meter" -msgid "%1m" -msgstr "%1m" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:148 -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:447 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:456 -msgctxt "@label g for grams" -msgid "%1g" -msgstr "%1g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:155 -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 -msgctxt "@label" -msgid "Total:" -msgstr "總共：" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:205 -msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" -msgid "%1m / ~ %2g / ~ %4 %3" -msgstr "%1m / ~ %2g / ~ %4 %3" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/CuraPrintProfileCreatorView.qml:210 -msgctxt "@label Print estimates: m for meters, g for grams" -msgid "%1m / ~ %2g" -msgstr "%1m / ~ %2g" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPage.qml:143 -msgctxt "@label" -msgid "Print experiment" -msgstr "列印實驗" - -#: /home/ruben/Projects/Cura/plugins/CuraPrintProfileCreator/components/ProfileCreatorPageValidation.qml:26 -msgctxt "@label" -msgid "Checklist" -msgstr "檢查清單" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:26 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -2468,36 +2496,6 @@ msgctxt "@action:button" msgid "Move to Next Position" msgstr "移動到下一個位置" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:30 -msgctxt "@title" -msgid "Upgrade Firmware" -msgstr "升級韌體" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:41 -msgctxt "@label" -msgid "Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work." -msgstr "韌體是直接在 3D 印表機上運行的一個軟體。此韌體控制步進馬達，調節溫度讓印表機正常運作。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:51 -msgctxt "@label" -msgid "The firmware shipping with new printers works, but new versions tend to have more features and improvements." -msgstr "新印表機出廠配備的韌體完全可以正常使用，但新版本往往具有更多的新功能和改進。" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:65 -msgctxt "@action:button" -msgid "Automatically upgrade Firmware" -msgstr "自動升級韌體" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:75 -msgctxt "@action:button" -msgid "Upload custom Firmware" -msgstr "上傳自訂韌體" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:87 -msgctxt "@title:window" -msgid "Select custom firmware" -msgstr "選擇自訂韌體" - #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:37 msgctxt "@label" msgid "Please select any upgrades made to this Ultimaker Original" @@ -2526,7 +2524,7 @@ msgstr "開始印表機檢查" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:80 msgctxt "@label" msgid "Connection: " -msgstr "連線：" +msgstr "連線： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:89 msgctxt "@info:status" @@ -2541,7 +2539,7 @@ msgstr "未連線" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:99 msgctxt "@label" msgid "Min endstop X: " -msgstr "X Min 限位開關：" +msgstr "X Min 限位開關： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:109 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:130 @@ -2562,17 +2560,17 @@ msgstr "未檢查" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:120 msgctxt "@label" msgid "Min endstop Y: " -msgstr "Y Min 限位開關：" +msgstr "Y Min 限位開關： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:141 msgctxt "@label" msgid "Min endstop Z: " -msgstr "Z Min 限位開關：" +msgstr "Z Min 限位開關： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:163 msgctxt "@label" msgid "Nozzle temperature check: " -msgstr "檢查噴頭溫度：" +msgstr "檢查噴頭溫度： " #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:187 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml:248 @@ -2685,7 +2683,7 @@ msgid "Customized" msgstr "自訂" #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:637 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "總是詢問" @@ -2833,6 +2831,12 @@ msgctxt "@action:button" msgid "Import" msgstr "匯入" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +msgctxt "@action:button" +msgid "Export" +msgstr "匯出" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:203 msgctxt "@action:label" msgid "Printer" @@ -2918,283 +2922,283 @@ msgid "Unit" msgstr "單位" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:544 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:142 msgctxt "@label" msgid "Interface" msgstr "介面" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:153 msgctxt "@label" msgid "Language:" msgstr "語言：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221 msgctxt "@label" msgid "Currency:" msgstr "貨幣：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:234 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:235 msgctxt "@label" msgid "Theme:" msgstr "主題：" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 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:311 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:309 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "當設定變更時自動進行切片。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動切片" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331 msgctxt "@label" msgid "Viewport behavior" msgstr "顯示區設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 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:350 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:348 msgctxt "@option:check" msgid "Display overhang" msgstr "顯示突出部分" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 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:362 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "當專案被選中時，自動置中視角" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:371 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:369 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要讓 Cura 的預設縮放操作反轉嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:376 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:374 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反轉視角縮放方向。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:384 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟隨滑鼠方向進行縮放？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:389 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟隨滑鼠方向縮放" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:399 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:406 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "確保每個模型都保持分離" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:415 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:413 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:420 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:418 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動下降模型到列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:432 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:430 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 g-code 讀取器中顯示警告訊息。" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:441 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:439 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 讀取器中的警告訊息" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "分層檢視要強制進入相容模式嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:452 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "強制分層檢視相容模式（需要重新啟動）" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:468 msgctxt "@label" msgid "Opening and saving files" msgstr "開啟並儲存檔案" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:477 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 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:482 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@option:check" msgid "Scale large models" msgstr "縮小過大模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:490 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:497 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大過小模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:507 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型載入後要設為被選擇的狀態嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:512 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgctxt "@option:check" msgid "Select models when loaded" msgstr "模型載入後選擇模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:522 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 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:527 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:525 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "將印表機名稱前綴添加到列印作業名稱中" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:537 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:535 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "儲存專案檔案時是否顯示摘要？" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:541 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:539 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "儲存專案時顯示摘要對話框" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:549 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "開啟專案檔案時的預設行為" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:559 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:557 msgctxt "@window:text" msgid "Default behavior when opening a project file: " -msgstr "開啟專案檔案時的預設行為：" +msgstr "開啟專案檔案時的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:571 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "每次都向我確認" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:574 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:572 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "總是作為一個專案開啟" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573 msgctxt "@option:openProject" msgid "Always import models" msgstr "總是匯入模型" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:611 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:609 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:620 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:618 msgctxt "@label" msgid "Profiles" msgstr "列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:625 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:623 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " -msgstr "當切換到另一組列印參數時，對於被修改過的設定的預設行為：" +msgstr "當切換到另一組列印參數時，對於被修改過的設定的預設行為： " -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:640 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:638 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "總是放棄修改過的設定" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:641 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:639 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "總是將修改過的設定轉移至新的列印參數" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:675 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:673 msgctxt "@label" msgid "Privacy" msgstr "隱私權" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 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:688 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:686 msgctxt "@option:check" msgid "Check for updates on start" msgstr "啟動時檢查更新" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:699 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:697 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:704 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:702 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）發送列印資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:713 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:711 msgctxt "@action:button" msgid "More information" msgstr "更多資訊" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:731 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:729 msgctxt "@label" msgid "Experimental" msgstr "實驗功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:738 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:736 msgctxt "@info:tooltip" msgid "Use multi build plate functionality" msgstr "使用多列印平台功能" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:743 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:741 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:542 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:549 msgctxt "@title:tab" msgid "Printers" msgstr "印表機" @@ -3216,7 +3220,7 @@ msgid "Connection:" msgstr "連線：" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:162 -#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/PrinterOutput/OutputDeviceHeader.qml:55 msgctxt "@info:status" msgid "The printer is not connected." msgstr "尚未連線到印表機。" @@ -3242,7 +3246,7 @@ msgid "Aborting print..." msgstr "中斷列印..." #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:546 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:553 msgctxt "@title:tab" msgid "Profiles" msgstr "列印參數" @@ -3323,17 +3327,17 @@ msgid "Global Settings" msgstr "全局設定" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:946 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:953 msgctxt "@title:window" msgid "Add Printer" msgstr "新增印表機" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:195 msgctxt "@label" msgid "Printer Name:" msgstr "印表機名稱：" -#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:219 msgctxt "@action:button" msgid "Add Printer" msgstr "新增印表機" @@ -3348,17 +3352,17 @@ msgctxt "@title:window" msgid "About Cura" msgstr "關於 Cura" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:55 msgctxt "@label" msgid "version: %1" msgstr "版本：%1" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:56 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 msgctxt "@label" msgid "End-to-end solution for fused filament 3D printing." msgstr "熔絲 3D 列印技術的的端對端解決方案。" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:69 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:82 msgctxt "@info:credit" msgid "" "Cura is developed by Ultimaker B.V. in cooperation with the community.\n" @@ -3367,102 +3371,122 @@ msgstr "" "Cura 由 Ultimaker B.V. 與社區合作開發。\n" "Cura 使用以下開源專案：" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 msgctxt "@label" msgid "Graphical user interface" msgstr "圖形用戶介面" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:119 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 msgctxt "@label" msgid "Application framework" msgstr "應用框架" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 msgctxt "@label" msgid "G-code generator" msgstr "G-code 產生器" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 msgctxt "@label" msgid "Interprocess communication library" msgstr "進程間通訊交互使用庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:123 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 msgctxt "@label" msgid "Programming language" msgstr "編程語言" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 msgctxt "@label" msgid "GUI framework" msgstr "GUI 框架" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:125 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 msgctxt "@label" msgid "GUI framework bindings" msgstr "GUI 框架綁定" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:126 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:140 msgctxt "@label" msgid "C/C++ Binding library" msgstr "C / C++ 綁定庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:141 msgctxt "@label" msgid "Data interchange format" msgstr "資料交換格式" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:142 msgctxt "@label" msgid "Support library for scientific computing" msgstr "科學計算函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:143 msgctxt "@label" msgid "Support library for faster math" msgstr "高速運算函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:130 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:144 msgctxt "@label" msgid "Support library for handling STL files" msgstr "用於處理 STL 檔案的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:131 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:145 +msgctxt "@label" +msgid "Support library for handling planar objects" +msgstr "用於處理平面物件的函式庫" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146 +msgctxt "@label" +msgid "Support library for handling triangular meshes" +msgstr "用於處理三角形網格的函式庫" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:147 +msgctxt "@label" +msgid "Support library for analysis of complex networks" +msgstr "用於分析複雜網路的函式庫" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:148 msgctxt "@label" msgid "Support library for handling 3MF files" msgstr "用於處理 3MF 檔案的函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:149 +msgctxt "@label" +msgid "Support library for file metadata and streaming" +msgstr "用於檔案 metadata 和串流的函式庫" + +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:150 msgctxt "@label" msgid "Serial communication library" msgstr "串口通訊函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:133 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:151 msgctxt "@label" msgid "ZeroConf discovery library" msgstr "ZeroConf 發現函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:152 msgctxt "@label" msgid "Polygon clipping library" msgstr "多邊形剪輯函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:153 msgctxt "@Label" msgid "Python HTTP library" msgstr "Python HTTP 函式庫" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:155 msgctxt "@label" msgid "Font" msgstr "字體" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:138 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:156 msgctxt "@label" msgid "SVG icons" msgstr "SVG 圖標" -#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:139 +#: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:157 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux cross-distribution 應用程式部署" @@ -3472,7 +3496,7 @@ msgctxt "@label" msgid "Profile:" msgstr "列印參數：" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:104 msgctxt "@tooltip" msgid "" "Some setting/override values are different from the values stored in the profile.\n" @@ -3483,53 +3507,53 @@ msgstr "" "\n" "點擊開啟列印參數管理器。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:199 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:200 msgctxt "@label:textbox" msgid "Search..." msgstr "搜尋..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:544 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:545 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "將設定值複製到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:553 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:554 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "複製所有改變的設定值到所有擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:590 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:591 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隱藏此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:608 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:609 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再顯示此設定" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:612 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:613 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此設定顯示" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:636 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:416 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:637 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:417 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "參數顯示設定..." -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:643 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:644 msgctxt "@action:inmenu" msgid "Collapse All" msgstr "全部折疊" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:648 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:649 msgctxt "@action:inmenu" msgid "Expand All" msgstr "全部展開" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:249 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:253 msgctxt "@label" msgid "" "Some hidden settings use values different from their normal calculated value.\n" @@ -3550,17 +3574,17 @@ msgctxt "@label Header for list of settings." msgid "Affected By" msgstr "影響因素" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155 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:157 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158 msgctxt "@label" msgid "The value is resolved from per-extruder values " msgstr "這個數值是由每個擠出機的設定值解析出來的 " -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:189 msgctxt "@label" msgid "" "This setting has a value that is different from the profile.\n" @@ -3571,7 +3595,7 @@ msgstr "" "\n" "單擊以復原列印參數的值。" -#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:281 msgctxt "@label" msgid "" "This setting is normally calculated, but it currently has an absolute value set.\n" @@ -3726,12 +3750,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "檢視（&V）" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:39 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:42 msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "視角位置（&C）" -#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:58 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "列印平台（&B）" @@ -3741,12 +3765,12 @@ msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "顯示設定" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 msgctxt "@action:inmenu" msgid "Show All Settings" msgstr "顯示所有設定" -#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:53 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "管理參數顯示..." @@ -3807,17 +3831,44 @@ msgstr "" "列印設定已關閉\n" "G-code 檔案無法被修改" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:359 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:340 +msgctxt "@label Hours and minutes" +msgid "00h 00min" +msgstr "00 小時 00 分" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:358 msgctxt "@tooltip" msgid "Time specification" msgstr "時間規格" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:577 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:440 +msgctxt "@label" +msgid "Cost specification" +msgstr "成本明細" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:445 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:454 +msgctxt "@label m for meter" +msgid "%1m" +msgstr "%1m" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:446 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:455 +msgctxt "@label g for grams" +msgid "%1g" +msgstr "%1g" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:453 +msgctxt "@label" +msgid "Total:" +msgstr "總共：" + +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:576 msgctxt "@tooltip" msgid "Recommended Print Setup

Print with the recommended settings for the selected printer, material and quality." msgstr "推薦的列印設定

使用針對所選印表機、耗材和品質的推薦設定進行列印。" -#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:582 +#: /home/ruben/Projects/Cura/resources/qml/PrepareSidebar.qml:581 msgctxt "@tooltip" msgid "Custom Print Setup

Print with finegrained control over every last bit of the slicing process." msgstr "自訂列印設定
對切片過程中的每一個細節進行精細控制。" @@ -3842,220 +3893,220 @@ msgctxt "@label" msgid "Estimated time left" msgstr "預計剩餘時間" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切換全螢幕" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:86 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "復原（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "取消復原（&R）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:106 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出（&Q）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:113 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:114 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "立體圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:121 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "前視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:127 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:128 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "上視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:135 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:142 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右視圖" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:148 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:149 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "設定 Cura…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:155 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:156 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增印表機（&A）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理印表機（&I）..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "管理耗材…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫更新列印參數（&U）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:184 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:185 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "捨棄目前更改（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:196 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:197 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "從目前設定 / 覆寫值建立列印參數（&C）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理列印參數.." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:209 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "顯示線上說明文件（&D）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:217 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 回報（&B）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:226 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "關於…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:233 msgctxt "@action:inmenu menubar:edit" msgid "Delete Selected Model" msgid_plural "Delete Selected Models" msgstr[0] "刪除所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:243 msgctxt "@action:inmenu menubar:edit" msgid "Center Selected Model" msgid_plural "Center Selected Models" msgstr[0] "置中所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:251 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:edit" msgid "Multiply Selected Model" msgid_plural "Multiply Selected Models" msgstr[0] "複製所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:261 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "刪除模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:269 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "將模型置中（&N）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:274 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:275 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "群組模型（&G）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:294 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "取消模型群組" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:304 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:305 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "結合模型（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:314 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "複製模型…（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:321 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:322 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "選擇所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:331 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:332 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空列印平台" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:342 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新載入所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:350 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:351 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "將所有模型排列到所有列印平台上" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:357 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:358 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "排列所有模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:365 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:366 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "排列所選模型" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:372 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:373 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "重置所有模型位置" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:379 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:380 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "重置所有模型旋轉" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:386 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:387 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "開啟檔案（&O）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:394 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:395 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建專案（&N）…" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:401 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:402 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "顯示切片引擎日誌（&L）..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:409 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:410 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "顯示設定資料夾" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:424 msgctxt "@action:menu" msgid "Browse packages..." msgstr "瀏覽軟體包..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:430 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:431 msgctxt "@action:inmenu menubar:view" msgid "Expand/Collapse Sidebar" msgstr "展開/收合側邊欄" @@ -4116,7 +4167,7 @@ msgid "Select the active output device" msgstr "選擇作用中的輸出裝置" #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:767 msgctxt "@title:window" msgid "Open file(s)" msgstr "開啟檔案" @@ -4136,145 +4187,145 @@ msgctxt "@title:window" msgid "Ultimaker Cura" msgstr "Ultimaker Cura" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:104 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:103 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "檔案（&F）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:120 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:121 msgctxt "@title:menu menubar:file" msgid "&Save..." msgstr "儲存（&S）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:141 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:142 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "匯出（&E）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:151 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:153 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "匯出選擇…" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:168 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174 msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "編輯（&E）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191 msgctxt "@title:menu" msgid "&View" msgstr "檢視（&V）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:190 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:196 msgctxt "@title:menu" msgid "&Settings" msgstr "設定（&S）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:198 msgctxt "@title:menu menubar:settings" msgid "&Printer" msgstr "印表機（&P）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:201 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:207 msgctxt "@title:menu" msgid "&Material" msgstr "耗材（&M）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 msgctxt "@action:inmenu" msgid "Set as Active Extruder" msgstr "設為主要擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:216 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:222 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:188 msgctxt "@action:inmenu" msgid "Enable Extruder" msgstr "啟用擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:229 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:194 msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "關閉擠出機" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:241 msgctxt "@title:menu" msgid "&Build plate" msgstr "列印平台（&B）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:236 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:242 msgctxt "@title:settings" msgid "&Profile" msgstr "列印參數（&P）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:246 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:252 msgctxt "@title:menu menubar:toplevel" msgid "E&xtensions" msgstr "擴充功能（&X）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:280 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:286 msgctxt "@title:menu menubar:toplevel" msgid "&Toolbox" msgstr "工具箱（&T）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:294 msgctxt "@title:menu menubar:toplevel" msgid "P&references" msgstr "偏好設定（&R）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:295 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:302 msgctxt "@title:menu menubar:toplevel" msgid "&Help" msgstr "幫助（&H）" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:341 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:348 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "此軟體包將在重新啟動後安裝。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:370 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:377 msgctxt "@action:button" msgid "Open File" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:540 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:547 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:586 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:593 msgctxt "@title:window" msgid "New project" msgstr "新建專案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:594 msgctxt "@info:question" msgid "Are you sure you want to start a new project? This will clear the build plate and any unsaved settings." msgstr "你確定要開始一個新專案嗎？這將清除列印平台及任何未儲存的設定。" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:715 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:722 msgctxt "@title:window" msgid "Closing Cura" msgstr "關閉 Cura 中" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:716 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:728 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:723 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:735 msgctxt "@label" msgid "Are you sure you want to exit Cura?" msgstr "你確定要結束 Cura 嗎？" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:861 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 msgctxt "@window:title" msgid "Install Package" msgstr "安裝軟體包" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:868 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:875 msgctxt "@title:window" msgid "Open File(s)" msgstr "開啟檔案" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:871 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:878 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 檔案，請僅選擇一個。" @@ -4284,11 +4335,6 @@ msgctxt "@title:window" msgid "Save Project" msgstr "儲存專案" -#: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:120 -msgctxt "@action:label" -msgid "" -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:137 msgctxt "@action:label" msgid "Build plate" @@ -4359,37 +4405,37 @@ msgctxt "@label" msgid "Gradual infill will gradually increase the amount of infill towards the top." msgstr "漸層填充（Gradual infill）將隨著列印高度的提升而逐漸加大填充密度。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:789 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:791 msgctxt "@label" msgid "Enable gradual" msgstr "啟用漸層" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:856 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:858 msgctxt "@label" msgid "Generate Support" msgstr "產生支撐" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:890 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:892 msgctxt "@label" msgid "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing." msgstr "在模型的突出部分產生支撐結構。若不這樣做，這些部分在列印時將倒塌。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:962 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:964 msgctxt "@label" msgid "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air." msgstr "選擇用於支撐的擠出機。該擠出機將在模型之下建立支撐結構，以防止模型下垂或在空中列印。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:985 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:987 msgctxt "@label" msgid "Build Plate Adhesion" msgstr "列印平台附著" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1040 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1042 msgctxt "@label" msgid "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards." msgstr "允許列印邊緣或木筏。這將在你的物件周圍或下方添加一個容易切斷的平面區域。" -#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1080 +#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:1082 msgctxt "@label" msgid "Need help improving your prints?
Read the Ultimaker Troubleshooting Guides" msgstr "需要幫助改善你的列印？閱讀 Ultimaker 故障排除指南" @@ -4550,6 +4596,16 @@ msgctxt "name" msgid "Changelog" msgstr "更新日誌" +#: FirmwareUpdater/plugin.json +msgctxt "description" +msgid "Provides a machine actions for updating firmware." +msgstr "提供升級韌體用的機器操作。" + +#: FirmwareUpdater/plugin.json +msgctxt "name" +msgid "Firmware Updater" +msgstr "韌體更新器" + #: ProfileFlattener/plugin.json msgctxt "description" msgid "Create a flattend quality changes profile." @@ -4900,16 +4956,6 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 列印參數寫入器" -#: CuraPrintProfileCreator/plugin.json -msgctxt "description" -msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." -msgstr "允許耗材製造商使用下拉式 UI 建立新的耗材和品質設定參數。" - -#: CuraPrintProfileCreator/plugin.json -msgctxt "name" -msgid "Print Profile Assistant" -msgstr "列印參數設定助手" - #: 3MFWriter/plugin.json msgctxt "description" msgid "Provides support for writing 3MF files." @@ -4940,6 +4986,86 @@ msgctxt "name" msgid "Cura Profile Reader" msgstr "Cura 列印參數讀取器" +#~ msgctxt "@warning:status" +#~ msgid "Please generate G-code before saving." +#~ msgstr "請在儲存前產出 G-code。" + +#~ msgctxt "@item:inmenu" +#~ msgid "Profile Assistant" +#~ msgstr "參數助手" + +#~ msgctxt "@item:inlistbox" +#~ msgid "Profile Assistant" +#~ msgstr "參數助手" + +#~ msgctxt "@action" +#~ msgid "Upgrade Firmware" +#~ msgstr "升級韌體" + +#~ msgctxt "@label unknown material" +#~ msgid "Unknown" +#~ msgstr "未知" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "No custom profile to import in file {0}" +#~ msgstr "檔案 {0} 內無自訂參數可匯入" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "This profile {0} contains incorrect data, could not import it." +#~ msgstr "此列印參數 {0} 含有錯誤的資料，無法導入。" + +#~ msgctxt "@info:status Don't translate the XML tags or !" +#~ msgid "The machine defined in profile {0} ({1}) doesn't match with your current machine ({2}), could not import it." +#~ msgstr "參數檔案 {0} ({1}) 中定義的機器與你目前的機器 ({2}) 不匹配，無法匯入。" + +#~ msgctxt "@title:window" +#~ msgid "Confirm uninstall " +#~ msgstr "移除確認 " + +#~ msgctxt "@label:status" +#~ msgid "Paused" +#~ msgstr "已暫停" + +#~ msgctxt "@action:button" +#~ msgid "Previous" +#~ msgstr "前一個" + +#~ msgctxt "@action:button" +#~ msgid "Next" +#~ msgstr "下一個" + +#~ msgctxt "@label" +#~ msgid "Tip" +#~ msgstr "提示" + +#~ msgctxt "@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost" +#~ msgid "%1m / ~ %2g / ~ %4 %3" +#~ msgstr "%1m / ~ %2g / ~ %4 %3" + +#~ msgctxt "@label Print estimates: m for meters, g for grams" +#~ msgid "%1m / ~ %2g" +#~ msgstr "%1m / ~ %2g" + +#~ msgctxt "@label" +#~ msgid "Print experiment" +#~ msgstr "列印實驗" + +#~ msgctxt "@label" +#~ msgid "Checklist" +#~ msgstr "檢查清單" + +#~ msgctxt "@title" +#~ msgid "Upgrade Firmware" +#~ msgstr "升級韌體" + +#~ msgctxt "description" +#~ msgid "Allows material manufacturers to create new material and quality profiles using a drop-in UI." +#~ msgstr "允許耗材製造商使用下拉式 UI 建立新的耗材和品質設定參數。" + +#~ msgctxt "name" +#~ msgid "Print Profile Assistant" +#~ msgstr "列印參數設定助手" + #~ msgctxt "@action:button" #~ msgid "Print with Doodle3D WiFi-Box" #~ msgstr "使用 Doodle3D 無線網路盒列印" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index 5ccea0af91..93d62b5155 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-03-31 15:18+0800\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-04 13:04+0800\n" "Last-Translator: Zhang Heh Ji \n" -"Language-Team: TEAM\n" +"Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.2\n" #: fdmextruder.def.json msgctxt "machine_settings label" @@ -167,6 +167,16 @@ msgctxt "extruder_prime_pos_z description" msgid "The Z coordinate of the position where the nozzle primes at the start of printing." msgstr "列印開始時，噴頭在 Z 軸座標上的起始位置." +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number label" +msgid "Extruder Print Cooling Fan" +msgstr "擠出機列印冷卻風扇" + +#: fdmextruder.def.json +msgctxt "machine_extruder_cooling_fan_number description" +msgid "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder." +msgstr "與此擠出機關聯的列印冷卻風扇的數量。只有當每個擠出機的列印冷卻風扇數量不同時，才需更改此值為正確數量，否則保持預設值 0 即可。" + #: fdmextruder.def.json msgctxt "platform_adhesion label" msgid "Build Plate Adhesion" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index b59748ce00..1571d7648c 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 3.5\n" -"Report-Msgid-Bugs-To: r.dulek@ultimaker.com" -"POT-Creation-Date: 2018-09-19 17:07+0000\n" -"PO-Revision-Date: 2018-10-02 10:30+0100\n" +"Project-Id-Version: Cura 3.6\n" +"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" +"POT-Creation-Date: 2018-10-29 15:01+0000\n" +"PO-Revision-Date: 2018-11-06 16:00+0100\n" "Last-Translator: Zhang Heh Ji \n" "Language-Team: Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.0.6\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -59,7 +59,7 @@ msgid "" "." msgstr "" "開始時最先執行的 G-code 命令 - 使用 \n" -". 隔開" +"隔開。" #: fdmprinter.def.json msgctxt "machine_end_gcode label" @@ -73,7 +73,7 @@ msgid "" "." msgstr "" "結束前最後執行的 G-code 命令 - 使用 \n" -". 隔開" +" 隔開。" #: fdmprinter.def.json msgctxt "material_guid label" @@ -83,7 +83,7 @@ msgstr "耗材 GUID" #: fdmprinter.def.json msgctxt "material_guid description" msgid "GUID of the material. This is set automatically. " -msgstr "耗材 GUID，此項為自動設定。" +msgstr "耗材 GUID，此項為自動設定。 " #: fdmprinter.def.json msgctxt "material_diameter label" @@ -1077,8 +1077,8 @@ msgstr "連接頂部/底部多邊形" #: fdmprinter.def.json msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." -msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時開啟此設定，可以大大地減少空跑時間。但因連接可能發生在填充途中，所以此功能可能降低頂部表層的品質。" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時啟用此設定，可以大大地減少移動時間。但因連接可能碰巧在途中跨越填充，所以此功能可能會降低頂部表層的品質。" #: fdmprinter.def.json msgctxt "skin_angles label" @@ -1497,8 +1497,8 @@ msgstr "填充列印樣式" #: fdmprinter.def.json msgctxt "infill_pattern description" -msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "填充耗材的樣式。線條和鋸齒狀填充輪流在每一層交換方向，以降低耗材成本。網格、三角形、三-六邊形、立方體、八面體、四分立方體、十字形和同心的列印樣式在每層完整列印。立方體、四分立方體和八面體填充隨每層變化，以在各個方向提供更均衡的强度分布。" +msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +msgstr "選擇填充耗材的樣式。直線和鋸齒狀填充輪流在每一層交換方向，以降低耗材成本。網格、三角形、三-六邊形、立方體、八面體、四分立方體、十字形和同心的列印樣式在每層完整列印。螺旋形、立方體、四分立方體和八面體填充隨每層變化，以在各個方向提供更均衡的强度分布。" #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1560,6 +1560,11 @@ msgctxt "infill_pattern option cross_3d" msgid "Cross 3D" msgstr "立體十字形" +#: fdmprinter.def.json +msgctxt "infill_pattern option gyroid" +msgid "Gyroid" +msgstr "螺旋形" + #: fdmprinter.def.json msgctxt "zig_zaggify_infill label" msgid "Connect Infill Lines" @@ -2002,7 +2007,7 @@ msgstr "啟用回抽" #: fdmprinter.def.json msgctxt "retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area. " -msgstr "當噴頭移動到非列印區域上方時回抽耗材。" +msgstr "當噴頭移動到非列印區域上方時回抽耗材。 " #: fdmprinter.def.json msgctxt "retract_at_layer_change label" @@ -3264,6 +3269,36 @@ msgctxt "support_infill_angle description" msgid "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane." msgstr "支撐填充樣式的方向。 支撐填充樣式的旋轉方向是在水平面上旋轉。" +#: fdmprinter.def.json +msgctxt "support_brim_enable label" +msgid "Enable Support Brim" +msgstr "啟用支撐邊緣" + +#: fdmprinter.def.json +msgctxt "support_brim_enable description" +msgid "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate." +msgstr "在第一層的支撐填充區域內產生邊緣。這些邊緣列印在支撐下面，而不是支撐的周圍。啟用此設定可增加支撐對列印平台的附著力。" + +#: fdmprinter.def.json +msgctxt "support_brim_width label" +msgid "Support Brim Width" +msgstr "支撐邊緣寬度" + +#: fdmprinter.def.json +msgctxt "support_brim_width description" +msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." +msgstr "列印在支撐下面邊緣的寬度。較大的邊緣會加強對列印平台的附著力，但會需要一些額外的耗材。" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count label" +msgid "Support Brim Line Count" +msgstr "支撐邊緣線條數量" + +#: fdmprinter.def.json +msgctxt "support_brim_line_count description" +msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." +msgstr "支撐邊緣所使用的線條數量。邊緣使用較多的線條會加強對列印平台的附著力，但會需要一些額外的耗材。" + #: fdmprinter.def.json msgctxt "support_z_distance label" msgid "Support Z Distance" @@ -3332,7 +3367,7 @@ msgstr "最小支撐 X/Y 間距" #: fdmprinter.def.json msgctxt "support_xy_distance_overhang description" msgid "Distance of the support structure from the overhang in the X/Y directions. " -msgstr "支撐結構在 X/Y 方向與突出部分的間距。" +msgstr "支撐結構在 X/Y 方向與突出部分的間距。 " #: fdmprinter.def.json msgctxt "support_bottom_stair_step_height label" @@ -3833,6 +3868,16 @@ msgctxt "brim_line_count description" msgid "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area." msgstr "邊緣所用線條數量。更多邊緣線條可增强與列印平台的附著，但也會減少有效列印區域。" +#: fdmprinter.def.json +msgctxt "brim_replaces_support label" +msgid "Brim Replaces Support" +msgstr "邊綠取代支撐" + +#: fdmprinter.def.json +msgctxt "brim_replaces_support description" +msgid "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions." +msgstr "強制在模型周圍列印邊緣，即使該空間已被支撐佔用。在第一層的部份區域會以邊綠取代支撐。" + #: fdmprinter.def.json msgctxt "brim_outside_only label" msgid "Brim Only on Outside" @@ -5657,6 +5702,14 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在將模型從檔案中載入時套用在模型上的轉換矩陣。" +#~ msgctxt "connect_skin_polygons description" +#~ msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality." +#~ msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時開啟此設定，可以大大地減少空跑時間。但因連接可能發生在填充途中，所以此功能可能降低頂部表層的品質。" + +#~ msgctxt "infill_pattern description" +#~ msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." +#~ msgstr "填充耗材的樣式。線條和鋸齒狀填充輪流在每一層交換方向，以降低耗材成本。網格、三角形、三-六邊形、立方體、八面體、四分立方體、十字形和同心的列印樣式在每層完整列印。立方體、四分立方體和八面體填充隨每層變化，以在各個方向提供更均衡的强度分布。" + #~ msgctxt "infill_pattern option concentric_3d" #~ msgid "Concentric 3D" #~ msgstr "立體同心圓" diff --git a/resources/meshes/anycubic_4max_platform.stl b/resources/meshes/anycubic_4max_platform.stl new file mode 100644 index 0000000000..cc3651b9f3 Binary files /dev/null and b/resources/meshes/anycubic_4max_platform.stl differ diff --git a/resources/meshes/creality_ender3_platform.stl b/resources/meshes/creality_ender3_platform.stl index e4f9b1fd89..b362330c9c 100644 --- a/resources/meshes/creality_ender3_platform.stl +++ b/resources/meshes/creality_ender3_platform.stl @@ -1,1673 +1,1673 @@ solid OpenSCAD_Model facet normal 0 0 1 outer loop - vertex 19.3736 -10.7173 -0.1 - vertex 19.6895 -11.13 -0.1 - vertex 19.6819 -11.0243 -0.1 + vertex 19.3736 -10.7173 -0.2 + vertex 19.6895 -11.13 -0.2 + vertex 19.6819 -11.0243 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4763 -10.749 -0.1 - vertex 19.6819 -11.0243 -0.1 - vertex 19.6583 -10.9333 -0.1 + vertex 19.4763 -10.749 -0.2 + vertex 19.6819 -11.0243 -0.2 + vertex 19.6583 -10.9333 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.557 -10.7956 -0.1 - vertex 19.6583 -10.9333 -0.1 - vertex 19.6172 -10.8571 -0.1 + vertex 19.557 -10.7956 -0.2 + vertex 19.6583 -10.9333 -0.2 + vertex 19.6172 -10.8571 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6895 -11.13 -0.1 - vertex 19.3736 -10.7173 -0.1 - vertex 19.6598 -11.2975 -0.1 + vertex 19.6895 -11.13 -0.2 + vertex 19.3736 -10.7173 -0.2 + vertex 19.6598 -11.2975 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6583 -10.9333 -0.1 - vertex 19.557 -10.7956 -0.1 - vertex 19.4763 -10.749 -0.1 + vertex 19.6583 -10.9333 -0.2 + vertex 19.557 -10.7956 -0.2 + vertex 19.4763 -10.749 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6819 -11.0243 -0.1 - vertex 19.4763 -10.749 -0.1 - vertex 19.3736 -10.7173 -0.1 + vertex 19.6819 -11.0243 -0.2 + vertex 19.4763 -10.749 -0.2 + vertex 19.3736 -10.7173 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.0963 -10.6988 -0.1 - vertex 19.6598 -11.2975 -0.1 - vertex 19.3736 -10.7173 -0.1 + vertex 19.0963 -10.6988 -0.2 + vertex 19.6598 -11.2975 -0.2 + vertex 19.3736 -10.7173 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6598 -11.2975 -0.1 - vertex 19.0963 -10.6988 -0.1 - vertex 19.5653 -11.6083 -0.1 + vertex 19.6598 -11.2975 -0.2 + vertex 19.0963 -10.6988 -0.2 + vertex 19.5653 -11.6083 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.7132 -10.7406 -0.1 - vertex 19.5653 -11.6083 -0.1 - vertex 19.0963 -10.6988 -0.1 + vertex 18.7132 -10.7406 -0.2 + vertex 19.5653 -11.6083 -0.2 + vertex 19.0963 -10.6988 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.2126 -10.843 -0.1 - vertex 19.5653 -11.6083 -0.1 - vertex 18.7132 -10.7406 -0.1 + vertex 18.2126 -10.843 -0.2 + vertex 19.5653 -11.6083 -0.2 + vertex 18.7132 -10.7406 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5653 -11.6083 -0.1 - vertex 18.2126 -10.843 -0.1 - vertex 19.1479 -12.7477 -0.1 + vertex 19.5653 -11.6083 -0.2 + vertex 18.2126 -10.843 -0.2 + vertex 19.1479 -12.7477 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 17.5824 -11.0066 -0.1 - vertex 19.1479 -12.7477 -0.1 - vertex 18.2126 -10.843 -0.1 + vertex 17.5824 -11.0066 -0.2 + vertex 19.1479 -12.7477 -0.2 + vertex 18.2126 -10.843 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 16.811 -11.2316 -0.1 - vertex 19.1479 -12.7477 -0.1 - vertex 17.5824 -11.0066 -0.1 + vertex 16.811 -11.2316 -0.2 + vertex 19.1479 -12.7477 -0.2 + vertex 17.5824 -11.0066 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.1479 -12.7477 -0.1 - vertex 16.811 -11.2316 -0.1 - vertex 18.3699 -14.7241 -0.1 + vertex 19.1479 -12.7477 -0.2 + vertex 16.811 -11.2316 -0.2 + vertex 18.3699 -14.7241 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.1363 -14.3424 -0.1 - vertex 18.3699 -14.7241 -0.1 - vertex 16.811 -11.2316 -0.1 + vertex 14.1363 -14.3424 -0.2 + vertex 18.3699 -14.7241 -0.2 + vertex 16.811 -11.2316 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.0967 -14.5873 -0.1 - vertex 18.3699 -14.7241 -0.1 - vertex 14.1362 -14.4186 -0.1 + vertex 14.0967 -14.5873 -0.2 + vertex 18.3699 -14.7241 -0.2 + vertex 14.1362 -14.4186 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.3699 -14.7241 -0.1 - vertex 14.1363 -14.3424 -0.1 - vertex 14.1362 -14.4186 -0.1 + vertex 18.3699 -14.7241 -0.2 + vertex 14.1363 -14.3424 -0.2 + vertex 14.1362 -14.4186 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.7217 -12.1451 -0.1 - vertex 14.1363 -14.3424 -0.1 - vertex 16.811 -11.2316 -0.1 + vertex 13.7217 -12.1451 -0.2 + vertex 14.1363 -14.3424 -0.2 + vertex 16.811 -11.2316 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.1363 -14.3424 -0.1 - vertex 13.7217 -12.1451 -0.1 - vertex 14.0881 -14.3092 -0.1 + vertex 14.1363 -14.3424 -0.2 + vertex 13.7217 -12.1451 -0.2 + vertex 14.0881 -14.3092 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.0881 -14.3092 -0.1 - vertex 13.7217 -12.1451 -0.1 - vertex 14.0003 -14.2763 -0.1 + vertex 14.0881 -14.3092 -0.2 + vertex 13.7217 -12.1451 -0.2 + vertex 14.0003 -14.2763 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.0003 -14.2763 -0.1 - vertex 13.7217 -12.1451 -0.1 - vertex 13.7222 -14.2141 -0.1 + vertex 14.0003 -14.2763 -0.2 + vertex 13.7217 -12.1451 -0.2 + vertex 13.7222 -14.2141 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.4022 -12.26 -0.1 - vertex 13.7222 -14.2141 -0.1 - vertex 13.7217 -12.1451 -0.1 + vertex 13.4022 -12.26 -0.2 + vertex 13.7222 -14.2141 -0.2 + vertex 13.7217 -12.1451 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.1153 -12.4148 -0.1 - vertex 13.7222 -14.2141 -0.1 - vertex 13.4022 -12.26 -0.1 + vertex 13.1153 -12.4148 -0.2 + vertex 13.7222 -14.2141 -0.2 + vertex 13.4022 -12.26 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.7222 -14.2141 -0.1 - vertex 13.1153 -12.4148 -0.1 - vertex 13.3346 -14.1615 -0.1 + vertex 13.7222 -14.2141 -0.2 + vertex 13.1153 -12.4148 -0.2 + vertex 13.3346 -14.1615 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.8673 -12.6015 -0.1 - vertex 13.3346 -14.1615 -0.1 - vertex 13.1153 -12.4148 -0.1 + vertex 12.8673 -12.6015 -0.2 + vertex 13.3346 -14.1615 -0.2 + vertex 13.1153 -12.4148 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.6645 -12.8127 -0.1 - vertex 13.3346 -14.1615 -0.1 - vertex 12.8673 -12.6015 -0.1 + vertex 12.6645 -12.8127 -0.2 + vertex 13.3346 -14.1615 -0.2 + vertex 12.8673 -12.6015 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.513 -13.0405 -0.1 - vertex 13.3346 -14.1615 -0.1 - vertex 12.6645 -12.8127 -0.1 + vertex 12.513 -13.0405 -0.2 + vertex 13.3346 -14.1615 -0.2 + vertex 12.6645 -12.8127 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.3346 -14.1615 -0.1 - vertex 12.513 -13.0405 -0.1 - vertex 12.8698 -14.1239 -0.1 + vertex 13.3346 -14.1615 -0.2 + vertex 12.513 -13.0405 -0.2 + vertex 12.8698 -14.1239 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.419 -13.2773 -0.1 - vertex 12.8698 -14.1239 -0.1 - vertex 12.513 -13.0405 -0.1 + vertex 12.419 -13.2773 -0.2 + vertex 12.8698 -14.1239 -0.2 + vertex 12.513 -13.0405 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.3889 -13.5153 -0.1 - vertex 12.8698 -14.1239 -0.1 - vertex 12.419 -13.2773 -0.1 + vertex 12.3889 -13.5153 -0.2 + vertex 12.8698 -14.1239 -0.2 + vertex 12.419 -13.2773 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 12.3997 -13.6324 -0.1 - vertex 12.8698 -14.1239 -0.1 - vertex 12.3889 -13.5153 -0.1 + vertex 12.3997 -13.6324 -0.2 + vertex 12.8698 -14.1239 -0.2 + vertex 12.3889 -13.5153 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 12.5013 -13.8876 -0.1 - vertex 12.8698 -14.1239 -0.1 - vertex 12.3997 -13.6324 -0.1 + vertex 12.5013 -13.8876 -0.2 + vertex 12.8698 -14.1239 -0.2 + vertex 12.3997 -13.6324 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.8698 -14.1239 -0.1 - vertex 12.6087 -14.0056 -0.1 - vertex 12.7363 -14.0885 -0.1 + vertex 12.8698 -14.1239 -0.2 + vertex 12.6087 -14.0056 -0.2 + vertex 12.7363 -14.0885 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.8698 -14.1239 -0.1 - vertex 12.5013 -13.8876 -0.1 - vertex 12.6087 -14.0056 -0.1 + vertex 12.8698 -14.1239 -0.2 + vertex 12.5013 -13.8876 -0.2 + vertex 12.6087 -14.0056 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.5013 -13.8876 -0.1 - vertex 12.3997 -13.6324 -0.1 - vertex 12.4287 -13.7469 -0.1 + vertex 12.5013 -13.8876 -0.2 + vertex 12.3997 -13.6324 -0.2 + vertex 12.4287 -13.7469 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.9185 -15.1524 -0.1 - vertex 18.3699 -14.7241 -0.1 - vertex 14.0967 -14.5873 -0.1 + vertex 13.9185 -15.1524 -0.2 + vertex 18.3699 -14.7241 -0.2 + vertex 14.0967 -14.5873 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.3699 -14.7241 -0.1 - vertex 13.9185 -15.1524 -0.1 - vertex 17.1638 -17.7131 -0.1 + vertex 18.3699 -14.7241 -0.2 + vertex 13.9185 -15.1524 -0.2 + vertex 17.1638 -17.7131 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.6397 -15.9386 -0.1 - vertex 17.1638 -17.7131 -0.1 - vertex 13.9185 -15.1524 -0.1 + vertex 13.6397 -15.9386 -0.2 + vertex 17.1638 -17.7131 -0.2 + vertex 13.9185 -15.1524 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.2984 -16.8469 -0.1 - vertex 17.1638 -17.7131 -0.1 - vertex 13.6397 -15.9386 -0.1 + vertex 13.2984 -16.8469 -0.2 + vertex 17.1638 -17.7131 -0.2 + vertex 13.6397 -15.9386 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.5806 -18.6336 -0.1 - vertex 17.1638 -17.7131 -0.1 - vertex 13.2984 -16.8469 -0.1 + vertex 12.5806 -18.6336 -0.2 + vertex 17.1638 -17.7131 -0.2 + vertex 13.2984 -16.8469 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2803 -19.3138 -0.1 - vertex 17.1638 -17.7131 -0.1 - vertex 12.5806 -18.6336 -0.1 + vertex 12.2803 -19.3138 -0.2 + vertex 17.1638 -17.7131 -0.2 + vertex 12.5806 -18.6336 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.1638 -17.7131 -0.1 - vertex 12.2803 -19.3138 -0.1 - vertex 14.5952 -23.8342 -0.1 + vertex 17.1638 -17.7131 -0.2 + vertex 12.2803 -19.3138 -0.2 + vertex 14.5952 -23.8342 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.0697 -19.7199 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 12.2803 -19.3138 -0.1 + vertex 12.0697 -19.7199 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 12.2803 -19.3138 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.0185 -19.7802 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 12.0697 -19.7199 -0.1 + vertex 12.0185 -19.7802 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 12.0697 -19.7199 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.9563 -19.8175 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 12.0185 -19.7802 -0.1 + vertex 11.9563 -19.8175 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 12.0185 -19.7802 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 10.1598 -23.7848 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 10.1807 -23.3758 -0.1 + vertex 10.1598 -23.7848 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 10.1807 -23.3758 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 10.1103 -22.7594 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 11.9563 -19.8175 -0.1 + vertex 10.1103 -22.7594 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 11.9563 -19.8175 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.1103 -22.7594 -0.1 - vertex 11.9563 -19.8175 -0.1 - vertex 11.881 -19.8313 -0.1 + vertex 10.1103 -22.7594 -0.2 + vertex 11.9563 -19.8175 -0.2 + vertex 11.881 -19.8313 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.99008 -22.4166 -0.1 - vertex 11.881 -19.8313 -0.1 - vertex 11.7902 -19.8211 -0.1 + vertex 9.99008 -22.4166 -0.2 + vertex 11.881 -19.8313 -0.2 + vertex 11.7902 -19.8211 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.81668 -22.1284 -0.1 - vertex 11.7902 -19.8211 -0.1 - vertex 11.5538 -19.7266 -0.1 + vertex 9.81668 -22.1284 -0.2 + vertex 11.7902 -19.8211 -0.2 + vertex 11.5538 -19.7266 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.95745 -24.7805 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 10.0892 -24.2416 -0.1 + vertex 9.95745 -24.7805 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 10.0892 -24.2416 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.59484 -21.895 -0.1 - vertex 11.5538 -19.7266 -0.1 - vertex 11.2294 -19.5302 -0.1 + vertex 9.59484 -21.895 -0.2 + vertex 11.5538 -19.7266 -0.2 + vertex 11.2294 -19.5302 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.5952 -23.8342 -0.1 - vertex 9.95745 -24.7805 -0.1 - vertex 12.8097 -28.1484 -0.1 + vertex 14.5952 -23.8342 -0.2 + vertex 9.95745 -24.7805 -0.2 + vertex 12.8097 -28.1484 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.46723 -21.7989 -0.1 - vertex 11.2294 -19.5302 -0.1 - vertex 11.0203 -19.4009 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 11.2294 -19.5302 -0.2 + vertex 11.0203 -19.4009 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 9.75283 -25.4359 -0.1 - vertex 12.8097 -28.1484 -0.1 - vertex 9.95745 -24.7805 -0.1 + vertex 9.75283 -25.4359 -0.2 + vertex 12.8097 -28.1484 -0.2 + vertex 9.95745 -24.7805 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.46723 -21.7989 -0.1 - vertex 11.0203 -19.4009 -0.1 - vertex 10.8168 -19.3006 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 11.0203 -19.4009 -0.2 + vertex 10.8168 -19.3006 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 9.46376 -26.2422 -0.1 - vertex 12.8097 -28.1484 -0.1 - vertex 9.75283 -25.4359 -0.1 + vertex 9.46376 -26.2422 -0.2 + vertex 12.8097 -28.1484 -0.2 + vertex 9.75283 -25.4359 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 9.07864 -27.2338 -0.1 - vertex 12.8097 -28.1484 -0.1 - vertex 9.46376 -26.2422 -0.1 + vertex 9.07864 -27.2338 -0.2 + vertex 12.8097 -28.1484 -0.2 + vertex 9.46376 -26.2422 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.8097 -28.1484 -0.1 - vertex 9.07864 -27.2338 -0.1 - vertex 12.0447 -30.0547 -0.1 + vertex 12.8097 -28.1484 -0.2 + vertex 9.07864 -27.2338 -0.2 + vertex 12.0447 -30.0547 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.46723 -21.7989 -0.1 - vertex 10.8168 -19.3006 -0.1 - vertex 10.602 -19.227 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 10.8168 -19.3006 -0.2 + vertex 10.602 -19.227 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.6919 -34.4621 -0.1 - vertex 12.2468 -35.1875 -0.1 - vertex 12.2214 -34.9805 -0.1 + vertex 11.6919 -34.4621 -0.2 + vertex 12.2468 -35.1875 -0.2 + vertex 12.2214 -34.9805 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.6919 -34.4621 -0.1 - vertex 12.2214 -34.9805 -0.1 - vertex 12.1503 -34.7994 -0.1 + vertex 11.6919 -34.4621 -0.2 + vertex 12.2214 -34.9805 -0.2 + vertex 12.1503 -34.7994 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.4668 -34.4353 -0.1 - vertex 12.2468 -35.1875 -0.1 - vertex 11.6919 -34.4621 -0.1 + vertex 11.4668 -34.4353 -0.2 + vertex 12.2468 -35.1875 -0.2 + vertex 11.6919 -34.4621 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2239 -35.4151 -0.1 - vertex 11.4668 -34.4353 -0.1 - vertex 12.1496 -35.6584 -0.1 + vertex 12.2239 -35.4151 -0.2 + vertex 11.4668 -34.4353 -0.2 + vertex 12.1496 -35.6584 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8827 -34.5351 -0.1 - vertex 12.1503 -34.7994 -0.1 - vertex 12.0364 -34.6492 -0.1 + vertex 11.8827 -34.5351 -0.2 + vertex 12.1503 -34.7994 -0.2 + vertex 12.0364 -34.6492 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2468 -35.1875 -0.1 - vertex 11.4668 -34.4353 -0.1 - vertex 12.2239 -35.4151 -0.1 + vertex 12.2468 -35.1875 -0.2 + vertex 11.4668 -34.4353 -0.2 + vertex 12.2239 -35.4151 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1503 -34.7994 -0.1 - vertex 11.8827 -34.5351 -0.1 - vertex 11.6919 -34.4621 -0.1 + vertex 12.1503 -34.7994 -0.2 + vertex 11.8827 -34.5351 -0.2 + vertex 11.6919 -34.4621 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1496 -35.6584 -0.1 - vertex 11.4668 -34.4353 -0.1 - vertex 12.0956 -35.7642 -0.1 + vertex 12.1496 -35.6584 -0.2 + vertex 11.4668 -34.4353 -0.2 + vertex 12.0956 -35.7642 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0956 -35.7642 -0.1 - vertex 11.4668 -34.4353 -0.1 - vertex 12.0181 -35.8752 -0.1 + vertex 12.0956 -35.7642 -0.2 + vertex 11.4668 -34.4353 -0.2 + vertex 12.0181 -35.8752 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.143 -34.4171 -0.1 - vertex 12.0181 -35.8752 -0.1 - vertex 11.4668 -34.4353 -0.1 + vertex 11.143 -34.4171 -0.2 + vertex 12.0181 -35.8752 -0.2 + vertex 11.4668 -34.4353 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0181 -35.8752 -0.1 - vertex 11.143 -34.4171 -0.1 - vertex 11.8034 -36.1064 -0.1 + vertex 12.0181 -35.8752 -0.2 + vertex 11.143 -34.4171 -0.2 + vertex 11.8034 -36.1064 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8034 -36.1064 -0.1 - vertex 11.143 -34.4171 -0.1 - vertex 11.5264 -36.339 -0.1 + vertex 11.8034 -36.1064 -0.2 + vertex 11.143 -34.4171 -0.2 + vertex 11.5264 -36.339 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.016 -34.3915 -0.1 - vertex 11.5264 -36.339 -0.1 - vertex 11.143 -34.4171 -0.1 + vertex 11.016 -34.3915 -0.2 + vertex 11.5264 -36.339 -0.2 + vertex 11.143 -34.4171 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5264 -36.339 -0.1 - vertex 11.016 -34.3915 -0.1 - vertex 11.208 -36.5595 -0.1 + vertex 11.5264 -36.339 -0.2 + vertex 11.016 -34.3915 -0.2 + vertex 11.208 -36.5595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9123 -34.3507 -0.1 - vertex 11.208 -36.5595 -0.1 - vertex 11.016 -34.3915 -0.1 + vertex 10.9123 -34.3507 -0.2 + vertex 11.208 -36.5595 -0.2 + vertex 11.016 -34.3915 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9123 -34.3507 -0.1 - vertex 10.8691 -36.7549 -0.1 - vertex 11.208 -36.5595 -0.1 + vertex 10.9123 -34.3507 -0.2 + vertex 10.8691 -36.7549 -0.2 + vertex 11.208 -36.5595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.5307 -36.9119 -0.1 - vertex 10.9123 -34.3507 -0.1 - vertex 10.832 -34.2912 -0.1 + vertex 10.5307 -36.9119 -0.2 + vertex 10.9123 -34.3507 -0.2 + vertex 10.832 -34.2912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.71926 -37.0921 -0.1 - vertex 10.832 -34.2912 -0.1 - vertex 10.775 -34.2097 -0.1 + vertex 9.71926 -37.0921 -0.2 + vertex 10.832 -34.2912 -0.2 + vertex 10.775 -34.2097 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.94379 -37.3156 -0.1 - vertex 10.775 -34.2097 -0.1 - vertex 10.7415 -34.103 -0.1 + vertex 8.94379 -37.3156 -0.2 + vertex 10.775 -34.2097 -0.2 + vertex 10.7415 -34.103 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.63949 -32.8952 -0.1 - vertex 10.7415 -34.103 -0.1 - vertex 10.7315 -33.9677 -0.1 + vertex 6.63949 -32.8952 -0.2 + vertex 10.7415 -34.103 -0.2 + vertex 10.7315 -33.9677 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9123 -34.3507 -0.1 - vertex 10.5307 -36.9119 -0.1 - vertex 10.8691 -36.7549 -0.1 + vertex 10.9123 -34.3507 -0.2 + vertex 10.5307 -36.9119 -0.2 + vertex 10.8691 -36.7549 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.97377 -29.9101 -0.1 - vertex 12.0447 -30.0547 -0.1 - vertex 9.07864 -27.2338 -0.1 + vertex 7.97377 -29.9101 -0.2 + vertex 12.0447 -30.0547 -0.2 + vertex 9.07864 -27.2338 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.46723 -21.7989 -0.1 - vertex 10.602 -19.227 -0.1 - vertex 10.3591 -19.1774 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 10.602 -19.227 -0.2 + vertex 10.3591 -19.1774 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.0892 -24.2416 -0.1 - vertex 14.5952 -23.8342 -0.1 - vertex 10.1598 -23.7848 -0.1 + vertex 10.0892 -24.2416 -0.2 + vertex 14.5952 -23.8342 -0.2 + vertex 10.1598 -23.7848 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0447 -30.0547 -0.1 - vertex 7.97377 -29.9101 -0.1 - vertex 11.5005 -31.4602 -0.1 + vertex 12.0447 -30.0547 -0.2 + vertex 7.97377 -29.9101 -0.2 + vertex 11.5005 -31.4602 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.5952 -23.8342 -0.1 - vertex 10.149 -22.9513 -0.1 - vertex 10.1807 -23.3758 -0.1 + vertex 14.5952 -23.8342 -0.2 + vertex 10.149 -22.9513 -0.2 + vertex 10.1807 -23.3758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.5952 -23.8342 -0.1 - vertex 10.1103 -22.7594 -0.1 - vertex 10.149 -22.9513 -0.1 + vertex 14.5952 -23.8342 -0.2 + vertex 10.1103 -22.7594 -0.2 + vertex 10.149 -22.9513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.46723 -21.7989 -0.1 - vertex 10.3591 -19.1774 -0.1 - vertex 10.0711 -19.1496 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 10.3591 -19.1774 -0.2 + vertex 10.0711 -19.1496 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.881 -19.8313 -0.1 - vertex 10.0571 -22.5812 -0.1 - vertex 10.1103 -22.7594 -0.1 + vertex 11.881 -19.8313 -0.2 + vertex 10.0571 -22.5812 -0.2 + vertex 10.1103 -22.7594 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.881 -19.8313 -0.1 - vertex 9.99008 -22.4166 -0.1 - vertex 10.0571 -22.5812 -0.1 + vertex 11.881 -19.8313 -0.2 + vertex 9.99008 -22.4166 -0.2 + vertex 10.0571 -22.5812 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.7902 -19.8211 -0.1 - vertex 9.90973 -22.2656 -0.1 - vertex 9.99008 -22.4166 -0.1 + vertex 11.7902 -19.8211 -0.2 + vertex 9.90973 -22.2656 -0.2 + vertex 9.99008 -22.4166 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.7902 -19.8211 -0.1 - vertex 9.81668 -22.1284 -0.1 - vertex 9.90973 -22.2656 -0.1 + vertex 11.7902 -19.8211 -0.2 + vertex 9.81668 -22.1284 -0.2 + vertex 9.90973 -22.2656 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.18157 -21.6481 -0.1 - vertex 10.0711 -19.1496 -0.1 - vertex 9.72114 -19.1409 -0.1 + vertex 9.18157 -21.6481 -0.2 + vertex 10.0711 -19.1496 -0.2 + vertex 9.72114 -19.1409 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5538 -19.7266 -0.1 - vertex 9.71152 -22.0048 -0.1 - vertex 9.81668 -22.1284 -0.1 + vertex 11.5538 -19.7266 -0.2 + vertex 9.71152 -22.0048 -0.2 + vertex 9.81668 -22.1284 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5538 -19.7266 -0.1 - vertex 9.59484 -21.895 -0.1 - vertex 9.71152 -22.0048 -0.1 + vertex 11.5538 -19.7266 -0.2 + vertex 9.59484 -21.895 -0.2 + vertex 9.71152 -22.0048 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.2294 -19.5302 -0.1 - vertex 9.46723 -21.7989 -0.1 - vertex 9.59484 -21.895 -0.1 + vertex 11.2294 -19.5302 -0.2 + vertex 9.46723 -21.7989 -0.2 + vertex 9.59484 -21.895 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.0711 -19.1496 -0.1 - vertex 9.18157 -21.6481 -0.1 - vertex 9.46723 -21.7989 -0.1 + vertex 10.0711 -19.1496 -0.2 + vertex 9.18157 -21.6481 -0.2 + vertex 9.46723 -21.7989 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.72114 -19.1409 -0.1 - vertex 8.85925 -21.5524 -0.1 - vertex 9.18157 -21.6481 -0.1 + vertex 9.72114 -19.1409 -0.2 + vertex 8.85925 -21.5524 -0.2 + vertex 9.18157 -21.6481 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 8.76754 -19.1712 -0.1 - vertex 8.85925 -21.5524 -0.1 - vertex 9.72114 -19.1409 -0.1 + vertex 8.76754 -19.1712 -0.2 + vertex 8.85925 -21.5524 -0.2 + vertex 9.72114 -19.1409 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.76754 -19.1712 -0.1 - vertex 8.50498 -21.5121 -0.1 - vertex 8.85925 -21.5524 -0.1 + vertex 8.76754 -19.1712 -0.2 + vertex 8.50498 -21.5121 -0.2 + vertex 8.85925 -21.5524 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.80885 -19.2424 -0.1 - vertex 8.50498 -21.5121 -0.1 - vertex 8.76754 -19.1712 -0.1 + vertex 7.80885 -19.2424 -0.2 + vertex 8.50498 -21.5121 -0.2 + vertex 8.76754 -19.1712 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.50498 -21.5121 -0.1 - vertex 7.80885 -19.2424 -0.1 - vertex 8.12348 -21.5274 -0.1 + vertex 8.50498 -21.5121 -0.2 + vertex 7.80885 -19.2424 -0.2 + vertex 8.12348 -21.5274 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.42262 -19.2967 -0.1 - vertex 8.12348 -21.5274 -0.1 - vertex 7.80885 -19.2424 -0.1 + vertex 7.42262 -19.2967 -0.2 + vertex 8.12348 -21.5274 -0.2 + vertex 7.80885 -19.2424 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.12348 -21.5274 -0.1 - vertex 7.42262 -19.2967 -0.1 - vertex 7.71946 -21.5983 -0.1 + vertex 8.12348 -21.5274 -0.2 + vertex 7.42262 -19.2967 -0.2 + vertex 7.71946 -21.5983 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.07441 -19.3694 -0.1 - vertex 7.71946 -21.5983 -0.1 - vertex 7.42262 -19.2967 -0.1 + vertex 7.07441 -19.3694 -0.2 + vertex 7.71946 -21.5983 -0.2 + vertex 7.42262 -19.2967 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.74616 -19.4649 -0.1 - vertex 7.71946 -21.5983 -0.1 - vertex 7.07441 -19.3694 -0.1 + vertex 6.74616 -19.4649 -0.2 + vertex 7.71946 -21.5983 -0.2 + vertex 7.07441 -19.3694 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.71946 -21.5983 -0.1 - vertex 6.74616 -19.4649 -0.1 - vertex 7.29763 -21.7251 -0.1 + vertex 7.71946 -21.5983 -0.2 + vertex 6.74616 -19.4649 -0.2 + vertex 7.29763 -21.7251 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.41984 -19.5879 -0.1 - vertex 7.29763 -21.7251 -0.1 - vertex 6.74616 -19.4649 -0.1 + vertex 6.41984 -19.5879 -0.2 + vertex 7.29763 -21.7251 -0.2 + vertex 6.74616 -19.4649 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.07737 -19.7427 -0.1 - vertex 7.29763 -21.7251 -0.1 - vertex 6.41984 -19.5879 -0.1 + vertex 6.07737 -19.7427 -0.2 + vertex 7.29763 -21.7251 -0.2 + vertex 6.41984 -19.5879 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.29763 -21.7251 -0.1 - vertex 6.07737 -19.7427 -0.1 - vertex 6.8627 -21.9079 -0.1 + vertex 7.29763 -21.7251 -0.2 + vertex 6.07737 -19.7427 -0.2 + vertex 6.8627 -21.9079 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.70074 -19.9339 -0.1 - vertex 6.8627 -21.9079 -0.1 - vertex 6.07737 -19.7427 -0.1 + vertex 5.70074 -19.9339 -0.2 + vertex 6.8627 -21.9079 -0.2 + vertex 6.07737 -19.7427 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.8627 -21.9079 -0.1 - vertex 5.70074 -19.9339 -0.1 - vertex 6.41939 -22.1469 -0.1 + vertex 6.8627 -21.9079 -0.2 + vertex 5.70074 -19.9339 -0.2 + vertex 6.41939 -22.1469 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.20766 -20.2058 -0.1 - vertex 6.41939 -22.1469 -0.1 - vertex 5.70074 -19.9339 -0.1 + vertex 5.20766 -20.2058 -0.2 + vertex 6.41939 -22.1469 -0.2 + vertex 5.70074 -19.9339 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.41939 -22.1469 -0.1 - vertex 5.20766 -20.2058 -0.1 - vertex 5.97241 -22.4422 -0.1 + vertex 6.41939 -22.1469 -0.2 + vertex 5.20766 -20.2058 -0.2 + vertex 5.97241 -22.4422 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.71458 -20.5006 -0.1 - vertex 5.97241 -22.4422 -0.1 - vertex 5.20766 -20.2058 -0.1 + vertex 4.71458 -20.5006 -0.2 + vertex 5.97241 -22.4422 -0.2 + vertex 5.20766 -20.2058 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.22328 -20.8168 -0.1 - vertex 5.97241 -22.4422 -0.1 - vertex 4.71458 -20.5006 -0.1 + vertex 4.22328 -20.8168 -0.2 + vertex 5.97241 -22.4422 -0.2 + vertex 4.71458 -20.5006 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.97241 -22.4422 -0.1 - vertex 4.22328 -20.8168 -0.1 - vertex 5.52647 -22.794 -0.1 + vertex 5.97241 -22.4422 -0.2 + vertex 4.22328 -20.8168 -0.2 + vertex 5.52647 -22.794 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 3.73558 -21.1527 -0.1 - vertex 5.52647 -22.794 -0.1 - vertex 4.22328 -20.8168 -0.1 + vertex 3.73558 -21.1527 -0.2 + vertex 5.52647 -22.794 -0.2 + vertex 4.22328 -20.8168 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.52647 -22.794 -0.1 - vertex 3.73558 -21.1527 -0.1 - vertex 5.08628 -23.2024 -0.1 + vertex 5.52647 -22.794 -0.2 + vertex 3.73558 -21.1527 -0.2 + vertex 5.08628 -23.2024 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 3.25328 -21.5067 -0.1 - vertex 5.08628 -23.2024 -0.1 - vertex 3.73558 -21.1527 -0.1 + vertex 3.25328 -21.5067 -0.2 + vertex 5.08628 -23.2024 -0.2 + vertex 3.73558 -21.1527 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.08628 -23.2024 -0.1 - vertex 3.25328 -21.5067 -0.1 - vertex 4.45147 -23.8871 -0.1 + vertex 5.08628 -23.2024 -0.2 + vertex 3.25328 -21.5067 -0.2 + vertex 4.45147 -23.8871 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 2.77819 -21.8771 -0.1 - vertex 4.45147 -23.8871 -0.1 - vertex 3.25328 -21.5067 -0.1 + vertex 2.77819 -21.8771 -0.2 + vertex 4.45147 -23.8871 -0.2 + vertex 3.25328 -21.5067 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 2.31211 -22.2625 -0.1 - vertex 4.45147 -23.8871 -0.1 - vertex 2.77819 -21.8771 -0.1 + vertex 2.31211 -22.2625 -0.2 + vertex 4.45147 -23.8871 -0.2 + vertex 2.77819 -21.8771 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.45147 -23.8871 -0.1 - vertex 2.31211 -22.2625 -0.1 - vertex 3.85887 -24.6213 -0.1 + vertex 4.45147 -23.8871 -0.2 + vertex 2.31211 -22.2625 -0.2 + vertex 3.85887 -24.6213 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.85684 -22.661 -0.1 - vertex 3.85887 -24.6213 -0.1 - vertex 2.31211 -22.2625 -0.1 + vertex 1.85684 -22.661 -0.2 + vertex 3.85887 -24.6213 -0.2 + vertex 2.31211 -22.2625 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.4142 -23.0712 -0.1 - vertex 3.85887 -24.6213 -0.1 - vertex 1.85684 -22.661 -0.1 + vertex 1.4142 -23.0712 -0.2 + vertex 3.85887 -24.6213 -0.2 + vertex 1.85684 -22.661 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.85887 -24.6213 -0.1 - vertex 1.4142 -23.0712 -0.1 - vertex 3.31148 -25.3951 -0.1 + vertex 3.85887 -24.6213 -0.2 + vertex 1.4142 -23.0712 -0.2 + vertex 3.31148 -25.3951 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.985991 -23.4913 -0.1 - vertex 3.31148 -25.3951 -0.1 - vertex 1.4142 -23.0712 -0.1 + vertex 0.985991 -23.4913 -0.2 + vertex 3.31148 -25.3951 -0.2 + vertex 1.4142 -23.0712 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.574011 -23.9198 -0.1 - vertex 3.31148 -25.3951 -0.1 - vertex 0.985991 -23.4913 -0.1 + vertex 0.574011 -23.9198 -0.2 + vertex 3.31148 -25.3951 -0.2 + vertex 0.985991 -23.4913 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.31148 -25.3951 -0.1 - vertex 0.574011 -23.9198 -0.1 - vertex 2.81229 -26.1986 -0.1 + vertex 3.31148 -25.3951 -0.2 + vertex 0.574011 -23.9198 -0.2 + vertex 2.81229 -26.1986 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.18007 -24.355 -0.1 - vertex 2.81229 -26.1986 -0.1 - vertex 0.574011 -23.9198 -0.1 + vertex 0.18007 -24.355 -0.2 + vertex 2.81229 -26.1986 -0.2 + vertex 0.574011 -23.9198 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -0.194025 -24.7953 -0.1 - vertex 2.81229 -26.1986 -0.1 - vertex 0.18007 -24.355 -0.1 + vertex -0.194025 -24.7953 -0.2 + vertex 2.81229 -26.1986 -0.2 + vertex 0.18007 -24.355 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.81229 -26.1986 -0.1 - vertex -0.194025 -24.7953 -0.1 - vertex 2.36428 -27.0218 -0.1 + vertex 2.81229 -26.1986 -0.2 + vertex -0.194025 -24.7953 -0.2 + vertex 2.36428 -27.0218 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -0.546472 -25.2391 -0.1 - vertex 2.36428 -27.0218 -0.1 - vertex -0.194025 -24.7953 -0.1 + vertex -0.546472 -25.2391 -0.2 + vertex 2.36428 -27.0218 -0.2 + vertex -0.194025 -24.7953 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -0.875463 -25.6847 -0.1 - vertex 2.36428 -27.0218 -0.1 - vertex -0.546472 -25.2391 -0.1 + vertex -0.875463 -25.6847 -0.2 + vertex 2.36428 -27.0218 -0.2 + vertex -0.546472 -25.2391 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.36428 -27.0218 -0.1 - vertex -0.875463 -25.6847 -0.1 - vertex 1.97046 -27.8549 -0.1 + vertex 2.36428 -27.0218 -0.2 + vertex -0.875463 -25.6847 -0.2 + vertex 1.97046 -27.8549 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -1.17919 -26.1306 -0.1 - vertex 1.97046 -27.8549 -0.1 - vertex -0.875463 -25.6847 -0.1 + vertex -1.17919 -26.1306 -0.2 + vertex 1.97046 -27.8549 -0.2 + vertex -0.875463 -25.6847 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -1.45361 -26.5684 -0.1 - vertex 1.97046 -27.8549 -0.1 - vertex -1.17919 -26.1306 -0.1 + vertex -1.45361 -26.5684 -0.2 + vertex 1.97046 -27.8549 -0.2 + vertex -1.17919 -26.1306 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5005 -31.4602 -0.1 - vertex 7.97377 -29.9101 -0.1 - vertex 11.1661 -32.3709 -0.1 + vertex 11.5005 -31.4602 -0.2 + vertex 7.97377 -29.9101 -0.2 + vertex 11.1661 -32.3709 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.44603 -31.1479 -0.1 - vertex 11.1661 -32.3709 -0.1 - vertex 7.97377 -29.9101 -0.1 + vertex 7.44603 -31.1479 -0.2 + vertex 11.1661 -32.3709 -0.2 + vertex 7.97377 -29.9101 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.1661 -32.3709 -0.1 - vertex 7.44603 -31.1479 -0.1 - vertex 10.9267 -33.0747 -0.1 + vertex 11.1661 -32.3709 -0.2 + vertex 7.44603 -31.1479 -0.2 + vertex 10.9267 -33.0747 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.00854 -32.1311 -0.1 - vertex 10.9267 -33.0747 -0.1 - vertex 7.44603 -31.1479 -0.1 + vertex 7.00854 -32.1311 -0.2 + vertex 10.9267 -33.0747 -0.2 + vertex 7.44603 -31.1479 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9267 -33.0747 -0.1 - vertex 7.00854 -32.1311 -0.1 - vertex 10.7819 -33.5982 -0.1 + vertex 10.9267 -33.0747 -0.2 + vertex 7.00854 -32.1311 -0.2 + vertex 10.7819 -33.5982 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.7819 -33.5982 -0.1 - vertex 7.00854 -32.1311 -0.1 - vertex 10.7449 -33.8005 -0.1 + vertex 10.7819 -33.5982 -0.2 + vertex 7.00854 -32.1311 -0.2 + vertex 10.7449 -33.8005 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.63949 -32.8952 -0.1 - vertex 10.7449 -33.8005 -0.1 - vertex 7.00854 -32.1311 -0.1 + vertex 6.63949 -32.8952 -0.2 + vertex 10.7449 -33.8005 -0.2 + vertex 7.00854 -32.1311 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.7449 -33.8005 -0.1 - vertex 6.63949 -32.8952 -0.1 - vertex 10.7315 -33.9677 -0.1 + vertex 10.7449 -33.8005 -0.2 + vertex 6.63949 -32.8952 -0.2 + vertex 10.7315 -33.9677 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.7415 -34.103 -0.1 - vertex 6.63949 -32.8952 -0.1 - vertex 6.31707 -33.4759 -0.1 + vertex 10.7415 -34.103 -0.2 + vertex 6.63949 -32.8952 -0.2 + vertex 6.31707 -33.4759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.832 -34.2912 -0.1 - vertex 9.93892 -37.0575 -0.1 - vertex 10.2137 -37.0171 -0.1 + vertex 10.832 -34.2912 -0.2 + vertex 9.93892 -37.0575 -0.2 + vertex 10.2137 -37.0171 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.832 -34.2912 -0.1 - vertex 10.2137 -37.0171 -0.1 - vertex 10.5307 -36.9119 -0.1 + vertex 10.832 -34.2912 -0.2 + vertex 10.2137 -37.0171 -0.2 + vertex 10.5307 -36.9119 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.832 -34.2912 -0.1 - vertex 9.71926 -37.0921 -0.1 - vertex 9.93892 -37.0575 -0.1 + vertex 10.832 -34.2912 -0.2 + vertex 9.71926 -37.0921 -0.2 + vertex 9.93892 -37.0575 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.775 -34.2097 -0.1 - vertex 9.37163 -37.1827 -0.1 - vertex 9.71926 -37.0921 -0.1 + vertex 10.775 -34.2097 -0.2 + vertex 9.37163 -37.1827 -0.2 + vertex 9.71926 -37.0921 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 8.94379 -37.3156 -0.1 - vertex 10.7415 -34.103 -0.1 - vertex 6.31707 -33.4759 -0.1 + vertex 8.94379 -37.3156 -0.2 + vertex 10.7415 -34.103 -0.2 + vertex 6.31707 -33.4759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.775 -34.2097 -0.1 - vertex 8.94379 -37.3156 -0.1 - vertex 9.37163 -37.1827 -0.1 + vertex 10.775 -34.2097 -0.2 + vertex 8.94379 -37.3156 -0.2 + vertex 9.37163 -37.1827 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.01946 -33.9088 -0.1 - vertex 8.94379 -37.3156 -0.1 - vertex 6.31707 -33.4759 -0.1 + vertex 6.01946 -33.9088 -0.2 + vertex 8.94379 -37.3156 -0.2 + vertex 6.31707 -33.4759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.94379 -37.3156 -0.1 - vertex 6.01946 -33.9088 -0.1 - vertex 8.4835 -37.477 -0.1 + vertex 8.94379 -37.3156 -0.2 + vertex 6.01946 -33.9088 -0.2 + vertex 8.4835 -37.477 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.87315 -34.0811 -0.1 - vertex 8.4835 -37.477 -0.1 - vertex 6.01946 -33.9088 -0.1 + vertex 5.87315 -34.0811 -0.2 + vertex 8.4835 -37.477 -0.2 + vertex 6.01946 -33.9088 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.72486 -34.2297 -0.1 - vertex 8.4835 -37.477 -0.1 - vertex 5.87315 -34.0811 -0.1 + vertex 5.72486 -34.2297 -0.2 + vertex 8.4835 -37.477 -0.2 + vertex 5.87315 -34.0811 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.4835 -37.477 -0.1 - vertex 5.72486 -34.2297 -0.1 - vertex 7.35232 -37.8908 -0.1 + vertex 8.4835 -37.477 -0.2 + vertex 5.72486 -34.2297 -0.2 + vertex 7.35232 -37.8908 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.41146 -34.4742 -0.1 - vertex 7.35232 -37.8908 -0.1 - vertex 5.72486 -34.2297 -0.1 + vertex 5.41146 -34.4742 -0.2 + vertex 7.35232 -37.8908 -0.2 + vertex 5.72486 -34.2297 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.69132 -37.3222 -0.1 - vertex 7.35232 -37.8908 -0.1 - vertex 5.41146 -34.4742 -0.1 + vertex 4.69132 -37.3222 -0.2 + vertex 7.35232 -37.8908 -0.2 + vertex 5.41146 -34.4742 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.35232 -37.8908 -0.1 - vertex 4.69132 -37.3222 -0.1 - vertex 6.47346 -38.1927 -0.1 + vertex 7.35232 -37.8908 -0.2 + vertex 4.69132 -37.3222 -0.2 + vertex 6.47346 -38.1927 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 4.72035 -37.4346 -0.1 - vertex 6.47346 -38.1927 -0.1 - vertex 4.69132 -37.3222 -0.1 + vertex 4.72035 -37.4346 -0.2 + vertex 6.47346 -38.1927 -0.2 + vertex 4.69132 -37.3222 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.47346 -38.1927 -0.1 - vertex 4.72035 -37.4346 -0.1 - vertex 5.81563 -38.3852 -0.1 + vertex 6.47346 -38.1927 -0.2 + vertex 4.72035 -37.4346 -0.2 + vertex 5.81563 -38.3852 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 4.74716 -37.8041 -0.1 - vertex 5.81563 -38.3852 -0.1 - vertex 4.72035 -37.4346 -0.1 + vertex 4.74716 -37.8041 -0.2 + vertex 5.81563 -38.3852 -0.2 + vertex 4.72035 -37.4346 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.69132 -37.3222 -0.1 - vertex 5.41146 -34.4742 -0.1 - vertex 5.05744 -34.678 -0.1 + vertex 4.69132 -37.3222 -0.2 + vertex 5.41146 -34.4742 -0.2 + vertex 5.05744 -34.678 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.55983 -38.4413 -0.1 - vertex 4.74716 -37.8041 -0.1 - vertex 5.34756 -38.4712 -0.1 + vertex 5.55983 -38.4413 -0.2 + vertex 4.74716 -37.8041 -0.2 + vertex 5.34756 -38.4712 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 4.76904 -38.117 -0.1 - vertex 5.34756 -38.4712 -0.1 - vertex 4.74716 -37.8041 -0.1 + vertex 4.76904 -38.117 -0.2 + vertex 5.34756 -38.4712 -0.2 + vertex 4.74716 -37.8041 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.34756 -38.4712 -0.1 - vertex 4.76904 -38.117 -0.1 - vertex 5.17491 -38.475 -0.1 + vertex 5.34756 -38.4712 -0.2 + vertex 4.76904 -38.117 -0.2 + vertex 5.17491 -38.475 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.17491 -38.475 -0.1 - vertex 4.76904 -38.117 -0.1 - vertex 5.03796 -38.4533 -0.1 + vertex 5.17491 -38.475 -0.2 + vertex 4.76904 -38.117 -0.2 + vertex 5.03796 -38.4533 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.03796 -38.4533 -0.1 - vertex 4.80226 -38.2378 -0.1 - vertex 4.93281 -38.4063 -0.1 + vertex 5.03796 -38.4533 -0.2 + vertex 4.80226 -38.2378 -0.2 + vertex 4.93281 -38.4063 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.93281 -38.4063 -0.1 - vertex 4.80226 -38.2378 -0.1 - vertex 4.85555 -38.3343 -0.1 + vertex 4.93281 -38.4063 -0.2 + vertex 4.80226 -38.2378 -0.2 + vertex 4.85555 -38.3343 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 4.80226 -38.2378 -0.1 - vertex 5.03796 -38.4533 -0.1 - vertex 4.76904 -38.117 -0.1 + vertex 4.80226 -38.2378 -0.2 + vertex 5.03796 -38.4533 -0.2 + vertex 4.76904 -38.117 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.81563 -38.3852 -0.1 - vertex 4.74716 -37.8041 -0.1 - vertex 5.55983 -38.4413 -0.1 + vertex 5.81563 -38.3852 -0.2 + vertex 4.74716 -37.8041 -0.2 + vertex 5.55983 -38.4413 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.05744 -34.678 -0.1 - vertex 4.65588 -37.2809 -0.1 - vertex 4.69132 -37.3222 -0.1 + vertex 5.05744 -34.678 -0.2 + vertex 4.65588 -37.2809 -0.2 + vertex 4.69132 -37.3222 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.59905 -34.8756 -0.1 - vertex 4.65588 -37.2809 -0.1 - vertex 5.05744 -34.678 -0.1 + vertex 4.59905 -34.8756 -0.2 + vertex 4.65588 -37.2809 -0.2 + vertex 5.05744 -34.678 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.12685 -35.011 -0.1 - vertex 4.65588 -37.2809 -0.1 - vertex 4.59905 -34.8756 -0.1 + vertex 4.12685 -35.011 -0.2 + vertex 4.65588 -37.2809 -0.2 + vertex 4.59905 -34.8756 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 3.65273 -35.0844 -0.1 - vertex 4.65588 -37.2809 -0.1 - vertex 4.12685 -35.011 -0.1 + vertex 3.65273 -35.0844 -0.2 + vertex 4.65588 -37.2809 -0.2 + vertex 4.12685 -35.011 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.65588 -37.2809 -0.1 - vertex 3.65273 -35.0844 -0.1 - vertex 4.26446 -37.4494 -0.1 + vertex 4.65588 -37.2809 -0.2 + vertex 3.65273 -35.0844 -0.2 + vertex 4.26446 -37.4494 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 3.18861 -35.0966 -0.1 - vertex 4.26446 -37.4494 -0.1 - vertex 3.65273 -35.0844 -0.1 + vertex 3.18861 -35.0966 -0.2 + vertex 4.26446 -37.4494 -0.2 + vertex 3.65273 -35.0844 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.26446 -37.4494 -0.1 - vertex 3.18861 -35.0966 -0.1 - vertex 3.45158 -37.8545 -0.1 + vertex 4.26446 -37.4494 -0.2 + vertex 3.18861 -35.0966 -0.2 + vertex 3.45158 -37.8545 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.7464 -35.0478 -0.1 - vertex 3.45158 -37.8545 -0.1 - vertex 3.18861 -35.0966 -0.1 + vertex 2.7464 -35.0478 -0.2 + vertex 3.45158 -37.8545 -0.2 + vertex 3.18861 -35.0966 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.45158 -37.8545 -0.1 - vertex 2.7464 -35.0478 -0.1 - vertex 3.20396 -37.9704 -0.1 + vertex 3.45158 -37.8545 -0.2 + vertex 2.7464 -35.0478 -0.2 + vertex 3.20396 -37.9704 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.20396 -37.9704 -0.1 - vertex 2.7464 -35.0478 -0.1 - vertex 2.93102 -38.0768 -0.1 + vertex 3.20396 -37.9704 -0.2 + vertex 2.7464 -35.0478 -0.2 + vertex 2.93102 -38.0768 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.53723 -35.0007 -0.1 - vertex 2.93102 -38.0768 -0.1 - vertex 2.7464 -35.0478 -0.1 + vertex 2.53723 -35.0007 -0.2 + vertex 2.93102 -38.0768 -0.2 + vertex 2.7464 -35.0478 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.32439 -38.26 -0.1 - vertex 2.53723 -35.0007 -0.1 - vertex 2.33801 -34.9386 -0.1 + vertex 2.32439 -38.26 -0.2 + vertex 2.53723 -35.0007 -0.2 + vertex 2.33801 -34.9386 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.53723 -35.0007 -0.1 - vertex 2.32439 -38.26 -0.1 - vertex 2.93102 -38.0768 -0.1 + vertex 2.53723 -35.0007 -0.2 + vertex 2.32439 -38.26 -0.2 + vertex 2.93102 -38.0768 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.66207 -38.4009 -0.1 - vertex 2.33801 -34.9386 -0.1 - vertex 2.15022 -34.8616 -0.1 + vertex 1.66207 -38.4009 -0.2 + vertex 2.33801 -34.9386 -0.2 + vertex 2.15022 -34.8616 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.66207 -38.4009 -0.1 - vertex 2.15022 -34.8616 -0.1 - vertex 1.97535 -34.7696 -0.1 + vertex 1.66207 -38.4009 -0.2 + vertex 2.15022 -34.8616 -0.2 + vertex 1.97535 -34.7696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.974434 -38.4962 -0.1 - vertex 1.97535 -34.7696 -0.1 - vertex 1.8149 -34.6627 -0.1 + vertex 0.974434 -38.4962 -0.2 + vertex 1.97535 -34.7696 -0.2 + vertex 1.8149 -34.6627 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.291868 -38.543 -0.1 - vertex 1.8149 -34.6627 -0.1 - vertex 1.67035 -34.5411 -0.1 + vertex 0.291868 -38.543 -0.2 + vertex 1.8149 -34.6627 -0.2 + vertex 1.67035 -34.5411 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.33801 -34.9386 -0.1 - vertex 1.66207 -38.4009 -0.1 - vertex 2.32439 -38.26 -0.1 + vertex 2.33801 -34.9386 -0.2 + vertex 1.66207 -38.4009 -0.2 + vertex 2.32439 -38.26 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.355246 -38.538 -0.1 - vertex 1.67035 -34.5411 -0.1 - vertex 1.50339 -34.3603 -0.1 + vertex -0.355246 -38.538 -0.2 + vertex 1.67035 -34.5411 -0.2 + vertex 1.50339 -34.3603 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.66982 -37.4742 -0.1 - vertex 1.50339 -34.3603 -0.1 - vertex 1.35782 -34.1559 -0.1 + vertex -2.66982 -37.4742 -0.2 + vertex 1.50339 -34.3603 -0.2 + vertex 1.35782 -34.1559 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.25661 -36.6145 -0.1 - vertex 1.35782 -34.1559 -0.1 - vertex 1.23329 -33.9292 -0.1 + vertex -3.25661 -36.6145 -0.2 + vertex 1.35782 -34.1559 -0.2 + vertex 1.23329 -33.9292 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.68783 -35.5721 -0.1 - vertex 1.23329 -33.9292 -0.1 - vertex 1.1294 -33.6813 -0.1 + vertex -3.68783 -35.5721 -0.2 + vertex 1.23329 -33.9292 -0.2 + vertex 1.1294 -33.6813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.87516 -34.8013 -0.1 - vertex 1.1294 -33.6813 -0.1 - vertex 1.04578 -33.4136 -0.1 + vertex -3.87516 -34.8013 -0.2 + vertex 1.1294 -33.6813 -0.2 + vertex 1.04578 -33.4136 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.97277 -33.9877 -0.1 - vertex 1.04578 -33.4136 -0.1 - vertex 0.982074 -33.1272 -0.1 + vertex -3.97277 -33.9877 -0.2 + vertex 1.04578 -33.4136 -0.2 + vertex 0.982074 -33.1272 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.97535 -34.7696 -0.1 - vertex 0.974434 -38.4962 -0.1 - vertex 1.66207 -38.4009 -0.1 + vertex 1.97535 -34.7696 -0.2 + vertex 0.974434 -38.4962 -0.2 + vertex 1.66207 -38.4009 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.97004 -33.2395 -0.1 - vertex 0.982074 -33.1272 -0.1 - vertex 0.937893 -32.8234 -0.1 + vertex -3.97004 -33.2395 -0.2 + vertex 0.982074 -33.1272 -0.2 + vertex 0.937893 -32.8234 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.8527 -32.4651 -0.1 - vertex 0.937893 -32.8234 -0.1 - vertex 0.912865 -32.5034 -0.1 + vertex -3.8527 -32.4651 -0.2 + vertex 0.937893 -32.8234 -0.2 + vertex 0.912865 -32.5034 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.75417 -32.0301 -0.1 - vertex 0.912865 -32.5034 -0.1 - vertex 0.906618 -32.1685 -0.1 + vertex -3.75417 -32.0301 -0.2 + vertex 0.912865 -32.5034 -0.2 + vertex 0.906618 -32.1685 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.97046 -27.8549 -0.1 - vertex -1.45361 -26.5684 -0.1 - vertex 1.63381 -28.6878 -0.1 + vertex 1.97046 -27.8549 -0.2 + vertex -1.45361 -26.5684 -0.2 + vertex 1.63381 -28.6878 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -1.72295 -27.0315 -0.1 - vertex 1.63381 -28.6878 -0.1 - vertex -1.45361 -26.5684 -0.1 + vertex -1.72295 -27.0315 -0.2 + vertex 1.63381 -28.6878 -0.2 + vertex -1.45361 -26.5684 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -2.23947 -28.0146 -0.1 - vertex 1.63381 -28.6878 -0.1 - vertex -1.72295 -27.0315 -0.1 + vertex -2.23947 -28.0146 -0.2 + vertex 1.63381 -28.6878 -0.2 + vertex -1.72295 -27.0315 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.63381 -28.6878 -0.1 - vertex -2.23947 -28.0146 -0.1 - vertex 1.35733 -29.5107 -0.1 + vertex 1.63381 -28.6878 -0.2 + vertex -2.23947 -28.0146 -0.2 + vertex 1.35733 -29.5107 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -2.71481 -29.043 -0.1 - vertex 1.35733 -29.5107 -0.1 - vertex -2.23947 -28.0146 -0.1 + vertex -2.71481 -29.043 -0.2 + vertex 1.35733 -29.5107 -0.2 + vertex -2.23947 -28.0146 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.35733 -29.5107 -0.1 - vertex -2.71481 -29.043 -0.1 - vertex 1.144 -30.3137 -0.1 + vertex 1.35733 -29.5107 -0.2 + vertex -2.71481 -29.043 -0.2 + vertex 1.144 -30.3137 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.144 -30.3137 -0.1 - vertex -2.71481 -29.043 -0.1 - vertex 0.99682 -31.0867 -0.1 + vertex 1.144 -30.3137 -0.2 + vertex -2.71481 -29.043 -0.2 + vertex 0.99682 -31.0867 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -3.135 -30.0798 -0.1 - vertex 0.99682 -31.0867 -0.1 - vertex -2.71481 -29.043 -0.1 + vertex -3.135 -30.0798 -0.2 + vertex 0.99682 -31.0867 -0.2 + vertex -2.71481 -29.043 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.99682 -31.0867 -0.1 - vertex -3.135 -30.0798 -0.1 - vertex 0.918778 -31.8199 -0.1 + vertex 0.99682 -31.0867 -0.2 + vertex -3.135 -30.0798 -0.2 + vertex 0.918778 -31.8199 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -3.4861 -31.0878 -0.1 - vertex 0.918778 -31.8199 -0.1 - vertex -3.135 -30.0798 -0.1 + vertex -3.4861 -31.0878 -0.2 + vertex 0.918778 -31.8199 -0.2 + vertex -3.135 -30.0798 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.918778 -31.8199 -0.1 - vertex -3.4861 -31.0878 -0.1 - vertex 0.906618 -32.1685 -0.1 + vertex 0.918778 -31.8199 -0.2 + vertex -3.4861 -31.0878 -0.2 + vertex 0.906618 -32.1685 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -3.75417 -32.0301 -0.1 - vertex 0.906618 -32.1685 -0.1 - vertex -3.4861 -31.0878 -0.1 + vertex -3.75417 -32.0301 -0.2 + vertex 0.906618 -32.1685 -0.2 + vertex -3.4861 -31.0878 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.912865 -32.5034 -0.1 - vertex -3.75417 -32.0301 -0.1 - vertex -3.8527 -32.4651 -0.1 + vertex 0.912865 -32.5034 -0.2 + vertex -3.75417 -32.0301 -0.2 + vertex -3.8527 -32.4651 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.937893 -32.8234 -0.1 - vertex -3.8527 -32.4651 -0.1 - vertex -3.92523 -32.8697 -0.1 + vertex 0.937893 -32.8234 -0.2 + vertex -3.8527 -32.4651 -0.2 + vertex -3.92523 -32.8697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.937893 -32.8234 -0.1 - vertex -3.92523 -32.8697 -0.1 - vertex -3.97004 -33.2395 -0.1 + vertex 0.937893 -32.8234 -0.2 + vertex -3.92523 -32.8697 -0.2 + vertex -3.97004 -33.2395 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.04578 -33.4136 -0.1 - vertex -3.97277 -33.9877 -0.1 - vertex -3.93569 -34.3989 -0.1 + vertex 1.04578 -33.4136 -0.2 + vertex -3.97277 -33.9877 -0.2 + vertex -3.93569 -34.3989 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.04578 -33.4136 -0.1 - vertex -3.93569 -34.3989 -0.1 - vertex -3.87516 -34.8013 -0.1 + vertex 1.04578 -33.4136 -0.2 + vertex -3.93569 -34.3989 -0.2 + vertex -3.87516 -34.8013 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.1294 -33.6813 -0.1 - vertex -3.87516 -34.8013 -0.1 - vertex -3.79219 -35.193 -0.1 + vertex 1.1294 -33.6813 -0.2 + vertex -3.87516 -34.8013 -0.2 + vertex -3.79219 -35.193 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.8149 -34.6627 -0.1 - vertex 0.291868 -38.543 -0.1 - vertex 0.974434 -38.4962 -0.1 + vertex 1.8149 -34.6627 -0.2 + vertex 0.291868 -38.543 -0.2 + vertex 0.974434 -38.4962 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.23329 -33.9292 -0.1 - vertex -3.56309 -35.9367 -0.1 - vertex -3.41901 -36.2848 -0.1 + vertex 1.23329 -33.9292 -0.2 + vertex -3.56309 -35.9367 -0.2 + vertex -3.41901 -36.2848 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.23329 -33.9292 -0.1 - vertex -3.41901 -36.2848 -0.1 - vertex -3.25661 -36.6145 -0.1 + vertex 1.23329 -33.9292 -0.2 + vertex -3.41901 -36.2848 -0.2 + vertex -3.25661 -36.6145 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.35782 -34.1559 -0.1 - vertex -3.25661 -36.6145 -0.1 - vertex -3.07693 -36.924 -0.1 + vertex 1.35782 -34.1559 -0.2 + vertex -3.25661 -36.6145 -0.2 + vertex -3.07693 -36.924 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.35782 -34.1559 -0.1 - vertex -3.07693 -36.924 -0.1 - vertex -2.88099 -37.2112 -0.1 + vertex 1.35782 -34.1559 -0.2 + vertex -3.07693 -36.924 -0.2 + vertex -2.88099 -37.2112 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.35782 -34.1559 -0.1 - vertex -2.88099 -37.2112 -0.1 - vertex -2.66982 -37.4742 -0.1 + vertex 1.35782 -34.1559 -0.2 + vertex -2.88099 -37.2112 -0.2 + vertex -2.66982 -37.4742 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.50339 -34.3603 -0.1 - vertex -2.20592 -37.9202 -0.1 - vertex -0.936529 -38.478 -0.1 + vertex 1.50339 -34.3603 -0.2 + vertex -2.20592 -37.9202 -0.2 + vertex -0.936529 -38.478 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.19299 -38.4265 -0.1 - vertex -2.20592 -37.9202 -0.1 - vertex -1.4216 -38.36 -0.1 + vertex -1.19299 -38.4265 -0.2 + vertex -2.20592 -37.9202 -0.2 + vertex -1.4216 -38.36 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.69347 -38.2465 -0.1 - vertex -2.20592 -37.9202 -0.1 - vertex -1.95525 -38.0993 -0.1 + vertex -1.69347 -38.2465 -0.2 + vertex -2.20592 -37.9202 -0.2 + vertex -1.95525 -38.0993 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.4216 -38.36 -0.1 - vertex -2.20592 -37.9202 -0.1 - vertex -1.69347 -38.2465 -0.1 + vertex -1.4216 -38.36 -0.2 + vertex -2.20592 -37.9202 -0.2 + vertex -1.69347 -38.2465 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.936529 -38.478 -0.1 - vertex -2.20592 -37.9202 -0.1 - vertex -1.19299 -38.4265 -0.1 + vertex -0.936529 -38.478 -0.2 + vertex -2.20592 -37.9202 -0.2 + vertex -1.19299 -38.4265 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.50339 -34.3603 -0.1 - vertex -2.44446 -37.7112 -0.1 - vertex -2.20592 -37.9202 -0.1 + vertex 1.50339 -34.3603 -0.2 + vertex -2.44446 -37.7112 -0.2 + vertex -2.20592 -37.9202 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.50339 -34.3603 -0.1 - vertex -0.936529 -38.478 -0.1 - vertex -0.355246 -38.538 -0.1 + vertex 1.50339 -34.3603 -0.2 + vertex -0.936529 -38.478 -0.2 + vertex -0.355246 -38.538 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.50339 -34.3603 -0.1 - vertex -2.66982 -37.4742 -0.1 - vertex -2.44446 -37.7112 -0.1 + vertex 1.50339 -34.3603 -0.2 + vertex -2.66982 -37.4742 -0.2 + vertex -2.44446 -37.7112 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.1294 -33.6813 -0.1 - vertex -3.79219 -35.193 -0.1 - vertex -3.68783 -35.5721 -0.1 + vertex 1.1294 -33.6813 -0.2 + vertex -3.79219 -35.193 -0.2 + vertex -3.68783 -35.5721 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.67035 -34.5411 -0.1 - vertex -0.355246 -38.538 -0.1 - vertex 0.291868 -38.543 -0.1 + vertex 1.67035 -34.5411 -0.2 + vertex -0.355246 -38.538 -0.2 + vertex 0.291868 -38.543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.982074 -33.1272 -0.1 - vertex -3.97004 -33.2395 -0.1 - vertex -3.98536 -33.5697 -0.1 + vertex 0.982074 -33.1272 -0.2 + vertex -3.97004 -33.2395 -0.2 + vertex -3.98536 -33.5697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.23329 -33.9292 -0.1 - vertex -3.68783 -35.5721 -0.1 - vertex -3.56309 -35.9367 -0.1 + vertex 1.23329 -33.9292 -0.2 + vertex -3.68783 -35.5721 -0.2 + vertex -3.56309 -35.9367 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.982074 -33.1272 -0.1 - vertex -3.98536 -33.5697 -0.1 - vertex -3.97277 -33.9877 -0.1 + vertex 0.982074 -33.1272 -0.2 + vertex -3.98536 -33.5697 -0.2 + vertex -3.97277 -33.9877 -0.2 endloop endfacet facet normal -0.2949 -0.955528 0 outer loop - vertex 19.3736 -10.7173 -0.1 + vertex 19.3736 -10.7173 -0.2 vertex 19.4763 -10.749 0 vertex 19.3736 -10.7173 0 endloop @@ -1675,13 +1675,13 @@ solid OpenSCAD_Model facet normal -0.2949 -0.955528 -0 outer loop vertex 19.4763 -10.749 0 - vertex 19.3736 -10.7173 -0.1 - vertex 19.4763 -10.749 -0.1 + vertex 19.3736 -10.7173 -0.2 + vertex 19.4763 -10.749 -0.2 endloop endfacet facet normal -0.500051 -0.865996 0 outer loop - vertex 19.4763 -10.749 -0.1 + vertex 19.4763 -10.749 -0.2 vertex 19.557 -10.7956 0 vertex 19.4763 -10.749 0 endloop @@ -1689,307 +1689,307 @@ solid OpenSCAD_Model facet normal -0.500051 -0.865996 -0 outer loop vertex 19.557 -10.7956 0 - vertex 19.4763 -10.749 -0.1 - vertex 19.557 -10.7956 -0.1 + vertex 19.4763 -10.749 -0.2 + vertex 19.557 -10.7956 -0.2 endloop endfacet facet normal -0.714409 -0.699729 0 outer loop - vertex 19.6172 -10.8571 -0.1 + vertex 19.6172 -10.8571 -0.2 vertex 19.557 -10.7956 0 - vertex 19.557 -10.7956 -0.1 + vertex 19.557 -10.7956 -0.2 endloop endfacet facet normal -0.714409 -0.699729 0 outer loop vertex 19.557 -10.7956 0 - vertex 19.6172 -10.8571 -0.1 + vertex 19.6172 -10.8571 -0.2 vertex 19.6172 -10.8571 0 endloop endfacet facet normal -0.879991 -0.47499 0 outer loop - vertex 19.6583 -10.9333 -0.1 + vertex 19.6583 -10.9333 -0.2 vertex 19.6172 -10.8571 0 - vertex 19.6172 -10.8571 -0.1 + vertex 19.6172 -10.8571 -0.2 endloop endfacet facet normal -0.879991 -0.47499 0 outer loop vertex 19.6172 -10.8571 0 - vertex 19.6583 -10.9333 -0.1 + vertex 19.6583 -10.9333 -0.2 vertex 19.6583 -10.9333 0 endloop endfacet facet normal -0.967951 -0.251138 0 outer loop - vertex 19.6819 -11.0243 -0.1 + vertex 19.6819 -11.0243 -0.2 vertex 19.6583 -10.9333 0 - vertex 19.6583 -10.9333 -0.1 + vertex 19.6583 -10.9333 -0.2 endloop endfacet facet normal -0.967951 -0.251138 0 outer loop vertex 19.6583 -10.9333 0 - vertex 19.6819 -11.0243 -0.1 + vertex 19.6819 -11.0243 -0.2 vertex 19.6819 -11.0243 0 endloop endfacet facet normal -0.997465 -0.0711569 0 outer loop - vertex 19.6895 -11.13 -0.1 + vertex 19.6895 -11.13 -0.2 vertex 19.6819 -11.0243 0 - vertex 19.6819 -11.0243 -0.1 + vertex 19.6819 -11.0243 -0.2 endloop endfacet facet normal -0.997465 -0.0711569 0 outer loop vertex 19.6819 -11.0243 0 - vertex 19.6895 -11.13 -0.1 + vertex 19.6895 -11.13 -0.2 vertex 19.6895 -11.13 0 endloop endfacet facet normal -0.984705 0.17423 0 outer loop - vertex 19.6598 -11.2975 -0.1 + vertex 19.6598 -11.2975 -0.2 vertex 19.6895 -11.13 0 - vertex 19.6895 -11.13 -0.1 + vertex 19.6895 -11.13 -0.2 endloop endfacet facet normal -0.984705 0.17423 0 outer loop vertex 19.6895 -11.13 0 - vertex 19.6598 -11.2975 -0.1 + vertex 19.6598 -11.2975 -0.2 vertex 19.6598 -11.2975 0 endloop endfacet facet normal -0.956743 0.290933 0 outer loop - vertex 19.5653 -11.6083 -0.1 + vertex 19.5653 -11.6083 -0.2 vertex 19.6598 -11.2975 0 - vertex 19.6598 -11.2975 -0.1 + vertex 19.6598 -11.2975 -0.2 endloop endfacet facet normal -0.956743 0.290933 0 outer loop vertex 19.6598 -11.2975 0 - vertex 19.5653 -11.6083 -0.1 + vertex 19.5653 -11.6083 -0.2 vertex 19.5653 -11.6083 0 endloop endfacet facet normal -0.93899 0.343946 0 outer loop - vertex 19.1479 -12.7477 -0.1 + vertex 19.1479 -12.7477 -0.2 vertex 19.5653 -11.6083 0 - vertex 19.5653 -11.6083 -0.1 + vertex 19.5653 -11.6083 -0.2 endloop endfacet facet normal -0.93899 0.343946 0 outer loop vertex 19.5653 -11.6083 0 - vertex 19.1479 -12.7477 -0.1 + vertex 19.1479 -12.7477 -0.2 vertex 19.1479 -12.7477 0 endloop endfacet facet normal -0.930496 0.366302 0 outer loop - vertex 18.3699 -14.7241 -0.1 + vertex 18.3699 -14.7241 -0.2 vertex 19.1479 -12.7477 0 - vertex 19.1479 -12.7477 -0.1 + vertex 19.1479 -12.7477 -0.2 endloop endfacet facet normal -0.930496 0.366302 0 outer loop vertex 19.1479 -12.7477 0 - vertex 18.3699 -14.7241 -0.1 + vertex 18.3699 -14.7241 -0.2 vertex 18.3699 -14.7241 0 endloop endfacet facet normal -0.92735 0.374196 0 outer loop - vertex 17.1638 -17.7131 -0.1 + vertex 17.1638 -17.7131 -0.2 vertex 18.3699 -14.7241 0 - vertex 18.3699 -14.7241 -0.1 + vertex 18.3699 -14.7241 -0.2 endloop endfacet facet normal -0.92735 0.374196 0 outer loop vertex 18.3699 -14.7241 0 - vertex 17.1638 -17.7131 -0.1 + vertex 17.1638 -17.7131 -0.2 vertex 17.1638 -17.7131 0 endloop endfacet facet normal -0.922106 0.386938 0 outer loop - vertex 14.5952 -23.8342 -0.1 + vertex 14.5952 -23.8342 -0.2 vertex 17.1638 -17.7131 0 - vertex 17.1638 -17.7131 -0.1 + vertex 17.1638 -17.7131 -0.2 endloop endfacet facet normal -0.922106 0.386938 0 outer loop vertex 17.1638 -17.7131 0 - vertex 14.5952 -23.8342 -0.1 + vertex 14.5952 -23.8342 -0.2 vertex 14.5952 -23.8342 0 endloop endfacet facet normal -0.923985 0.382428 0 outer loop - vertex 12.8097 -28.1484 -0.1 + vertex 12.8097 -28.1484 -0.2 vertex 14.5952 -23.8342 0 - vertex 14.5952 -23.8342 -0.1 + vertex 14.5952 -23.8342 -0.2 endloop endfacet facet normal -0.923985 0.382428 0 outer loop vertex 14.5952 -23.8342 0 - vertex 12.8097 -28.1484 -0.1 + vertex 12.8097 -28.1484 -0.2 vertex 12.8097 -28.1484 0 endloop endfacet facet normal -0.928075 0.372394 0 outer loop - vertex 12.0447 -30.0547 -0.1 + vertex 12.0447 -30.0547 -0.2 vertex 12.8097 -28.1484 0 - vertex 12.8097 -28.1484 -0.1 + vertex 12.8097 -28.1484 -0.2 endloop endfacet facet normal -0.928075 0.372394 0 outer loop vertex 12.8097 -28.1484 0 - vertex 12.0447 -30.0547 -0.1 + vertex 12.0447 -30.0547 -0.2 vertex 12.0447 -30.0547 0 endloop endfacet facet normal -0.932522 0.361114 0 outer loop - vertex 11.5005 -31.4602 -0.1 + vertex 11.5005 -31.4602 -0.2 vertex 12.0447 -30.0547 0 - vertex 12.0447 -30.0547 -0.1 + vertex 12.0447 -30.0547 -0.2 endloop endfacet facet normal -0.932522 0.361114 0 outer loop vertex 12.0447 -30.0547 0 - vertex 11.5005 -31.4602 -0.1 + vertex 11.5005 -31.4602 -0.2 vertex 11.5005 -31.4602 0 endloop endfacet facet normal -0.938737 0.344634 0 outer loop - vertex 11.1661 -32.3709 -0.1 + vertex 11.1661 -32.3709 -0.2 vertex 11.5005 -31.4602 0 - vertex 11.5005 -31.4602 -0.1 + vertex 11.5005 -31.4602 -0.2 endloop endfacet facet normal -0.938737 0.344634 0 outer loop vertex 11.5005 -31.4602 0 - vertex 11.1661 -32.3709 -0.1 + vertex 11.1661 -32.3709 -0.2 vertex 11.1661 -32.3709 0 endloop endfacet facet normal -0.946728 0.322034 0 outer loop - vertex 10.9267 -33.0747 -0.1 + vertex 10.9267 -33.0747 -0.2 vertex 11.1661 -32.3709 0 - vertex 11.1661 -32.3709 -0.1 + vertex 11.1661 -32.3709 -0.2 endloop endfacet facet normal -0.946728 0.322034 0 outer loop vertex 11.1661 -32.3709 0 - vertex 10.9267 -33.0747 -0.1 + vertex 10.9267 -33.0747 -0.2 vertex 10.9267 -33.0747 0 endloop endfacet facet normal -0.963806 0.266603 0 outer loop - vertex 10.7819 -33.5982 -0.1 + vertex 10.7819 -33.5982 -0.2 vertex 10.9267 -33.0747 0 - vertex 10.9267 -33.0747 -0.1 + vertex 10.9267 -33.0747 -0.2 endloop endfacet facet normal -0.963806 0.266603 0 outer loop vertex 10.9267 -33.0747 0 - vertex 10.7819 -33.5982 -0.1 + vertex 10.7819 -33.5982 -0.2 vertex 10.7819 -33.5982 0 endloop endfacet facet normal -0.983685 0.179901 0 outer loop - vertex 10.7449 -33.8005 -0.1 + vertex 10.7449 -33.8005 -0.2 vertex 10.7819 -33.5982 0 - vertex 10.7819 -33.5982 -0.1 + vertex 10.7819 -33.5982 -0.2 endloop endfacet facet normal -0.983685 0.179901 0 outer loop vertex 10.7819 -33.5982 0 - vertex 10.7449 -33.8005 -0.1 + vertex 10.7449 -33.8005 -0.2 vertex 10.7449 -33.8005 0 endloop endfacet facet normal -0.996773 0.0802779 0 outer loop - vertex 10.7315 -33.9677 -0.1 + vertex 10.7315 -33.9677 -0.2 vertex 10.7449 -33.8005 0 - vertex 10.7449 -33.8005 -0.1 + vertex 10.7449 -33.8005 -0.2 endloop endfacet facet normal -0.996773 0.0802779 0 outer loop vertex 10.7449 -33.8005 0 - vertex 10.7315 -33.9677 -0.1 + vertex 10.7315 -33.9677 -0.2 vertex 10.7315 -33.9677 0 endloop endfacet facet normal -0.997256 -0.0740364 0 outer loop - vertex 10.7415 -34.103 -0.1 + vertex 10.7415 -34.103 -0.2 vertex 10.7315 -33.9677 0 - vertex 10.7315 -33.9677 -0.1 + vertex 10.7315 -33.9677 -0.2 endloop endfacet facet normal -0.997256 -0.0740364 0 outer loop vertex 10.7315 -33.9677 0 - vertex 10.7415 -34.103 -0.1 + vertex 10.7415 -34.103 -0.2 vertex 10.7415 -34.103 0 endloop endfacet facet normal -0.954067 -0.299593 0 outer loop - vertex 10.775 -34.2097 -0.1 + vertex 10.775 -34.2097 -0.2 vertex 10.7415 -34.103 0 - vertex 10.7415 -34.103 -0.1 + vertex 10.7415 -34.103 -0.2 endloop endfacet facet normal -0.954067 -0.299593 0 outer loop vertex 10.7415 -34.103 0 - vertex 10.775 -34.2097 -0.1 + vertex 10.775 -34.2097 -0.2 vertex 10.775 -34.2097 0 endloop endfacet facet normal -0.81961 -0.572921 0 outer loop - vertex 10.832 -34.2912 -0.1 + vertex 10.832 -34.2912 -0.2 vertex 10.775 -34.2097 0 - vertex 10.775 -34.2097 -0.1 + vertex 10.775 -34.2097 -0.2 endloop endfacet facet normal -0.81961 -0.572921 0 outer loop vertex 10.775 -34.2097 0 - vertex 10.832 -34.2912 -0.1 + vertex 10.832 -34.2912 -0.2 vertex 10.832 -34.2912 0 endloop endfacet facet normal -0.595252 -0.803539 0 outer loop - vertex 10.832 -34.2912 -0.1 + vertex 10.832 -34.2912 -0.2 vertex 10.9123 -34.3507 0 vertex 10.832 -34.2912 0 endloop @@ -1997,13 +1997,13 @@ solid OpenSCAD_Model facet normal -0.595252 -0.803539 -0 outer loop vertex 10.9123 -34.3507 0 - vertex 10.832 -34.2912 -0.1 - vertex 10.9123 -34.3507 -0.1 + vertex 10.832 -34.2912 -0.2 + vertex 10.9123 -34.3507 -0.2 endloop endfacet facet normal -0.366659 -0.930355 0 outer loop - vertex 10.9123 -34.3507 -0.1 + vertex 10.9123 -34.3507 -0.2 vertex 11.016 -34.3915 0 vertex 10.9123 -34.3507 0 endloop @@ -2011,13 +2011,13 @@ solid OpenSCAD_Model facet normal -0.366659 -0.930355 -0 outer loop vertex 11.016 -34.3915 0 - vertex 10.9123 -34.3507 -0.1 - vertex 11.016 -34.3915 -0.1 + vertex 10.9123 -34.3507 -0.2 + vertex 11.016 -34.3915 -0.2 endloop endfacet facet normal -0.197016 -0.9804 0 outer loop - vertex 11.016 -34.3915 -0.1 + vertex 11.016 -34.3915 -0.2 vertex 11.143 -34.4171 0 vertex 11.016 -34.3915 0 endloop @@ -2025,13 +2025,13 @@ solid OpenSCAD_Model facet normal -0.197016 -0.9804 -0 outer loop vertex 11.143 -34.4171 0 - vertex 11.016 -34.3915 -0.1 - vertex 11.143 -34.4171 -0.1 + vertex 11.016 -34.3915 -0.2 + vertex 11.143 -34.4171 -0.2 endloop endfacet facet normal -0.0562764 -0.998415 0 outer loop - vertex 11.143 -34.4171 -0.1 + vertex 11.143 -34.4171 -0.2 vertex 11.4668 -34.4353 0 vertex 11.143 -34.4171 0 endloop @@ -2039,13 +2039,13 @@ solid OpenSCAD_Model facet normal -0.0562764 -0.998415 -0 outer loop vertex 11.4668 -34.4353 0 - vertex 11.143 -34.4171 -0.1 - vertex 11.4668 -34.4353 -0.1 + vertex 11.143 -34.4171 -0.2 + vertex 11.4668 -34.4353 -0.2 endloop endfacet facet normal -0.118118 -0.993 0 outer loop - vertex 11.4668 -34.4353 -0.1 + vertex 11.4668 -34.4353 -0.2 vertex 11.6919 -34.4621 0 vertex 11.4668 -34.4353 0 endloop @@ -2053,13 +2053,13 @@ solid OpenSCAD_Model facet normal -0.118118 -0.993 -0 outer loop vertex 11.6919 -34.4621 0 - vertex 11.4668 -34.4353 -0.1 - vertex 11.6919 -34.4621 -0.1 + vertex 11.4668 -34.4353 -0.2 + vertex 11.6919 -34.4621 -0.2 endloop endfacet facet normal -0.357337 -0.933976 0 outer loop - vertex 11.6919 -34.4621 -0.1 + vertex 11.6919 -34.4621 -0.2 vertex 11.8827 -34.5351 0 vertex 11.6919 -34.4621 0 endloop @@ -2067,13 +2067,13 @@ solid OpenSCAD_Model facet normal -0.357337 -0.933976 -0 outer loop vertex 11.8827 -34.5351 0 - vertex 11.6919 -34.4621 -0.1 - vertex 11.8827 -34.5351 -0.1 + vertex 11.6919 -34.4621 -0.2 + vertex 11.8827 -34.5351 -0.2 endloop endfacet facet normal -0.596054 -0.802944 0 outer loop - vertex 11.8827 -34.5351 -0.1 + vertex 11.8827 -34.5351 -0.2 vertex 12.0364 -34.6492 0 vertex 11.8827 -34.5351 0 endloop @@ -2081,125 +2081,125 @@ solid OpenSCAD_Model facet normal -0.596054 -0.802944 -0 outer loop vertex 12.0364 -34.6492 0 - vertex 11.8827 -34.5351 -0.1 - vertex 12.0364 -34.6492 -0.1 + vertex 11.8827 -34.5351 -0.2 + vertex 12.0364 -34.6492 -0.2 endloop endfacet facet normal -0.796902 -0.604109 0 outer loop - vertex 12.1503 -34.7994 -0.1 + vertex 12.1503 -34.7994 -0.2 vertex 12.0364 -34.6492 0 - vertex 12.0364 -34.6492 -0.1 + vertex 12.0364 -34.6492 -0.2 endloop endfacet facet normal -0.796902 -0.604109 0 outer loop vertex 12.0364 -34.6492 0 - vertex 12.1503 -34.7994 -0.1 + vertex 12.1503 -34.7994 -0.2 vertex 12.1503 -34.7994 0 endloop endfacet facet normal -0.930863 -0.365367 0 outer loop - vertex 12.2214 -34.9805 -0.1 + vertex 12.2214 -34.9805 -0.2 vertex 12.1503 -34.7994 0 - vertex 12.1503 -34.7994 -0.1 + vertex 12.1503 -34.7994 -0.2 endloop endfacet facet normal -0.930863 -0.365367 0 outer loop vertex 12.1503 -34.7994 0 - vertex 12.2214 -34.9805 -0.1 + vertex 12.2214 -34.9805 -0.2 vertex 12.2214 -34.9805 0 endloop endfacet facet normal -0.992505 -0.122206 0 outer loop - vertex 12.2468 -35.1875 -0.1 + vertex 12.2468 -35.1875 -0.2 vertex 12.2214 -34.9805 0 - vertex 12.2214 -34.9805 -0.1 + vertex 12.2214 -34.9805 -0.2 endloop endfacet facet normal -0.992505 -0.122206 0 outer loop vertex 12.2214 -34.9805 0 - vertex 12.2468 -35.1875 -0.1 + vertex 12.2468 -35.1875 -0.2 vertex 12.2468 -35.1875 0 endloop endfacet facet normal -0.994949 0.100386 0 outer loop - vertex 12.2239 -35.4151 -0.1 + vertex 12.2239 -35.4151 -0.2 vertex 12.2468 -35.1875 0 - vertex 12.2468 -35.1875 -0.1 + vertex 12.2468 -35.1875 -0.2 endloop endfacet facet normal -0.994949 0.100386 0 outer loop vertex 12.2468 -35.1875 0 - vertex 12.2239 -35.4151 -0.1 + vertex 12.2239 -35.4151 -0.2 vertex 12.2239 -35.4151 0 endloop endfacet facet normal -0.956433 0.291953 0 outer loop - vertex 12.1496 -35.6584 -0.1 + vertex 12.1496 -35.6584 -0.2 vertex 12.2239 -35.4151 0 - vertex 12.2239 -35.4151 -0.1 + vertex 12.2239 -35.4151 -0.2 endloop endfacet facet normal -0.956433 0.291953 0 outer loop vertex 12.2239 -35.4151 0 - vertex 12.1496 -35.6584 -0.1 + vertex 12.1496 -35.6584 -0.2 vertex 12.1496 -35.6584 0 endloop endfacet facet normal -0.890412 0.455156 0 outer loop - vertex 12.0956 -35.7642 -0.1 + vertex 12.0956 -35.7642 -0.2 vertex 12.1496 -35.6584 0 - vertex 12.1496 -35.6584 -0.1 + vertex 12.1496 -35.6584 -0.2 endloop endfacet facet normal -0.890412 0.455156 0 outer loop vertex 12.1496 -35.6584 0 - vertex 12.0956 -35.7642 -0.1 + vertex 12.0956 -35.7642 -0.2 vertex 12.0956 -35.7642 0 endloop endfacet facet normal -0.820093 0.572231 0 outer loop - vertex 12.0181 -35.8752 -0.1 + vertex 12.0181 -35.8752 -0.2 vertex 12.0956 -35.7642 0 - vertex 12.0956 -35.7642 -0.1 + vertex 12.0956 -35.7642 -0.2 endloop endfacet facet normal -0.820093 0.572231 0 outer loop vertex 12.0956 -35.7642 0 - vertex 12.0181 -35.8752 -0.1 + vertex 12.0181 -35.8752 -0.2 vertex 12.0181 -35.8752 0 endloop endfacet facet normal -0.732832 0.680409 0 outer loop - vertex 11.8034 -36.1064 -0.1 + vertex 11.8034 -36.1064 -0.2 vertex 12.0181 -35.8752 0 - vertex 12.0181 -35.8752 -0.1 + vertex 12.0181 -35.8752 -0.2 endloop endfacet facet normal -0.732832 0.680409 0 outer loop vertex 12.0181 -35.8752 0 - vertex 11.8034 -36.1064 -0.1 + vertex 11.8034 -36.1064 -0.2 vertex 11.8034 -36.1064 0 endloop endfacet facet normal -0.642938 0.765918 0 outer loop - vertex 11.8034 -36.1064 -0.1 + vertex 11.8034 -36.1064 -0.2 vertex 11.5264 -36.339 0 vertex 11.8034 -36.1064 0 endloop @@ -2207,13 +2207,13 @@ solid OpenSCAD_Model facet normal -0.642938 0.765918 0 outer loop vertex 11.5264 -36.339 0 - vertex 11.8034 -36.1064 -0.1 - vertex 11.5264 -36.339 -0.1 + vertex 11.8034 -36.1064 -0.2 + vertex 11.5264 -36.339 -0.2 endloop endfacet facet normal -0.569468 0.822014 0 outer loop - vertex 11.5264 -36.339 -0.1 + vertex 11.5264 -36.339 -0.2 vertex 11.208 -36.5595 0 vertex 11.5264 -36.339 0 endloop @@ -2221,13 +2221,13 @@ solid OpenSCAD_Model facet normal -0.569468 0.822014 0 outer loop vertex 11.208 -36.5595 0 - vertex 11.5264 -36.339 -0.1 - vertex 11.208 -36.5595 -0.1 + vertex 11.5264 -36.339 -0.2 + vertex 11.208 -36.5595 -0.2 endloop endfacet facet normal -0.499497 0.866315 0 outer loop - vertex 11.208 -36.5595 -0.1 + vertex 11.208 -36.5595 -0.2 vertex 10.8691 -36.7549 0 vertex 11.208 -36.5595 0 endloop @@ -2235,13 +2235,13 @@ solid OpenSCAD_Model facet normal -0.499497 0.866315 0 outer loop vertex 10.8691 -36.7549 0 - vertex 11.208 -36.5595 -0.1 - vertex 10.8691 -36.7549 -0.1 + vertex 11.208 -36.5595 -0.2 + vertex 10.8691 -36.7549 -0.2 endloop endfacet facet normal -0.420709 0.907196 0 outer loop - vertex 10.8691 -36.7549 -0.1 + vertex 10.8691 -36.7549 -0.2 vertex 10.5307 -36.9119 0 vertex 10.8691 -36.7549 0 endloop @@ -2249,13 +2249,13 @@ solid OpenSCAD_Model facet normal -0.420709 0.907196 0 outer loop vertex 10.5307 -36.9119 0 - vertex 10.8691 -36.7549 -0.1 - vertex 10.5307 -36.9119 -0.1 + vertex 10.8691 -36.7549 -0.2 + vertex 10.5307 -36.9119 -0.2 endloop endfacet facet normal -0.315116 0.949053 0 outer loop - vertex 10.5307 -36.9119 -0.1 + vertex 10.5307 -36.9119 -0.2 vertex 10.2137 -37.0171 0 vertex 10.5307 -36.9119 0 endloop @@ -2263,13 +2263,13 @@ solid OpenSCAD_Model facet normal -0.315116 0.949053 0 outer loop vertex 10.2137 -37.0171 0 - vertex 10.5307 -36.9119 -0.1 - vertex 10.2137 -37.0171 -0.1 + vertex 10.5307 -36.9119 -0.2 + vertex 10.2137 -37.0171 -0.2 endloop endfacet facet normal -0.145343 0.989381 0 outer loop - vertex 10.2137 -37.0171 -0.1 + vertex 10.2137 -37.0171 -0.2 vertex 9.93892 -37.0575 0 vertex 10.2137 -37.0171 0 endloop @@ -2277,13 +2277,13 @@ solid OpenSCAD_Model facet normal -0.145343 0.989381 0 outer loop vertex 9.93892 -37.0575 0 - vertex 10.2137 -37.0171 -0.1 - vertex 9.93892 -37.0575 -0.1 + vertex 10.2137 -37.0171 -0.2 + vertex 9.93892 -37.0575 -0.2 endloop endfacet facet normal -0.15554 0.98783 0 outer loop - vertex 9.93892 -37.0575 -0.1 + vertex 9.93892 -37.0575 -0.2 vertex 9.71926 -37.0921 0 vertex 9.93892 -37.0575 0 endloop @@ -2291,13 +2291,13 @@ solid OpenSCAD_Model facet normal -0.15554 0.98783 0 outer loop vertex 9.71926 -37.0921 0 - vertex 9.93892 -37.0575 -0.1 - vertex 9.71926 -37.0921 -0.1 + vertex 9.93892 -37.0575 -0.2 + vertex 9.71926 -37.0921 -0.2 endloop endfacet facet normal -0.252236 0.967666 0 outer loop - vertex 9.71926 -37.0921 -0.1 + vertex 9.71926 -37.0921 -0.2 vertex 9.37163 -37.1827 0 vertex 9.71926 -37.0921 0 endloop @@ -2305,13 +2305,13 @@ solid OpenSCAD_Model facet normal -0.252236 0.967666 0 outer loop vertex 9.37163 -37.1827 0 - vertex 9.71926 -37.0921 -0.1 - vertex 9.37163 -37.1827 -0.1 + vertex 9.71926 -37.0921 -0.2 + vertex 9.37163 -37.1827 -0.2 endloop endfacet facet normal -0.296619 0.954996 0 outer loop - vertex 9.37163 -37.1827 -0.1 + vertex 9.37163 -37.1827 -0.2 vertex 8.94379 -37.3156 0 vertex 9.37163 -37.1827 0 endloop @@ -2319,13 +2319,13 @@ solid OpenSCAD_Model facet normal -0.296619 0.954996 0 outer loop vertex 8.94379 -37.3156 0 - vertex 9.37163 -37.1827 -0.1 - vertex 8.94379 -37.3156 -0.1 + vertex 9.37163 -37.1827 -0.2 + vertex 8.94379 -37.3156 -0.2 endloop endfacet facet normal -0.330869 0.943677 0 outer loop - vertex 8.94379 -37.3156 -0.1 + vertex 8.94379 -37.3156 -0.2 vertex 8.4835 -37.477 0 vertex 8.94379 -37.3156 0 endloop @@ -2333,13 +2333,13 @@ solid OpenSCAD_Model facet normal -0.330869 0.943677 0 outer loop vertex 8.4835 -37.477 0 - vertex 8.94379 -37.3156 -0.1 - vertex 8.4835 -37.477 -0.1 + vertex 8.94379 -37.3156 -0.2 + vertex 8.4835 -37.477 -0.2 endloop endfacet facet normal -0.343608 0.939113 0 outer loop - vertex 8.4835 -37.477 -0.1 + vertex 8.4835 -37.477 -0.2 vertex 7.35232 -37.8908 0 vertex 8.4835 -37.477 0 endloop @@ -2347,13 +2347,13 @@ solid OpenSCAD_Model facet normal -0.343608 0.939113 0 outer loop vertex 7.35232 -37.8908 0 - vertex 8.4835 -37.477 -0.1 - vertex 7.35232 -37.8908 -0.1 + vertex 8.4835 -37.477 -0.2 + vertex 7.35232 -37.8908 -0.2 endloop endfacet facet normal -0.324819 0.945776 0 outer loop - vertex 7.35232 -37.8908 -0.1 + vertex 7.35232 -37.8908 -0.2 vertex 6.47346 -38.1927 0 vertex 7.35232 -37.8908 0 endloop @@ -2361,13 +2361,13 @@ solid OpenSCAD_Model facet normal -0.324819 0.945776 0 outer loop vertex 6.47346 -38.1927 0 - vertex 7.35232 -37.8908 -0.1 - vertex 6.47346 -38.1927 -0.1 + vertex 7.35232 -37.8908 -0.2 + vertex 6.47346 -38.1927 -0.2 endloop endfacet facet normal -0.280895 0.959739 0 outer loop - vertex 6.47346 -38.1927 -0.1 + vertex 6.47346 -38.1927 -0.2 vertex 5.81563 -38.3852 0 vertex 6.47346 -38.1927 0 endloop @@ -2375,13 +2375,13 @@ solid OpenSCAD_Model facet normal -0.280895 0.959739 0 outer loop vertex 5.81563 -38.3852 0 - vertex 6.47346 -38.1927 -0.1 - vertex 5.81563 -38.3852 -0.1 + vertex 6.47346 -38.1927 -0.2 + vertex 5.81563 -38.3852 -0.2 endloop endfacet facet normal -0.214328 0.976762 0 outer loop - vertex 5.81563 -38.3852 -0.1 + vertex 5.81563 -38.3852 -0.2 vertex 5.55983 -38.4413 0 vertex 5.81563 -38.3852 0 endloop @@ -2389,13 +2389,13 @@ solid OpenSCAD_Model facet normal -0.214328 0.976762 0 outer loop vertex 5.55983 -38.4413 0 - vertex 5.81563 -38.3852 -0.1 - vertex 5.55983 -38.4413 -0.1 + vertex 5.81563 -38.3852 -0.2 + vertex 5.55983 -38.4413 -0.2 endloop endfacet facet normal -0.139165 0.990269 0 outer loop - vertex 5.55983 -38.4413 -0.1 + vertex 5.55983 -38.4413 -0.2 vertex 5.34756 -38.4712 0 vertex 5.55983 -38.4413 0 endloop @@ -2403,13 +2403,13 @@ solid OpenSCAD_Model facet normal -0.139165 0.990269 0 outer loop vertex 5.34756 -38.4712 0 - vertex 5.55983 -38.4413 -0.1 - vertex 5.34756 -38.4712 -0.1 + vertex 5.55983 -38.4413 -0.2 + vertex 5.34756 -38.4712 -0.2 endloop endfacet facet normal -0.0224422 0.999748 0 outer loop - vertex 5.34756 -38.4712 -0.1 + vertex 5.34756 -38.4712 -0.2 vertex 5.17491 -38.475 0 vertex 5.34756 -38.4712 0 endloop @@ -2417,13 +2417,13 @@ solid OpenSCAD_Model facet normal -0.0224422 0.999748 0 outer loop vertex 5.17491 -38.475 0 - vertex 5.34756 -38.4712 -0.1 - vertex 5.17491 -38.475 -0.1 + vertex 5.34756 -38.4712 -0.2 + vertex 5.17491 -38.475 -0.2 endloop endfacet facet normal 0.156812 0.987628 -0 outer loop - vertex 5.17491 -38.475 -0.1 + vertex 5.17491 -38.475 -0.2 vertex 5.03796 -38.4533 0 vertex 5.17491 -38.475 0 endloop @@ -2431,13 +2431,13 @@ solid OpenSCAD_Model facet normal 0.156812 0.987628 0 outer loop vertex 5.03796 -38.4533 0 - vertex 5.17491 -38.475 -0.1 - vertex 5.03796 -38.4533 -0.1 + vertex 5.17491 -38.475 -0.2 + vertex 5.03796 -38.4533 -0.2 endloop endfacet facet normal 0.408161 0.91291 -0 outer loop - vertex 5.03796 -38.4533 -0.1 + vertex 5.03796 -38.4533 -0.2 vertex 4.93281 -38.4063 0 vertex 5.03796 -38.4533 0 endloop @@ -2445,13 +2445,13 @@ solid OpenSCAD_Model facet normal 0.408161 0.91291 0 outer loop vertex 4.93281 -38.4063 0 - vertex 5.03796 -38.4533 -0.1 - vertex 4.93281 -38.4063 -0.1 + vertex 5.03796 -38.4533 -0.2 + vertex 4.93281 -38.4063 -0.2 endloop endfacet facet normal 0.681473 0.731843 -0 outer loop - vertex 4.93281 -38.4063 -0.1 + vertex 4.93281 -38.4063 -0.2 vertex 4.85555 -38.3343 0 vertex 4.93281 -38.4063 0 endloop @@ -2459,97 +2459,97 @@ solid OpenSCAD_Model facet normal 0.681473 0.731843 0 outer loop vertex 4.85555 -38.3343 0 - vertex 4.93281 -38.4063 -0.1 - vertex 4.85555 -38.3343 -0.1 + vertex 4.93281 -38.4063 -0.2 + vertex 4.85555 -38.3343 -0.2 endloop endfacet facet normal 0.875472 0.48327 0 outer loop vertex 4.85555 -38.3343 0 - vertex 4.80226 -38.2378 -0.1 + vertex 4.80226 -38.2378 -0.2 vertex 4.80226 -38.2378 0 endloop endfacet facet normal 0.875472 0.48327 0 outer loop - vertex 4.80226 -38.2378 -0.1 + vertex 4.80226 -38.2378 -0.2 vertex 4.85555 -38.3343 0 - vertex 4.85555 -38.3343 -0.1 + vertex 4.85555 -38.3343 -0.2 endloop endfacet facet normal 0.964192 0.265205 0 outer loop vertex 4.80226 -38.2378 0 - vertex 4.76904 -38.117 -0.1 + vertex 4.76904 -38.117 -0.2 vertex 4.76904 -38.117 0 endloop endfacet facet normal 0.964192 0.265205 0 outer loop - vertex 4.76904 -38.117 -0.1 + vertex 4.76904 -38.117 -0.2 vertex 4.80226 -38.2378 0 - vertex 4.80226 -38.2378 -0.1 + vertex 4.80226 -38.2378 -0.2 endloop endfacet facet normal 0.997564 0.069762 0 outer loop vertex 4.76904 -38.117 0 - vertex 4.74716 -37.8041 -0.1 + vertex 4.74716 -37.8041 -0.2 vertex 4.74716 -37.8041 0 endloop endfacet facet normal 0.997564 0.069762 0 outer loop - vertex 4.74716 -37.8041 -0.1 + vertex 4.74716 -37.8041 -0.2 vertex 4.76904 -38.117 0 - vertex 4.76904 -38.117 -0.1 + vertex 4.76904 -38.117 -0.2 endloop endfacet facet normal 0.997378 0.0723715 0 outer loop vertex 4.74716 -37.8041 0 - vertex 4.72035 -37.4346 -0.1 + vertex 4.72035 -37.4346 -0.2 vertex 4.72035 -37.4346 0 endloop endfacet facet normal 0.997378 0.0723715 0 outer loop - vertex 4.72035 -37.4346 -0.1 + vertex 4.72035 -37.4346 -0.2 vertex 4.74716 -37.8041 0 - vertex 4.74716 -37.8041 -0.1 + vertex 4.74716 -37.8041 -0.2 endloop endfacet facet normal 0.968245 0.250005 0 outer loop vertex 4.72035 -37.4346 0 - vertex 4.69132 -37.3222 -0.1 + vertex 4.69132 -37.3222 -0.2 vertex 4.69132 -37.3222 0 endloop endfacet facet normal 0.968245 0.250005 0 outer loop - vertex 4.69132 -37.3222 -0.1 + vertex 4.69132 -37.3222 -0.2 vertex 4.72035 -37.4346 0 - vertex 4.72035 -37.4346 -0.1 + vertex 4.72035 -37.4346 -0.2 endloop endfacet facet normal 0.758745 0.651387 0 outer loop vertex 4.69132 -37.3222 0 - vertex 4.65588 -37.2809 -0.1 + vertex 4.65588 -37.2809 -0.2 vertex 4.65588 -37.2809 0 endloop endfacet facet normal 0.758745 0.651387 0 outer loop - vertex 4.65588 -37.2809 -0.1 + vertex 4.65588 -37.2809 -0.2 vertex 4.69132 -37.3222 0 - vertex 4.69132 -37.3222 -0.1 + vertex 4.69132 -37.3222 -0.2 endloop endfacet facet normal -0.395389 0.918514 0 outer loop - vertex 4.65588 -37.2809 -0.1 + vertex 4.65588 -37.2809 -0.2 vertex 4.26446 -37.4494 0 vertex 4.65588 -37.2809 0 endloop @@ -2557,13 +2557,13 @@ solid OpenSCAD_Model facet normal -0.395389 0.918514 0 outer loop vertex 4.26446 -37.4494 0 - vertex 4.65588 -37.2809 -0.1 - vertex 4.26446 -37.4494 -0.1 + vertex 4.65588 -37.2809 -0.2 + vertex 4.26446 -37.4494 -0.2 endloop endfacet facet normal -0.446029 0.895018 0 outer loop - vertex 4.26446 -37.4494 -0.1 + vertex 4.26446 -37.4494 -0.2 vertex 3.45158 -37.8545 0 vertex 4.26446 -37.4494 0 endloop @@ -2571,13 +2571,13 @@ solid OpenSCAD_Model facet normal -0.446029 0.895018 0 outer loop vertex 3.45158 -37.8545 0 - vertex 4.26446 -37.4494 -0.1 - vertex 3.45158 -37.8545 -0.1 + vertex 4.26446 -37.4494 -0.2 + vertex 3.45158 -37.8545 -0.2 endloop endfacet facet normal -0.42381 0.905751 0 outer loop - vertex 3.45158 -37.8545 -0.1 + vertex 3.45158 -37.8545 -0.2 vertex 3.20396 -37.9704 0 vertex 3.45158 -37.8545 0 endloop @@ -2585,13 +2585,13 @@ solid OpenSCAD_Model facet normal -0.42381 0.905751 0 outer loop vertex 3.20396 -37.9704 0 - vertex 3.45158 -37.8545 -0.1 - vertex 3.20396 -37.9704 -0.1 + vertex 3.45158 -37.8545 -0.2 + vertex 3.20396 -37.9704 -0.2 endloop endfacet facet normal -0.363414 0.931628 0 outer loop - vertex 3.20396 -37.9704 -0.1 + vertex 3.20396 -37.9704 -0.2 vertex 2.93102 -38.0768 0 vertex 3.20396 -37.9704 0 endloop @@ -2599,13 +2599,13 @@ solid OpenSCAD_Model facet normal -0.363414 0.931628 0 outer loop vertex 2.93102 -38.0768 0 - vertex 3.20396 -37.9704 -0.1 - vertex 2.93102 -38.0768 -0.1 + vertex 3.20396 -37.9704 -0.2 + vertex 2.93102 -38.0768 -0.2 endloop endfacet facet normal -0.289057 0.957312 0 outer loop - vertex 2.93102 -38.0768 -0.1 + vertex 2.93102 -38.0768 -0.2 vertex 2.32439 -38.26 0 vertex 2.93102 -38.0768 0 endloop @@ -2613,13 +2613,13 @@ solid OpenSCAD_Model facet normal -0.289057 0.957312 0 outer loop vertex 2.32439 -38.26 0 - vertex 2.93102 -38.0768 -0.1 - vertex 2.32439 -38.26 -0.1 + vertex 2.93102 -38.0768 -0.2 + vertex 2.32439 -38.26 -0.2 endloop endfacet facet normal -0.208009 0.978127 0 outer loop - vertex 2.32439 -38.26 -0.1 + vertex 2.32439 -38.26 -0.2 vertex 1.66207 -38.4009 0 vertex 2.32439 -38.26 0 endloop @@ -2627,13 +2627,13 @@ solid OpenSCAD_Model facet normal -0.208009 0.978127 0 outer loop vertex 1.66207 -38.4009 0 - vertex 2.32439 -38.26 -0.1 - vertex 1.66207 -38.4009 -0.1 + vertex 2.32439 -38.26 -0.2 + vertex 1.66207 -38.4009 -0.2 endloop endfacet facet normal -0.13739 0.990517 0 outer loop - vertex 1.66207 -38.4009 -0.1 + vertex 1.66207 -38.4009 -0.2 vertex 0.974434 -38.4962 0 vertex 1.66207 -38.4009 0 endloop @@ -2641,13 +2641,13 @@ solid OpenSCAD_Model facet normal -0.13739 0.990517 0 outer loop vertex 0.974434 -38.4962 0 - vertex 1.66207 -38.4009 -0.1 - vertex 0.974434 -38.4962 -0.1 + vertex 1.66207 -38.4009 -0.2 + vertex 0.974434 -38.4962 -0.2 endloop endfacet facet normal -0.0683412 0.997662 0 outer loop - vertex 0.974434 -38.4962 -0.1 + vertex 0.974434 -38.4962 -0.2 vertex 0.291868 -38.543 0 vertex 0.974434 -38.4962 0 endloop @@ -2655,13 +2655,13 @@ solid OpenSCAD_Model facet normal -0.0683412 0.997662 0 outer loop vertex 0.291868 -38.543 0 - vertex 0.974434 -38.4962 -0.1 - vertex 0.291868 -38.543 -0.1 + vertex 0.974434 -38.4962 -0.2 + vertex 0.291868 -38.543 -0.2 endloop endfacet facet normal 0.00775161 0.99997 -0 outer loop - vertex 0.291868 -38.543 -0.1 + vertex 0.291868 -38.543 -0.2 vertex -0.355246 -38.538 0 vertex 0.291868 -38.543 0 endloop @@ -2669,13 +2669,13 @@ solid OpenSCAD_Model facet normal 0.00775161 0.99997 0 outer loop vertex -0.355246 -38.538 0 - vertex 0.291868 -38.543 -0.1 - vertex -0.355246 -38.538 -0.1 + vertex 0.291868 -38.543 -0.2 + vertex -0.355246 -38.538 -0.2 endloop endfacet facet normal 0.10258 0.994725 -0 outer loop - vertex -0.355246 -38.538 -0.1 + vertex -0.355246 -38.538 -0.2 vertex -0.936529 -38.478 0 vertex -0.355246 -38.538 0 endloop @@ -2683,13 +2683,13 @@ solid OpenSCAD_Model facet normal 0.10258 0.994725 0 outer loop vertex -0.936529 -38.478 0 - vertex -0.355246 -38.538 -0.1 - vertex -0.936529 -38.478 -0.1 + vertex -0.355246 -38.538 -0.2 + vertex -0.936529 -38.478 -0.2 endloop endfacet facet normal 0.197071 0.980389 -0 outer loop - vertex -0.936529 -38.478 -0.1 + vertex -0.936529 -38.478 -0.2 vertex -1.19299 -38.4265 0 vertex -0.936529 -38.478 0 endloop @@ -2697,13 +2697,13 @@ solid OpenSCAD_Model facet normal 0.197071 0.980389 0 outer loop vertex -1.19299 -38.4265 0 - vertex -0.936529 -38.478 -0.1 - vertex -1.19299 -38.4265 -0.1 + vertex -0.936529 -38.478 -0.2 + vertex -1.19299 -38.4265 -0.2 endloop endfacet facet normal 0.279186 0.960237 -0 outer loop - vertex -1.19299 -38.4265 -0.1 + vertex -1.19299 -38.4265 -0.2 vertex -1.4216 -38.36 0 vertex -1.19299 -38.4265 0 endloop @@ -2711,13 +2711,13 @@ solid OpenSCAD_Model facet normal 0.279186 0.960237 0 outer loop vertex -1.4216 -38.36 0 - vertex -1.19299 -38.4265 -0.1 - vertex -1.4216 -38.36 -0.1 + vertex -1.19299 -38.4265 -0.2 + vertex -1.4216 -38.36 -0.2 endloop endfacet facet normal 0.385209 0.92283 -0 outer loop - vertex -1.4216 -38.36 -0.1 + vertex -1.4216 -38.36 -0.2 vertex -1.69347 -38.2465 0 vertex -1.4216 -38.36 0 endloop @@ -2725,13 +2725,13 @@ solid OpenSCAD_Model facet normal 0.385209 0.92283 0 outer loop vertex -1.69347 -38.2465 0 - vertex -1.4216 -38.36 -0.1 - vertex -1.69347 -38.2465 -0.1 + vertex -1.4216 -38.36 -0.2 + vertex -1.69347 -38.2465 -0.2 endloop endfacet facet normal 0.490243 0.871586 -0 outer loop - vertex -1.69347 -38.2465 -0.1 + vertex -1.69347 -38.2465 -0.2 vertex -1.95525 -38.0993 0 vertex -1.69347 -38.2465 0 endloop @@ -2739,13 +2739,13 @@ solid OpenSCAD_Model facet normal 0.490243 0.871586 0 outer loop vertex -1.95525 -38.0993 0 - vertex -1.69347 -38.2465 -0.1 - vertex -1.95525 -38.0993 -0.1 + vertex -1.69347 -38.2465 -0.2 + vertex -1.95525 -38.0993 -0.2 endloop endfacet facet normal 0.581299 0.81369 -0 outer loop - vertex -1.95525 -38.0993 -0.1 + vertex -1.95525 -38.0993 -0.2 vertex -2.20592 -37.9202 0 vertex -1.95525 -38.0993 0 endloop @@ -2753,13 +2753,13 @@ solid OpenSCAD_Model facet normal 0.581299 0.81369 0 outer loop vertex -2.20592 -37.9202 0 - vertex -1.95525 -38.0993 -0.1 - vertex -2.20592 -37.9202 -0.1 + vertex -1.95525 -38.0993 -0.2 + vertex -2.20592 -37.9202 -0.2 endloop endfacet facet normal 0.65901 0.752134 -0 outer loop - vertex -2.20592 -37.9202 -0.1 + vertex -2.20592 -37.9202 -0.2 vertex -2.44446 -37.7112 0 vertex -2.20592 -37.9202 0 endloop @@ -2767,419 +2767,419 @@ solid OpenSCAD_Model facet normal 0.65901 0.752134 0 outer loop vertex -2.44446 -37.7112 0 - vertex -2.20592 -37.9202 -0.1 - vertex -2.44446 -37.7112 -0.1 + vertex -2.20592 -37.9202 -0.2 + vertex -2.44446 -37.7112 -0.2 endloop endfacet facet normal 0.724655 0.689112 0 outer loop vertex -2.44446 -37.7112 0 - vertex -2.66982 -37.4742 -0.1 + vertex -2.66982 -37.4742 -0.2 vertex -2.66982 -37.4742 0 endloop endfacet facet normal 0.724655 0.689112 0 outer loop - vertex -2.66982 -37.4742 -0.1 + vertex -2.66982 -37.4742 -0.2 vertex -2.44446 -37.7112 0 - vertex -2.44446 -37.7112 -0.1 + vertex -2.44446 -37.7112 -0.2 endloop endfacet facet normal 0.779827 0.625996 0 outer loop vertex -2.66982 -37.4742 0 - vertex -2.88099 -37.2112 -0.1 + vertex -2.88099 -37.2112 -0.2 vertex -2.88099 -37.2112 0 endloop endfacet facet normal 0.779827 0.625996 0 outer loop - vertex -2.88099 -37.2112 -0.1 + vertex -2.88099 -37.2112 -0.2 vertex -2.66982 -37.4742 0 - vertex -2.66982 -37.4742 -0.1 + vertex -2.66982 -37.4742 -0.2 endloop endfacet facet normal 0.826071 0.563566 0 outer loop vertex -2.88099 -37.2112 0 - vertex -3.07693 -36.924 -0.1 + vertex -3.07693 -36.924 -0.2 vertex -3.07693 -36.924 0 endloop endfacet facet normal 0.826071 0.563566 0 outer loop - vertex -3.07693 -36.924 -0.1 + vertex -3.07693 -36.924 -0.2 vertex -2.88099 -37.2112 0 - vertex -2.88099 -37.2112 -0.1 + vertex -2.88099 -37.2112 -0.2 endloop endfacet facet normal 0.864772 0.502165 0 outer loop vertex -3.07693 -36.924 0 - vertex -3.25661 -36.6145 -0.1 + vertex -3.25661 -36.6145 -0.2 vertex -3.25661 -36.6145 0 endloop endfacet facet normal 0.864772 0.502165 0 outer loop - vertex -3.25661 -36.6145 -0.1 + vertex -3.25661 -36.6145 -0.2 vertex -3.07693 -36.924 0 - vertex -3.07693 -36.924 -0.1 + vertex -3.07693 -36.924 -0.2 endloop endfacet facet normal 0.897098 0.441832 0 outer loop vertex -3.25661 -36.6145 0 - vertex -3.41901 -36.2848 -0.1 + vertex -3.41901 -36.2848 -0.2 vertex -3.41901 -36.2848 0 endloop endfacet facet normal 0.897098 0.441832 0 outer loop - vertex -3.41901 -36.2848 -0.1 + vertex -3.41901 -36.2848 -0.2 vertex -3.25661 -36.6145 0 - vertex -3.25661 -36.6145 -0.1 + vertex -3.25661 -36.6145 -0.2 endloop endfacet facet normal 0.923982 0.382435 0 outer loop vertex -3.41901 -36.2848 0 - vertex -3.56309 -35.9367 -0.1 + vertex -3.56309 -35.9367 -0.2 vertex -3.56309 -35.9367 0 endloop endfacet facet normal 0.923982 0.382435 0 outer loop - vertex -3.56309 -35.9367 -0.1 + vertex -3.56309 -35.9367 -0.2 vertex -3.41901 -36.2848 0 - vertex -3.41901 -36.2848 -0.1 + vertex -3.41901 -36.2848 -0.2 endloop endfacet facet normal 0.946149 0.323732 0 outer loop vertex -3.56309 -35.9367 0 - vertex -3.68783 -35.5721 -0.1 + vertex -3.68783 -35.5721 -0.2 vertex -3.68783 -35.5721 0 endloop endfacet facet normal 0.946149 0.323732 0 outer loop - vertex -3.68783 -35.5721 -0.1 + vertex -3.68783 -35.5721 -0.2 vertex -3.56309 -35.9367 0 - vertex -3.56309 -35.9367 -0.1 + vertex -3.56309 -35.9367 -0.2 endloop endfacet facet normal 0.964131 0.265426 0 outer loop vertex -3.68783 -35.5721 0 - vertex -3.79219 -35.193 -0.1 + vertex -3.79219 -35.193 -0.2 vertex -3.79219 -35.193 0 endloop endfacet facet normal 0.964131 0.265426 0 outer loop - vertex -3.79219 -35.193 -0.1 + vertex -3.79219 -35.193 -0.2 vertex -3.68783 -35.5721 0 - vertex -3.68783 -35.5721 -0.1 + vertex -3.68783 -35.5721 -0.2 endloop endfacet facet normal 0.978298 0.207204 0 outer loop vertex -3.79219 -35.193 0 - vertex -3.87516 -34.8013 -0.1 + vertex -3.87516 -34.8013 -0.2 vertex -3.87516 -34.8013 0 endloop endfacet facet normal 0.978298 0.207204 0 outer loop - vertex -3.87516 -34.8013 -0.1 + vertex -3.87516 -34.8013 -0.2 vertex -3.79219 -35.193 0 - vertex -3.79219 -35.193 -0.1 + vertex -3.79219 -35.193 -0.2 endloop endfacet facet normal 0.988873 0.148763 0 outer loop vertex -3.87516 -34.8013 0 - vertex -3.93569 -34.3989 -0.1 + vertex -3.93569 -34.3989 -0.2 vertex -3.93569 -34.3989 0 endloop endfacet facet normal 0.988873 0.148763 0 outer loop - vertex -3.93569 -34.3989 -0.1 + vertex -3.93569 -34.3989 -0.2 vertex -3.87516 -34.8013 0 - vertex -3.87516 -34.8013 -0.1 + vertex -3.87516 -34.8013 -0.2 endloop endfacet facet normal 0.995959 0.0898073 0 outer loop vertex -3.93569 -34.3989 0 - vertex -3.97277 -33.9877 -0.1 + vertex -3.97277 -33.9877 -0.2 vertex -3.97277 -33.9877 0 endloop endfacet facet normal 0.995959 0.0898073 0 outer loop - vertex -3.97277 -33.9877 -0.1 + vertex -3.97277 -33.9877 -0.2 vertex -3.93569 -34.3989 0 - vertex -3.93569 -34.3989 -0.1 + vertex -3.93569 -34.3989 -0.2 endloop endfacet facet normal 0.999547 0.0300979 0 outer loop vertex -3.97277 -33.9877 0 - vertex -3.98536 -33.5697 -0.1 + vertex -3.98536 -33.5697 -0.2 vertex -3.98536 -33.5697 0 endloop endfacet facet normal 0.999547 0.0300979 0 outer loop - vertex -3.98536 -33.5697 -0.1 + vertex -3.98536 -33.5697 -0.2 vertex -3.97277 -33.9877 0 - vertex -3.97277 -33.9877 -0.1 + vertex -3.97277 -33.9877 -0.2 endloop endfacet facet normal 0.998925 -0.0463463 0 outer loop vertex -3.98536 -33.5697 0 - vertex -3.97004 -33.2395 -0.1 + vertex -3.97004 -33.2395 -0.2 vertex -3.97004 -33.2395 0 endloop endfacet facet normal 0.998925 -0.0463463 0 outer loop - vertex -3.97004 -33.2395 -0.1 + vertex -3.97004 -33.2395 -0.2 vertex -3.98536 -33.5697 0 - vertex -3.98536 -33.5697 -0.1 + vertex -3.98536 -33.5697 -0.2 endloop endfacet facet normal 0.99274 -0.120283 0 outer loop vertex -3.97004 -33.2395 0 - vertex -3.92523 -32.8697 -0.1 + vertex -3.92523 -32.8697 -0.2 vertex -3.92523 -32.8697 0 endloop endfacet facet normal 0.99274 -0.120283 0 outer loop - vertex -3.92523 -32.8697 -0.1 + vertex -3.92523 -32.8697 -0.2 vertex -3.97004 -33.2395 0 - vertex -3.97004 -33.2395 -0.1 + vertex -3.97004 -33.2395 -0.2 endloop endfacet facet normal 0.984312 -0.176435 0 outer loop vertex -3.92523 -32.8697 0 - vertex -3.8527 -32.4651 -0.1 + vertex -3.8527 -32.4651 -0.2 vertex -3.8527 -32.4651 0 endloop endfacet facet normal 0.984312 -0.176435 0 outer loop - vertex -3.8527 -32.4651 -0.1 + vertex -3.8527 -32.4651 -0.2 vertex -3.92523 -32.8697 0 - vertex -3.92523 -32.8697 -0.1 + vertex -3.92523 -32.8697 -0.2 endloop endfacet facet normal 0.975291 -0.220925 0 outer loop vertex -3.8527 -32.4651 0 - vertex -3.75417 -32.0301 -0.1 + vertex -3.75417 -32.0301 -0.2 vertex -3.75417 -32.0301 0 endloop endfacet facet normal 0.975291 -0.220925 0 outer loop - vertex -3.75417 -32.0301 -0.1 + vertex -3.75417 -32.0301 -0.2 vertex -3.8527 -32.4651 0 - vertex -3.8527 -32.4651 -0.1 + vertex -3.8527 -32.4651 -0.2 endloop endfacet facet normal 0.96184 -0.273613 0 outer loop vertex -3.75417 -32.0301 0 - vertex -3.4861 -31.0878 -0.1 + vertex -3.4861 -31.0878 -0.2 vertex -3.4861 -31.0878 0 endloop endfacet facet normal 0.96184 -0.273613 0 outer loop - vertex -3.4861 -31.0878 -0.1 + vertex -3.4861 -31.0878 -0.2 vertex -3.75417 -32.0301 0 - vertex -3.75417 -32.0301 -0.1 + vertex -3.75417 -32.0301 -0.2 endloop endfacet facet normal 0.944354 -0.328931 0 outer loop vertex -3.4861 -31.0878 0 - vertex -3.135 -30.0798 -0.1 + vertex -3.135 -30.0798 -0.2 vertex -3.135 -30.0798 0 endloop endfacet facet normal 0.944354 -0.328931 0 outer loop - vertex -3.135 -30.0798 -0.1 + vertex -3.135 -30.0798 -0.2 vertex -3.4861 -31.0878 0 - vertex -3.4861 -31.0878 -0.1 + vertex -3.4861 -31.0878 -0.2 endloop endfacet facet normal 0.926769 -0.375632 0 outer loop vertex -3.135 -30.0798 0 - vertex -2.71481 -29.043 -0.1 + vertex -2.71481 -29.043 -0.2 vertex -2.71481 -29.043 0 endloop endfacet facet normal 0.926769 -0.375632 0 outer loop - vertex -2.71481 -29.043 -0.1 + vertex -2.71481 -29.043 -0.2 vertex -3.135 -30.0798 0 - vertex -3.135 -30.0798 -0.1 + vertex -3.135 -30.0798 -0.2 endloop endfacet facet normal 0.907733 -0.419549 0 outer loop vertex -2.71481 -29.043 0 - vertex -2.23947 -28.0146 -0.1 + vertex -2.23947 -28.0146 -0.2 vertex -2.23947 -28.0146 0 endloop endfacet facet normal 0.907733 -0.419549 0 outer loop - vertex -2.23947 -28.0146 -0.1 + vertex -2.23947 -28.0146 -0.2 vertex -2.71481 -29.043 0 - vertex -2.71481 -29.043 -0.1 + vertex -2.71481 -29.043 -0.2 endloop endfacet facet normal 0.885263 -0.46509 0 outer loop vertex -2.23947 -28.0146 0 - vertex -1.72295 -27.0315 -0.1 + vertex -1.72295 -27.0315 -0.2 vertex -1.72295 -27.0315 0 endloop endfacet facet normal 0.885263 -0.46509 0 outer loop - vertex -1.72295 -27.0315 -0.1 + vertex -1.72295 -27.0315 -0.2 vertex -2.23947 -28.0146 0 - vertex -2.23947 -28.0146 -0.1 + vertex -2.23947 -28.0146 -0.2 endloop endfacet facet normal 0.8644 -0.502806 0 outer loop vertex -1.72295 -27.0315 0 - vertex -1.45361 -26.5684 -0.1 + vertex -1.45361 -26.5684 -0.2 vertex -1.45361 -26.5684 0 endloop endfacet facet normal 0.8644 -0.502806 0 outer loop - vertex -1.45361 -26.5684 -0.1 + vertex -1.45361 -26.5684 -0.2 vertex -1.72295 -27.0315 0 - vertex -1.72295 -27.0315 -0.1 + vertex -1.72295 -27.0315 -0.2 endloop endfacet facet normal 0.847345 -0.531043 0 outer loop vertex -1.45361 -26.5684 0 - vertex -1.17919 -26.1306 -0.1 + vertex -1.17919 -26.1306 -0.2 vertex -1.17919 -26.1306 0 endloop endfacet facet normal 0.847345 -0.531043 0 outer loop - vertex -1.17919 -26.1306 -0.1 + vertex -1.17919 -26.1306 -0.2 vertex -1.45361 -26.5684 0 - vertex -1.45361 -26.5684 -0.1 + vertex -1.45361 -26.5684 -0.2 endloop endfacet facet normal 0.82644 -0.563025 0 outer loop vertex -1.17919 -26.1306 0 - vertex -0.875463 -25.6847 -0.1 + vertex -0.875463 -25.6847 -0.2 vertex -0.875463 -25.6847 0 endloop endfacet facet normal 0.82644 -0.563025 0 outer loop - vertex -0.875463 -25.6847 -0.1 + vertex -0.875463 -25.6847 -0.2 vertex -1.17919 -26.1306 0 - vertex -1.17919 -26.1306 -0.1 + vertex -1.17919 -26.1306 -0.2 endloop endfacet facet normal 0.8045 -0.593952 0 outer loop vertex -0.875463 -25.6847 0 - vertex -0.546472 -25.2391 -0.1 + vertex -0.546472 -25.2391 -0.2 vertex -0.546472 -25.2391 0 endloop endfacet facet normal 0.8045 -0.593952 0 outer loop - vertex -0.546472 -25.2391 -0.1 + vertex -0.546472 -25.2391 -0.2 vertex -0.875463 -25.6847 0 - vertex -0.875463 -25.6847 -0.1 + vertex -0.875463 -25.6847 -0.2 endloop endfacet facet normal 0.783077 -0.621924 0 outer loop vertex -0.546472 -25.2391 0 - vertex -0.194025 -24.7953 -0.1 + vertex -0.194025 -24.7953 -0.2 vertex -0.194025 -24.7953 0 endloop endfacet facet normal 0.783077 -0.621924 0 outer loop - vertex -0.194025 -24.7953 -0.1 + vertex -0.194025 -24.7953 -0.2 vertex -0.546472 -25.2391 0 - vertex -0.546472 -25.2391 -0.1 + vertex -0.546472 -25.2391 -0.2 endloop endfacet facet normal 0.762077 -0.647486 0 outer loop vertex -0.194025 -24.7953 0 - vertex 0.18007 -24.355 -0.1 + vertex 0.18007 -24.355 -0.2 vertex 0.18007 -24.355 0 endloop endfacet facet normal 0.762077 -0.647486 0 outer loop - vertex 0.18007 -24.355 -0.1 + vertex 0.18007 -24.355 -0.2 vertex -0.194025 -24.7953 0 - vertex -0.194025 -24.7953 -0.1 + vertex -0.194025 -24.7953 -0.2 endloop endfacet facet normal 0.74138 -0.671085 0 outer loop vertex 0.18007 -24.355 0 - vertex 0.574011 -23.9198 -0.1 + vertex 0.574011 -23.9198 -0.2 vertex 0.574011 -23.9198 0 endloop endfacet facet normal 0.74138 -0.671085 0 outer loop - vertex 0.574011 -23.9198 -0.1 + vertex 0.574011 -23.9198 -0.2 vertex 0.18007 -24.355 0 - vertex 0.18007 -24.355 -0.1 + vertex 0.18007 -24.355 -0.2 endloop endfacet facet normal 0.720855 -0.693086 0 outer loop vertex 0.574011 -23.9198 0 - vertex 0.985991 -23.4913 -0.1 + vertex 0.985991 -23.4913 -0.2 vertex 0.985991 -23.4913 0 endloop endfacet facet normal 0.720855 -0.693086 0 outer loop - vertex 0.985991 -23.4913 -0.1 + vertex 0.985991 -23.4913 -0.2 vertex 0.574011 -23.9198 0 - vertex 0.574011 -23.9198 -0.1 + vertex 0.574011 -23.9198 -0.2 endloop endfacet facet normal 0.700344 -0.713805 0 outer loop - vertex 0.985991 -23.4913 -0.1 + vertex 0.985991 -23.4913 -0.2 vertex 1.4142 -23.0712 0 vertex 0.985991 -23.4913 0 endloop @@ -3187,13 +3187,13 @@ solid OpenSCAD_Model facet normal 0.700344 -0.713805 0 outer loop vertex 1.4142 -23.0712 0 - vertex 0.985991 -23.4913 -0.1 - vertex 1.4142 -23.0712 -0.1 + vertex 0.985991 -23.4913 -0.2 + vertex 1.4142 -23.0712 -0.2 endloop endfacet facet normal 0.679685 -0.733504 0 outer loop - vertex 1.4142 -23.0712 -0.1 + vertex 1.4142 -23.0712 -0.2 vertex 1.85684 -22.661 0 vertex 1.4142 -23.0712 0 endloop @@ -3201,13 +3201,13 @@ solid OpenSCAD_Model facet normal 0.679685 -0.733504 0 outer loop vertex 1.85684 -22.661 0 - vertex 1.4142 -23.0712 -0.1 - vertex 1.85684 -22.661 -0.1 + vertex 1.4142 -23.0712 -0.2 + vertex 1.85684 -22.661 -0.2 endloop endfacet facet normal 0.658698 -0.752407 0 outer loop - vertex 1.85684 -22.661 -0.1 + vertex 1.85684 -22.661 -0.2 vertex 2.31211 -22.2625 0 vertex 1.85684 -22.661 0 endloop @@ -3215,13 +3215,13 @@ solid OpenSCAD_Model facet normal 0.658698 -0.752407 0 outer loop vertex 2.31211 -22.2625 0 - vertex 1.85684 -22.661 -0.1 - vertex 2.31211 -22.2625 -0.1 + vertex 1.85684 -22.661 -0.2 + vertex 2.31211 -22.2625 -0.2 endloop endfacet facet normal 0.637189 -0.770708 0 outer loop - vertex 2.31211 -22.2625 -0.1 + vertex 2.31211 -22.2625 -0.2 vertex 2.77819 -21.8771 0 vertex 2.31211 -22.2625 0 endloop @@ -3229,13 +3229,13 @@ solid OpenSCAD_Model facet normal 0.637189 -0.770708 0 outer loop vertex 2.77819 -21.8771 0 - vertex 2.31211 -22.2625 -0.1 - vertex 2.77819 -21.8771 -0.1 + vertex 2.31211 -22.2625 -0.2 + vertex 2.77819 -21.8771 -0.2 endloop endfacet facet normal 0.614941 -0.788573 0 outer loop - vertex 2.77819 -21.8771 -0.1 + vertex 2.77819 -21.8771 -0.2 vertex 3.25328 -21.5067 0 vertex 2.77819 -21.8771 0 endloop @@ -3243,13 +3243,13 @@ solid OpenSCAD_Model facet normal 0.614941 -0.788573 0 outer loop vertex 3.25328 -21.5067 0 - vertex 2.77819 -21.8771 -0.1 - vertex 3.25328 -21.5067 -0.1 + vertex 2.77819 -21.8771 -0.2 + vertex 3.25328 -21.5067 -0.2 endloop endfacet facet normal 0.591711 -0.80615 0 outer loop - vertex 3.25328 -21.5067 -0.1 + vertex 3.25328 -21.5067 -0.2 vertex 3.73558 -21.1527 0 vertex 3.25328 -21.5067 0 endloop @@ -3257,13 +3257,13 @@ solid OpenSCAD_Model facet normal 0.591711 -0.80615 0 outer loop vertex 3.73558 -21.1527 0 - vertex 3.25328 -21.5067 -0.1 - vertex 3.73558 -21.1527 -0.1 + vertex 3.25328 -21.5067 -0.2 + vertex 3.73558 -21.1527 -0.2 endloop endfacet facet normal 0.567228 -0.823561 0 outer loop - vertex 3.73558 -21.1527 -0.1 + vertex 3.73558 -21.1527 -0.2 vertex 4.22328 -20.8168 0 vertex 3.73558 -21.1527 0 endloop @@ -3271,13 +3271,13 @@ solid OpenSCAD_Model facet normal 0.567228 -0.823561 0 outer loop vertex 4.22328 -20.8168 0 - vertex 3.73558 -21.1527 -0.1 - vertex 4.22328 -20.8168 -0.1 + vertex 3.73558 -21.1527 -0.2 + vertex 4.22328 -20.8168 -0.2 endloop endfacet facet normal 0.541167 -0.840915 0 outer loop - vertex 4.22328 -20.8168 -0.1 + vertex 4.22328 -20.8168 -0.2 vertex 4.71458 -20.5006 0 vertex 4.22328 -20.8168 0 endloop @@ -3285,13 +3285,13 @@ solid OpenSCAD_Model facet normal 0.541167 -0.840915 0 outer loop vertex 4.71458 -20.5006 0 - vertex 4.22328 -20.8168 -0.1 - vertex 4.71458 -20.5006 -0.1 + vertex 4.22328 -20.8168 -0.2 + vertex 4.71458 -20.5006 -0.2 endloop endfacet facet normal 0.513171 -0.858287 0 outer loop - vertex 4.71458 -20.5006 -0.1 + vertex 4.71458 -20.5006 -0.2 vertex 5.20766 -20.2058 0 vertex 4.71458 -20.5006 0 endloop @@ -3299,13 +3299,13 @@ solid OpenSCAD_Model facet normal 0.513171 -0.858287 0 outer loop vertex 5.20766 -20.2058 0 - vertex 4.71458 -20.5006 -0.1 - vertex 5.20766 -20.2058 -0.1 + vertex 4.71458 -20.5006 -0.2 + vertex 5.20766 -20.2058 -0.2 endloop endfacet facet normal 0.482795 -0.875733 0 outer loop - vertex 5.20766 -20.2058 -0.1 + vertex 5.20766 -20.2058 -0.2 vertex 5.70074 -19.9339 0 vertex 5.20766 -20.2058 0 endloop @@ -3313,13 +3313,13 @@ solid OpenSCAD_Model facet normal 0.482795 -0.875733 0 outer loop vertex 5.70074 -19.9339 0 - vertex 5.20766 -20.2058 -0.1 - vertex 5.70074 -19.9339 -0.1 + vertex 5.20766 -20.2058 -0.2 + vertex 5.70074 -19.9339 -0.2 endloop endfacet facet normal 0.452672 -0.891677 0 outer loop - vertex 5.70074 -19.9339 -0.1 + vertex 5.70074 -19.9339 -0.2 vertex 6.07737 -19.7427 0 vertex 5.70074 -19.9339 0 endloop @@ -3327,13 +3327,13 @@ solid OpenSCAD_Model facet normal 0.452672 -0.891677 0 outer loop vertex 6.07737 -19.7427 0 - vertex 5.70074 -19.9339 -0.1 - vertex 6.07737 -19.7427 -0.1 + vertex 5.70074 -19.9339 -0.2 + vertex 6.07737 -19.7427 -0.2 endloop endfacet facet normal 0.411982 -0.911192 0 outer loop - vertex 6.07737 -19.7427 -0.1 + vertex 6.07737 -19.7427 -0.2 vertex 6.41984 -19.5879 0 vertex 6.07737 -19.7427 0 endloop @@ -3341,13 +3341,13 @@ solid OpenSCAD_Model facet normal 0.411982 -0.911192 0 outer loop vertex 6.41984 -19.5879 0 - vertex 6.07737 -19.7427 -0.1 - vertex 6.41984 -19.5879 -0.1 + vertex 6.07737 -19.7427 -0.2 + vertex 6.41984 -19.5879 -0.2 endloop endfacet facet normal 0.352601 -0.935774 0 outer loop - vertex 6.41984 -19.5879 -0.1 + vertex 6.41984 -19.5879 -0.2 vertex 6.74616 -19.4649 0 vertex 6.41984 -19.5879 0 endloop @@ -3355,13 +3355,13 @@ solid OpenSCAD_Model facet normal 0.352601 -0.935774 0 outer loop vertex 6.74616 -19.4649 0 - vertex 6.41984 -19.5879 -0.1 - vertex 6.74616 -19.4649 -0.1 + vertex 6.41984 -19.5879 -0.2 + vertex 6.74616 -19.4649 -0.2 endloop endfacet facet normal 0.279545 -0.960133 0 outer loop - vertex 6.74616 -19.4649 -0.1 + vertex 6.74616 -19.4649 -0.2 vertex 7.07441 -19.3694 0 vertex 6.74616 -19.4649 0 endloop @@ -3369,13 +3369,13 @@ solid OpenSCAD_Model facet normal 0.279545 -0.960133 0 outer loop vertex 7.07441 -19.3694 0 - vertex 6.74616 -19.4649 -0.1 - vertex 7.07441 -19.3694 -0.1 + vertex 6.74616 -19.4649 -0.2 + vertex 7.07441 -19.3694 -0.2 endloop endfacet facet normal 0.204293 -0.97891 0 outer loop - vertex 7.07441 -19.3694 -0.1 + vertex 7.07441 -19.3694 -0.2 vertex 7.42262 -19.2967 0 vertex 7.07441 -19.3694 0 endloop @@ -3383,13 +3383,13 @@ solid OpenSCAD_Model facet normal 0.204293 -0.97891 0 outer loop vertex 7.42262 -19.2967 0 - vertex 7.07441 -19.3694 -0.1 - vertex 7.42262 -19.2967 -0.1 + vertex 7.07441 -19.3694 -0.2 + vertex 7.42262 -19.2967 -0.2 endloop endfacet facet normal 0.139108 -0.990277 0 outer loop - vertex 7.42262 -19.2967 -0.1 + vertex 7.42262 -19.2967 -0.2 vertex 7.80885 -19.2424 0 vertex 7.42262 -19.2967 0 endloop @@ -3397,13 +3397,13 @@ solid OpenSCAD_Model facet normal 0.139108 -0.990277 0 outer loop vertex 7.80885 -19.2424 0 - vertex 7.42262 -19.2967 -0.1 - vertex 7.80885 -19.2424 -0.1 + vertex 7.42262 -19.2967 -0.2 + vertex 7.80885 -19.2424 -0.2 endloop endfacet facet normal 0.0740931 -0.997251 0 outer loop - vertex 7.80885 -19.2424 -0.1 + vertex 7.80885 -19.2424 -0.2 vertex 8.76754 -19.1712 0 vertex 7.80885 -19.2424 0 endloop @@ -3411,13 +3411,13 @@ solid OpenSCAD_Model facet normal 0.0740931 -0.997251 0 outer loop vertex 8.76754 -19.1712 0 - vertex 7.80885 -19.2424 -0.1 - vertex 8.76754 -19.1712 -0.1 + vertex 7.80885 -19.2424 -0.2 + vertex 8.76754 -19.1712 -0.2 endloop endfacet facet normal 0.0317962 -0.999494 0 outer loop - vertex 8.76754 -19.1712 -0.1 + vertex 8.76754 -19.1712 -0.2 vertex 9.72114 -19.1409 0 vertex 8.76754 -19.1712 0 endloop @@ -3425,13 +3425,13 @@ solid OpenSCAD_Model facet normal 0.0317962 -0.999494 0 outer loop vertex 9.72114 -19.1409 0 - vertex 8.76754 -19.1712 -0.1 - vertex 9.72114 -19.1409 -0.1 + vertex 8.76754 -19.1712 -0.2 + vertex 9.72114 -19.1409 -0.2 endloop endfacet facet normal -0.0248159 -0.999692 0 outer loop - vertex 9.72114 -19.1409 -0.1 + vertex 9.72114 -19.1409 -0.2 vertex 10.0711 -19.1496 0 vertex 9.72114 -19.1409 0 endloop @@ -3439,13 +3439,13 @@ solid OpenSCAD_Model facet normal -0.0248159 -0.999692 -0 outer loop vertex 10.0711 -19.1496 0 - vertex 9.72114 -19.1409 -0.1 - vertex 10.0711 -19.1496 -0.1 + vertex 9.72114 -19.1409 -0.2 + vertex 10.0711 -19.1496 -0.2 endloop endfacet facet normal -0.0963554 -0.995347 0 outer loop - vertex 10.0711 -19.1496 -0.1 + vertex 10.0711 -19.1496 -0.2 vertex 10.3591 -19.1774 0 vertex 10.0711 -19.1496 0 endloop @@ -3453,13 +3453,13 @@ solid OpenSCAD_Model facet normal -0.0963554 -0.995347 -0 outer loop vertex 10.3591 -19.1774 0 - vertex 10.0711 -19.1496 -0.1 - vertex 10.3591 -19.1774 -0.1 + vertex 10.0711 -19.1496 -0.2 + vertex 10.3591 -19.1774 -0.2 endloop endfacet facet normal -0.199823 -0.979832 0 outer loop - vertex 10.3591 -19.1774 -0.1 + vertex 10.3591 -19.1774 -0.2 vertex 10.602 -19.227 0 vertex 10.3591 -19.1774 0 endloop @@ -3467,13 +3467,13 @@ solid OpenSCAD_Model facet normal -0.199823 -0.979832 -0 outer loop vertex 10.602 -19.227 0 - vertex 10.3591 -19.1774 -0.1 - vertex 10.602 -19.227 -0.1 + vertex 10.3591 -19.1774 -0.2 + vertex 10.602 -19.227 -0.2 endloop endfacet facet normal -0.324456 -0.945901 0 outer loop - vertex 10.602 -19.227 -0.1 + vertex 10.602 -19.227 -0.2 vertex 10.8168 -19.3006 0 vertex 10.602 -19.227 0 endloop @@ -3481,13 +3481,13 @@ solid OpenSCAD_Model facet normal -0.324456 -0.945901 -0 outer loop vertex 10.8168 -19.3006 0 - vertex 10.602 -19.227 -0.1 - vertex 10.8168 -19.3006 -0.1 + vertex 10.602 -19.227 -0.2 + vertex 10.8168 -19.3006 -0.2 endloop endfacet facet normal -0.441937 -0.897046 0 outer loop - vertex 10.8168 -19.3006 -0.1 + vertex 10.8168 -19.3006 -0.2 vertex 11.0203 -19.4009 0 vertex 10.8168 -19.3006 0 endloop @@ -3495,13 +3495,13 @@ solid OpenSCAD_Model facet normal -0.441937 -0.897046 -0 outer loop vertex 11.0203 -19.4009 0 - vertex 10.8168 -19.3006 -0.1 - vertex 11.0203 -19.4009 -0.1 + vertex 10.8168 -19.3006 -0.2 + vertex 11.0203 -19.4009 -0.2 endloop endfacet facet normal -0.525875 -0.850562 0 outer loop - vertex 11.0203 -19.4009 -0.1 + vertex 11.0203 -19.4009 -0.2 vertex 11.2294 -19.5302 0 vertex 11.0203 -19.4009 0 endloop @@ -3509,13 +3509,13 @@ solid OpenSCAD_Model facet normal -0.525875 -0.850562 -0 outer loop vertex 11.2294 -19.5302 0 - vertex 11.0203 -19.4009 -0.1 - vertex 11.2294 -19.5302 -0.1 + vertex 11.0203 -19.4009 -0.2 + vertex 11.2294 -19.5302 -0.2 endloop endfacet facet normal -0.518008 -0.855376 0 outer loop - vertex 11.2294 -19.5302 -0.1 + vertex 11.2294 -19.5302 -0.2 vertex 11.5538 -19.7266 0 vertex 11.2294 -19.5302 0 endloop @@ -3523,13 +3523,13 @@ solid OpenSCAD_Model facet normal -0.518008 -0.855376 -0 outer loop vertex 11.5538 -19.7266 0 - vertex 11.2294 -19.5302 -0.1 - vertex 11.5538 -19.7266 -0.1 + vertex 11.2294 -19.5302 -0.2 + vertex 11.5538 -19.7266 -0.2 endloop endfacet facet normal -0.370976 -0.928642 0 outer loop - vertex 11.5538 -19.7266 -0.1 + vertex 11.5538 -19.7266 -0.2 vertex 11.7902 -19.8211 0 vertex 11.5538 -19.7266 0 endloop @@ -3537,13 +3537,13 @@ solid OpenSCAD_Model facet normal -0.370976 -0.928642 -0 outer loop vertex 11.7902 -19.8211 0 - vertex 11.5538 -19.7266 -0.1 - vertex 11.7902 -19.8211 -0.1 + vertex 11.5538 -19.7266 -0.2 + vertex 11.7902 -19.8211 -0.2 endloop endfacet facet normal -0.111982 -0.99371 0 outer loop - vertex 11.7902 -19.8211 -0.1 + vertex 11.7902 -19.8211 -0.2 vertex 11.881 -19.8313 0 vertex 11.7902 -19.8211 0 endloop @@ -3551,13 +3551,13 @@ solid OpenSCAD_Model facet normal -0.111982 -0.99371 -0 outer loop vertex 11.881 -19.8313 0 - vertex 11.7902 -19.8211 -0.1 - vertex 11.881 -19.8313 -0.1 + vertex 11.7902 -19.8211 -0.2 + vertex 11.881 -19.8313 -0.2 endloop endfacet facet normal 0.179863 -0.983692 0 outer loop - vertex 11.881 -19.8313 -0.1 + vertex 11.881 -19.8313 -0.2 vertex 11.9563 -19.8175 0 vertex 11.881 -19.8313 0 endloop @@ -3565,13 +3565,13 @@ solid OpenSCAD_Model facet normal 0.179863 -0.983692 0 outer loop vertex 11.9563 -19.8175 0 - vertex 11.881 -19.8313 -0.1 - vertex 11.9563 -19.8175 -0.1 + vertex 11.881 -19.8313 -0.2 + vertex 11.9563 -19.8175 -0.2 endloop endfacet facet normal 0.514293 -0.857615 0 outer loop - vertex 11.9563 -19.8175 -0.1 + vertex 11.9563 -19.8175 -0.2 vertex 12.0185 -19.7802 0 vertex 11.9563 -19.8175 0 endloop @@ -3579,139 +3579,139 @@ solid OpenSCAD_Model facet normal 0.514293 -0.857615 0 outer loop vertex 12.0185 -19.7802 0 - vertex 11.9563 -19.8175 -0.1 - vertex 12.0185 -19.7802 -0.1 + vertex 11.9563 -19.8175 -0.2 + vertex 12.0185 -19.7802 -0.2 endloop endfacet facet normal 0.762299 -0.647226 0 outer loop vertex 12.0185 -19.7802 0 - vertex 12.0697 -19.7199 -0.1 + vertex 12.0697 -19.7199 -0.2 vertex 12.0697 -19.7199 0 endloop endfacet facet normal 0.762299 -0.647226 0 outer loop - vertex 12.0697 -19.7199 -0.1 + vertex 12.0697 -19.7199 -0.2 vertex 12.0185 -19.7802 0 - vertex 12.0185 -19.7802 -0.1 + vertex 12.0185 -19.7802 -0.2 endloop endfacet facet normal 0.887752 -0.460323 0 outer loop vertex 12.0697 -19.7199 0 - vertex 12.2803 -19.3138 -0.1 + vertex 12.2803 -19.3138 -0.2 vertex 12.2803 -19.3138 0 endloop endfacet facet normal 0.887752 -0.460323 0 outer loop - vertex 12.2803 -19.3138 -0.1 + vertex 12.2803 -19.3138 -0.2 vertex 12.0697 -19.7199 0 - vertex 12.0697 -19.7199 -0.1 + vertex 12.0697 -19.7199 -0.2 endloop endfacet facet normal 0.914794 -0.403921 0 outer loop vertex 12.2803 -19.3138 0 - vertex 12.5806 -18.6336 -0.1 + vertex 12.5806 -18.6336 -0.2 vertex 12.5806 -18.6336 0 endloop endfacet facet normal 0.914794 -0.403921 0 outer loop - vertex 12.5806 -18.6336 -0.1 + vertex 12.5806 -18.6336 -0.2 vertex 12.2803 -19.3138 0 - vertex 12.2803 -19.3138 -0.1 + vertex 12.2803 -19.3138 -0.2 endloop endfacet facet normal 0.927919 -0.372782 0 outer loop vertex 12.5806 -18.6336 0 - vertex 13.2984 -16.8469 -0.1 + vertex 13.2984 -16.8469 -0.2 vertex 13.2984 -16.8469 0 endloop endfacet facet normal 0.927919 -0.372782 0 outer loop - vertex 13.2984 -16.8469 -0.1 + vertex 13.2984 -16.8469 -0.2 vertex 12.5806 -18.6336 0 - vertex 12.5806 -18.6336 -0.1 + vertex 12.5806 -18.6336 -0.2 endloop endfacet facet normal 0.936103 -0.351727 0 outer loop vertex 13.2984 -16.8469 0 - vertex 13.6397 -15.9386 -0.1 + vertex 13.6397 -15.9386 -0.2 vertex 13.6397 -15.9386 0 endloop endfacet facet normal 0.936103 -0.351727 0 outer loop - vertex 13.6397 -15.9386 -0.1 + vertex 13.6397 -15.9386 -0.2 vertex 13.2984 -16.8469 0 - vertex 13.2984 -16.8469 -0.1 + vertex 13.2984 -16.8469 -0.2 endloop endfacet facet normal 0.9425 -0.334207 0 outer loop vertex 13.6397 -15.9386 0 - vertex 13.9185 -15.1524 -0.1 + vertex 13.9185 -15.1524 -0.2 vertex 13.9185 -15.1524 0 endloop endfacet facet normal 0.9425 -0.334207 0 outer loop - vertex 13.9185 -15.1524 -0.1 + vertex 13.9185 -15.1524 -0.2 vertex 13.6397 -15.9386 0 - vertex 13.6397 -15.9386 -0.1 + vertex 13.6397 -15.9386 -0.2 endloop endfacet facet normal 0.953687 -0.300802 0 outer loop vertex 13.9185 -15.1524 0 - vertex 14.0967 -14.5873 -0.1 + vertex 14.0967 -14.5873 -0.2 vertex 14.0967 -14.5873 0 endloop endfacet facet normal 0.953687 -0.300802 0 outer loop - vertex 14.0967 -14.5873 -0.1 + vertex 14.0967 -14.5873 -0.2 vertex 13.9185 -15.1524 0 - vertex 13.9185 -15.1524 -0.1 + vertex 13.9185 -15.1524 -0.2 endloop endfacet facet normal 0.97364 -0.22809 0 outer loop vertex 14.0967 -14.5873 0 - vertex 14.1362 -14.4186 -0.1 + vertex 14.1362 -14.4186 -0.2 vertex 14.1362 -14.4186 0 endloop endfacet facet normal 0.97364 -0.22809 0 outer loop - vertex 14.1362 -14.4186 -0.1 + vertex 14.1362 -14.4186 -0.2 vertex 14.0967 -14.5873 0 - vertex 14.0967 -14.5873 -0.1 + vertex 14.0967 -14.5873 -0.2 endloop endfacet facet normal 0.999999 -0.00127602 0 outer loop vertex 14.1362 -14.4186 0 - vertex 14.1363 -14.3424 -0.1 + vertex 14.1363 -14.3424 -0.2 vertex 14.1363 -14.3424 0 endloop endfacet facet normal 0.999999 -0.00127602 0 outer loop - vertex 14.1363 -14.3424 -0.1 + vertex 14.1363 -14.3424 -0.2 vertex 14.1362 -14.4186 0 - vertex 14.1362 -14.4186 -0.1 + vertex 14.1362 -14.4186 -0.2 endloop endfacet facet normal 0.566913 0.823778 -0 outer loop - vertex 14.1363 -14.3424 -0.1 + vertex 14.1363 -14.3424 -0.2 vertex 14.0881 -14.3092 0 vertex 14.1363 -14.3424 0 endloop @@ -3719,13 +3719,13 @@ solid OpenSCAD_Model facet normal 0.566913 0.823778 0 outer loop vertex 14.0881 -14.3092 0 - vertex 14.1363 -14.3424 -0.1 - vertex 14.0881 -14.3092 -0.1 + vertex 14.1363 -14.3424 -0.2 + vertex 14.0881 -14.3092 -0.2 endloop endfacet facet normal 0.351025 0.936366 -0 outer loop - vertex 14.0881 -14.3092 -0.1 + vertex 14.0881 -14.3092 -0.2 vertex 14.0003 -14.2763 0 vertex 14.0881 -14.3092 0 endloop @@ -3733,13 +3733,13 @@ solid OpenSCAD_Model facet normal 0.351025 0.936366 0 outer loop vertex 14.0003 -14.2763 0 - vertex 14.0881 -14.3092 -0.1 - vertex 14.0003 -14.2763 -0.1 + vertex 14.0881 -14.3092 -0.2 + vertex 14.0003 -14.2763 -0.2 endloop endfacet facet normal 0.218251 0.975893 -0 outer loop - vertex 14.0003 -14.2763 -0.1 + vertex 14.0003 -14.2763 -0.2 vertex 13.7222 -14.2141 0 vertex 14.0003 -14.2763 0 endloop @@ -3747,13 +3747,13 @@ solid OpenSCAD_Model facet normal 0.218251 0.975893 0 outer loop vertex 13.7222 -14.2141 0 - vertex 14.0003 -14.2763 -0.1 - vertex 13.7222 -14.2141 -0.1 + vertex 14.0003 -14.2763 -0.2 + vertex 13.7222 -14.2141 -0.2 endloop endfacet facet normal 0.134641 0.990894 -0 outer loop - vertex 13.7222 -14.2141 -0.1 + vertex 13.7222 -14.2141 -0.2 vertex 13.3346 -14.1615 0 vertex 13.7222 -14.2141 0 endloop @@ -3761,13 +3761,13 @@ solid OpenSCAD_Model facet normal 0.134641 0.990894 0 outer loop vertex 13.3346 -14.1615 0 - vertex 13.7222 -14.2141 -0.1 - vertex 13.3346 -14.1615 -0.1 + vertex 13.7222 -14.2141 -0.2 + vertex 13.3346 -14.1615 -0.2 endloop endfacet facet normal 0.0805571 0.99675 -0 outer loop - vertex 13.3346 -14.1615 -0.1 + vertex 13.3346 -14.1615 -0.2 vertex 12.8698 -14.1239 0 vertex 13.3346 -14.1615 0 endloop @@ -3775,13 +3775,13 @@ solid OpenSCAD_Model facet normal 0.0805571 0.99675 0 outer loop vertex 12.8698 -14.1239 0 - vertex 13.3346 -14.1615 -0.1 - vertex 12.8698 -14.1239 -0.1 + vertex 13.3346 -14.1615 -0.2 + vertex 12.8698 -14.1239 -0.2 endloop endfacet facet normal 0.256285 0.966601 -0 outer loop - vertex 12.8698 -14.1239 -0.1 + vertex 12.8698 -14.1239 -0.2 vertex 12.7363 -14.0885 0 vertex 12.8698 -14.1239 0 endloop @@ -3789,13 +3789,13 @@ solid OpenSCAD_Model facet normal 0.256285 0.966601 0 outer loop vertex 12.7363 -14.0885 0 - vertex 12.8698 -14.1239 -0.1 - vertex 12.7363 -14.0885 -0.1 + vertex 12.8698 -14.1239 -0.2 + vertex 12.7363 -14.0885 -0.2 endloop endfacet facet normal 0.544571 0.838715 -0 outer loop - vertex 12.7363 -14.0885 -0.1 + vertex 12.7363 -14.0885 -0.2 vertex 12.6087 -14.0056 0 vertex 12.7363 -14.0885 0 endloop @@ -3803,125 +3803,125 @@ solid OpenSCAD_Model facet normal 0.544571 0.838715 0 outer loop vertex 12.6087 -14.0056 0 - vertex 12.7363 -14.0885 -0.1 - vertex 12.6087 -14.0056 -0.1 + vertex 12.7363 -14.0885 -0.2 + vertex 12.6087 -14.0056 -0.2 endloop endfacet facet normal 0.739657 0.672985 0 outer loop vertex 12.6087 -14.0056 0 - vertex 12.5013 -13.8876 -0.1 + vertex 12.5013 -13.8876 -0.2 vertex 12.5013 -13.8876 0 endloop endfacet facet normal 0.739657 0.672985 0 outer loop - vertex 12.5013 -13.8876 -0.1 + vertex 12.5013 -13.8876 -0.2 vertex 12.6087 -14.0056 0 - vertex 12.6087 -14.0056 -0.1 + vertex 12.6087 -14.0056 -0.2 endloop endfacet facet normal 0.888712 0.458466 0 outer loop vertex 12.5013 -13.8876 0 - vertex 12.4287 -13.7469 -0.1 + vertex 12.4287 -13.7469 -0.2 vertex 12.4287 -13.7469 0 endloop endfacet facet normal 0.888712 0.458466 0 outer loop - vertex 12.4287 -13.7469 -0.1 + vertex 12.4287 -13.7469 -0.2 vertex 12.5013 -13.8876 0 - vertex 12.5013 -13.8876 -0.1 + vertex 12.5013 -13.8876 -0.2 endloop endfacet facet normal 0.969282 0.245953 0 outer loop vertex 12.4287 -13.7469 0 - vertex 12.3997 -13.6324 -0.1 + vertex 12.3997 -13.6324 -0.2 vertex 12.3997 -13.6324 0 endloop endfacet facet normal 0.969282 0.245953 0 outer loop - vertex 12.3997 -13.6324 -0.1 + vertex 12.3997 -13.6324 -0.2 vertex 12.4287 -13.7469 0 - vertex 12.4287 -13.7469 -0.1 + vertex 12.4287 -13.7469 -0.2 endloop endfacet facet normal 0.995788 0.0916817 0 outer loop vertex 12.3997 -13.6324 0 - vertex 12.3889 -13.5153 -0.1 + vertex 12.3889 -13.5153 -0.2 vertex 12.3889 -13.5153 0 endloop endfacet facet normal 0.995788 0.0916817 0 outer loop - vertex 12.3889 -13.5153 -0.1 + vertex 12.3889 -13.5153 -0.2 vertex 12.3997 -13.6324 0 - vertex 12.3997 -13.6324 -0.1 + vertex 12.3997 -13.6324 -0.2 endloop endfacet facet normal 0.99207 -0.12569 0 outer loop vertex 12.3889 -13.5153 0 - vertex 12.419 -13.2773 -0.1 + vertex 12.419 -13.2773 -0.2 vertex 12.419 -13.2773 0 endloop endfacet facet normal 0.99207 -0.12569 0 outer loop - vertex 12.419 -13.2773 -0.1 + vertex 12.419 -13.2773 -0.2 vertex 12.3889 -13.5153 0 - vertex 12.3889 -13.5153 -0.1 + vertex 12.3889 -13.5153 -0.2 endloop endfacet facet normal 0.929521 -0.368768 0 outer loop vertex 12.419 -13.2773 0 - vertex 12.513 -13.0405 -0.1 + vertex 12.513 -13.0405 -0.2 vertex 12.513 -13.0405 0 endloop endfacet facet normal 0.929521 -0.368768 0 outer loop - vertex 12.513 -13.0405 -0.1 + vertex 12.513 -13.0405 -0.2 vertex 12.419 -13.2773 0 - vertex 12.419 -13.2773 -0.1 + vertex 12.419 -13.2773 -0.2 endloop endfacet facet normal 0.832694 -0.553733 0 outer loop vertex 12.513 -13.0405 0 - vertex 12.6645 -12.8127 -0.1 + vertex 12.6645 -12.8127 -0.2 vertex 12.6645 -12.8127 0 endloop endfacet facet normal 0.832694 -0.553733 0 outer loop - vertex 12.6645 -12.8127 -0.1 + vertex 12.6645 -12.8127 -0.2 vertex 12.513 -13.0405 0 - vertex 12.513 -13.0405 -0.1 + vertex 12.513 -13.0405 -0.2 endloop endfacet facet normal 0.721168 -0.69276 0 outer loop vertex 12.6645 -12.8127 0 - vertex 12.8673 -12.6015 -0.1 + vertex 12.8673 -12.6015 -0.2 vertex 12.8673 -12.6015 0 endloop endfacet facet normal 0.721168 -0.69276 0 outer loop - vertex 12.8673 -12.6015 -0.1 + vertex 12.8673 -12.6015 -0.2 vertex 12.6645 -12.8127 0 - vertex 12.6645 -12.8127 -0.1 + vertex 12.6645 -12.8127 -0.2 endloop endfacet facet normal 0.601691 -0.798729 0 outer loop - vertex 12.8673 -12.6015 -0.1 + vertex 12.8673 -12.6015 -0.2 vertex 13.1153 -12.4148 0 vertex 12.8673 -12.6015 0 endloop @@ -3929,13 +3929,13 @@ solid OpenSCAD_Model facet normal 0.601691 -0.798729 0 outer loop vertex 13.1153 -12.4148 0 - vertex 12.8673 -12.6015 -0.1 - vertex 13.1153 -12.4148 -0.1 + vertex 12.8673 -12.6015 -0.2 + vertex 13.1153 -12.4148 -0.2 endloop endfacet facet normal 0.474719 -0.880138 0 outer loop - vertex 13.1153 -12.4148 -0.1 + vertex 13.1153 -12.4148 -0.2 vertex 13.4022 -12.26 0 vertex 13.1153 -12.4148 0 endloop @@ -3943,13 +3943,13 @@ solid OpenSCAD_Model facet normal 0.474719 -0.880138 0 outer loop vertex 13.4022 -12.26 0 - vertex 13.1153 -12.4148 -0.1 - vertex 13.4022 -12.26 -0.1 + vertex 13.1153 -12.4148 -0.2 + vertex 13.4022 -12.26 -0.2 endloop endfacet facet normal 0.33852 -0.940959 0 outer loop - vertex 13.4022 -12.26 -0.1 + vertex 13.4022 -12.26 -0.2 vertex 13.7217 -12.1451 0 vertex 13.4022 -12.26 0 endloop @@ -3957,13 +3957,13 @@ solid OpenSCAD_Model facet normal 0.33852 -0.940959 0 outer loop vertex 13.7217 -12.1451 0 - vertex 13.4022 -12.26 -0.1 - vertex 13.7217 -12.1451 -0.1 + vertex 13.4022 -12.26 -0.2 + vertex 13.7217 -12.1451 -0.2 endloop endfacet facet normal 0.283558 -0.958955 0 outer loop - vertex 13.7217 -12.1451 -0.1 + vertex 13.7217 -12.1451 -0.2 vertex 16.811 -11.2316 0 vertex 13.7217 -12.1451 0 endloop @@ -3971,13 +3971,13 @@ solid OpenSCAD_Model facet normal 0.283558 -0.958955 0 outer loop vertex 16.811 -11.2316 0 - vertex 13.7217 -12.1451 -0.1 - vertex 16.811 -11.2316 -0.1 + vertex 13.7217 -12.1451 -0.2 + vertex 16.811 -11.2316 -0.2 endloop endfacet facet normal 0.280008 -0.959998 0 outer loop - vertex 16.811 -11.2316 -0.1 + vertex 16.811 -11.2316 -0.2 vertex 17.5824 -11.0066 0 vertex 16.811 -11.2316 0 endloop @@ -3985,13 +3985,13 @@ solid OpenSCAD_Model facet normal 0.280008 -0.959998 0 outer loop vertex 17.5824 -11.0066 0 - vertex 16.811 -11.2316 -0.1 - vertex 17.5824 -11.0066 -0.1 + vertex 16.811 -11.2316 -0.2 + vertex 17.5824 -11.0066 -0.2 endloop endfacet facet normal 0.251173 -0.967942 0 outer loop - vertex 17.5824 -11.0066 -0.1 + vertex 17.5824 -11.0066 -0.2 vertex 18.2126 -10.843 0 vertex 17.5824 -11.0066 0 endloop @@ -3999,13 +3999,13 @@ solid OpenSCAD_Model facet normal 0.251173 -0.967942 0 outer loop vertex 18.2126 -10.843 0 - vertex 17.5824 -11.0066 -0.1 - vertex 18.2126 -10.843 -0.1 + vertex 17.5824 -11.0066 -0.2 + vertex 18.2126 -10.843 -0.2 endloop endfacet facet normal 0.200442 -0.979706 0 outer loop - vertex 18.2126 -10.843 -0.1 + vertex 18.2126 -10.843 -0.2 vertex 18.7132 -10.7406 0 vertex 18.2126 -10.843 0 endloop @@ -4013,13 +4013,13 @@ solid OpenSCAD_Model facet normal 0.200442 -0.979706 0 outer loop vertex 18.7132 -10.7406 0 - vertex 18.2126 -10.843 -0.1 - vertex 18.7132 -10.7406 -0.1 + vertex 18.2126 -10.843 -0.2 + vertex 18.7132 -10.7406 -0.2 endloop endfacet facet normal 0.10841 -0.994106 0 outer loop - vertex 18.7132 -10.7406 -0.1 + vertex 18.7132 -10.7406 -0.2 vertex 19.0963 -10.6988 0 vertex 18.7132 -10.7406 0 endloop @@ -4027,13 +4027,13 @@ solid OpenSCAD_Model facet normal 0.10841 -0.994106 0 outer loop vertex 19.0963 -10.6988 0 - vertex 18.7132 -10.7406 -0.1 - vertex 19.0963 -10.6988 -0.1 + vertex 18.7132 -10.7406 -0.2 + vertex 19.0963 -10.6988 -0.2 endloop endfacet facet normal -0.0664596 -0.997789 0 outer loop - vertex 19.0963 -10.6988 -0.1 + vertex 19.0963 -10.6988 -0.2 vertex 19.3736 -10.7173 0 vertex 19.0963 -10.6988 0 endloop @@ -4041,13 +4041,13 @@ solid OpenSCAD_Model facet normal -0.0664596 -0.997789 -0 outer loop vertex 19.3736 -10.7173 0 - vertex 19.0963 -10.6988 -0.1 - vertex 19.3736 -10.7173 -0.1 + vertex 19.0963 -10.6988 -0.2 + vertex 19.3736 -10.7173 -0.2 endloop endfacet facet normal -0.172939 0.984933 0 outer loop - vertex 8.12348 -21.5274 -0.1 + vertex 8.12348 -21.5274 -0.2 vertex 7.71946 -21.5983 0 vertex 8.12348 -21.5274 0 endloop @@ -4055,13 +4055,13 @@ solid OpenSCAD_Model facet normal -0.172939 0.984933 0 outer loop vertex 7.71946 -21.5983 0 - vertex 8.12348 -21.5274 -0.1 - vertex 7.71946 -21.5983 -0.1 + vertex 8.12348 -21.5274 -0.2 + vertex 7.71946 -21.5983 -0.2 endloop endfacet facet normal -0.287852 0.957675 0 outer loop - vertex 7.71946 -21.5983 -0.1 + vertex 7.71946 -21.5983 -0.2 vertex 7.29763 -21.7251 0 vertex 7.71946 -21.5983 0 endloop @@ -4069,13 +4069,13 @@ solid OpenSCAD_Model facet normal -0.287852 0.957675 0 outer loop vertex 7.29763 -21.7251 0 - vertex 7.71946 -21.5983 -0.1 - vertex 7.29763 -21.7251 -0.1 + vertex 7.71946 -21.5983 -0.2 + vertex 7.29763 -21.7251 -0.2 endloop endfacet facet normal -0.387479 0.921879 0 outer loop - vertex 7.29763 -21.7251 -0.1 + vertex 7.29763 -21.7251 -0.2 vertex 6.8627 -21.9079 0 vertex 7.29763 -21.7251 0 endloop @@ -4083,13 +4083,13 @@ solid OpenSCAD_Model facet normal -0.387479 0.921879 0 outer loop vertex 6.8627 -21.9079 0 - vertex 7.29763 -21.7251 -0.1 - vertex 6.8627 -21.9079 -0.1 + vertex 7.29763 -21.7251 -0.2 + vertex 6.8627 -21.9079 -0.2 endloop endfacet facet normal -0.474518 0.880246 0 outer loop - vertex 6.8627 -21.9079 -0.1 + vertex 6.8627 -21.9079 -0.2 vertex 6.41939 -22.1469 0 vertex 6.8627 -21.9079 0 endloop @@ -4097,13 +4097,13 @@ solid OpenSCAD_Model facet normal -0.474518 0.880246 0 outer loop vertex 6.41939 -22.1469 0 - vertex 6.8627 -21.9079 -0.1 - vertex 6.41939 -22.1469 -0.1 + vertex 6.8627 -21.9079 -0.2 + vertex 6.41939 -22.1469 -0.2 endloop endfacet facet normal -0.551235 0.83435 0 outer loop - vertex 6.41939 -22.1469 -0.1 + vertex 6.41939 -22.1469 -0.2 vertex 5.97241 -22.4422 0 vertex 6.41939 -22.1469 0 endloop @@ -4111,13 +4111,13 @@ solid OpenSCAD_Model facet normal -0.551235 0.83435 0 outer loop vertex 5.97241 -22.4422 0 - vertex 6.41939 -22.1469 -0.1 - vertex 5.97241 -22.4422 -0.1 + vertex 6.41939 -22.1469 -0.2 + vertex 5.97241 -22.4422 -0.2 endloop endfacet facet normal -0.619368 0.785101 0 outer loop - vertex 5.97241 -22.4422 -0.1 + vertex 5.97241 -22.4422 -0.2 vertex 5.52647 -22.794 0 vertex 5.97241 -22.4422 0 endloop @@ -4125,13 +4125,13 @@ solid OpenSCAD_Model facet normal -0.619368 0.785101 0 outer loop vertex 5.52647 -22.794 0 - vertex 5.97241 -22.4422 -0.1 - vertex 5.52647 -22.794 -0.1 + vertex 5.97241 -22.4422 -0.2 + vertex 5.52647 -22.794 -0.2 endloop endfacet facet normal -0.680193 0.733033 0 outer loop - vertex 5.52647 -22.794 -0.1 + vertex 5.52647 -22.794 -0.2 vertex 5.08628 -23.2024 0 vertex 5.52647 -22.794 0 endloop @@ -4139,307 +4139,307 @@ solid OpenSCAD_Model facet normal -0.680193 0.733033 0 outer loop vertex 5.08628 -23.2024 0 - vertex 5.52647 -22.794 -0.1 - vertex 5.08628 -23.2024 -0.1 + vertex 5.52647 -22.794 -0.2 + vertex 5.08628 -23.2024 -0.2 endloop endfacet facet normal -0.733294 0.679911 0 outer loop - vertex 4.45147 -23.8871 -0.1 + vertex 4.45147 -23.8871 -0.2 vertex 5.08628 -23.2024 0 - vertex 5.08628 -23.2024 -0.1 + vertex 5.08628 -23.2024 -0.2 endloop endfacet facet normal -0.733294 0.679911 0 outer loop vertex 5.08628 -23.2024 0 - vertex 4.45147 -23.8871 -0.1 + vertex 4.45147 -23.8871 -0.2 vertex 4.45147 -23.8871 0 endloop endfacet facet normal -0.778151 0.628077 0 outer loop - vertex 3.85887 -24.6213 -0.1 + vertex 3.85887 -24.6213 -0.2 vertex 4.45147 -23.8871 0 - vertex 4.45147 -23.8871 -0.1 + vertex 4.45147 -23.8871 -0.2 endloop endfacet facet normal -0.778151 0.628077 0 outer loop vertex 4.45147 -23.8871 0 - vertex 3.85887 -24.6213 -0.1 + vertex 3.85887 -24.6213 -0.2 vertex 3.85887 -24.6213 0 endloop endfacet facet normal -0.816383 0.577511 0 outer loop - vertex 3.31148 -25.3951 -0.1 + vertex 3.31148 -25.3951 -0.2 vertex 3.85887 -24.6213 0 - vertex 3.85887 -24.6213 -0.1 + vertex 3.85887 -24.6213 -0.2 endloop endfacet facet normal -0.816383 0.577511 0 outer loop vertex 3.85887 -24.6213 0 - vertex 3.31148 -25.3951 -0.1 + vertex 3.31148 -25.3951 -0.2 vertex 3.31148 -25.3951 0 endloop endfacet facet normal -0.849413 0.527728 0 outer loop - vertex 2.81229 -26.1986 -0.1 + vertex 2.81229 -26.1986 -0.2 vertex 3.31148 -25.3951 0 - vertex 3.31148 -25.3951 -0.1 + vertex 3.31148 -25.3951 -0.2 endloop endfacet facet normal -0.849413 0.527728 0 outer loop vertex 3.31148 -25.3951 0 - vertex 2.81229 -26.1986 -0.1 + vertex 2.81229 -26.1986 -0.2 vertex 2.81229 -26.1986 0 endloop endfacet facet normal -0.878359 0.478001 0 outer loop - vertex 2.36428 -27.0218 -0.1 + vertex 2.36428 -27.0218 -0.2 vertex 2.81229 -26.1986 0 - vertex 2.81229 -26.1986 -0.1 + vertex 2.81229 -26.1986 -0.2 endloop endfacet facet normal -0.878359 0.478001 0 outer loop vertex 2.81229 -26.1986 0 - vertex 2.36428 -27.0218 -0.1 + vertex 2.36428 -27.0218 -0.2 vertex 2.36428 -27.0218 0 endloop endfacet facet normal -0.904067 0.427391 0 outer loop - vertex 1.97046 -27.8549 -0.1 + vertex 1.97046 -27.8549 -0.2 vertex 2.36428 -27.0218 0 - vertex 2.36428 -27.0218 -0.1 + vertex 2.36428 -27.0218 -0.2 endloop endfacet facet normal -0.904067 0.427391 0 outer loop vertex 2.36428 -27.0218 0 - vertex 1.97046 -27.8549 -0.1 + vertex 1.97046 -27.8549 -0.2 vertex 1.97046 -27.8549 0 endloop endfacet facet normal -0.927139 0.374717 0 outer loop - vertex 1.63381 -28.6878 -0.1 + vertex 1.63381 -28.6878 -0.2 vertex 1.97046 -27.8549 0 - vertex 1.97046 -27.8549 -0.1 + vertex 1.97046 -27.8549 -0.2 endloop endfacet facet normal -0.927139 0.374717 0 outer loop vertex 1.97046 -27.8549 0 - vertex 1.63381 -28.6878 -0.1 + vertex 1.63381 -28.6878 -0.2 vertex 1.63381 -28.6878 0 endloop endfacet facet normal -0.947927 0.318489 0 outer loop - vertex 1.35733 -29.5107 -0.1 + vertex 1.35733 -29.5107 -0.2 vertex 1.63381 -28.6878 0 - vertex 1.63381 -28.6878 -0.1 + vertex 1.63381 -28.6878 -0.2 endloop endfacet facet normal -0.947927 0.318489 0 outer loop vertex 1.63381 -28.6878 0 - vertex 1.35733 -29.5107 -0.1 + vertex 1.35733 -29.5107 -0.2 vertex 1.35733 -29.5107 0 endloop endfacet facet normal -0.966471 0.256775 0 outer loop - vertex 1.144 -30.3137 -0.1 + vertex 1.144 -30.3137 -0.2 vertex 1.35733 -29.5107 0 - vertex 1.35733 -29.5107 -0.1 + vertex 1.35733 -29.5107 -0.2 endloop endfacet facet normal -0.966471 0.256775 0 outer loop vertex 1.35733 -29.5107 0 - vertex 1.144 -30.3137 -0.1 + vertex 1.144 -30.3137 -0.2 vertex 1.144 -30.3137 0 endloop endfacet facet normal -0.982354 0.187033 0 outer loop - vertex 0.99682 -31.0867 -0.1 + vertex 0.99682 -31.0867 -0.2 vertex 1.144 -30.3137 0 - vertex 1.144 -30.3137 -0.1 + vertex 1.144 -30.3137 -0.2 endloop endfacet facet normal -0.982354 0.187033 0 outer loop vertex 1.144 -30.3137 0 - vertex 0.99682 -31.0867 -0.1 + vertex 0.99682 -31.0867 -0.2 vertex 0.99682 -31.0867 0 endloop endfacet facet normal -0.994383 0.105841 0 outer loop - vertex 0.918778 -31.8199 -0.1 + vertex 0.918778 -31.8199 -0.2 vertex 0.99682 -31.0867 0 - vertex 0.99682 -31.0867 -0.1 + vertex 0.99682 -31.0867 -0.2 endloop endfacet facet normal -0.994383 0.105841 0 outer loop vertex 0.99682 -31.0867 0 - vertex 0.918778 -31.8199 -0.1 + vertex 0.918778 -31.8199 -0.2 vertex 0.918778 -31.8199 0 endloop endfacet facet normal -0.999392 0.0348629 0 outer loop - vertex 0.906618 -32.1685 -0.1 + vertex 0.906618 -32.1685 -0.2 vertex 0.918778 -31.8199 0 - vertex 0.918778 -31.8199 -0.1 + vertex 0.918778 -31.8199 -0.2 endloop endfacet facet normal -0.999392 0.0348629 0 outer loop vertex 0.918778 -31.8199 0 - vertex 0.906618 -32.1685 -0.1 + vertex 0.906618 -32.1685 -0.2 vertex 0.906618 -32.1685 0 endloop endfacet facet normal -0.999826 -0.0186499 0 outer loop - vertex 0.912865 -32.5034 -0.1 + vertex 0.912865 -32.5034 -0.2 vertex 0.906618 -32.1685 0 - vertex 0.906618 -32.1685 -0.1 + vertex 0.906618 -32.1685 -0.2 endloop endfacet facet normal -0.999826 -0.0186499 0 outer loop vertex 0.906618 -32.1685 0 - vertex 0.912865 -32.5034 -0.1 + vertex 0.912865 -32.5034 -0.2 vertex 0.912865 -32.5034 0 endloop endfacet facet normal -0.996955 -0.077982 0 outer loop - vertex 0.937893 -32.8234 -0.1 + vertex 0.937893 -32.8234 -0.2 vertex 0.912865 -32.5034 0 - vertex 0.912865 -32.5034 -0.1 + vertex 0.912865 -32.5034 -0.2 endloop endfacet facet normal -0.996955 -0.077982 0 outer loop vertex 0.912865 -32.5034 0 - vertex 0.937893 -32.8234 -0.1 + vertex 0.937893 -32.8234 -0.2 vertex 0.937893 -32.8234 0 endloop endfacet facet normal -0.98959 -0.143913 0 outer loop - vertex 0.982074 -33.1272 -0.1 + vertex 0.982074 -33.1272 -0.2 vertex 0.937893 -32.8234 0 - vertex 0.937893 -32.8234 -0.1 + vertex 0.937893 -32.8234 -0.2 endloop endfacet facet normal -0.98959 -0.143913 0 outer loop vertex 0.937893 -32.8234 0 - vertex 0.982074 -33.1272 -0.1 + vertex 0.982074 -33.1272 -0.2 vertex 0.982074 -33.1272 0 endloop endfacet facet normal -0.97614 -0.217144 0 outer loop - vertex 1.04578 -33.4136 -0.1 + vertex 1.04578 -33.4136 -0.2 vertex 0.982074 -33.1272 0 - vertex 0.982074 -33.1272 -0.1 + vertex 0.982074 -33.1272 -0.2 endloop endfacet facet normal -0.97614 -0.217144 0 outer loop vertex 0.982074 -33.1272 0 - vertex 1.04578 -33.4136 -0.1 + vertex 1.04578 -33.4136 -0.2 vertex 1.04578 -33.4136 0 endloop endfacet facet normal -0.954541 -0.298078 0 outer loop - vertex 1.1294 -33.6813 -0.1 + vertex 1.1294 -33.6813 -0.2 vertex 1.04578 -33.4136 0 - vertex 1.04578 -33.4136 -0.1 + vertex 1.04578 -33.4136 -0.2 endloop endfacet facet normal -0.954541 -0.298078 0 outer loop vertex 1.04578 -33.4136 0 - vertex 1.1294 -33.6813 -0.1 + vertex 1.1294 -33.6813 -0.2 vertex 1.1294 -33.6813 0 endloop endfacet facet normal -0.922268 -0.38655 0 outer loop - vertex 1.23329 -33.9292 -0.1 + vertex 1.23329 -33.9292 -0.2 vertex 1.1294 -33.6813 0 - vertex 1.1294 -33.6813 -0.1 + vertex 1.1294 -33.6813 -0.2 endloop endfacet facet normal -0.922268 -0.38655 0 outer loop vertex 1.1294 -33.6813 0 - vertex 1.23329 -33.9292 -0.1 + vertex 1.23329 -33.9292 -0.2 vertex 1.23329 -33.9292 0 endloop endfacet facet normal -0.876493 -0.481415 0 outer loop - vertex 1.35782 -34.1559 -0.1 + vertex 1.35782 -34.1559 -0.2 vertex 1.23329 -33.9292 0 - vertex 1.23329 -33.9292 -0.1 + vertex 1.23329 -33.9292 -0.2 endloop endfacet facet normal -0.876493 -0.481415 0 outer loop vertex 1.23329 -33.9292 0 - vertex 1.35782 -34.1559 -0.1 + vertex 1.35782 -34.1559 -0.2 vertex 1.35782 -34.1559 0 endloop endfacet facet normal -0.814521 -0.580134 0 outer loop - vertex 1.50339 -34.3603 -0.1 + vertex 1.50339 -34.3603 -0.2 vertex 1.35782 -34.1559 0 - vertex 1.35782 -34.1559 -0.1 + vertex 1.35782 -34.1559 -0.2 endloop endfacet facet normal -0.814521 -0.580134 0 outer loop vertex 1.35782 -34.1559 0 - vertex 1.50339 -34.3603 -0.1 + vertex 1.50339 -34.3603 -0.2 vertex 1.50339 -34.3603 0 endloop endfacet facet normal -0.734597 -0.678504 0 outer loop - vertex 1.67035 -34.5411 -0.1 + vertex 1.67035 -34.5411 -0.2 vertex 1.50339 -34.3603 0 - vertex 1.50339 -34.3603 -0.1 + vertex 1.50339 -34.3603 -0.2 endloop endfacet facet normal -0.734597 -0.678504 0 outer loop vertex 1.50339 -34.3603 0 - vertex 1.67035 -34.5411 -0.1 + vertex 1.67035 -34.5411 -0.2 vertex 1.67035 -34.5411 0 endloop endfacet facet normal -0.643892 -0.765116 0 outer loop - vertex 1.67035 -34.5411 -0.1 + vertex 1.67035 -34.5411 -0.2 vertex 1.8149 -34.6627 0 vertex 1.67035 -34.5411 0 endloop @@ -4447,13 +4447,13 @@ solid OpenSCAD_Model facet normal -0.643892 -0.765116 -0 outer loop vertex 1.8149 -34.6627 0 - vertex 1.67035 -34.5411 -0.1 - vertex 1.8149 -34.6627 -0.1 + vertex 1.67035 -34.5411 -0.2 + vertex 1.8149 -34.6627 -0.2 endloop endfacet facet normal -0.554297 -0.832319 0 outer loop - vertex 1.8149 -34.6627 -0.1 + vertex 1.8149 -34.6627 -0.2 vertex 1.97535 -34.7696 0 vertex 1.8149 -34.6627 0 endloop @@ -4461,13 +4461,13 @@ solid OpenSCAD_Model facet normal -0.554297 -0.832319 -0 outer loop vertex 1.97535 -34.7696 0 - vertex 1.8149 -34.6627 -0.1 - vertex 1.97535 -34.7696 -0.1 + vertex 1.8149 -34.6627 -0.2 + vertex 1.97535 -34.7696 -0.2 endloop endfacet facet normal -0.465589 -0.885001 0 outer loop - vertex 1.97535 -34.7696 -0.1 + vertex 1.97535 -34.7696 -0.2 vertex 2.15022 -34.8616 0 vertex 1.97535 -34.7696 0 endloop @@ -4475,13 +4475,13 @@ solid OpenSCAD_Model facet normal -0.465589 -0.885001 -0 outer loop vertex 2.15022 -34.8616 0 - vertex 1.97535 -34.7696 -0.1 - vertex 2.15022 -34.8616 -0.1 + vertex 1.97535 -34.7696 -0.2 + vertex 2.15022 -34.8616 -0.2 endloop endfacet facet normal -0.379703 -0.925108 0 outer loop - vertex 2.15022 -34.8616 -0.1 + vertex 2.15022 -34.8616 -0.2 vertex 2.33801 -34.9386 0 vertex 2.15022 -34.8616 0 endloop @@ -4489,13 +4489,13 @@ solid OpenSCAD_Model facet normal -0.379703 -0.925108 -0 outer loop vertex 2.33801 -34.9386 0 - vertex 2.15022 -34.8616 -0.1 - vertex 2.33801 -34.9386 -0.1 + vertex 2.15022 -34.8616 -0.2 + vertex 2.33801 -34.9386 -0.2 endloop endfacet facet normal -0.297589 -0.954694 0 outer loop - vertex 2.33801 -34.9386 -0.1 + vertex 2.33801 -34.9386 -0.2 vertex 2.53723 -35.0007 0 vertex 2.33801 -34.9386 0 endloop @@ -4503,13 +4503,13 @@ solid OpenSCAD_Model facet normal -0.297589 -0.954694 -0 outer loop vertex 2.53723 -35.0007 0 - vertex 2.33801 -34.9386 -0.1 - vertex 2.53723 -35.0007 -0.1 + vertex 2.33801 -34.9386 -0.2 + vertex 2.53723 -35.0007 -0.2 endloop endfacet facet normal -0.219494 -0.975614 0 outer loop - vertex 2.53723 -35.0007 -0.1 + vertex 2.53723 -35.0007 -0.2 vertex 2.7464 -35.0478 0 vertex 2.53723 -35.0007 0 endloop @@ -4517,13 +4517,13 @@ solid OpenSCAD_Model facet normal -0.219494 -0.975614 -0 outer loop vertex 2.7464 -35.0478 0 - vertex 2.53723 -35.0007 -0.1 - vertex 2.7464 -35.0478 -0.1 + vertex 2.53723 -35.0007 -0.2 + vertex 2.7464 -35.0478 -0.2 endloop endfacet facet normal -0.109599 -0.993976 0 outer loop - vertex 2.7464 -35.0478 -0.1 + vertex 2.7464 -35.0478 -0.2 vertex 3.18861 -35.0966 0 vertex 2.7464 -35.0478 0 endloop @@ -4531,13 +4531,13 @@ solid OpenSCAD_Model facet normal -0.109599 -0.993976 -0 outer loop vertex 3.18861 -35.0966 0 - vertex 2.7464 -35.0478 -0.1 - vertex 3.18861 -35.0966 -0.1 + vertex 2.7464 -35.0478 -0.2 + vertex 3.18861 -35.0966 -0.2 endloop endfacet facet normal 0.0261117 -0.999659 0 outer loop - vertex 3.18861 -35.0966 -0.1 + vertex 3.18861 -35.0966 -0.2 vertex 3.65273 -35.0844 0 vertex 3.18861 -35.0966 0 endloop @@ -4545,13 +4545,13 @@ solid OpenSCAD_Model facet normal 0.0261117 -0.999659 0 outer loop vertex 3.65273 -35.0844 0 - vertex 3.18861 -35.0966 -0.1 - vertex 3.65273 -35.0844 -0.1 + vertex 3.18861 -35.0966 -0.2 + vertex 3.65273 -35.0844 -0.2 endloop endfacet facet normal 0.153159 -0.988202 0 outer loop - vertex 3.65273 -35.0844 -0.1 + vertex 3.65273 -35.0844 -0.2 vertex 4.12685 -35.011 0 vertex 3.65273 -35.0844 0 endloop @@ -4559,13 +4559,13 @@ solid OpenSCAD_Model facet normal 0.153159 -0.988202 0 outer loop vertex 4.12685 -35.011 0 - vertex 3.65273 -35.0844 -0.1 - vertex 4.12685 -35.011 -0.1 + vertex 3.65273 -35.0844 -0.2 + vertex 4.12685 -35.011 -0.2 endloop endfacet facet normal 0.275485 -0.961305 0 outer loop - vertex 4.12685 -35.011 -0.1 + vertex 4.12685 -35.011 -0.2 vertex 4.59905 -34.8756 0 vertex 4.12685 -35.011 0 endloop @@ -4573,13 +4573,13 @@ solid OpenSCAD_Model facet normal 0.275485 -0.961305 0 outer loop vertex 4.59905 -34.8756 0 - vertex 4.12685 -35.011 -0.1 - vertex 4.59905 -34.8756 -0.1 + vertex 4.12685 -35.011 -0.2 + vertex 4.59905 -34.8756 -0.2 endloop endfacet facet normal 0.39595 -0.918272 0 outer loop - vertex 4.59905 -34.8756 -0.1 + vertex 4.59905 -34.8756 -0.2 vertex 5.05744 -34.678 0 vertex 4.59905 -34.8756 0 endloop @@ -4587,13 +4587,13 @@ solid OpenSCAD_Model facet normal 0.39595 -0.918272 0 outer loop vertex 5.05744 -34.678 0 - vertex 4.59905 -34.8756 -0.1 - vertex 5.05744 -34.678 -0.1 + vertex 4.59905 -34.8756 -0.2 + vertex 5.05744 -34.678 -0.2 endloop endfacet facet normal 0.498797 -0.866719 0 outer loop - vertex 5.05744 -34.678 -0.1 + vertex 5.05744 -34.678 -0.2 vertex 5.41146 -34.4742 0 vertex 5.05744 -34.678 0 endloop @@ -4601,13 +4601,13 @@ solid OpenSCAD_Model facet normal 0.498797 -0.866719 0 outer loop vertex 5.41146 -34.4742 0 - vertex 5.05744 -34.678 -0.1 - vertex 5.41146 -34.4742 -0.1 + vertex 5.05744 -34.678 -0.2 + vertex 5.41146 -34.4742 -0.2 endloop endfacet facet normal 0.615093 -0.788455 0 outer loop - vertex 5.41146 -34.4742 -0.1 + vertex 5.41146 -34.4742 -0.2 vertex 5.72486 -34.2297 0 vertex 5.41146 -34.4742 0 endloop @@ -4615,307 +4615,307 @@ solid OpenSCAD_Model facet normal 0.615093 -0.788455 0 outer loop vertex 5.72486 -34.2297 0 - vertex 5.41146 -34.4742 -0.1 - vertex 5.72486 -34.2297 -0.1 + vertex 5.41146 -34.4742 -0.2 + vertex 5.72486 -34.2297 -0.2 endloop endfacet facet normal 0.708025 -0.706188 0 outer loop vertex 5.72486 -34.2297 0 - vertex 5.87315 -34.0811 -0.1 + vertex 5.87315 -34.0811 -0.2 vertex 5.87315 -34.0811 0 endloop endfacet facet normal 0.708025 -0.706188 0 outer loop - vertex 5.87315 -34.0811 -0.1 + vertex 5.87315 -34.0811 -0.2 vertex 5.72486 -34.2297 0 - vertex 5.72486 -34.2297 -0.1 + vertex 5.72486 -34.2297 -0.2 endloop endfacet facet normal 0.762128 -0.647427 0 outer loop vertex 5.87315 -34.0811 0 - vertex 6.01946 -33.9088 -0.1 + vertex 6.01946 -33.9088 -0.2 vertex 6.01946 -33.9088 0 endloop endfacet facet normal 0.762128 -0.647427 0 outer loop - vertex 6.01946 -33.9088 -0.1 + vertex 6.01946 -33.9088 -0.2 vertex 5.87315 -34.0811 0 - vertex 5.87315 -34.0811 -0.1 + vertex 5.87315 -34.0811 -0.2 endloop endfacet facet normal 0.824099 -0.566446 0 outer loop vertex 6.01946 -33.9088 0 - vertex 6.31707 -33.4759 -0.1 + vertex 6.31707 -33.4759 -0.2 vertex 6.31707 -33.4759 0 endloop endfacet facet normal 0.824099 -0.566446 0 outer loop - vertex 6.31707 -33.4759 -0.1 + vertex 6.31707 -33.4759 -0.2 vertex 6.01946 -33.9088 0 - vertex 6.01946 -33.9088 -0.1 + vertex 6.01946 -33.9088 -0.2 endloop endfacet facet normal 0.874277 -0.485427 0 outer loop vertex 6.31707 -33.4759 0 - vertex 6.63949 -32.8952 -0.1 + vertex 6.63949 -32.8952 -0.2 vertex 6.63949 -32.8952 0 endloop endfacet facet normal 0.874277 -0.485427 0 outer loop - vertex 6.63949 -32.8952 -0.1 + vertex 6.63949 -32.8952 -0.2 vertex 6.31707 -33.4759 0 - vertex 6.31707 -33.4759 -0.1 + vertex 6.31707 -33.4759 -0.2 endloop endfacet facet normal 0.900468 -0.434923 0 outer loop vertex 6.63949 -32.8952 0 - vertex 7.00854 -32.1311 -0.1 + vertex 7.00854 -32.1311 -0.2 vertex 7.00854 -32.1311 0 endloop endfacet facet normal 0.900468 -0.434923 0 outer loop - vertex 7.00854 -32.1311 -0.1 + vertex 7.00854 -32.1311 -0.2 vertex 6.63949 -32.8952 0 - vertex 6.63949 -32.8952 -0.1 + vertex 6.63949 -32.8952 -0.2 endloop endfacet facet normal 0.913625 -0.406558 0 outer loop vertex 7.00854 -32.1311 0 - vertex 7.44603 -31.1479 -0.1 + vertex 7.44603 -31.1479 -0.2 vertex 7.44603 -31.1479 0 endloop endfacet facet normal 0.913625 -0.406558 0 outer loop - vertex 7.44603 -31.1479 -0.1 + vertex 7.44603 -31.1479 -0.2 vertex 7.00854 -32.1311 0 - vertex 7.00854 -32.1311 -0.1 + vertex 7.00854 -32.1311 -0.2 endloop endfacet facet normal 0.919886 -0.392186 0 outer loop vertex 7.44603 -31.1479 0 - vertex 7.97377 -29.9101 -0.1 + vertex 7.97377 -29.9101 -0.2 vertex 7.97377 -29.9101 0 endloop endfacet facet normal 0.919886 -0.392186 0 outer loop - vertex 7.97377 -29.9101 -0.1 + vertex 7.97377 -29.9101 -0.2 vertex 7.44603 -31.1479 0 - vertex 7.44603 -31.1479 -0.1 + vertex 7.44603 -31.1479 -0.2 endloop endfacet facet normal 0.924332 -0.381588 0 outer loop vertex 7.97377 -29.9101 0 - vertex 9.07864 -27.2338 -0.1 + vertex 9.07864 -27.2338 -0.2 vertex 9.07864 -27.2338 0 endloop endfacet facet normal 0.924332 -0.381588 0 outer loop - vertex 9.07864 -27.2338 -0.1 + vertex 9.07864 -27.2338 -0.2 vertex 7.97377 -29.9101 0 - vertex 7.97377 -29.9101 -0.1 + vertex 7.97377 -29.9101 -0.2 endloop endfacet facet normal 0.932155 -0.362059 0 outer loop vertex 9.07864 -27.2338 0 - vertex 9.46376 -26.2422 -0.1 + vertex 9.46376 -26.2422 -0.2 vertex 9.46376 -26.2422 0 endloop endfacet facet normal 0.932155 -0.362059 0 outer loop - vertex 9.46376 -26.2422 -0.1 + vertex 9.46376 -26.2422 -0.2 vertex 9.07864 -27.2338 0 - vertex 9.07864 -27.2338 -0.1 + vertex 9.07864 -27.2338 -0.2 endloop endfacet facet normal 0.941332 -0.337483 0 outer loop vertex 9.46376 -26.2422 0 - vertex 9.75283 -25.4359 -0.1 + vertex 9.75283 -25.4359 -0.2 vertex 9.75283 -25.4359 0 endloop endfacet facet normal 0.941332 -0.337483 0 outer loop - vertex 9.75283 -25.4359 -0.1 + vertex 9.75283 -25.4359 -0.2 vertex 9.46376 -26.2422 0 - vertex 9.46376 -26.2422 -0.1 + vertex 9.46376 -26.2422 -0.2 endloop endfacet facet normal 0.954562 -0.298012 0 outer loop vertex 9.75283 -25.4359 0 - vertex 9.95745 -24.7805 -0.1 + vertex 9.95745 -24.7805 -0.2 vertex 9.95745 -24.7805 0 endloop endfacet facet normal 0.954562 -0.298012 0 outer loop - vertex 9.95745 -24.7805 -0.1 + vertex 9.95745 -24.7805 -0.2 vertex 9.75283 -25.4359 0 - vertex 9.75283 -25.4359 -0.1 + vertex 9.75283 -25.4359 -0.2 endloop endfacet facet normal 0.971378 -0.237537 0 outer loop vertex 9.95745 -24.7805 0 - vertex 10.0892 -24.2416 -0.1 + vertex 10.0892 -24.2416 -0.2 vertex 10.0892 -24.2416 0 endloop endfacet facet normal 0.971378 -0.237537 0 outer loop - vertex 10.0892 -24.2416 -0.1 + vertex 10.0892 -24.2416 -0.2 vertex 9.95745 -24.7805 0 - vertex 9.95745 -24.7805 -0.1 + vertex 9.95745 -24.7805 -0.2 endloop endfacet facet normal 0.98828 -0.15265 0 outer loop vertex 10.0892 -24.2416 0 - vertex 10.1598 -23.7848 -0.1 + vertex 10.1598 -23.7848 -0.2 vertex 10.1598 -23.7848 0 endloop endfacet facet normal 0.98828 -0.15265 0 outer loop - vertex 10.1598 -23.7848 -0.1 + vertex 10.1598 -23.7848 -0.2 vertex 10.0892 -24.2416 0 - vertex 10.0892 -24.2416 -0.1 + vertex 10.0892 -24.2416 -0.2 endloop endfacet facet normal 0.998693 -0.0511194 0 outer loop vertex 10.1598 -23.7848 0 - vertex 10.1807 -23.3758 -0.1 + vertex 10.1807 -23.3758 -0.2 vertex 10.1807 -23.3758 0 endloop endfacet facet normal 0.998693 -0.0511194 0 outer loop - vertex 10.1807 -23.3758 -0.1 + vertex 10.1807 -23.3758 -0.2 vertex 10.1598 -23.7848 0 - vertex 10.1598 -23.7848 -0.1 + vertex 10.1598 -23.7848 -0.2 endloop endfacet facet normal 0.997227 0.0744219 0 outer loop vertex 10.1807 -23.3758 0 - vertex 10.149 -22.9513 -0.1 + vertex 10.149 -22.9513 -0.2 vertex 10.149 -22.9513 0 endloop endfacet facet normal 0.997227 0.0744219 0 outer loop - vertex 10.149 -22.9513 -0.1 + vertex 10.149 -22.9513 -0.2 vertex 10.1807 -23.3758 0 - vertex 10.1807 -23.3758 -0.1 + vertex 10.1807 -23.3758 -0.2 endloop endfacet facet normal 0.980241 0.197806 0 outer loop vertex 10.149 -22.9513 0 - vertex 10.1103 -22.7594 -0.1 + vertex 10.1103 -22.7594 -0.2 vertex 10.1103 -22.7594 0 endloop endfacet facet normal 0.980241 0.197806 0 outer loop - vertex 10.1103 -22.7594 -0.1 + vertex 10.1103 -22.7594 -0.2 vertex 10.149 -22.9513 0 - vertex 10.149 -22.9513 -0.1 + vertex 10.149 -22.9513 -0.2 endloop endfacet facet normal 0.958253 0.285922 0 outer loop vertex 10.1103 -22.7594 0 - vertex 10.0571 -22.5812 -0.1 + vertex 10.0571 -22.5812 -0.2 vertex 10.0571 -22.5812 0 endloop endfacet facet normal 0.958253 0.285922 0 outer loop - vertex 10.0571 -22.5812 -0.1 + vertex 10.0571 -22.5812 -0.2 vertex 10.1103 -22.7594 0 - vertex 10.1103 -22.7594 -0.1 + vertex 10.1103 -22.7594 -0.2 endloop endfacet facet normal 0.926088 0.377307 0 outer loop vertex 10.0571 -22.5812 0 - vertex 9.99008 -22.4166 -0.1 + vertex 9.99008 -22.4166 -0.2 vertex 9.99008 -22.4166 0 endloop endfacet facet normal 0.926088 0.377307 0 outer loop - vertex 9.99008 -22.4166 -0.1 + vertex 9.99008 -22.4166 -0.2 vertex 10.0571 -22.5812 0 - vertex 10.0571 -22.5812 -0.1 + vertex 10.0571 -22.5812 -0.2 endloop endfacet facet normal 0.882715 0.469908 0 outer loop vertex 9.99008 -22.4166 0 - vertex 9.90973 -22.2656 -0.1 + vertex 9.90973 -22.2656 -0.2 vertex 9.90973 -22.2656 0 endloop endfacet facet normal 0.882715 0.469908 0 outer loop - vertex 9.90973 -22.2656 -0.1 + vertex 9.90973 -22.2656 -0.2 vertex 9.99008 -22.4166 0 - vertex 9.99008 -22.4166 -0.1 + vertex 9.99008 -22.4166 -0.2 endloop endfacet facet normal 0.827725 0.561134 0 outer loop vertex 9.90973 -22.2656 0 - vertex 9.81668 -22.1284 -0.1 + vertex 9.81668 -22.1284 -0.2 vertex 9.81668 -22.1284 0 endloop endfacet facet normal 0.827725 0.561134 0 outer loop - vertex 9.81668 -22.1284 -0.1 + vertex 9.81668 -22.1284 -0.2 vertex 9.90973 -22.2656 0 - vertex 9.90973 -22.2656 -0.1 + vertex 9.90973 -22.2656 -0.2 endloop endfacet facet normal 0.761518 0.648143 0 outer loop vertex 9.81668 -22.1284 0 - vertex 9.71152 -22.0048 -0.1 + vertex 9.71152 -22.0048 -0.2 vertex 9.71152 -22.0048 0 endloop endfacet facet normal 0.761518 0.648143 0 outer loop - vertex 9.71152 -22.0048 -0.1 + vertex 9.71152 -22.0048 -0.2 vertex 9.81668 -22.1284 0 - vertex 9.81668 -22.1284 -0.1 + vertex 9.81668 -22.1284 -0.2 endloop endfacet facet normal 0.685415 0.728153 -0 outer loop - vertex 9.71152 -22.0048 -0.1 + vertex 9.71152 -22.0048 -0.2 vertex 9.59484 -21.895 0 vertex 9.71152 -22.0048 0 endloop @@ -4923,13 +4923,13 @@ solid OpenSCAD_Model facet normal 0.685415 0.728153 0 outer loop vertex 9.59484 -21.895 0 - vertex 9.71152 -22.0048 -0.1 - vertex 9.59484 -21.895 -0.1 + vertex 9.71152 -22.0048 -0.2 + vertex 9.59484 -21.895 -0.2 endloop endfacet facet normal 0.601514 0.798862 -0 outer loop - vertex 9.59484 -21.895 -0.1 + vertex 9.59484 -21.895 -0.2 vertex 9.46723 -21.7989 0 vertex 9.59484 -21.895 0 endloop @@ -4937,13 +4937,13 @@ solid OpenSCAD_Model facet normal 0.601514 0.798862 0 outer loop vertex 9.46723 -21.7989 0 - vertex 9.59484 -21.895 -0.1 - vertex 9.46723 -21.7989 -0.1 + vertex 9.59484 -21.895 -0.2 + vertex 9.46723 -21.7989 -0.2 endloop endfacet facet normal 0.467006 0.884254 -0 outer loop - vertex 9.46723 -21.7989 -0.1 + vertex 9.46723 -21.7989 -0.2 vertex 9.18157 -21.6481 0 vertex 9.46723 -21.7989 0 endloop @@ -4951,13 +4951,13 @@ solid OpenSCAD_Model facet normal 0.467006 0.884254 0 outer loop vertex 9.18157 -21.6481 0 - vertex 9.46723 -21.7989 -0.1 - vertex 9.18157 -21.6481 -0.1 + vertex 9.46723 -21.7989 -0.2 + vertex 9.18157 -21.6481 -0.2 endloop endfacet facet normal 0.284506 0.958674 -0 outer loop - vertex 9.18157 -21.6481 -0.1 + vertex 9.18157 -21.6481 -0.2 vertex 8.85925 -21.5524 0 vertex 9.18157 -21.6481 0 endloop @@ -4965,13 +4965,13 @@ solid OpenSCAD_Model facet normal 0.284506 0.958674 0 outer loop vertex 8.85925 -21.5524 0 - vertex 9.18157 -21.6481 -0.1 - vertex 8.85925 -21.5524 -0.1 + vertex 9.18157 -21.6481 -0.2 + vertex 8.85925 -21.5524 -0.2 endloop endfacet facet normal 0.112981 0.993597 -0 outer loop - vertex 8.85925 -21.5524 -0.1 + vertex 8.85925 -21.5524 -0.2 vertex 8.50498 -21.5121 0 vertex 8.85925 -21.5524 0 endloop @@ -4979,13 +4979,13 @@ solid OpenSCAD_Model facet normal 0.112981 0.993597 0 outer loop vertex 8.50498 -21.5121 0 - vertex 8.85925 -21.5524 -0.1 - vertex 8.50498 -21.5121 -0.1 + vertex 8.85925 -21.5524 -0.2 + vertex 8.50498 -21.5121 -0.2 endloop endfacet facet normal -0.039935 0.999202 0 outer loop - vertex 8.50498 -21.5121 -0.1 + vertex 8.50498 -21.5121 -0.2 vertex 8.12348 -21.5274 0 vertex 8.50498 -21.5121 0 endloop @@ -4993,1301 +4993,1301 @@ solid OpenSCAD_Model facet normal -0.039935 0.999202 0 outer loop vertex 8.12348 -21.5274 0 - vertex 8.50498 -21.5121 -0.1 - vertex 8.12348 -21.5274 -0.1 + vertex 8.50498 -21.5121 -0.2 + vertex 8.12348 -21.5274 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.1179 -30.7807 -0.1 - vertex 30.2299 -31.0524 -0.1 - vertex 30.2187 -30.9454 -0.1 + vertex 30.1179 -30.7807 -0.2 + vertex 30.2299 -31.0524 -0.2 + vertex 30.2187 -30.9454 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.1179 -30.7807 -0.1 - vertex 30.2187 -30.9454 -0.1 - vertex 30.1812 -30.855 -0.1 + vertex 30.1179 -30.7807 -0.2 + vertex 30.2187 -30.9454 -0.2 + vertex 30.1812 -30.855 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.2299 -31.0524 -0.1 - vertex 30.1179 -30.7807 -0.1 - vertex 30.2146 -31.1764 -0.1 + vertex 30.2299 -31.0524 -0.2 + vertex 30.1179 -30.7807 -0.2 + vertex 30.2146 -31.1764 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.2146 -31.1764 -0.1 - vertex 30.1179 -30.7807 -0.1 - vertex 30.1726 -31.3179 -0.1 + vertex 30.2146 -31.1764 -0.2 + vertex 30.1179 -30.7807 -0.2 + vertex 30.1726 -31.3179 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.9008 -30.6099 -0.1 - vertex 30.1726 -31.3179 -0.1 - vertex 30.1179 -30.7807 -0.1 + vertex 29.9008 -30.6099 -0.2 + vertex 30.1726 -31.3179 -0.2 + vertex 30.1179 -30.7807 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.1726 -31.3179 -0.1 - vertex 29.9008 -30.6099 -0.1 - vertex 30.1034 -31.4773 -0.1 + vertex 30.1726 -31.3179 -0.2 + vertex 29.9008 -30.6099 -0.2 + vertex 30.1034 -31.4773 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.7002 -30.4984 -0.1 - vertex 30.1034 -31.4773 -0.1 - vertex 29.9008 -30.6099 -0.1 + vertex 29.7002 -30.4984 -0.2 + vertex 30.1034 -31.4773 -0.2 + vertex 29.9008 -30.6099 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.1034 -31.4773 -0.1 - vertex 29.7002 -30.4984 -0.1 - vertex 29.0845 -30.5466 -0.1 + vertex 30.1034 -31.4773 -0.2 + vertex 29.7002 -30.4984 -0.2 + vertex 29.0845 -30.5466 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.8369 -30.6989 -0.1 - vertex 30.1034 -31.4773 -0.1 - vertex 29.0845 -30.5466 -0.1 + vertex 28.8369 -30.6989 -0.2 + vertex 30.1034 -31.4773 -0.2 + vertex 29.0845 -30.5466 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.3033 -30.4642 -0.1 - vertex 29.7002 -30.4984 -0.1 - vertex 29.5048 -30.449 -0.1 + vertex 29.3033 -30.4642 -0.2 + vertex 29.7002 -30.4984 -0.2 + vertex 29.5048 -30.449 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.7002 -30.4984 -0.1 - vertex 29.3033 -30.4642 -0.1 - vertex 29.0845 -30.5466 -0.1 + vertex 29.7002 -30.4984 -0.2 + vertex 29.3033 -30.4642 -0.2 + vertex 29.0845 -30.5466 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.1034 -31.4773 -0.1 - vertex 28.8369 -30.6989 -0.1 - vertex 29.8827 -31.8517 -0.1 + vertex 30.1034 -31.4773 -0.2 + vertex 28.8369 -30.6989 -0.2 + vertex 29.8827 -31.8517 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.5495 -30.9236 -0.1 - vertex 29.8827 -31.8517 -0.1 - vertex 28.8369 -30.6989 -0.1 + vertex 28.5495 -30.9236 -0.2 + vertex 29.8827 -31.8517 -0.2 + vertex 28.8369 -30.6989 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.8827 -31.8517 -0.1 - vertex 28.5495 -30.9236 -0.1 - vertex 29.5499 -32.3032 -0.1 + vertex 29.8827 -31.8517 -0.2 + vertex 28.5495 -30.9236 -0.2 + vertex 29.5499 -32.3032 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.2108 -31.2235 -0.1 - vertex 29.5499 -32.3032 -0.1 - vertex 28.5495 -30.9236 -0.1 + vertex 28.2108 -31.2235 -0.2 + vertex 29.5499 -32.3032 -0.2 + vertex 28.5495 -30.9236 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.5499 -32.3032 -0.1 - vertex 28.2108 -31.2235 -0.1 - vertex 29.1028 -32.8352 -0.1 + vertex 29.5499 -32.3032 -0.2 + vertex 28.2108 -31.2235 -0.2 + vertex 29.1028 -32.8352 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 27.276 -32.055 -0.1 - vertex 29.1028 -32.8352 -0.1 - vertex 28.2108 -31.2235 -0.1 + vertex 27.276 -32.055 -0.2 + vertex 29.1028 -32.8352 -0.2 + vertex 28.2108 -31.2235 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.1028 -32.8352 -0.1 - vertex 27.276 -32.055 -0.1 - vertex 28.539 -33.4515 -0.1 + vertex 29.1028 -32.8352 -0.2 + vertex 27.276 -32.055 -0.2 + vertex 28.539 -33.4515 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.539 -33.4515 -0.1 - vertex 27.276 -32.055 -0.1 - vertex 27.856 -34.1555 -0.1 + vertex 28.539 -33.4515 -0.2 + vertex 27.276 -32.055 -0.2 + vertex 27.856 -34.1555 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 26.4309 -32.7448 -0.1 - vertex 27.856 -34.1555 -0.1 - vertex 27.276 -32.055 -0.1 + vertex 26.4309 -32.7448 -0.2 + vertex 27.856 -34.1555 -0.2 + vertex 27.276 -32.055 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.856 -34.1555 -0.1 - vertex 26.4309 -32.7448 -0.1 - vertex 27.3514 -34.6537 -0.1 + vertex 27.856 -34.1555 -0.2 + vertex 26.4309 -32.7448 -0.2 + vertex 27.3514 -34.6537 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.6577 -33.3022 -0.1 - vertex 27.3514 -34.6537 -0.1 - vertex 26.4309 -32.7448 -0.1 + vertex 25.6577 -33.3022 -0.2 + vertex 27.3514 -34.6537 -0.2 + vertex 26.4309 -32.7448 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3514 -34.6537 -0.1 - vertex 25.6577 -33.3022 -0.1 - vertex 26.8832 -35.0925 -0.1 + vertex 27.3514 -34.6537 -0.2 + vertex 25.6577 -33.3022 -0.2 + vertex 26.8832 -35.0925 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.2926 -33.5342 -0.1 - vertex 26.8832 -35.0925 -0.1 - vertex 25.6577 -33.3022 -0.1 + vertex 25.2926 -33.5342 -0.2 + vertex 26.8832 -35.0925 -0.2 + vertex 25.6577 -33.3022 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8832 -35.0925 -0.1 - vertex 25.2926 -33.5342 -0.1 - vertex 26.4377 -35.4824 -0.1 + vertex 26.8832 -35.0925 -0.2 + vertex 25.2926 -33.5342 -0.2 + vertex 26.4377 -35.4824 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.9388 -33.7368 -0.1 - vertex 26.4377 -35.4824 -0.1 - vertex 25.2926 -33.5342 -0.1 + vertex 24.9388 -33.7368 -0.2 + vertex 26.4377 -35.4824 -0.2 + vertex 25.2926 -33.5342 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.4377 -35.4824 -0.1 - vertex 24.9388 -33.7368 -0.1 - vertex 26.0012 -35.834 -0.1 + vertex 26.4377 -35.4824 -0.2 + vertex 24.9388 -33.7368 -0.2 + vertex 26.0012 -35.834 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.5942 -33.911 -0.1 - vertex 26.0012 -35.834 -0.1 - vertex 24.9388 -33.7368 -0.1 + vertex 24.5942 -33.911 -0.2 + vertex 26.0012 -35.834 -0.2 + vertex 24.9388 -33.7368 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0012 -35.834 -0.1 - vertex 24.5942 -33.911 -0.1 - vertex 25.5601 -36.1579 -0.1 + vertex 26.0012 -35.834 -0.2 + vertex 24.5942 -33.911 -0.2 + vertex 25.5601 -36.1579 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.2566 -34.0582 -0.1 - vertex 25.5601 -36.1579 -0.1 - vertex 24.5942 -33.911 -0.1 + vertex 24.2566 -34.0582 -0.2 + vertex 25.5601 -36.1579 -0.2 + vertex 24.5942 -33.911 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.5601 -36.1579 -0.1 - vertex 24.2566 -34.0582 -0.1 - vertex 25.1006 -36.4644 -0.1 + vertex 25.5601 -36.1579 -0.2 + vertex 24.2566 -34.0582 -0.2 + vertex 25.1006 -36.4644 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.9237 -34.1793 -0.1 - vertex 25.1006 -36.4644 -0.1 - vertex 24.2566 -34.0582 -0.1 + vertex 23.9237 -34.1793 -0.2 + vertex 25.1006 -36.4644 -0.2 + vertex 24.2566 -34.0582 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.1006 -36.4644 -0.1 - vertex 23.9237 -34.1793 -0.1 - vertex 24.6091 -36.7642 -0.1 + vertex 25.1006 -36.4644 -0.2 + vertex 23.9237 -34.1793 -0.2 + vertex 24.6091 -36.7642 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.5933 -34.2758 -0.1 - vertex 24.6091 -36.7642 -0.1 - vertex 23.9237 -34.1793 -0.1 + vertex 23.5933 -34.2758 -0.2 + vertex 24.6091 -36.7642 -0.2 + vertex 23.9237 -34.1793 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.2634 -34.3487 -0.1 - vertex 24.6091 -36.7642 -0.1 - vertex 23.5933 -34.2758 -0.1 + vertex 23.2634 -34.3487 -0.2 + vertex 24.6091 -36.7642 -0.2 + vertex 23.5933 -34.2758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6091 -36.7642 -0.1 - vertex 23.2634 -34.3487 -0.1 - vertex 24.0719 -37.0678 -0.1 + vertex 24.6091 -36.7642 -0.2 + vertex 23.2634 -34.3487 -0.2 + vertex 24.0719 -37.0678 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.9315 -34.3992 -0.1 - vertex 24.0719 -37.0678 -0.1 - vertex 23.2634 -34.3487 -0.1 + vertex 22.9315 -34.3992 -0.2 + vertex 24.0719 -37.0678 -0.2 + vertex 23.2634 -34.3487 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.0719 -37.0678 -0.1 - vertex 22.9315 -34.3992 -0.1 - vertex 23.2902 -37.4839 -0.1 + vertex 24.0719 -37.0678 -0.2 + vertex 22.9315 -34.3992 -0.2 + vertex 23.2902 -37.4839 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.5956 -34.4285 -0.1 - vertex 23.2902 -37.4839 -0.1 - vertex 22.9315 -34.3992 -0.1 + vertex 22.5956 -34.4285 -0.2 + vertex 23.2902 -37.4839 -0.2 + vertex 22.9315 -34.3992 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.2534 -34.4379 -0.1 - vertex 23.2902 -37.4839 -0.1 - vertex 22.5956 -34.4285 -0.1 + vertex 22.2534 -34.4379 -0.2 + vertex 23.2902 -37.4839 -0.2 + vertex 22.5956 -34.4285 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.2902 -37.4839 -0.1 - vertex 22.2534 -34.4379 -0.1 - vertex 22.6041 -37.8201 -0.1 + vertex 23.2902 -37.4839 -0.2 + vertex 22.2534 -34.4379 -0.2 + vertex 22.6041 -37.8201 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.8355 -34.4151 -0.1 - vertex 22.6041 -37.8201 -0.1 - vertex 22.2534 -34.4379 -0.1 + vertex 21.8355 -34.4151 -0.2 + vertex 22.6041 -37.8201 -0.2 + vertex 22.2534 -34.4379 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.6041 -37.8201 -0.1 - vertex 21.8355 -34.4151 -0.1 - vertex 21.9889 -38.084 -0.1 + vertex 22.6041 -37.8201 -0.2 + vertex 21.8355 -34.4151 -0.2 + vertex 21.9889 -38.084 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.43 -34.349 -0.1 - vertex 21.9889 -38.084 -0.1 - vertex 21.8355 -34.4151 -0.1 + vertex 21.43 -34.349 -0.2 + vertex 21.9889 -38.084 -0.2 + vertex 21.8355 -34.4151 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.43 -34.349 -0.1 - vertex 21.4197 -38.2833 -0.1 - vertex 21.9889 -38.084 -0.1 + vertex 21.43 -34.349 -0.2 + vertex 21.4197 -38.2833 -0.2 + vertex 21.9889 -38.084 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0421 -34.2419 -0.1 - vertex 21.4197 -38.2833 -0.1 - vertex 21.43 -34.349 -0.1 + vertex 21.0421 -34.2419 -0.2 + vertex 21.4197 -38.2833 -0.2 + vertex 21.43 -34.349 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0421 -34.2419 -0.1 - vertex 20.8717 -38.4255 -0.1 - vertex 21.4197 -38.2833 -0.1 + vertex 21.0421 -34.2419 -0.2 + vertex 20.8717 -38.4255 -0.2 + vertex 21.4197 -38.2833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3202 -38.5182 -0.1 - vertex 21.0421 -34.2419 -0.1 - vertex 20.6768 -34.0963 -0.1 + vertex 20.3202 -38.5182 -0.2 + vertex 21.0421 -34.2419 -0.2 + vertex 20.6768 -34.0963 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7403 -38.5689 -0.1 - vertex 20.6768 -34.0963 -0.1 - vertex 20.3392 -33.9144 -0.1 + vertex 19.7403 -38.5689 -0.2 + vertex 20.6768 -34.0963 -0.2 + vertex 20.3392 -33.9144 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0421 -34.2419 -0.1 - vertex 20.3202 -38.5182 -0.1 - vertex 20.8717 -38.4255 -0.1 + vertex 21.0421 -34.2419 -0.2 + vertex 20.3202 -38.5182 -0.2 + vertex 20.8717 -38.4255 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.4669 -38.5591 -0.1 - vertex 20.3392 -33.9144 -0.1 - vertex 20.0345 -33.6987 -0.1 + vertex 18.4669 -38.5591 -0.2 + vertex 20.3392 -33.9144 -0.2 + vertex 20.0345 -33.6987 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.8529 -38.0675 -0.1 - vertex 20.0345 -33.6987 -0.1 - vertex 19.7677 -33.4516 -0.1 + vertex 16.8529 -38.0675 -0.2 + vertex 20.0345 -33.6987 -0.2 + vertex 19.7677 -33.4516 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.6768 -34.0963 -0.1 - vertex 19.7403 -38.5689 -0.1 - vertex 20.3202 -38.5182 -0.1 + vertex 20.6768 -34.0963 -0.2 + vertex 19.7403 -38.5689 -0.2 + vertex 20.3202 -38.5182 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.927 -35.9398 -0.1 - vertex 19.7677 -33.4516 -0.1 - vertex 19.5439 -33.1754 -0.1 + vertex 14.927 -35.9398 -0.2 + vertex 19.7677 -33.4516 -0.2 + vertex 19.5439 -33.1754 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.6774 -34.4466 -0.1 - vertex 19.5439 -33.1754 -0.1 - vertex 19.466 -33.0295 -0.1 + vertex 14.6774 -34.4466 -0.2 + vertex 19.5439 -33.1754 -0.2 + vertex 19.466 -33.0295 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.6656 -33.913 -0.1 - vertex 19.466 -33.0295 -0.1 - vertex 19.403 -32.8415 -0.1 + vertex 14.6656 -33.913 -0.2 + vertex 19.466 -33.0295 -0.2 + vertex 19.403 -32.8415 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.73 -32.8205 -0.1 - vertex 19.403 -32.8415 -0.1 - vertex 19.3545 -32.6156 -0.1 + vertex 14.73 -32.8205 -0.2 + vertex 19.403 -32.8415 -0.2 + vertex 19.3545 -32.6156 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.8056 -32.2631 -0.1 - vertex 19.3545 -32.6156 -0.1 - vertex 19.3203 -32.3556 -0.1 + vertex 14.8056 -32.2631 -0.2 + vertex 19.3545 -32.6156 -0.2 + vertex 19.3203 -32.3556 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3392 -33.9144 -0.1 - vertex 19.1073 -38.5852 -0.1 - vertex 19.7403 -38.5689 -0.1 + vertex 20.3392 -33.9144 -0.2 + vertex 19.1073 -38.5852 -0.2 + vertex 19.7403 -38.5689 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9098 -31.6993 -0.1 - vertex 19.3203 -32.3556 -0.1 - vertex 19.2935 -31.7496 -0.1 + vertex 14.9098 -31.6993 -0.2 + vertex 19.3203 -32.3556 -0.2 + vertex 19.2935 -31.7496 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.4186 -23.1088 -0.1 - vertex 32.0619 -22.7991 -0.1 - vertex 32.0349 -22.2828 -0.1 + vertex 27.4186 -23.1088 -0.2 + vertex 32.0619 -22.7991 -0.2 + vertex 32.0349 -22.2828 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 32.0619 -22.7991 -0.1 - vertex 27.4186 -23.1088 -0.1 - vertex 32.0372 -23.3848 -0.1 + vertex 32.0619 -22.7991 -0.2 + vertex 27.4186 -23.1088 -0.2 + vertex 32.0372 -23.3848 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3785 -22.8574 -0.1 - vertex 32.0349 -22.2828 -0.1 - vertex 31.9549 -21.8223 -0.1 + vertex 27.3785 -22.8574 -0.2 + vertex 32.0349 -22.2828 -0.2 + vertex 31.9549 -21.8223 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 27.4312 -23.3865 -0.1 - vertex 32.0372 -23.3848 -0.1 - vertex 27.4186 -23.1088 -0.1 + vertex 27.4312 -23.3865 -0.2 + vertex 32.0372 -23.3848 -0.2 + vertex 27.4186 -23.1088 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3785 -22.8574 -0.1 - vertex 31.9549 -21.8223 -0.1 - vertex 31.8204 -21.404 -0.1 + vertex 27.3785 -22.8574 -0.2 + vertex 31.9549 -21.8223 -0.2 + vertex 31.8204 -21.404 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 27.4161 -23.6904 -0.1 - vertex 31.9625 -24.0535 -0.1 - vertex 27.4312 -23.3865 -0.1 + vertex 27.4161 -23.6904 -0.2 + vertex 31.9625 -24.0535 -0.2 + vertex 27.4312 -23.3865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3785 -22.8574 -0.1 - vertex 31.8204 -21.404 -0.1 - vertex 31.6298 -21.0145 -0.1 + vertex 27.3785 -22.8574 -0.2 + vertex 31.8204 -21.404 -0.2 + vertex 31.6298 -21.0145 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.9625 -24.0535 -0.1 - vertex 27.4161 -23.6904 -0.1 - vertex 31.8392 -24.8188 -0.1 + vertex 31.9625 -24.0535 -0.2 + vertex 27.4161 -23.6904 -0.2 + vertex 31.8392 -24.8188 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 27.373 -24.0204 -0.1 - vertex 31.8392 -24.8188 -0.1 - vertex 27.4161 -23.6904 -0.1 + vertex 27.373 -24.0204 -0.2 + vertex 31.8392 -24.8188 -0.2 + vertex 27.4161 -23.6904 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.8392 -24.8188 -0.1 - vertex 27.2401 -24.8188 -0.1 - vertex 31.6784 -25.7224 -0.1 + vertex 31.8392 -24.8188 -0.2 + vertex 27.2401 -24.8188 -0.2 + vertex 31.6784 -25.7224 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3785 -22.8574 -0.1 - vertex 31.6298 -21.0145 -0.1 - vertex 31.3816 -20.64 -0.1 + vertex 27.3785 -22.8574 -0.2 + vertex 31.6298 -21.0145 -0.2 + vertex 31.3816 -20.64 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2401 -24.8188 -0.1 - vertex 31.8392 -24.8188 -0.1 - vertex 27.373 -24.0204 -0.1 + vertex 27.2401 -24.8188 -0.2 + vertex 31.8392 -24.8188 -0.2 + vertex 27.373 -24.0204 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3111 -22.6325 -0.1 - vertex 31.3816 -20.64 -0.1 - vertex 31.074 -20.2742 -0.1 + vertex 27.3111 -22.6325 -0.2 + vertex 31.3816 -20.64 -0.2 + vertex 31.074 -20.2742 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 29.58 -27.3827 -0.1 - vertex 31.6784 -25.7224 -0.1 - vertex 27.2401 -24.8188 -0.1 + vertex 29.58 -27.3827 -0.2 + vertex 31.6784 -25.7224 -0.2 + vertex 27.2401 -24.8188 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 30.0709 -27.3331 -0.1 - vertex 31.6784 -25.7224 -0.1 - vertex 29.58 -27.3827 -0.1 + vertex 30.0709 -27.3331 -0.2 + vertex 31.6784 -25.7224 -0.2 + vertex 29.58 -27.3827 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3111 -22.6325 -0.1 - vertex 31.074 -20.2742 -0.1 - vertex 30.7365 -19.9631 -0.1 + vertex 27.3111 -22.6325 -0.2 + vertex 31.074 -20.2742 -0.2 + vertex 30.7365 -19.9631 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 30.4717 -27.2602 -0.1 - vertex 31.6003 -26.0834 -0.1 - vertex 30.0709 -27.3331 -0.1 + vertex 30.4717 -27.2602 -0.2 + vertex 31.6003 -26.0834 -0.2 + vertex 30.0709 -27.3331 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3111 -22.6325 -0.1 - vertex 30.7365 -19.9631 -0.1 - vertex 30.3649 -19.705 -0.1 + vertex 27.3111 -22.6325 -0.2 + vertex 30.7365 -19.9631 -0.2 + vertex 30.3649 -19.705 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 30.7934 -27.1595 -0.1 - vertex 31.5092 -26.3899 -0.1 - vertex 30.4717 -27.2602 -0.1 + vertex 30.7934 -27.1595 -0.2 + vertex 31.5092 -26.3899 -0.2 + vertex 30.4717 -27.2602 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2166 -22.4344 -0.1 - vertex 30.3649 -19.705 -0.1 - vertex 29.9546 -19.4981 -0.1 + vertex 27.2166 -22.4344 -0.2 + vertex 30.3649 -19.705 -0.2 + vertex 29.9546 -19.4981 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 31.047 -27.0266 -0.1 - vertex 31.3939 -26.6463 -0.1 - vertex 30.7934 -27.1595 -0.1 + vertex 31.047 -27.0266 -0.2 + vertex 31.3939 -26.6463 -0.2 + vertex 30.7934 -27.1595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2166 -22.4344 -0.1 - vertex 29.9546 -19.4981 -0.1 - vertex 29.5013 -19.3404 -0.1 + vertex 27.2166 -22.4344 -0.2 + vertex 29.9546 -19.4981 -0.2 + vertex 29.5013 -19.3404 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2166 -22.4344 -0.1 - vertex 29.5013 -19.3404 -0.1 - vertex 29.0007 -19.2301 -0.1 + vertex 27.2166 -22.4344 -0.2 + vertex 29.5013 -19.3404 -0.2 + vertex 29.0007 -19.2301 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.3939 -26.6463 -0.1 - vertex 31.047 -27.0266 -0.1 - vertex 31.2435 -26.857 -0.1 + vertex 31.3939 -26.6463 -0.2 + vertex 31.047 -27.0266 -0.2 + vertex 31.2435 -26.857 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0952 -22.2631 -0.1 - vertex 29.0007 -19.2301 -0.1 - vertex 28.4483 -19.1654 -0.1 + vertex 27.0952 -22.2631 -0.2 + vertex 29.0007 -19.2301 -0.2 + vertex 28.4483 -19.1654 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9471 -22.1189 -0.1 - vertex 28.4483 -19.1654 -0.1 - vertex 27.8398 -19.1444 -0.1 + vertex 26.9471 -22.1189 -0.2 + vertex 28.4483 -19.1654 -0.2 + vertex 27.8398 -19.1444 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 32.0372 -23.3848 -0.1 - vertex 27.4312 -23.3865 -0.1 - vertex 31.9625 -24.0535 -0.1 + vertex 32.0372 -23.3848 -0.2 + vertex 27.4312 -23.3865 -0.2 + vertex 31.9625 -24.0535 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.6003 -26.0834 -0.1 - vertex 30.4717 -27.2602 -0.1 - vertex 31.5092 -26.3899 -0.1 + vertex 31.6003 -26.0834 -0.2 + vertex 30.4717 -27.2602 -0.2 + vertex 31.5092 -26.3899 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.5092 -26.3899 -0.1 - vertex 30.7934 -27.1595 -0.1 - vertex 31.3939 -26.6463 -0.1 + vertex 31.5092 -26.3899 -0.2 + vertex 30.7934 -27.1595 -0.2 + vertex 31.3939 -26.6463 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 32.0349 -22.2828 -0.1 - vertex 27.3785 -22.8574 -0.1 - vertex 27.4186 -23.1088 -0.1 + vertex 32.0349 -22.2828 -0.2 + vertex 27.3785 -22.8574 -0.2 + vertex 27.4186 -23.1088 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.3816 -20.64 -0.1 - vertex 27.3111 -22.6325 -0.1 - vertex 27.3785 -22.8574 -0.1 + vertex 31.3816 -20.64 -0.2 + vertex 27.3111 -22.6325 -0.2 + vertex 27.3785 -22.8574 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.3649 -19.705 -0.1 - vertex 27.2166 -22.4344 -0.1 - vertex 27.3111 -22.6325 -0.1 + vertex 30.3649 -19.705 -0.2 + vertex 27.2166 -22.4344 -0.2 + vertex 27.3111 -22.6325 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.7726 -22.0019 -0.1 - vertex 27.8398 -19.1444 -0.1 - vertex 27.1629 -19.1581 -0.1 + vertex 26.7726 -22.0019 -0.2 + vertex 27.8398 -19.1444 -0.2 + vertex 27.1629 -19.1581 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.0007 -19.2301 -0.1 - vertex 27.0952 -22.2631 -0.1 - vertex 27.2166 -22.4344 -0.1 + vertex 29.0007 -19.2301 -0.2 + vertex 27.0952 -22.2631 -0.2 + vertex 27.2166 -22.4344 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.4483 -19.1654 -0.1 - vertex 26.9471 -22.1189 -0.1 - vertex 27.0952 -22.2631 -0.1 + vertex 28.4483 -19.1654 -0.2 + vertex 26.9471 -22.1189 -0.2 + vertex 27.0952 -22.2631 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.8398 -19.1444 -0.1 - vertex 26.7726 -22.0019 -0.1 - vertex 26.9471 -22.1189 -0.1 + vertex 27.8398 -19.1444 -0.2 + vertex 26.7726 -22.0019 -0.2 + vertex 26.9471 -22.1189 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.1629 -19.1581 -0.1 - vertex 26.5717 -21.9122 -0.1 - vertex 26.7726 -22.0019 -0.1 + vertex 27.1629 -19.1581 -0.2 + vertex 26.5717 -21.9122 -0.2 + vertex 26.7726 -22.0019 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 26.5531 -19.2026 -0.1 - vertex 26.5717 -21.9122 -0.1 - vertex 27.1629 -19.1581 -0.1 + vertex 26.5531 -19.2026 -0.2 + vertex 26.5717 -21.9122 -0.2 + vertex 27.1629 -19.1581 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.5531 -19.2026 -0.1 - vertex 26.3449 -21.8501 -0.1 - vertex 26.5717 -21.9122 -0.1 + vertex 26.5531 -19.2026 -0.2 + vertex 26.3449 -21.8501 -0.2 + vertex 26.5717 -21.9122 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.9886 -19.284 -0.1 - vertex 26.3449 -21.8501 -0.1 - vertex 26.5531 -19.2026 -0.1 + vertex 25.9886 -19.284 -0.2 + vertex 26.3449 -21.8501 -0.2 + vertex 26.5531 -19.2026 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.3449 -21.8501 -0.1 - vertex 25.9886 -19.284 -0.1 - vertex 26.0922 -21.8157 -0.1 + vertex 26.3449 -21.8501 -0.2 + vertex 25.9886 -19.284 -0.2 + vertex 26.0922 -21.8157 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.4477 -19.4082 -0.1 - vertex 26.0922 -21.8157 -0.1 - vertex 25.9886 -19.284 -0.1 + vertex 25.4477 -19.4082 -0.2 + vertex 26.0922 -21.8157 -0.2 + vertex 25.9886 -19.284 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0922 -21.8157 -0.1 - vertex 25.4477 -19.4082 -0.1 - vertex 25.8138 -21.8092 -0.1 + vertex 26.0922 -21.8157 -0.2 + vertex 25.4477 -19.4082 -0.2 + vertex 25.8138 -21.8092 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.8138 -21.8092 -0.1 - vertex 25.4477 -19.4082 -0.1 - vertex 25.51 -21.8307 -0.1 + vertex 25.8138 -21.8092 -0.2 + vertex 25.4477 -19.4082 -0.2 + vertex 25.51 -21.8307 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.9086 -19.5812 -0.1 - vertex 25.51 -21.8307 -0.1 - vertex 25.4477 -19.4082 -0.1 + vertex 24.9086 -19.5812 -0.2 + vertex 25.51 -21.8307 -0.2 + vertex 25.4477 -19.4082 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.51 -21.8307 -0.1 - vertex 24.9086 -19.5812 -0.1 - vertex 25.181 -21.8805 -0.1 + vertex 25.51 -21.8307 -0.2 + vertex 24.9086 -19.5812 -0.2 + vertex 25.181 -21.8805 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.3497 -19.8089 -0.1 - vertex 25.181 -21.8805 -0.1 - vertex 24.9086 -19.5812 -0.1 + vertex 24.3497 -19.8089 -0.2 + vertex 25.181 -21.8805 -0.2 + vertex 24.9086 -19.5812 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.181 -21.8805 -0.1 - vertex 24.3497 -19.8089 -0.1 - vertex 24.827 -21.9586 -0.1 + vertex 25.181 -21.8805 -0.2 + vertex 24.3497 -19.8089 -0.2 + vertex 24.827 -21.9586 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.7493 -20.0973 -0.1 - vertex 24.827 -21.9586 -0.1 - vertex 24.3497 -19.8089 -0.1 + vertex 23.7493 -20.0973 -0.2 + vertex 24.827 -21.9586 -0.2 + vertex 24.3497 -19.8089 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.827 -21.9586 -0.1 - vertex 23.7493 -20.0973 -0.1 - vertex 24.5319 -22.0421 -0.1 + vertex 24.827 -21.9586 -0.2 + vertex 23.7493 -20.0973 -0.2 + vertex 24.5319 -22.0421 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.5319 -22.0421 -0.1 - vertex 23.7493 -20.0973 -0.1 - vertex 24.2621 -22.1397 -0.1 + vertex 24.5319 -22.0421 -0.2 + vertex 23.7493 -20.0973 -0.2 + vertex 24.2621 -22.1397 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.0854 -20.4525 -0.1 - vertex 24.2621 -22.1397 -0.1 - vertex 23.7493 -20.0973 -0.1 + vertex 23.0854 -20.4525 -0.2 + vertex 24.2621 -22.1397 -0.2 + vertex 23.7493 -20.0973 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.2621 -22.1397 -0.1 - vertex 23.0854 -20.4525 -0.1 - vertex 24.0091 -22.2567 -0.1 + vertex 24.2621 -22.1397 -0.2 + vertex 23.0854 -20.4525 -0.2 + vertex 24.0091 -22.2567 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.0091 -22.2567 -0.1 - vertex 23.0854 -20.4525 -0.1 - vertex 23.7644 -22.3987 -0.1 + vertex 24.0091 -22.2567 -0.2 + vertex 23.0854 -20.4525 -0.2 + vertex 23.7644 -22.3987 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.3543 -20.8886 -0.1 - vertex 23.7644 -22.3987 -0.1 - vertex 23.0854 -20.4525 -0.1 + vertex 22.3543 -20.8886 -0.2 + vertex 23.7644 -22.3987 -0.2 + vertex 23.0854 -20.4525 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.7644 -22.3987 -0.1 - vertex 22.3543 -20.8886 -0.1 - vertex 23.5194 -22.5712 -0.1 + vertex 23.7644 -22.3987 -0.2 + vertex 22.3543 -20.8886 -0.2 + vertex 23.5194 -22.5712 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.5194 -22.5712 -0.1 - vertex 22.3543 -20.8886 -0.1 - vertex 23.2657 -22.7795 -0.1 + vertex 23.5194 -22.5712 -0.2 + vertex 22.3543 -20.8886 -0.2 + vertex 23.2657 -22.7795 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 21.6485 -21.3703 -0.1 - vertex 23.2657 -22.7795 -0.1 - vertex 22.3543 -20.8886 -0.1 + vertex 21.6485 -21.3703 -0.2 + vertex 23.2657 -22.7795 -0.2 + vertex 22.3543 -20.8886 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.2657 -22.7795 -0.1 - vertex 21.6485 -21.3703 -0.1 - vertex 22.6979 -23.3258 -0.1 + vertex 23.2657 -22.7795 -0.2 + vertex 21.6485 -21.3703 -0.2 + vertex 22.6979 -23.3258 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 20.9665 -21.899 -0.1 - vertex 22.6979 -23.3258 -0.1 - vertex 21.6485 -21.3703 -0.1 + vertex 20.9665 -21.899 -0.2 + vertex 22.6979 -23.3258 -0.2 + vertex 21.6485 -21.3703 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.6979 -23.3258 -0.1 - vertex 20.9665 -21.899 -0.1 - vertex 22.2832 -23.7683 -0.1 + vertex 22.6979 -23.3258 -0.2 + vertex 20.9665 -21.899 -0.2 + vertex 22.2832 -23.7683 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 20.3071 -22.4759 -0.1 - vertex 22.2832 -23.7683 -0.1 - vertex 20.9665 -21.899 -0.1 + vertex 20.3071 -22.4759 -0.2 + vertex 22.2832 -23.7683 -0.2 + vertex 20.9665 -21.899 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.2832 -23.7683 -0.1 - vertex 20.3071 -22.4759 -0.1 - vertex 21.9437 -24.1601 -0.1 + vertex 22.2832 -23.7683 -0.2 + vertex 20.3071 -22.4759 -0.2 + vertex 21.9437 -24.1601 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.9437 -24.1601 -0.1 - vertex 20.3071 -22.4759 -0.1 - vertex 21.7143 -24.4589 -0.1 + vertex 21.9437 -24.1601 -0.2 + vertex 20.3071 -22.4759 -0.2 + vertex 21.7143 -24.4589 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.6689 -23.1024 -0.1 - vertex 21.7143 -24.4589 -0.1 - vertex 20.3071 -22.4759 -0.1 + vertex 19.6689 -23.1024 -0.2 + vertex 21.7143 -24.4589 -0.2 + vertex 20.3071 -22.4759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 31.6784 -25.7224 -0.1 - vertex 30.0709 -27.3331 -0.1 - vertex 31.6003 -26.0834 -0.1 + vertex 31.6784 -25.7224 -0.2 + vertex 30.0709 -27.3331 -0.2 + vertex 31.6003 -26.0834 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.58 -27.3827 -0.1 - vertex 27.2401 -24.8188 -0.1 - vertex 28.988 -27.4135 -0.1 + vertex 29.58 -27.3827 -0.2 + vertex 27.2401 -24.8188 -0.2 + vertex 28.988 -27.4135 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.988 -27.4135 -0.1 - vertex 27.2401 -24.8188 -0.1 - vertex 27.4568 -27.4364 -0.1 + vertex 28.988 -27.4135 -0.2 + vertex 27.2401 -24.8188 -0.2 + vertex 27.4568 -27.4364 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2401 -24.8188 -0.1 - vertex 25.3891 -27.4375 -0.1 - vertex 27.4568 -27.4364 -0.1 + vertex 27.2401 -24.8188 -0.2 + vertex 25.3891 -27.4375 -0.2 + vertex 27.4568 -27.4364 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.435 -24.8188 -0.1 - vertex 25.3891 -27.4375 -0.1 - vertex 27.2401 -24.8188 -0.1 + vertex 24.435 -24.8188 -0.2 + vertex 25.3891 -27.4375 -0.2 + vertex 27.2401 -24.8188 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.3459 -24.8032 -0.1 - vertex 25.3891 -27.4375 -0.1 - vertex 24.435 -24.8188 -0.1 + vertex 23.3459 -24.8032 -0.2 + vertex 25.3891 -27.4375 -0.2 + vertex 24.435 -24.8188 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.454 -24.761 -0.1 - vertex 25.3891 -27.4375 -0.1 - vertex 23.3459 -24.8032 -0.1 + vertex 22.454 -24.761 -0.2 + vertex 25.3891 -27.4375 -0.2 + vertex 23.3459 -24.8032 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.1247 -27.4424 -0.1 - vertex 22.454 -24.761 -0.1 - vertex 21.8514 -24.6984 -0.1 + vertex 20.1247 -27.4424 -0.2 + vertex 22.454 -24.761 -0.2 + vertex 21.8514 -24.6984 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.1247 -27.4424 -0.1 - vertex 21.8514 -24.6984 -0.1 - vertex 21.6873 -24.6616 -0.1 + vertex 20.1247 -27.4424 -0.2 + vertex 21.8514 -24.6984 -0.2 + vertex 21.6873 -24.6616 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.1247 -27.4424 -0.1 - vertex 21.6873 -24.6616 -0.1 - vertex 21.63 -24.6221 -0.1 + vertex 20.1247 -27.4424 -0.2 + vertex 21.6873 -24.6616 -0.2 + vertex 21.63 -24.6221 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.7143 -24.4589 -0.1 - vertex 19.6689 -23.1024 -0.1 - vertex 21.6518 -24.5601 -0.1 + vertex 21.7143 -24.4589 -0.2 + vertex 19.6689 -23.1024 -0.2 + vertex 21.6518 -24.5601 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.454 -24.761 -0.1 - vertex 20.1247 -27.4424 -0.1 - vertex 25.3891 -27.4375 -0.1 + vertex 22.454 -24.761 -0.2 + vertex 20.1247 -27.4424 -0.2 + vertex 25.3891 -27.4375 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.6518 -24.5601 -0.1 - vertex 19.6689 -23.1024 -0.1 - vertex 21.63 -24.6221 -0.1 + vertex 21.6518 -24.5601 -0.2 + vertex 19.6689 -23.1024 -0.2 + vertex 21.63 -24.6221 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.0503 -23.7798 -0.1 - vertex 21.63 -24.6221 -0.1 - vertex 19.6689 -23.1024 -0.1 + vertex 19.0503 -23.7798 -0.2 + vertex 21.63 -24.6221 -0.2 + vertex 19.6689 -23.1024 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.4501 -24.5093 -0.1 - vertex 21.63 -24.6221 -0.1 - vertex 19.0503 -23.7798 -0.1 + vertex 18.4501 -24.5093 -0.2 + vertex 21.63 -24.6221 -0.2 + vertex 19.0503 -23.7798 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.63 -24.6221 -0.1 - vertex 18.4501 -24.5093 -0.1 - vertex 20.1247 -27.4424 -0.1 + vertex 21.63 -24.6221 -0.2 + vertex 18.4501 -24.5093 -0.2 + vertex 20.1247 -27.4424 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 17.8667 -25.2923 -0.1 - vertex 20.1247 -27.4424 -0.1 - vertex 18.4501 -24.5093 -0.1 + vertex 17.8667 -25.2923 -0.2 + vertex 20.1247 -27.4424 -0.2 + vertex 18.4501 -24.5093 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 17.4656 -25.8764 -0.1 - vertex 20.1247 -27.4424 -0.1 - vertex 17.8667 -25.2923 -0.1 + vertex 17.4656 -25.8764 -0.2 + vertex 20.1247 -27.4424 -0.2 + vertex 17.8667 -25.2923 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 17.0901 -26.4624 -0.1 - vertex 20.1247 -27.4424 -0.1 - vertex 17.4656 -25.8764 -0.1 + vertex 17.0901 -26.4624 -0.2 + vertex 20.1247 -27.4424 -0.2 + vertex 17.4656 -25.8764 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.1247 -27.4424 -0.1 - vertex 17.0901 -26.4624 -0.1 - vertex 19.9171 -28.0436 -0.1 + vertex 20.1247 -27.4424 -0.2 + vertex 17.0901 -26.4624 -0.2 + vertex 19.9171 -28.0436 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 16.7406 -27.0496 -0.1 - vertex 19.9171 -28.0436 -0.1 - vertex 17.0901 -26.4624 -0.1 + vertex 16.7406 -27.0496 -0.2 + vertex 19.9171 -28.0436 -0.2 + vertex 17.0901 -26.4624 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.9171 -28.0436 -0.1 - vertex 16.7406 -27.0496 -0.1 - vertex 19.6992 -28.7679 -0.1 + vertex 19.9171 -28.0436 -0.2 + vertex 16.7406 -27.0496 -0.2 + vertex 19.6992 -28.7679 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 16.4172 -27.6373 -0.1 - vertex 19.6992 -28.7679 -0.1 - vertex 16.7406 -27.0496 -0.1 + vertex 16.4172 -27.6373 -0.2 + vertex 19.6992 -28.7679 -0.2 + vertex 16.7406 -27.0496 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6992 -28.7679 -0.1 - vertex 16.4172 -27.6373 -0.1 - vertex 19.5256 -29.5327 -0.1 + vertex 19.6992 -28.7679 -0.2 + vertex 16.4172 -27.6373 -0.2 + vertex 19.5256 -29.5327 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 16.1203 -28.2246 -0.1 - vertex 19.5256 -29.5327 -0.1 - vertex 16.4172 -27.6373 -0.1 + vertex 16.1203 -28.2246 -0.2 + vertex 19.5256 -29.5327 -0.2 + vertex 16.4172 -27.6373 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.8502 -28.8109 -0.1 - vertex 19.5256 -29.5327 -0.1 - vertex 16.1203 -28.2246 -0.1 + vertex 15.8502 -28.8109 -0.2 + vertex 19.5256 -29.5327 -0.2 + vertex 16.1203 -28.2246 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5256 -29.5327 -0.1 - vertex 15.8502 -28.8109 -0.1 - vertex 19.3985 -30.306 -0.1 + vertex 19.5256 -29.5327 -0.2 + vertex 15.8502 -28.8109 -0.2 + vertex 19.3985 -30.306 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.6071 -29.3953 -0.1 - vertex 19.3985 -30.306 -0.1 - vertex 15.8502 -28.8109 -0.1 + vertex 15.6071 -29.3953 -0.2 + vertex 19.3985 -30.306 -0.2 + vertex 15.8502 -28.8109 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.3912 -29.9771 -0.1 - vertex 19.3985 -30.306 -0.1 - vertex 15.6071 -29.3953 -0.1 + vertex 15.3912 -29.9771 -0.2 + vertex 19.3985 -30.306 -0.2 + vertex 15.6071 -29.3953 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3985 -30.306 -0.1 - vertex 15.3912 -29.9771 -0.1 - vertex 19.3204 -31.0557 -0.1 + vertex 19.3985 -30.306 -0.2 + vertex 15.3912 -29.9771 -0.2 + vertex 19.3204 -31.0557 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.2028 -30.5555 -0.1 - vertex 19.3204 -31.0557 -0.1 - vertex 15.3912 -29.9771 -0.1 + vertex 15.2028 -30.5555 -0.2 + vertex 19.3204 -31.0557 -0.2 + vertex 15.3912 -29.9771 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3204 -31.0557 -0.1 - vertex 15.2028 -30.5555 -0.1 - vertex 19.2935 -31.7496 -0.1 + vertex 19.3204 -31.0557 -0.2 + vertex 15.2028 -30.5555 -0.2 + vertex 19.2935 -31.7496 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.0423 -31.1299 -0.1 - vertex 19.2935 -31.7496 -0.1 - vertex 15.2028 -30.5555 -0.1 + vertex 15.0423 -31.1299 -0.2 + vertex 19.2935 -31.7496 -0.2 + vertex 15.2028 -30.5555 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.9098 -31.6993 -0.1 - vertex 19.2935 -31.7496 -0.1 - vertex 15.0423 -31.1299 -0.1 + vertex 14.9098 -31.6993 -0.2 + vertex 19.2935 -31.7496 -0.2 + vertex 15.0423 -31.1299 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3203 -32.3556 -0.1 - vertex 14.9098 -31.6993 -0.1 - vertex 14.8056 -32.2631 -0.1 + vertex 19.3203 -32.3556 -0.2 + vertex 14.9098 -31.6993 -0.2 + vertex 14.8056 -32.2631 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3545 -32.6156 -0.1 - vertex 14.8056 -32.2631 -0.1 - vertex 14.73 -32.8205 -0.1 + vertex 19.3545 -32.6156 -0.2 + vertex 14.8056 -32.2631 -0.2 + vertex 14.73 -32.8205 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.403 -32.8415 -0.1 - vertex 14.73 -32.8205 -0.1 - vertex 14.6832 -33.3707 -0.1 + vertex 19.403 -32.8415 -0.2 + vertex 14.73 -32.8205 -0.2 + vertex 14.6832 -33.3707 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.403 -32.8415 -0.1 - vertex 14.6832 -33.3707 -0.1 - vertex 14.6656 -33.913 -0.1 + vertex 19.403 -32.8415 -0.2 + vertex 14.6832 -33.3707 -0.2 + vertex 14.6656 -33.913 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.466 -33.0295 -0.1 - vertex 14.6656 -33.913 -0.1 - vertex 14.6774 -34.4466 -0.1 + vertex 19.466 -33.0295 -0.2 + vertex 14.6656 -33.913 -0.2 + vertex 14.6774 -34.4466 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5439 -33.1754 -0.1 - vertex 14.6774 -34.4466 -0.1 - vertex 14.7369 -35.0944 -0.1 + vertex 19.5439 -33.1754 -0.2 + vertex 14.6774 -34.4466 -0.2 + vertex 14.7369 -35.0944 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3392 -33.9144 -0.1 - vertex 18.4669 -38.5591 -0.1 - vertex 19.1073 -38.5852 -0.1 + vertex 20.3392 -33.9144 -0.2 + vertex 18.4669 -38.5591 -0.2 + vertex 19.1073 -38.5852 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 18.1792 -38.5233 -0.1 - vertex 18.4669 -38.5591 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 18.1792 -38.5233 -0.2 + vertex 18.4669 -38.5591 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 17.9062 -38.4707 -0.1 - vertex 18.1792 -38.5233 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 17.9062 -38.4707 -0.2 + vertex 18.1792 -38.5233 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 17.6424 -38.4 -0.1 - vertex 17.9062 -38.4707 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 17.6424 -38.4 -0.2 + vertex 17.9062 -38.4707 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 17.3825 -38.3101 -0.1 - vertex 17.6424 -38.4 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 17.3825 -38.3101 -0.2 + vertex 17.6424 -38.4 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 17.1211 -38.1997 -0.1 - vertex 17.3825 -38.3101 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 17.1211 -38.1997 -0.2 + vertex 17.3825 -38.3101 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0345 -33.6987 -0.1 - vertex 16.8529 -38.0675 -0.1 - vertex 17.1211 -38.1997 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 16.8529 -38.0675 -0.2 + vertex 17.1211 -38.1997 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5439 -33.1754 -0.1 - vertex 14.7369 -35.0944 -0.1 - vertex 14.8496 -35.6738 -0.1 + vertex 19.5439 -33.1754 -0.2 + vertex 14.7369 -35.0944 -0.2 + vertex 14.8496 -35.6738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 16.342 -37.7658 -0.1 - vertex 16.8529 -38.0675 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 16.342 -37.7658 -0.2 + vertex 16.8529 -38.0675 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5439 -33.1754 -0.1 - vertex 14.8496 -35.6738 -0.1 - vertex 14.927 -35.9398 -0.1 + vertex 19.5439 -33.1754 -0.2 + vertex 14.8496 -35.6738 -0.2 + vertex 14.927 -35.9398 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 16.1153 -37.6039 -0.1 - vertex 16.342 -37.7658 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 16.1153 -37.6039 -0.2 + vertex 16.342 -37.7658 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.907 -37.4336 -0.1 - vertex 16.1153 -37.6039 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.907 -37.4336 -0.2 + vertex 16.1153 -37.6039 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.7167 -37.2541 -0.1 - vertex 15.907 -37.4336 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.7167 -37.2541 -0.2 + vertex 15.907 -37.4336 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.544 -37.0647 -0.1 - vertex 15.7167 -37.2541 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.544 -37.0647 -0.2 + vertex 15.7167 -37.2541 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.3884 -36.8644 -0.1 - vertex 15.544 -37.0647 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.3884 -36.8644 -0.2 + vertex 15.544 -37.0647 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.2493 -36.6526 -0.1 - vertex 15.3884 -36.8644 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.2493 -36.6526 -0.2 + vertex 15.3884 -36.8644 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.1264 -36.4284 -0.1 - vertex 15.2493 -36.6526 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.1264 -36.4284 -0.2 + vertex 15.2493 -36.6526 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 14.927 -35.9398 -0.1 - vertex 15.0191 -36.1911 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 14.927 -35.9398 -0.2 + vertex 15.0191 -36.1911 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7677 -33.4516 -0.1 - vertex 15.0191 -36.1911 -0.1 - vertex 15.1264 -36.4284 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 15.0191 -36.1911 -0.2 + vertex 15.1264 -36.4284 -0.2 endloop endfacet facet normal -0.116346 -0.993209 0 outer loop - vertex 28.4483 -19.1654 -0.1 + vertex 28.4483 -19.1654 -0.2 vertex 29.0007 -19.2301 0 vertex 28.4483 -19.1654 0 endloop @@ -6295,13 +6295,13 @@ solid OpenSCAD_Model facet normal -0.116346 -0.993209 -0 outer loop vertex 29.0007 -19.2301 0 - vertex 28.4483 -19.1654 -0.1 - vertex 29.0007 -19.2301 -0.1 + vertex 28.4483 -19.1654 -0.2 + vertex 29.0007 -19.2301 -0.2 endloop endfacet facet normal -0.215114 -0.976589 0 outer loop - vertex 29.0007 -19.2301 -0.1 + vertex 29.0007 -19.2301 -0.2 vertex 29.5013 -19.3404 0 vertex 29.0007 -19.2301 0 endloop @@ -6309,13 +6309,13 @@ solid OpenSCAD_Model facet normal -0.215114 -0.976589 -0 outer loop vertex 29.5013 -19.3404 0 - vertex 29.0007 -19.2301 -0.1 - vertex 29.5013 -19.3404 -0.1 + vertex 29.0007 -19.2301 -0.2 + vertex 29.5013 -19.3404 -0.2 endloop endfacet facet normal -0.328588 -0.944473 0 outer loop - vertex 29.5013 -19.3404 -0.1 + vertex 29.5013 -19.3404 -0.2 vertex 29.9546 -19.4981 0 vertex 29.5013 -19.3404 0 endloop @@ -6323,13 +6323,13 @@ solid OpenSCAD_Model facet normal -0.328588 -0.944473 -0 outer loop vertex 29.9546 -19.4981 0 - vertex 29.5013 -19.3404 -0.1 - vertex 29.9546 -19.4981 -0.1 + vertex 29.5013 -19.3404 -0.2 + vertex 29.9546 -19.4981 -0.2 endloop endfacet facet normal -0.450382 -0.892836 0 outer loop - vertex 29.9546 -19.4981 -0.1 + vertex 29.9546 -19.4981 -0.2 vertex 30.3649 -19.705 0 vertex 29.9546 -19.4981 0 endloop @@ -6337,13 +6337,13 @@ solid OpenSCAD_Model facet normal -0.450382 -0.892836 -0 outer loop vertex 30.3649 -19.705 0 - vertex 29.9546 -19.4981 -0.1 - vertex 30.3649 -19.705 -0.1 + vertex 29.9546 -19.4981 -0.2 + vertex 30.3649 -19.705 -0.2 endloop endfacet facet normal -0.570354 -0.821399 0 outer loop - vertex 30.3649 -19.705 -0.1 + vertex 30.3649 -19.705 -0.2 vertex 30.7365 -19.9631 0 vertex 30.3649 -19.705 0 endloop @@ -6351,13 +6351,13 @@ solid OpenSCAD_Model facet normal -0.570354 -0.821399 -0 outer loop vertex 30.7365 -19.9631 0 - vertex 30.3649 -19.705 -0.1 - vertex 30.7365 -19.9631 -0.1 + vertex 30.3649 -19.705 -0.2 + vertex 30.7365 -19.9631 -0.2 endloop endfacet facet normal -0.677745 -0.735297 0 outer loop - vertex 30.7365 -19.9631 -0.1 + vertex 30.7365 -19.9631 -0.2 vertex 31.074 -20.2742 0 vertex 30.7365 -19.9631 0 endloop @@ -6365,209 +6365,209 @@ solid OpenSCAD_Model facet normal -0.677745 -0.735297 -0 outer loop vertex 31.074 -20.2742 0 - vertex 30.7365 -19.9631 -0.1 - vertex 31.074 -20.2742 -0.1 + vertex 30.7365 -19.9631 -0.2 + vertex 31.074 -20.2742 -0.2 endloop endfacet facet normal -0.765393 -0.643563 0 outer loop - vertex 31.3816 -20.64 -0.1 + vertex 31.3816 -20.64 -0.2 vertex 31.074 -20.2742 0 - vertex 31.074 -20.2742 -0.1 + vertex 31.074 -20.2742 -0.2 endloop endfacet facet normal -0.765393 -0.643563 0 outer loop vertex 31.074 -20.2742 0 - vertex 31.3816 -20.64 -0.1 + vertex 31.3816 -20.64 -0.2 vertex 31.3816 -20.64 0 endloop endfacet facet normal -0.833589 -0.552384 0 outer loop - vertex 31.6298 -21.0145 -0.1 + vertex 31.6298 -21.0145 -0.2 vertex 31.3816 -20.64 0 - vertex 31.3816 -20.64 -0.1 + vertex 31.3816 -20.64 -0.2 endloop endfacet facet normal -0.833589 -0.552384 0 outer loop vertex 31.3816 -20.64 0 - vertex 31.6298 -21.0145 -0.1 + vertex 31.6298 -21.0145 -0.2 vertex 31.6298 -21.0145 0 endloop endfacet facet normal -0.898247 -0.439492 0 outer loop - vertex 31.8204 -21.404 -0.1 + vertex 31.8204 -21.404 -0.2 vertex 31.6298 -21.0145 0 - vertex 31.6298 -21.0145 -0.1 + vertex 31.6298 -21.0145 -0.2 endloop endfacet facet normal -0.898247 -0.439492 0 outer loop vertex 31.6298 -21.0145 0 - vertex 31.8204 -21.404 -0.1 + vertex 31.8204 -21.404 -0.2 vertex 31.8204 -21.404 0 endloop endfacet facet normal -0.951943 -0.306275 0 outer loop - vertex 31.9549 -21.8223 -0.1 + vertex 31.9549 -21.8223 -0.2 vertex 31.8204 -21.404 0 - vertex 31.8204 -21.404 -0.1 + vertex 31.8204 -21.404 -0.2 endloop endfacet facet normal -0.951943 -0.306275 0 outer loop vertex 31.8204 -21.404 0 - vertex 31.9549 -21.8223 -0.1 + vertex 31.9549 -21.8223 -0.2 vertex 31.9549 -21.8223 0 endloop endfacet facet normal -0.985239 -0.171183 0 outer loop - vertex 32.0349 -22.2828 -0.1 + vertex 32.0349 -22.2828 -0.2 vertex 31.9549 -21.8223 0 - vertex 31.9549 -21.8223 -0.1 + vertex 31.9549 -21.8223 -0.2 endloop endfacet facet normal -0.985239 -0.171183 0 outer loop vertex 31.9549 -21.8223 0 - vertex 32.0349 -22.2828 -0.1 + vertex 32.0349 -22.2828 -0.2 vertex 32.0349 -22.2828 0 endloop endfacet facet normal -0.998641 -0.0521185 0 outer loop - vertex 32.0619 -22.7991 -0.1 + vertex 32.0619 -22.7991 -0.2 vertex 32.0349 -22.2828 0 - vertex 32.0349 -22.2828 -0.1 + vertex 32.0349 -22.2828 -0.2 endloop endfacet facet normal -0.998641 -0.0521185 0 outer loop vertex 32.0349 -22.2828 0 - vertex 32.0619 -22.7991 -0.1 + vertex 32.0619 -22.7991 -0.2 vertex 32.0619 -22.7991 0 endloop endfacet facet normal -0.999117 0.0420155 0 outer loop - vertex 32.0372 -23.3848 -0.1 + vertex 32.0372 -23.3848 -0.2 vertex 32.0619 -22.7991 0 - vertex 32.0619 -22.7991 -0.1 + vertex 32.0619 -22.7991 -0.2 endloop endfacet facet normal -0.999117 0.0420155 0 outer loop vertex 32.0619 -22.7991 0 - vertex 32.0372 -23.3848 -0.1 + vertex 32.0372 -23.3848 -0.2 vertex 32.0372 -23.3848 0 endloop endfacet facet normal -0.993814 0.111054 0 outer loop - vertex 31.9625 -24.0535 -0.1 + vertex 31.9625 -24.0535 -0.2 vertex 32.0372 -23.3848 0 - vertex 32.0372 -23.3848 -0.1 + vertex 32.0372 -23.3848 -0.2 endloop endfacet facet normal -0.993814 0.111054 0 outer loop vertex 32.0372 -23.3848 0 - vertex 31.9625 -24.0535 -0.1 + vertex 31.9625 -24.0535 -0.2 vertex 31.9625 -24.0535 0 endloop endfacet facet normal -0.98726 0.159117 0 outer loop - vertex 31.8392 -24.8188 -0.1 + vertex 31.8392 -24.8188 -0.2 vertex 31.9625 -24.0535 0 - vertex 31.9625 -24.0535 -0.1 + vertex 31.9625 -24.0535 -0.2 endloop endfacet facet normal -0.98726 0.159117 0 outer loop vertex 31.9625 -24.0535 0 - vertex 31.8392 -24.8188 -0.1 + vertex 31.8392 -24.8188 -0.2 vertex 31.8392 -24.8188 0 endloop endfacet facet normal -0.984533 0.175198 0 outer loop - vertex 31.6784 -25.7224 -0.1 + vertex 31.6784 -25.7224 -0.2 vertex 31.8392 -24.8188 0 - vertex 31.8392 -24.8188 -0.1 + vertex 31.8392 -24.8188 -0.2 endloop endfacet facet normal -0.984533 0.175198 0 outer loop vertex 31.8392 -24.8188 0 - vertex 31.6784 -25.7224 -0.1 + vertex 31.6784 -25.7224 -0.2 vertex 31.6784 -25.7224 0 endloop endfacet facet normal -0.977413 0.211338 0 outer loop - vertex 31.6003 -26.0834 -0.1 + vertex 31.6003 -26.0834 -0.2 vertex 31.6784 -25.7224 0 - vertex 31.6784 -25.7224 -0.1 + vertex 31.6784 -25.7224 -0.2 endloop endfacet facet normal -0.977413 0.211338 0 outer loop vertex 31.6784 -25.7224 0 - vertex 31.6003 -26.0834 -0.1 + vertex 31.6003 -26.0834 -0.2 vertex 31.6003 -26.0834 0 endloop endfacet facet normal -0.958488 0.285133 0 outer loop - vertex 31.5092 -26.3899 -0.1 + vertex 31.5092 -26.3899 -0.2 vertex 31.6003 -26.0834 0 - vertex 31.6003 -26.0834 -0.1 + vertex 31.6003 -26.0834 -0.2 endloop endfacet facet normal -0.958488 0.285133 0 outer loop vertex 31.6003 -26.0834 0 - vertex 31.5092 -26.3899 -0.1 + vertex 31.5092 -26.3899 -0.2 vertex 31.5092 -26.3899 0 endloop endfacet facet normal -0.912047 0.410085 0 outer loop - vertex 31.3939 -26.6463 -0.1 + vertex 31.3939 -26.6463 -0.2 vertex 31.5092 -26.3899 0 - vertex 31.5092 -26.3899 -0.1 + vertex 31.5092 -26.3899 -0.2 endloop endfacet facet normal -0.912047 0.410085 0 outer loop vertex 31.5092 -26.3899 0 - vertex 31.3939 -26.6463 -0.1 + vertex 31.3939 -26.6463 -0.2 vertex 31.3939 -26.6463 0 endloop endfacet facet normal -0.814021 0.580836 0 outer loop - vertex 31.2435 -26.857 -0.1 + vertex 31.2435 -26.857 -0.2 vertex 31.3939 -26.6463 0 - vertex 31.3939 -26.6463 -0.1 + vertex 31.3939 -26.6463 -0.2 endloop endfacet facet normal -0.814021 0.580836 0 outer loop vertex 31.3939 -26.6463 0 - vertex 31.2435 -26.857 -0.1 + vertex 31.2435 -26.857 -0.2 vertex 31.2435 -26.857 0 endloop endfacet facet normal -0.653404 0.75701 0 outer loop - vertex 31.2435 -26.857 -0.1 + vertex 31.2435 -26.857 -0.2 vertex 31.047 -27.0266 0 vertex 31.2435 -26.857 0 endloop @@ -6575,13 +6575,13 @@ solid OpenSCAD_Model facet normal -0.653404 0.75701 0 outer loop vertex 31.047 -27.0266 0 - vertex 31.2435 -26.857 -0.1 - vertex 31.047 -27.0266 -0.1 + vertex 31.2435 -26.857 -0.2 + vertex 31.047 -27.0266 -0.2 endloop endfacet facet normal -0.464184 0.885739 0 outer loop - vertex 31.047 -27.0266 -0.1 + vertex 31.047 -27.0266 -0.2 vertex 30.7934 -27.1595 0 vertex 31.047 -27.0266 0 endloop @@ -6589,13 +6589,13 @@ solid OpenSCAD_Model facet normal -0.464184 0.885739 0 outer loop vertex 30.7934 -27.1595 0 - vertex 31.047 -27.0266 -0.1 - vertex 30.7934 -27.1595 -0.1 + vertex 31.047 -27.0266 -0.2 + vertex 30.7934 -27.1595 -0.2 endloop endfacet facet normal -0.298657 0.954361 0 outer loop - vertex 30.7934 -27.1595 -0.1 + vertex 30.7934 -27.1595 -0.2 vertex 30.4717 -27.2602 0 vertex 30.7934 -27.1595 0 endloop @@ -6603,13 +6603,13 @@ solid OpenSCAD_Model facet normal -0.298657 0.954361 0 outer loop vertex 30.4717 -27.2602 0 - vertex 30.7934 -27.1595 -0.1 - vertex 30.4717 -27.2602 -0.1 + vertex 30.7934 -27.1595 -0.2 + vertex 30.4717 -27.2602 -0.2 endloop endfacet facet normal -0.17896 0.983856 0 outer loop - vertex 30.4717 -27.2602 -0.1 + vertex 30.4717 -27.2602 -0.2 vertex 30.0709 -27.3331 0 vertex 30.4717 -27.2602 0 endloop @@ -6617,13 +6617,13 @@ solid OpenSCAD_Model facet normal -0.17896 0.983856 0 outer loop vertex 30.0709 -27.3331 0 - vertex 30.4717 -27.2602 -0.1 - vertex 30.0709 -27.3331 -0.1 + vertex 30.4717 -27.2602 -0.2 + vertex 30.0709 -27.3331 -0.2 endloop endfacet facet normal -0.100534 0.994934 0 outer loop - vertex 30.0709 -27.3331 -0.1 + vertex 30.0709 -27.3331 -0.2 vertex 29.58 -27.3827 0 vertex 30.0709 -27.3331 0 endloop @@ -6631,13 +6631,13 @@ solid OpenSCAD_Model facet normal -0.100534 0.994934 0 outer loop vertex 29.58 -27.3827 0 - vertex 30.0709 -27.3331 -0.1 - vertex 29.58 -27.3827 -0.1 + vertex 30.0709 -27.3331 -0.2 + vertex 29.58 -27.3827 -0.2 endloop endfacet facet normal -0.0519093 0.998652 0 outer loop - vertex 29.58 -27.3827 -0.1 + vertex 29.58 -27.3827 -0.2 vertex 28.988 -27.4135 0 vertex 29.58 -27.3827 0 endloop @@ -6645,13 +6645,13 @@ solid OpenSCAD_Model facet normal -0.0519093 0.998652 0 outer loop vertex 28.988 -27.4135 0 - vertex 29.58 -27.3827 -0.1 - vertex 28.988 -27.4135 -0.1 + vertex 29.58 -27.3827 -0.2 + vertex 28.988 -27.4135 -0.2 endloop endfacet facet normal -0.014953 0.999888 0 outer loop - vertex 28.988 -27.4135 -0.1 + vertex 28.988 -27.4135 -0.2 vertex 27.4568 -27.4364 0 vertex 28.988 -27.4135 0 endloop @@ -6659,13 +6659,13 @@ solid OpenSCAD_Model facet normal -0.014953 0.999888 0 outer loop vertex 27.4568 -27.4364 0 - vertex 28.988 -27.4135 -0.1 - vertex 27.4568 -27.4364 -0.1 + vertex 28.988 -27.4135 -0.2 + vertex 27.4568 -27.4364 -0.2 endloop endfacet facet normal -0.000556252 1 0 outer loop - vertex 27.4568 -27.4364 -0.1 + vertex 27.4568 -27.4364 -0.2 vertex 25.3891 -27.4375 0 vertex 27.4568 -27.4364 0 endloop @@ -6673,13 +6673,13 @@ solid OpenSCAD_Model facet normal -0.000556252 1 0 outer loop vertex 25.3891 -27.4375 0 - vertex 27.4568 -27.4364 -0.1 - vertex 25.3891 -27.4375 -0.1 + vertex 27.4568 -27.4364 -0.2 + vertex 25.3891 -27.4375 -0.2 endloop endfacet facet normal -0.00092424 1 0 outer loop - vertex 25.3891 -27.4375 -0.1 + vertex 25.3891 -27.4375 -0.2 vertex 20.1247 -27.4424 0 vertex 25.3891 -27.4375 0 endloop @@ -6687,181 +6687,181 @@ solid OpenSCAD_Model facet normal -0.00092424 1 0 outer loop vertex 20.1247 -27.4424 0 - vertex 25.3891 -27.4375 -0.1 - vertex 20.1247 -27.4424 -0.1 + vertex 25.3891 -27.4375 -0.2 + vertex 20.1247 -27.4424 -0.2 endloop endfacet facet normal -0.945282 0.326254 0 outer loop - vertex 19.9171 -28.0436 -0.1 + vertex 19.9171 -28.0436 -0.2 vertex 20.1247 -27.4424 0 - vertex 20.1247 -27.4424 -0.1 + vertex 20.1247 -27.4424 -0.2 endloop endfacet facet normal -0.945282 0.326254 0 outer loop vertex 20.1247 -27.4424 0 - vertex 19.9171 -28.0436 -0.1 + vertex 19.9171 -28.0436 -0.2 vertex 19.9171 -28.0436 0 endloop endfacet facet normal -0.957593 0.288124 0 outer loop - vertex 19.6992 -28.7679 -0.1 + vertex 19.6992 -28.7679 -0.2 vertex 19.9171 -28.0436 0 - vertex 19.9171 -28.0436 -0.1 + vertex 19.9171 -28.0436 -0.2 endloop endfacet facet normal -0.957593 0.288124 0 outer loop vertex 19.9171 -28.0436 0 - vertex 19.6992 -28.7679 -0.1 + vertex 19.6992 -28.7679 -0.2 vertex 19.6992 -28.7679 0 endloop endfacet facet normal -0.97518 0.221412 0 outer loop - vertex 19.5256 -29.5327 -0.1 + vertex 19.5256 -29.5327 -0.2 vertex 19.6992 -28.7679 0 - vertex 19.6992 -28.7679 -0.1 + vertex 19.6992 -28.7679 -0.2 endloop endfacet facet normal -0.97518 0.221412 0 outer loop vertex 19.6992 -28.7679 0 - vertex 19.5256 -29.5327 -0.1 + vertex 19.5256 -29.5327 -0.2 vertex 19.5256 -29.5327 0 endloop endfacet facet normal -0.986769 0.16213 0 outer loop - vertex 19.3985 -30.306 -0.1 + vertex 19.3985 -30.306 -0.2 vertex 19.5256 -29.5327 0 - vertex 19.5256 -29.5327 -0.1 + vertex 19.5256 -29.5327 -0.2 endloop endfacet facet normal -0.986769 0.16213 0 outer loop vertex 19.5256 -29.5327 0 - vertex 19.3985 -30.306 -0.1 + vertex 19.3985 -30.306 -0.2 vertex 19.3985 -30.306 0 endloop endfacet facet normal -0.994613 0.103657 0 outer loop - vertex 19.3204 -31.0557 -0.1 + vertex 19.3204 -31.0557 -0.2 vertex 19.3985 -30.306 0 - vertex 19.3985 -30.306 -0.1 + vertex 19.3985 -30.306 -0.2 endloop endfacet facet normal -0.994613 0.103657 0 outer loop vertex 19.3985 -30.306 0 - vertex 19.3204 -31.0557 -0.1 + vertex 19.3204 -31.0557 -0.2 vertex 19.3204 -31.0557 0 endloop endfacet facet normal -0.999252 0.0386793 0 outer loop - vertex 19.2935 -31.7496 -0.1 + vertex 19.2935 -31.7496 -0.2 vertex 19.3204 -31.0557 0 - vertex 19.3204 -31.0557 -0.1 + vertex 19.3204 -31.0557 -0.2 endloop endfacet facet normal -0.999252 0.0386793 0 outer loop vertex 19.3204 -31.0557 0 - vertex 19.2935 -31.7496 -0.1 + vertex 19.2935 -31.7496 -0.2 vertex 19.2935 -31.7496 0 endloop endfacet facet normal -0.999028 -0.0440878 0 outer loop - vertex 19.3203 -32.3556 -0.1 + vertex 19.3203 -32.3556 -0.2 vertex 19.2935 -31.7496 0 - vertex 19.2935 -31.7496 -0.1 + vertex 19.2935 -31.7496 -0.2 endloop endfacet facet normal -0.999028 -0.0440878 0 outer loop vertex 19.2935 -31.7496 0 - vertex 19.3203 -32.3556 -0.1 + vertex 19.3203 -32.3556 -0.2 vertex 19.3203 -32.3556 0 endloop endfacet facet normal -0.991457 -0.130433 0 outer loop - vertex 19.3545 -32.6156 -0.1 + vertex 19.3545 -32.6156 -0.2 vertex 19.3203 -32.3556 0 - vertex 19.3203 -32.3556 -0.1 + vertex 19.3203 -32.3556 -0.2 endloop endfacet facet normal -0.991457 -0.130433 0 outer loop vertex 19.3203 -32.3556 0 - vertex 19.3545 -32.6156 -0.1 + vertex 19.3545 -32.6156 -0.2 vertex 19.3545 -32.6156 0 endloop endfacet facet normal -0.977754 -0.209757 0 outer loop - vertex 19.403 -32.8415 -0.1 + vertex 19.403 -32.8415 -0.2 vertex 19.3545 -32.6156 0 - vertex 19.3545 -32.6156 -0.1 + vertex 19.3545 -32.6156 -0.2 endloop endfacet facet normal -0.977754 -0.209757 0 outer loop vertex 19.3545 -32.6156 0 - vertex 19.403 -32.8415 -0.1 + vertex 19.403 -32.8415 -0.2 vertex 19.403 -32.8415 0 endloop endfacet facet normal -0.948071 -0.31806 0 outer loop - vertex 19.466 -33.0295 -0.1 + vertex 19.466 -33.0295 -0.2 vertex 19.403 -32.8415 0 - vertex 19.403 -32.8415 -0.1 + vertex 19.403 -32.8415 -0.2 endloop endfacet facet normal -0.948071 -0.31806 0 outer loop vertex 19.403 -32.8415 0 - vertex 19.466 -33.0295 -0.1 + vertex 19.466 -33.0295 -0.2 vertex 19.466 -33.0295 0 endloop endfacet facet normal -0.882102 -0.471058 0 outer loop - vertex 19.5439 -33.1754 -0.1 + vertex 19.5439 -33.1754 -0.2 vertex 19.466 -33.0295 0 - vertex 19.466 -33.0295 -0.1 + vertex 19.466 -33.0295 -0.2 endloop endfacet facet normal -0.882102 -0.471058 0 outer loop vertex 19.466 -33.0295 0 - vertex 19.5439 -33.1754 -0.1 + vertex 19.5439 -33.1754 -0.2 vertex 19.5439 -33.1754 0 endloop endfacet facet normal -0.777019 -0.629477 0 outer loop - vertex 19.7677 -33.4516 -0.1 + vertex 19.7677 -33.4516 -0.2 vertex 19.5439 -33.1754 0 - vertex 19.5439 -33.1754 -0.1 + vertex 19.5439 -33.1754 -0.2 endloop endfacet facet normal -0.777019 -0.629477 0 outer loop vertex 19.5439 -33.1754 0 - vertex 19.7677 -33.4516 -0.1 + vertex 19.7677 -33.4516 -0.2 vertex 19.7677 -33.4516 0 endloop endfacet facet normal -0.679559 -0.73362 0 outer loop - vertex 19.7677 -33.4516 -0.1 + vertex 19.7677 -33.4516 -0.2 vertex 20.0345 -33.6987 0 vertex 19.7677 -33.4516 0 endloop @@ -6869,13 +6869,13 @@ solid OpenSCAD_Model facet normal -0.679559 -0.73362 -0 outer loop vertex 20.0345 -33.6987 0 - vertex 19.7677 -33.4516 -0.1 - vertex 20.0345 -33.6987 -0.1 + vertex 19.7677 -33.4516 -0.2 + vertex 20.0345 -33.6987 -0.2 endloop endfacet facet normal -0.577724 -0.816232 0 outer loop - vertex 20.0345 -33.6987 -0.1 + vertex 20.0345 -33.6987 -0.2 vertex 20.3392 -33.9144 0 vertex 20.0345 -33.6987 0 endloop @@ -6883,13 +6883,13 @@ solid OpenSCAD_Model facet normal -0.577724 -0.816232 -0 outer loop vertex 20.3392 -33.9144 0 - vertex 20.0345 -33.6987 -0.1 - vertex 20.3392 -33.9144 -0.1 + vertex 20.0345 -33.6987 -0.2 + vertex 20.3392 -33.9144 -0.2 endloop endfacet facet normal -0.474279 -0.880374 0 outer loop - vertex 20.3392 -33.9144 -0.1 + vertex 20.3392 -33.9144 -0.2 vertex 20.6768 -34.0963 0 vertex 20.3392 -33.9144 0 endloop @@ -6897,13 +6897,13 @@ solid OpenSCAD_Model facet normal -0.474279 -0.880374 -0 outer loop vertex 20.6768 -34.0963 0 - vertex 20.3392 -33.9144 -0.1 - vertex 20.6768 -34.0963 -0.1 + vertex 20.3392 -33.9144 -0.2 + vertex 20.6768 -34.0963 -0.2 endloop endfacet facet normal -0.370342 -0.928896 0 outer loop - vertex 20.6768 -34.0963 -0.1 + vertex 20.6768 -34.0963 -0.2 vertex 21.0421 -34.2419 0 vertex 20.6768 -34.0963 0 endloop @@ -6911,13 +6911,13 @@ solid OpenSCAD_Model facet normal -0.370342 -0.928896 -0 outer loop vertex 21.0421 -34.2419 0 - vertex 20.6768 -34.0963 -0.1 - vertex 21.0421 -34.2419 -0.1 + vertex 20.6768 -34.0963 -0.2 + vertex 21.0421 -34.2419 -0.2 endloop endfacet facet normal -0.266037 -0.963963 0 outer loop - vertex 21.0421 -34.2419 -0.1 + vertex 21.0421 -34.2419 -0.2 vertex 21.43 -34.349 0 vertex 21.0421 -34.2419 0 endloop @@ -6925,13 +6925,13 @@ solid OpenSCAD_Model facet normal -0.266037 -0.963963 -0 outer loop vertex 21.43 -34.349 0 - vertex 21.0421 -34.2419 -0.1 - vertex 21.43 -34.349 -0.1 + vertex 21.0421 -34.2419 -0.2 + vertex 21.43 -34.349 -0.2 endloop endfacet facet normal -0.160906 -0.98697 0 outer loop - vertex 21.43 -34.349 -0.1 + vertex 21.43 -34.349 -0.2 vertex 21.8355 -34.4151 0 vertex 21.43 -34.349 0 endloop @@ -6939,13 +6939,13 @@ solid OpenSCAD_Model facet normal -0.160906 -0.98697 -0 outer loop vertex 21.8355 -34.4151 0 - vertex 21.43 -34.349 -0.1 - vertex 21.8355 -34.4151 -0.1 + vertex 21.43 -34.349 -0.2 + vertex 21.8355 -34.4151 -0.2 endloop endfacet facet normal -0.0544036 -0.998519 0 outer loop - vertex 21.8355 -34.4151 -0.1 + vertex 21.8355 -34.4151 -0.2 vertex 22.2534 -34.4379 0 vertex 21.8355 -34.4151 0 endloop @@ -6953,13 +6953,13 @@ solid OpenSCAD_Model facet normal -0.0544036 -0.998519 -0 outer loop vertex 22.2534 -34.4379 0 - vertex 21.8355 -34.4151 -0.1 - vertex 22.2534 -34.4379 -0.1 + vertex 21.8355 -34.4151 -0.2 + vertex 22.2534 -34.4379 -0.2 endloop endfacet facet normal 0.0273252 -0.999627 0 outer loop - vertex 22.2534 -34.4379 -0.1 + vertex 22.2534 -34.4379 -0.2 vertex 22.5956 -34.4285 0 vertex 22.2534 -34.4379 0 endloop @@ -6967,13 +6967,13 @@ solid OpenSCAD_Model facet normal 0.0273252 -0.999627 0 outer loop vertex 22.5956 -34.4285 0 - vertex 22.2534 -34.4379 -0.1 - vertex 22.5956 -34.4285 -0.1 + vertex 22.2534 -34.4379 -0.2 + vertex 22.5956 -34.4285 -0.2 endloop endfacet facet normal 0.0869987 -0.996208 0 outer loop - vertex 22.5956 -34.4285 -0.1 + vertex 22.5956 -34.4285 -0.2 vertex 22.9315 -34.3992 0 vertex 22.5956 -34.4285 0 endloop @@ -6981,13 +6981,13 @@ solid OpenSCAD_Model facet normal 0.0869987 -0.996208 0 outer loop vertex 22.9315 -34.3992 0 - vertex 22.5956 -34.4285 -0.1 - vertex 22.9315 -34.3992 -0.1 + vertex 22.5956 -34.4285 -0.2 + vertex 22.9315 -34.3992 -0.2 endloop endfacet facet normal 0.150489 -0.988612 0 outer loop - vertex 22.9315 -34.3992 -0.1 + vertex 22.9315 -34.3992 -0.2 vertex 23.2634 -34.3487 0 vertex 22.9315 -34.3992 0 endloop @@ -6995,13 +6995,13 @@ solid OpenSCAD_Model facet normal 0.150489 -0.988612 0 outer loop vertex 23.2634 -34.3487 0 - vertex 22.9315 -34.3992 -0.1 - vertex 23.2634 -34.3487 -0.1 + vertex 22.9315 -34.3992 -0.2 + vertex 23.2634 -34.3487 -0.2 endloop endfacet facet normal 0.215659 -0.976469 0 outer loop - vertex 23.2634 -34.3487 -0.1 + vertex 23.2634 -34.3487 -0.2 vertex 23.5933 -34.2758 0 vertex 23.2634 -34.3487 0 endloop @@ -7009,13 +7009,13 @@ solid OpenSCAD_Model facet normal 0.215659 -0.976469 0 outer loop vertex 23.5933 -34.2758 0 - vertex 23.2634 -34.3487 -0.1 - vertex 23.5933 -34.2758 -0.1 + vertex 23.2634 -34.3487 -0.2 + vertex 23.5933 -34.2758 -0.2 endloop endfacet facet normal 0.280239 -0.95993 0 outer loop - vertex 23.5933 -34.2758 -0.1 + vertex 23.5933 -34.2758 -0.2 vertex 23.9237 -34.1793 0 vertex 23.5933 -34.2758 0 endloop @@ -7023,13 +7023,13 @@ solid OpenSCAD_Model facet normal 0.280239 -0.95993 0 outer loop vertex 23.9237 -34.1793 0 - vertex 23.5933 -34.2758 -0.1 - vertex 23.9237 -34.1793 -0.1 + vertex 23.5933 -34.2758 -0.2 + vertex 23.9237 -34.1793 -0.2 endloop endfacet facet normal 0.342076 -0.939672 0 outer loop - vertex 23.9237 -34.1793 -0.1 + vertex 23.9237 -34.1793 -0.2 vertex 24.2566 -34.0582 0 vertex 23.9237 -34.1793 0 endloop @@ -7037,13 +7037,13 @@ solid OpenSCAD_Model facet normal 0.342076 -0.939672 0 outer loop vertex 24.2566 -34.0582 0 - vertex 23.9237 -34.1793 -0.1 - vertex 24.2566 -34.0582 -0.1 + vertex 23.9237 -34.1793 -0.2 + vertex 24.2566 -34.0582 -0.2 endloop endfacet facet normal 0.399452 -0.916754 0 outer loop - vertex 24.2566 -34.0582 -0.1 + vertex 24.2566 -34.0582 -0.2 vertex 24.5942 -33.911 0 vertex 24.2566 -34.0582 0 endloop @@ -7051,13 +7051,13 @@ solid OpenSCAD_Model facet normal 0.399452 -0.916754 0 outer loop vertex 24.5942 -33.911 0 - vertex 24.2566 -34.0582 -0.1 - vertex 24.5942 -33.911 -0.1 + vertex 24.2566 -34.0582 -0.2 + vertex 24.5942 -33.911 -0.2 endloop endfacet facet normal 0.451238 -0.892404 0 outer loop - vertex 24.5942 -33.911 -0.1 + vertex 24.5942 -33.911 -0.2 vertex 24.9388 -33.7368 0 vertex 24.5942 -33.911 0 endloop @@ -7065,13 +7065,13 @@ solid OpenSCAD_Model facet normal 0.451238 -0.892404 0 outer loop vertex 24.9388 -33.7368 0 - vertex 24.5942 -33.911 -0.1 - vertex 24.9388 -33.7368 -0.1 + vertex 24.5942 -33.911 -0.2 + vertex 24.9388 -33.7368 -0.2 endloop endfacet facet normal 0.496895 -0.867811 0 outer loop - vertex 24.9388 -33.7368 -0.1 + vertex 24.9388 -33.7368 -0.2 vertex 25.2926 -33.5342 0 vertex 24.9388 -33.7368 0 endloop @@ -7079,13 +7079,13 @@ solid OpenSCAD_Model facet normal 0.496895 -0.867811 0 outer loop vertex 25.2926 -33.5342 0 - vertex 24.9388 -33.7368 -0.1 - vertex 25.2926 -33.5342 -0.1 + vertex 24.9388 -33.7368 -0.2 + vertex 25.2926 -33.5342 -0.2 endloop endfacet facet normal 0.536389 -0.843971 0 outer loop - vertex 25.2926 -33.5342 -0.1 + vertex 25.2926 -33.5342 -0.2 vertex 25.6577 -33.3022 0 vertex 25.2926 -33.5342 0 endloop @@ -7093,13 +7093,13 @@ solid OpenSCAD_Model facet normal 0.536389 -0.843971 0 outer loop vertex 25.6577 -33.3022 0 - vertex 25.2926 -33.5342 -0.1 - vertex 25.6577 -33.3022 -0.1 + vertex 25.2926 -33.5342 -0.2 + vertex 25.6577 -33.3022 -0.2 endloop endfacet facet normal 0.584792 -0.811183 0 outer loop - vertex 25.6577 -33.3022 -0.1 + vertex 25.6577 -33.3022 -0.2 vertex 26.4309 -32.7448 0 vertex 25.6577 -33.3022 0 endloop @@ -7107,13 +7107,13 @@ solid OpenSCAD_Model facet normal 0.584792 -0.811183 0 outer loop vertex 26.4309 -32.7448 0 - vertex 25.6577 -33.3022 -0.1 - vertex 26.4309 -32.7448 -0.1 + vertex 25.6577 -33.3022 -0.2 + vertex 26.4309 -32.7448 -0.2 endloop endfacet facet normal 0.632266 -0.774751 0 outer loop - vertex 26.4309 -32.7448 -0.1 + vertex 26.4309 -32.7448 -0.2 vertex 27.276 -32.055 0 vertex 26.4309 -32.7448 0 endloop @@ -7121,13 +7121,13 @@ solid OpenSCAD_Model facet normal 0.632266 -0.774751 0 outer loop vertex 27.276 -32.055 0 - vertex 26.4309 -32.7448 -0.1 - vertex 27.276 -32.055 -0.1 + vertex 26.4309 -32.7448 -0.2 + vertex 27.276 -32.055 -0.2 endloop endfacet facet normal 0.66466 -0.747146 0 outer loop - vertex 27.276 -32.055 -0.1 + vertex 27.276 -32.055 -0.2 vertex 28.2108 -31.2235 0 vertex 27.276 -32.055 0 endloop @@ -7135,13 +7135,13 @@ solid OpenSCAD_Model facet normal 0.66466 -0.747146 0 outer loop vertex 28.2108 -31.2235 0 - vertex 27.276 -32.055 -0.1 - vertex 28.2108 -31.2235 -0.1 + vertex 27.276 -32.055 -0.2 + vertex 28.2108 -31.2235 -0.2 endloop endfacet facet normal 0.662871 -0.748733 0 outer loop - vertex 28.2108 -31.2235 -0.1 + vertex 28.2108 -31.2235 -0.2 vertex 28.5495 -30.9236 0 vertex 28.2108 -31.2235 0 endloop @@ -7149,13 +7149,13 @@ solid OpenSCAD_Model facet normal 0.662871 -0.748733 0 outer loop vertex 28.5495 -30.9236 0 - vertex 28.2108 -31.2235 -0.1 - vertex 28.5495 -30.9236 -0.1 + vertex 28.2108 -31.2235 -0.2 + vertex 28.5495 -30.9236 -0.2 endloop endfacet facet normal 0.615947 -0.787787 0 outer loop - vertex 28.5495 -30.9236 -0.1 + vertex 28.5495 -30.9236 -0.2 vertex 28.8369 -30.6989 0 vertex 28.5495 -30.9236 0 endloop @@ -7163,13 +7163,13 @@ solid OpenSCAD_Model facet normal 0.615947 -0.787787 0 outer loop vertex 28.8369 -30.6989 0 - vertex 28.5495 -30.9236 -0.1 - vertex 28.8369 -30.6989 -0.1 + vertex 28.5495 -30.9236 -0.2 + vertex 28.8369 -30.6989 -0.2 endloop endfacet facet normal 0.524001 -0.851718 0 outer loop - vertex 28.8369 -30.6989 -0.1 + vertex 28.8369 -30.6989 -0.2 vertex 29.0845 -30.5466 0 vertex 28.8369 -30.6989 0 endloop @@ -7177,13 +7177,13 @@ solid OpenSCAD_Model facet normal 0.524001 -0.851718 0 outer loop vertex 29.0845 -30.5466 0 - vertex 28.8369 -30.6989 -0.1 - vertex 29.0845 -30.5466 -0.1 + vertex 28.8369 -30.6989 -0.2 + vertex 29.0845 -30.5466 -0.2 endloop endfacet facet normal 0.352437 -0.935836 0 outer loop - vertex 29.0845 -30.5466 -0.1 + vertex 29.0845 -30.5466 -0.2 vertex 29.3033 -30.4642 0 vertex 29.0845 -30.5466 0 endloop @@ -7191,13 +7191,13 @@ solid OpenSCAD_Model facet normal 0.352437 -0.935836 0 outer loop vertex 29.3033 -30.4642 0 - vertex 29.0845 -30.5466 -0.1 - vertex 29.3033 -30.4642 -0.1 + vertex 29.0845 -30.5466 -0.2 + vertex 29.3033 -30.4642 -0.2 endloop endfacet facet normal 0.0751321 -0.997174 0 outer loop - vertex 29.3033 -30.4642 -0.1 + vertex 29.3033 -30.4642 -0.2 vertex 29.5048 -30.449 0 vertex 29.3033 -30.4642 0 endloop @@ -7205,13 +7205,13 @@ solid OpenSCAD_Model facet normal 0.0751321 -0.997174 0 outer loop vertex 29.5048 -30.449 0 - vertex 29.3033 -30.4642 -0.1 - vertex 29.5048 -30.449 -0.1 + vertex 29.3033 -30.4642 -0.2 + vertex 29.5048 -30.449 -0.2 endloop endfacet facet normal -0.245256 -0.969458 0 outer loop - vertex 29.5048 -30.449 -0.1 + vertex 29.5048 -30.449 -0.2 vertex 29.7002 -30.4984 0 vertex 29.5048 -30.449 0 endloop @@ -7219,13 +7219,13 @@ solid OpenSCAD_Model facet normal -0.245256 -0.969458 -0 outer loop vertex 29.7002 -30.4984 0 - vertex 29.5048 -30.449 -0.1 - vertex 29.7002 -30.4984 -0.1 + vertex 29.5048 -30.449 -0.2 + vertex 29.7002 -30.4984 -0.2 endloop endfacet facet normal -0.485575 -0.874195 0 outer loop - vertex 29.7002 -30.4984 -0.1 + vertex 29.7002 -30.4984 -0.2 vertex 29.9008 -30.6099 0 vertex 29.7002 -30.4984 0 endloop @@ -7233,13 +7233,13 @@ solid OpenSCAD_Model facet normal -0.485575 -0.874195 -0 outer loop vertex 29.9008 -30.6099 0 - vertex 29.7002 -30.4984 -0.1 - vertex 29.9008 -30.6099 -0.1 + vertex 29.7002 -30.4984 -0.2 + vertex 29.9008 -30.6099 -0.2 endloop endfacet facet normal -0.618314 -0.785931 0 outer loop - vertex 29.9008 -30.6099 -0.1 + vertex 29.9008 -30.6099 -0.2 vertex 30.1179 -30.7807 0 vertex 29.9008 -30.6099 0 endloop @@ -7247,167 +7247,167 @@ solid OpenSCAD_Model facet normal -0.618314 -0.785931 -0 outer loop vertex 30.1179 -30.7807 0 - vertex 29.9008 -30.6099 -0.1 - vertex 30.1179 -30.7807 -0.1 + vertex 29.9008 -30.6099 -0.2 + vertex 30.1179 -30.7807 -0.2 endloop endfacet facet normal -0.761006 -0.648745 0 outer loop - vertex 30.1812 -30.855 -0.1 + vertex 30.1812 -30.855 -0.2 vertex 30.1179 -30.7807 0 - vertex 30.1179 -30.7807 -0.1 + vertex 30.1179 -30.7807 -0.2 endloop endfacet facet normal -0.761006 -0.648745 0 outer loop vertex 30.1179 -30.7807 0 - vertex 30.1812 -30.855 -0.1 + vertex 30.1812 -30.855 -0.2 vertex 30.1812 -30.855 0 endloop endfacet facet normal -0.923965 -0.382477 0 outer loop - vertex 30.2187 -30.9454 -0.1 + vertex 30.2187 -30.9454 -0.2 vertex 30.1812 -30.855 0 - vertex 30.1812 -30.855 -0.1 + vertex 30.1812 -30.855 -0.2 endloop endfacet facet normal -0.923965 -0.382477 0 outer loop vertex 30.1812 -30.855 0 - vertex 30.2187 -30.9454 -0.1 + vertex 30.2187 -30.9454 -0.2 vertex 30.2187 -30.9454 0 endloop endfacet facet normal -0.994533 -0.104423 0 outer loop - vertex 30.2299 -31.0524 -0.1 + vertex 30.2299 -31.0524 -0.2 vertex 30.2187 -30.9454 0 - vertex 30.2187 -30.9454 -0.1 + vertex 30.2187 -30.9454 -0.2 endloop endfacet facet normal -0.994533 -0.104423 0 outer loop vertex 30.2187 -30.9454 0 - vertex 30.2299 -31.0524 -0.1 + vertex 30.2299 -31.0524 -0.2 vertex 30.2299 -31.0524 0 endloop endfacet facet normal -0.992515 0.122124 0 outer loop - vertex 30.2146 -31.1764 -0.1 + vertex 30.2146 -31.1764 -0.2 vertex 30.2299 -31.0524 0 - vertex 30.2299 -31.0524 -0.1 + vertex 30.2299 -31.0524 -0.2 endloop endfacet facet normal -0.992515 0.122124 0 outer loop vertex 30.2299 -31.0524 0 - vertex 30.2146 -31.1764 -0.1 + vertex 30.2146 -31.1764 -0.2 vertex 30.2146 -31.1764 0 endloop endfacet facet normal -0.95856 0.284892 0 outer loop - vertex 30.1726 -31.3179 -0.1 + vertex 30.1726 -31.3179 -0.2 vertex 30.2146 -31.1764 0 - vertex 30.2146 -31.1764 -0.1 + vertex 30.2146 -31.1764 -0.2 endloop endfacet facet normal -0.95856 0.284892 0 outer loop vertex 30.2146 -31.1764 0 - vertex 30.1726 -31.3179 -0.1 + vertex 30.1726 -31.3179 -0.2 vertex 30.1726 -31.3179 0 endloop endfacet facet normal -0.917421 0.397919 0 outer loop - vertex 30.1034 -31.4773 -0.1 + vertex 30.1034 -31.4773 -0.2 vertex 30.1726 -31.3179 0 - vertex 30.1726 -31.3179 -0.1 + vertex 30.1726 -31.3179 -0.2 endloop endfacet facet normal -0.917421 0.397919 0 outer loop vertex 30.1726 -31.3179 0 - vertex 30.1034 -31.4773 -0.1 + vertex 30.1034 -31.4773 -0.2 vertex 30.1034 -31.4773 0 endloop endfacet facet normal -0.861393 0.50794 0 outer loop - vertex 29.8827 -31.8517 -0.1 + vertex 29.8827 -31.8517 -0.2 vertex 30.1034 -31.4773 0 - vertex 30.1034 -31.4773 -0.1 + vertex 30.1034 -31.4773 -0.2 endloop endfacet facet normal -0.861393 0.50794 0 outer loop vertex 30.1034 -31.4773 0 - vertex 29.8827 -31.8517 -0.1 + vertex 29.8827 -31.8517 -0.2 vertex 29.8827 -31.8517 0 endloop endfacet facet normal -0.804973 0.593311 0 outer loop - vertex 29.5499 -32.3032 -0.1 + vertex 29.5499 -32.3032 -0.2 vertex 29.8827 -31.8517 0 - vertex 29.8827 -31.8517 -0.1 + vertex 29.8827 -31.8517 -0.2 endloop endfacet facet normal -0.804973 0.593311 0 outer loop vertex 29.8827 -31.8517 0 - vertex 29.5499 -32.3032 -0.1 + vertex 29.5499 -32.3032 -0.2 vertex 29.5499 -32.3032 0 endloop endfacet facet normal -0.76559 0.643329 0 outer loop - vertex 29.1028 -32.8352 -0.1 + vertex 29.1028 -32.8352 -0.2 vertex 29.5499 -32.3032 0 - vertex 29.5499 -32.3032 -0.1 + vertex 29.5499 -32.3032 -0.2 endloop endfacet facet normal -0.76559 0.643329 0 outer loop vertex 29.5499 -32.3032 0 - vertex 29.1028 -32.8352 -0.1 + vertex 29.1028 -32.8352 -0.2 vertex 29.1028 -32.8352 0 endloop endfacet facet normal -0.73778 0.675042 0 outer loop - vertex 28.539 -33.4515 -0.1 + vertex 28.539 -33.4515 -0.2 vertex 29.1028 -32.8352 0 - vertex 29.1028 -32.8352 -0.1 + vertex 29.1028 -32.8352 -0.2 endloop endfacet facet normal -0.73778 0.675042 0 outer loop vertex 29.1028 -32.8352 0 - vertex 28.539 -33.4515 -0.1 + vertex 28.539 -33.4515 -0.2 vertex 28.539 -33.4515 0 endloop endfacet facet normal -0.717743 0.696309 0 outer loop - vertex 27.856 -34.1555 -0.1 + vertex 27.856 -34.1555 -0.2 vertex 28.539 -33.4515 0 - vertex 28.539 -33.4515 -0.1 + vertex 28.539 -33.4515 -0.2 endloop endfacet facet normal -0.717743 0.696309 0 outer loop vertex 28.539 -33.4515 0 - vertex 27.856 -34.1555 -0.1 + vertex 27.856 -34.1555 -0.2 vertex 27.856 -34.1555 0 endloop endfacet facet normal -0.702585 0.7116 0 outer loop - vertex 27.856 -34.1555 -0.1 + vertex 27.856 -34.1555 -0.2 vertex 27.3514 -34.6537 0 vertex 27.856 -34.1555 0 endloop @@ -7415,13 +7415,13 @@ solid OpenSCAD_Model facet normal -0.702585 0.7116 0 outer loop vertex 27.3514 -34.6537 0 - vertex 27.856 -34.1555 -0.1 - vertex 27.3514 -34.6537 -0.1 + vertex 27.856 -34.1555 -0.2 + vertex 27.3514 -34.6537 -0.2 endloop endfacet facet normal -0.683825 0.729646 0 outer loop - vertex 27.3514 -34.6537 -0.1 + vertex 27.3514 -34.6537 -0.2 vertex 26.8832 -35.0925 0 vertex 27.3514 -34.6537 0 endloop @@ -7429,13 +7429,13 @@ solid OpenSCAD_Model facet normal -0.683825 0.729646 0 outer loop vertex 26.8832 -35.0925 0 - vertex 27.3514 -34.6537 -0.1 - vertex 26.8832 -35.0925 -0.1 + vertex 27.3514 -34.6537 -0.2 + vertex 26.8832 -35.0925 -0.2 endloop endfacet facet normal -0.65863 0.752467 0 outer loop - vertex 26.8832 -35.0925 -0.1 + vertex 26.8832 -35.0925 -0.2 vertex 26.4377 -35.4824 0 vertex 26.8832 -35.0925 0 endloop @@ -7443,13 +7443,13 @@ solid OpenSCAD_Model facet normal -0.65863 0.752467 0 outer loop vertex 26.4377 -35.4824 0 - vertex 26.8832 -35.0925 -0.1 - vertex 26.4377 -35.4824 -0.1 + vertex 26.8832 -35.0925 -0.2 + vertex 26.4377 -35.4824 -0.2 endloop endfacet facet normal -0.627338 0.778747 0 outer loop - vertex 26.4377 -35.4824 -0.1 + vertex 26.4377 -35.4824 -0.2 vertex 26.0012 -35.834 0 vertex 26.4377 -35.4824 0 endloop @@ -7457,13 +7457,13 @@ solid OpenSCAD_Model facet normal -0.627338 0.778747 0 outer loop vertex 26.0012 -35.834 0 - vertex 26.4377 -35.4824 -0.1 - vertex 26.0012 -35.834 -0.1 + vertex 26.4377 -35.4824 -0.2 + vertex 26.0012 -35.834 -0.2 endloop endfacet facet normal -0.591741 0.806128 0 outer loop - vertex 26.0012 -35.834 -0.1 + vertex 26.0012 -35.834 -0.2 vertex 25.5601 -36.1579 0 vertex 26.0012 -35.834 0 endloop @@ -7471,13 +7471,13 @@ solid OpenSCAD_Model facet normal -0.591741 0.806128 0 outer loop vertex 25.5601 -36.1579 0 - vertex 26.0012 -35.834 -0.1 - vertex 25.5601 -36.1579 -0.1 + vertex 26.0012 -35.834 -0.2 + vertex 25.5601 -36.1579 -0.2 endloop endfacet facet normal -0.554992 0.831856 0 outer loop - vertex 25.5601 -36.1579 -0.1 + vertex 25.5601 -36.1579 -0.2 vertex 25.1006 -36.4644 0 vertex 25.5601 -36.1579 0 endloop @@ -7485,13 +7485,13 @@ solid OpenSCAD_Model facet normal -0.554992 0.831856 0 outer loop vertex 25.1006 -36.4644 0 - vertex 25.5601 -36.1579 -0.1 - vertex 25.1006 -36.4644 -0.1 + vertex 25.5601 -36.1579 -0.2 + vertex 25.1006 -36.4644 -0.2 endloop endfacet facet normal -0.520754 0.853707 0 outer loop - vertex 25.1006 -36.4644 -0.1 + vertex 25.1006 -36.4644 -0.2 vertex 24.6091 -36.7642 0 vertex 25.1006 -36.4644 0 endloop @@ -7499,13 +7499,13 @@ solid OpenSCAD_Model facet normal -0.520754 0.853707 0 outer loop vertex 24.6091 -36.7642 0 - vertex 25.1006 -36.4644 -0.1 - vertex 24.6091 -36.7642 -0.1 + vertex 25.1006 -36.4644 -0.2 + vertex 24.6091 -36.7642 -0.2 endloop endfacet facet normal -0.492012 0.870588 0 outer loop - vertex 24.6091 -36.7642 -0.1 + vertex 24.6091 -36.7642 -0.2 vertex 24.0719 -37.0678 0 vertex 24.6091 -36.7642 0 endloop @@ -7513,13 +7513,13 @@ solid OpenSCAD_Model facet normal -0.492012 0.870588 0 outer loop vertex 24.0719 -37.0678 0 - vertex 24.6091 -36.7642 -0.1 - vertex 24.0719 -37.0678 -0.1 + vertex 24.6091 -36.7642 -0.2 + vertex 24.0719 -37.0678 -0.2 endloop endfacet facet normal -0.469837 0.882753 0 outer loop - vertex 24.0719 -37.0678 -0.1 + vertex 24.0719 -37.0678 -0.2 vertex 23.2902 -37.4839 0 vertex 24.0719 -37.0678 0 endloop @@ -7527,13 +7527,13 @@ solid OpenSCAD_Model facet normal -0.469837 0.882753 0 outer loop vertex 23.2902 -37.4839 0 - vertex 24.0719 -37.0678 -0.1 - vertex 23.2902 -37.4839 -0.1 + vertex 24.0719 -37.0678 -0.2 + vertex 23.2902 -37.4839 -0.2 endloop endfacet facet normal -0.440052 0.897972 0 outer loop - vertex 23.2902 -37.4839 -0.1 + vertex 23.2902 -37.4839 -0.2 vertex 22.6041 -37.8201 0 vertex 23.2902 -37.4839 0 endloop @@ -7541,13 +7541,13 @@ solid OpenSCAD_Model facet normal -0.440052 0.897972 0 outer loop vertex 22.6041 -37.8201 0 - vertex 23.2902 -37.4839 -0.1 - vertex 22.6041 -37.8201 -0.1 + vertex 23.2902 -37.4839 -0.2 + vertex 22.6041 -37.8201 -0.2 endloop endfacet facet normal -0.394271 0.918994 0 outer loop - vertex 22.6041 -37.8201 -0.1 + vertex 22.6041 -37.8201 -0.2 vertex 21.9889 -38.084 0 vertex 22.6041 -37.8201 0 endloop @@ -7555,13 +7555,13 @@ solid OpenSCAD_Model facet normal -0.394271 0.918994 0 outer loop vertex 21.9889 -38.084 0 - vertex 22.6041 -37.8201 -0.1 - vertex 21.9889 -38.084 -0.1 + vertex 22.6041 -37.8201 -0.2 + vertex 21.9889 -38.084 -0.2 endloop endfacet facet normal -0.330435 0.943829 0 outer loop - vertex 21.9889 -38.084 -0.1 + vertex 21.9889 -38.084 -0.2 vertex 21.4197 -38.2833 0 vertex 21.9889 -38.084 0 endloop @@ -7569,13 +7569,13 @@ solid OpenSCAD_Model facet normal -0.330435 0.943829 0 outer loop vertex 21.4197 -38.2833 0 - vertex 21.9889 -38.084 -0.1 - vertex 21.4197 -38.2833 -0.1 + vertex 21.9889 -38.084 -0.2 + vertex 21.4197 -38.2833 -0.2 endloop endfacet facet normal -0.251155 0.967947 0 outer loop - vertex 21.4197 -38.2833 -0.1 + vertex 21.4197 -38.2833 -0.2 vertex 20.8717 -38.4255 0 vertex 21.4197 -38.2833 0 endloop @@ -7583,13 +7583,13 @@ solid OpenSCAD_Model facet normal -0.251155 0.967947 0 outer loop vertex 20.8717 -38.4255 0 - vertex 21.4197 -38.2833 -0.1 - vertex 20.8717 -38.4255 -0.1 + vertex 21.4197 -38.2833 -0.2 + vertex 20.8717 -38.4255 -0.2 endloop endfacet facet normal -0.165695 0.986177 0 outer loop - vertex 20.8717 -38.4255 -0.1 + vertex 20.8717 -38.4255 -0.2 vertex 20.3202 -38.5182 0 vertex 20.8717 -38.4255 0 endloop @@ -7597,13 +7597,13 @@ solid OpenSCAD_Model facet normal -0.165695 0.986177 0 outer loop vertex 20.3202 -38.5182 0 - vertex 20.8717 -38.4255 -0.1 - vertex 20.3202 -38.5182 -0.1 + vertex 20.8717 -38.4255 -0.2 + vertex 20.3202 -38.5182 -0.2 endloop endfacet facet normal -0.0871415 0.996196 0 outer loop - vertex 20.3202 -38.5182 -0.1 + vertex 20.3202 -38.5182 -0.2 vertex 19.7403 -38.5689 0 vertex 20.3202 -38.5182 0 endloop @@ -7611,13 +7611,13 @@ solid OpenSCAD_Model facet normal -0.0871415 0.996196 0 outer loop vertex 19.7403 -38.5689 0 - vertex 20.3202 -38.5182 -0.1 - vertex 19.7403 -38.5689 -0.1 + vertex 20.3202 -38.5182 -0.2 + vertex 19.7403 -38.5689 -0.2 endloop endfacet facet normal -0.0258263 0.999666 0 outer loop - vertex 19.7403 -38.5689 -0.1 + vertex 19.7403 -38.5689 -0.2 vertex 19.1073 -38.5852 0 vertex 19.7403 -38.5689 0 endloop @@ -7625,13 +7625,13 @@ solid OpenSCAD_Model facet normal -0.0258263 0.999666 0 outer loop vertex 19.1073 -38.5852 0 - vertex 19.7403 -38.5689 -0.1 - vertex 19.1073 -38.5852 -0.1 + vertex 19.7403 -38.5689 -0.2 + vertex 19.1073 -38.5852 -0.2 endloop endfacet facet normal 0.0407265 0.99917 -0 outer loop - vertex 19.1073 -38.5852 -0.1 + vertex 19.1073 -38.5852 -0.2 vertex 18.4669 -38.5591 0 vertex 19.1073 -38.5852 0 endloop @@ -7639,13 +7639,13 @@ solid OpenSCAD_Model facet normal 0.0407265 0.99917 0 outer loop vertex 18.4669 -38.5591 0 - vertex 19.1073 -38.5852 -0.1 - vertex 18.4669 -38.5591 -0.1 + vertex 19.1073 -38.5852 -0.2 + vertex 18.4669 -38.5591 -0.2 endloop endfacet facet normal 0.12356 0.992337 -0 outer loop - vertex 18.4669 -38.5591 -0.1 + vertex 18.4669 -38.5591 -0.2 vertex 18.1792 -38.5233 0 vertex 18.4669 -38.5591 0 endloop @@ -7653,13 +7653,13 @@ solid OpenSCAD_Model facet normal 0.12356 0.992337 0 outer loop vertex 18.1792 -38.5233 0 - vertex 18.4669 -38.5591 -0.1 - vertex 18.1792 -38.5233 -0.1 + vertex 18.4669 -38.5591 -0.2 + vertex 18.1792 -38.5233 -0.2 endloop endfacet facet normal 0.189246 0.98193 -0 outer loop - vertex 18.1792 -38.5233 -0.1 + vertex 18.1792 -38.5233 -0.2 vertex 17.9062 -38.4707 0 vertex 18.1792 -38.5233 0 endloop @@ -7667,13 +7667,13 @@ solid OpenSCAD_Model facet normal 0.189246 0.98193 0 outer loop vertex 17.9062 -38.4707 0 - vertex 18.1792 -38.5233 -0.1 - vertex 17.9062 -38.4707 -0.1 + vertex 18.1792 -38.5233 -0.2 + vertex 17.9062 -38.4707 -0.2 endloop endfacet facet normal 0.258743 0.965946 -0 outer loop - vertex 17.9062 -38.4707 -0.1 + vertex 17.9062 -38.4707 -0.2 vertex 17.6424 -38.4 0 vertex 17.9062 -38.4707 0 endloop @@ -7681,13 +7681,13 @@ solid OpenSCAD_Model facet normal 0.258743 0.965946 0 outer loop vertex 17.6424 -38.4 0 - vertex 17.9062 -38.4707 -0.1 - vertex 17.6424 -38.4 -0.1 + vertex 17.9062 -38.4707 -0.2 + vertex 17.6424 -38.4 -0.2 endloop endfacet facet normal 0.326993 0.945027 -0 outer loop - vertex 17.6424 -38.4 -0.1 + vertex 17.6424 -38.4 -0.2 vertex 17.3825 -38.3101 0 vertex 17.6424 -38.4 0 endloop @@ -7695,13 +7695,13 @@ solid OpenSCAD_Model facet normal 0.326993 0.945027 0 outer loop vertex 17.3825 -38.3101 0 - vertex 17.6424 -38.4 -0.1 - vertex 17.3825 -38.3101 -0.1 + vertex 17.6424 -38.4 -0.2 + vertex 17.3825 -38.3101 -0.2 endloop endfacet facet normal 0.389172 0.921165 -0 outer loop - vertex 17.3825 -38.3101 -0.1 + vertex 17.3825 -38.3101 -0.2 vertex 17.1211 -38.1997 0 vertex 17.3825 -38.3101 0 endloop @@ -7709,13 +7709,13 @@ solid OpenSCAD_Model facet normal 0.389172 0.921165 0 outer loop vertex 17.1211 -38.1997 0 - vertex 17.3825 -38.3101 -0.1 - vertex 17.1211 -38.1997 -0.1 + vertex 17.3825 -38.3101 -0.2 + vertex 17.1211 -38.1997 -0.2 endloop endfacet facet normal 0.442006 0.897012 -0 outer loop - vertex 17.1211 -38.1997 -0.1 + vertex 17.1211 -38.1997 -0.2 vertex 16.8529 -38.0675 0 vertex 17.1211 -38.1997 0 endloop @@ -7723,13 +7723,13 @@ solid OpenSCAD_Model facet normal 0.442006 0.897012 0 outer loop vertex 16.8529 -38.0675 0 - vertex 17.1211 -38.1997 -0.1 - vertex 16.8529 -38.0675 -0.1 + vertex 17.1211 -38.1997 -0.2 + vertex 16.8529 -38.0675 -0.2 endloop endfacet facet normal 0.508496 0.861064 -0 outer loop - vertex 16.8529 -38.0675 -0.1 + vertex 16.8529 -38.0675 -0.2 vertex 16.342 -37.7658 0 vertex 16.8529 -38.0675 0 endloop @@ -7737,13 +7737,13 @@ solid OpenSCAD_Model facet normal 0.508496 0.861064 0 outer loop vertex 16.342 -37.7658 0 - vertex 16.8529 -38.0675 -0.1 - vertex 16.342 -37.7658 -0.1 + vertex 16.8529 -38.0675 -0.2 + vertex 16.342 -37.7658 -0.2 endloop endfacet facet normal 0.581032 0.813881 -0 outer loop - vertex 16.342 -37.7658 -0.1 + vertex 16.342 -37.7658 -0.2 vertex 16.1153 -37.6039 0 vertex 16.342 -37.7658 0 endloop @@ -7751,13 +7751,13 @@ solid OpenSCAD_Model facet normal 0.581032 0.813881 0 outer loop vertex 16.1153 -37.6039 0 - vertex 16.342 -37.7658 -0.1 - vertex 16.1153 -37.6039 -0.1 + vertex 16.342 -37.7658 -0.2 + vertex 16.1153 -37.6039 -0.2 endloop endfacet facet normal 0.632987 0.774162 -0 outer loop - vertex 16.1153 -37.6039 -0.1 + vertex 16.1153 -37.6039 -0.2 vertex 15.907 -37.4336 0 vertex 16.1153 -37.6039 0 endloop @@ -7765,13 +7765,13 @@ solid OpenSCAD_Model facet normal 0.632987 0.774162 0 outer loop vertex 15.907 -37.4336 0 - vertex 16.1153 -37.6039 -0.1 - vertex 15.907 -37.4336 -0.1 + vertex 16.1153 -37.6039 -0.2 + vertex 15.907 -37.4336 -0.2 endloop endfacet facet normal 0.68624 0.727375 -0 outer loop - vertex 15.907 -37.4336 -0.1 + vertex 15.907 -37.4336 -0.2 vertex 15.7167 -37.2541 0 vertex 15.907 -37.4336 0 endloop @@ -7779,405 +7779,405 @@ solid OpenSCAD_Model facet normal 0.68624 0.727375 0 outer loop vertex 15.7167 -37.2541 0 - vertex 15.907 -37.4336 -0.1 - vertex 15.7167 -37.2541 -0.1 + vertex 15.907 -37.4336 -0.2 + vertex 15.7167 -37.2541 -0.2 endloop endfacet facet normal 0.739053 0.673647 0 outer loop vertex 15.7167 -37.2541 0 - vertex 15.544 -37.0647 -0.1 + vertex 15.544 -37.0647 -0.2 vertex 15.544 -37.0647 0 endloop endfacet facet normal 0.739053 0.673647 0 outer loop - vertex 15.544 -37.0647 -0.1 + vertex 15.544 -37.0647 -0.2 vertex 15.7167 -37.2541 0 - vertex 15.7167 -37.2541 -0.1 + vertex 15.7167 -37.2541 -0.2 endloop endfacet facet normal 0.789576 0.613652 0 outer loop vertex 15.544 -37.0647 0 - vertex 15.3884 -36.8644 -0.1 + vertex 15.3884 -36.8644 -0.2 vertex 15.3884 -36.8644 0 endloop endfacet facet normal 0.789576 0.613652 0 outer loop - vertex 15.3884 -36.8644 -0.1 + vertex 15.3884 -36.8644 -0.2 vertex 15.544 -37.0647 0 - vertex 15.544 -37.0647 -0.1 + vertex 15.544 -37.0647 -0.2 endloop endfacet facet normal 0.835985 0.548752 0 outer loop vertex 15.3884 -36.8644 0 - vertex 15.2493 -36.6526 -0.1 + vertex 15.2493 -36.6526 -0.2 vertex 15.2493 -36.6526 0 endloop endfacet facet normal 0.835985 0.548752 0 outer loop - vertex 15.2493 -36.6526 -0.1 + vertex 15.2493 -36.6526 -0.2 vertex 15.3884 -36.8644 0 - vertex 15.3884 -36.8644 -0.1 + vertex 15.3884 -36.8644 -0.2 endloop endfacet facet normal 0.876837 0.480788 0 outer loop vertex 15.2493 -36.6526 0 - vertex 15.1264 -36.4284 -0.1 + vertex 15.1264 -36.4284 -0.2 vertex 15.1264 -36.4284 0 endloop endfacet facet normal 0.876837 0.480788 0 outer loop - vertex 15.1264 -36.4284 -0.1 + vertex 15.1264 -36.4284 -0.2 vertex 15.2493 -36.6526 0 - vertex 15.2493 -36.6526 -0.1 + vertex 15.2493 -36.6526 -0.2 endloop endfacet facet normal 0.911228 0.411902 0 outer loop vertex 15.1264 -36.4284 0 - vertex 15.0191 -36.1911 -0.1 + vertex 15.0191 -36.1911 -0.2 vertex 15.0191 -36.1911 0 endloop endfacet facet normal 0.911228 0.411902 0 outer loop - vertex 15.0191 -36.1911 -0.1 + vertex 15.0191 -36.1911 -0.2 vertex 15.1264 -36.4284 0 - vertex 15.1264 -36.4284 -0.1 + vertex 15.1264 -36.4284 -0.2 endloop endfacet facet normal 0.938903 0.344183 0 outer loop vertex 15.0191 -36.1911 0 - vertex 14.927 -35.9398 -0.1 + vertex 14.927 -35.9398 -0.2 vertex 14.927 -35.9398 0 endloop endfacet facet normal 0.938903 0.344183 0 outer loop - vertex 14.927 -35.9398 -0.1 + vertex 14.927 -35.9398 -0.2 vertex 15.0191 -36.1911 0 - vertex 15.0191 -36.1911 -0.1 + vertex 15.0191 -36.1911 -0.2 endloop endfacet facet normal 0.960161 0.279447 0 outer loop vertex 14.927 -35.9398 0 - vertex 14.8496 -35.6738 -0.1 + vertex 14.8496 -35.6738 -0.2 vertex 14.8496 -35.6738 0 endloop endfacet facet normal 0.960161 0.279447 0 outer loop - vertex 14.8496 -35.6738 -0.1 + vertex 14.8496 -35.6738 -0.2 vertex 14.927 -35.9398 0 - vertex 14.927 -35.9398 -0.1 + vertex 14.927 -35.9398 -0.2 endloop endfacet facet normal 0.981615 0.190873 0 outer loop vertex 14.8496 -35.6738 0 - vertex 14.7369 -35.0944 -0.1 + vertex 14.7369 -35.0944 -0.2 vertex 14.7369 -35.0944 0 endloop endfacet facet normal 0.981615 0.190873 0 outer loop - vertex 14.7369 -35.0944 -0.1 + vertex 14.7369 -35.0944 -0.2 vertex 14.8496 -35.6738 0 - vertex 14.8496 -35.6738 -0.1 + vertex 14.8496 -35.6738 -0.2 endloop endfacet facet normal 0.995797 0.0915901 0 outer loop vertex 14.7369 -35.0944 0 - vertex 14.6774 -34.4466 -0.1 + vertex 14.6774 -34.4466 -0.2 vertex 14.6774 -34.4466 0 endloop endfacet facet normal 0.995797 0.0915901 0 outer loop - vertex 14.6774 -34.4466 -0.1 + vertex 14.6774 -34.4466 -0.2 vertex 14.7369 -35.0944 0 - vertex 14.7369 -35.0944 -0.1 + vertex 14.7369 -35.0944 -0.2 endloop endfacet facet normal 0.999758 0.0220201 0 outer loop vertex 14.6774 -34.4466 0 - vertex 14.6656 -33.913 -0.1 + vertex 14.6656 -33.913 -0.2 vertex 14.6656 -33.913 0 endloop endfacet facet normal 0.999758 0.0220201 0 outer loop - vertex 14.6656 -33.913 -0.1 + vertex 14.6656 -33.913 -0.2 vertex 14.6774 -34.4466 0 - vertex 14.6774 -34.4466 -0.1 + vertex 14.6774 -34.4466 -0.2 endloop endfacet facet normal 0.999472 -0.03249 0 outer loop vertex 14.6656 -33.913 0 - vertex 14.6832 -33.3707 -0.1 + vertex 14.6832 -33.3707 -0.2 vertex 14.6832 -33.3707 0 endloop endfacet facet normal 0.999472 -0.03249 0 outer loop - vertex 14.6832 -33.3707 -0.1 + vertex 14.6832 -33.3707 -0.2 vertex 14.6656 -33.913 0 - vertex 14.6656 -33.913 -0.1 + vertex 14.6656 -33.913 -0.2 endloop endfacet facet normal 0.996411 -0.0846524 0 outer loop vertex 14.6832 -33.3707 0 - vertex 14.73 -32.8205 -0.1 + vertex 14.73 -32.8205 -0.2 vertex 14.73 -32.8205 0 endloop endfacet facet normal 0.996411 -0.0846524 0 outer loop - vertex 14.73 -32.8205 -0.1 + vertex 14.73 -32.8205 -0.2 vertex 14.6832 -33.3707 0 - vertex 14.6832 -33.3707 -0.1 + vertex 14.6832 -33.3707 -0.2 endloop endfacet facet normal 0.990928 -0.134393 0 outer loop vertex 14.73 -32.8205 0 - vertex 14.8056 -32.2631 -0.1 + vertex 14.8056 -32.2631 -0.2 vertex 14.8056 -32.2631 0 endloop endfacet facet normal 0.990928 -0.134393 0 outer loop - vertex 14.8056 -32.2631 -0.1 + vertex 14.8056 -32.2631 -0.2 vertex 14.73 -32.8205 0 - vertex 14.73 -32.8205 -0.1 + vertex 14.73 -32.8205 -0.2 endloop endfacet facet normal 0.983352 -0.181712 0 outer loop vertex 14.8056 -32.2631 0 - vertex 14.9098 -31.6993 -0.1 + vertex 14.9098 -31.6993 -0.2 vertex 14.9098 -31.6993 0 endloop endfacet facet normal 0.983352 -0.181712 0 outer loop - vertex 14.9098 -31.6993 -0.1 + vertex 14.9098 -31.6993 -0.2 vertex 14.8056 -32.2631 0 - vertex 14.8056 -32.2631 -0.1 + vertex 14.8056 -32.2631 -0.2 endloop endfacet facet normal 0.973979 -0.226639 0 outer loop vertex 14.9098 -31.6993 0 - vertex 15.0423 -31.1299 -0.1 + vertex 15.0423 -31.1299 -0.2 vertex 15.0423 -31.1299 0 endloop endfacet facet normal 0.973979 -0.226639 0 outer loop - vertex 15.0423 -31.1299 -0.1 + vertex 15.0423 -31.1299 -0.2 vertex 14.9098 -31.6993 0 - vertex 14.9098 -31.6993 -0.1 + vertex 14.9098 -31.6993 -0.2 endloop endfacet facet normal 0.963072 -0.269246 0 outer loop vertex 15.0423 -31.1299 0 - vertex 15.2028 -30.5555 -0.1 + vertex 15.2028 -30.5555 -0.2 vertex 15.2028 -30.5555 0 endloop endfacet facet normal 0.963072 -0.269246 0 outer loop - vertex 15.2028 -30.5555 -0.1 + vertex 15.2028 -30.5555 -0.2 vertex 15.0423 -31.1299 0 - vertex 15.0423 -31.1299 -0.1 + vertex 15.0423 -31.1299 -0.2 endloop endfacet facet normal 0.950861 -0.309619 0 outer loop vertex 15.2028 -30.5555 0 - vertex 15.3912 -29.9771 -0.1 + vertex 15.3912 -29.9771 -0.2 vertex 15.3912 -29.9771 0 endloop endfacet facet normal 0.950861 -0.309619 0 outer loop - vertex 15.3912 -29.9771 -0.1 + vertex 15.3912 -29.9771 -0.2 vertex 15.2028 -30.5555 0 - vertex 15.2028 -30.5555 -0.1 + vertex 15.2028 -30.5555 -0.2 endloop endfacet facet normal 0.93754 -0.347877 0 outer loop vertex 15.3912 -29.9771 0 - vertex 15.6071 -29.3953 -0.1 + vertex 15.6071 -29.3953 -0.2 vertex 15.6071 -29.3953 0 endloop endfacet facet normal 0.93754 -0.347877 0 outer loop - vertex 15.6071 -29.3953 -0.1 + vertex 15.6071 -29.3953 -0.2 vertex 15.3912 -29.9771 0 - vertex 15.3912 -29.9771 -0.1 + vertex 15.3912 -29.9771 -0.2 endloop endfacet facet normal 0.92328 -0.384128 0 outer loop vertex 15.6071 -29.3953 0 - vertex 15.8502 -28.8109 -0.1 + vertex 15.8502 -28.8109 -0.2 vertex 15.8502 -28.8109 0 endloop endfacet facet normal 0.92328 -0.384128 0 outer loop - vertex 15.8502 -28.8109 -0.1 + vertex 15.8502 -28.8109 -0.2 vertex 15.6071 -29.3953 0 - vertex 15.6071 -29.3953 -0.1 + vertex 15.6071 -29.3953 -0.2 endloop endfacet facet normal 0.908217 -0.418499 0 outer loop vertex 15.8502 -28.8109 0 - vertex 16.1203 -28.2246 -0.1 + vertex 16.1203 -28.2246 -0.2 vertex 16.1203 -28.2246 0 endloop endfacet facet normal 0.908217 -0.418499 0 outer loop - vertex 16.1203 -28.2246 -0.1 + vertex 16.1203 -28.2246 -0.2 vertex 15.8502 -28.8109 0 - vertex 15.8502 -28.8109 -0.1 + vertex 15.8502 -28.8109 -0.2 endloop endfacet facet normal 0.892471 -0.451106 0 outer loop vertex 16.1203 -28.2246 0 - vertex 16.4172 -27.6373 -0.1 + vertex 16.4172 -27.6373 -0.2 vertex 16.4172 -27.6373 0 endloop endfacet facet normal 0.892471 -0.451106 0 outer loop - vertex 16.4172 -27.6373 -0.1 + vertex 16.4172 -27.6373 -0.2 vertex 16.1203 -28.2246 0 - vertex 16.1203 -28.2246 -0.1 + vertex 16.1203 -28.2246 -0.2 endloop endfacet facet normal 0.876136 -0.482063 0 outer loop vertex 16.4172 -27.6373 0 - vertex 16.7406 -27.0496 -0.1 + vertex 16.7406 -27.0496 -0.2 vertex 16.7406 -27.0496 0 endloop endfacet facet normal 0.876136 -0.482063 0 outer loop - vertex 16.7406 -27.0496 -0.1 + vertex 16.7406 -27.0496 -0.2 vertex 16.4172 -27.6373 0 - vertex 16.4172 -27.6373 -0.1 + vertex 16.4172 -27.6373 -0.2 endloop endfacet facet normal 0.85929 -0.511489 0 outer loop vertex 16.7406 -27.0496 0 - vertex 17.0901 -26.4624 -0.1 + vertex 17.0901 -26.4624 -0.2 vertex 17.0901 -26.4624 0 endloop endfacet facet normal 0.85929 -0.511489 0 outer loop - vertex 17.0901 -26.4624 -0.1 + vertex 17.0901 -26.4624 -0.2 vertex 16.7406 -27.0496 0 - vertex 16.7406 -27.0496 -0.1 + vertex 16.7406 -27.0496 -0.2 endloop endfacet facet normal 0.841993 -0.539488 0 outer loop vertex 17.0901 -26.4624 0 - vertex 17.4656 -25.8764 -0.1 + vertex 17.4656 -25.8764 -0.2 vertex 17.4656 -25.8764 0 endloop endfacet facet normal 0.841993 -0.539488 0 outer loop - vertex 17.4656 -25.8764 -0.1 + vertex 17.4656 -25.8764 -0.2 vertex 17.0901 -26.4624 0 - vertex 17.0901 -26.4624 -0.1 + vertex 17.0901 -26.4624 -0.2 endloop endfacet facet normal 0.8243 -0.566153 0 outer loop vertex 17.4656 -25.8764 0 - vertex 17.8667 -25.2923 -0.1 + vertex 17.8667 -25.2923 -0.2 vertex 17.8667 -25.2923 0 endloop endfacet facet normal 0.8243 -0.566153 0 outer loop - vertex 17.8667 -25.2923 -0.1 + vertex 17.8667 -25.2923 -0.2 vertex 17.4656 -25.8764 0 - vertex 17.4656 -25.8764 -0.1 + vertex 17.4656 -25.8764 -0.2 endloop endfacet facet normal 0.801921 -0.59743 0 outer loop vertex 17.8667 -25.2923 0 - vertex 18.4501 -24.5093 -0.1 + vertex 18.4501 -24.5093 -0.2 vertex 18.4501 -24.5093 0 endloop endfacet facet normal 0.801921 -0.59743 0 outer loop - vertex 18.4501 -24.5093 -0.1 + vertex 18.4501 -24.5093 -0.2 vertex 17.8667 -25.2923 0 - vertex 17.8667 -25.2923 -0.1 + vertex 17.8667 -25.2923 -0.2 endloop endfacet facet normal 0.772213 -0.635364 0 outer loop vertex 18.4501 -24.5093 0 - vertex 19.0503 -23.7798 -0.1 + vertex 19.0503 -23.7798 -0.2 vertex 19.0503 -23.7798 0 endloop endfacet facet normal 0.772213 -0.635364 0 outer loop - vertex 19.0503 -23.7798 -0.1 + vertex 19.0503 -23.7798 -0.2 vertex 18.4501 -24.5093 0 - vertex 18.4501 -24.5093 -0.1 + vertex 18.4501 -24.5093 -0.2 endloop endfacet facet normal 0.738434 -0.674325 0 outer loop vertex 19.0503 -23.7798 0 - vertex 19.6689 -23.1024 -0.1 + vertex 19.6689 -23.1024 -0.2 vertex 19.6689 -23.1024 0 endloop endfacet facet normal 0.738434 -0.674325 0 outer loop - vertex 19.6689 -23.1024 -0.1 + vertex 19.6689 -23.1024 -0.2 vertex 19.0503 -23.7798 0 - vertex 19.0503 -23.7798 -0.1 + vertex 19.0503 -23.7798 -0.2 endloop endfacet facet normal 0.700496 -0.713656 0 outer loop - vertex 19.6689 -23.1024 -0.1 + vertex 19.6689 -23.1024 -0.2 vertex 20.3071 -22.4759 0 vertex 19.6689 -23.1024 0 endloop @@ -8185,13 +8185,13 @@ solid OpenSCAD_Model facet normal 0.700496 -0.713656 0 outer loop vertex 20.3071 -22.4759 0 - vertex 19.6689 -23.1024 -0.1 - vertex 20.3071 -22.4759 -0.1 + vertex 19.6689 -23.1024 -0.2 + vertex 20.3071 -22.4759 -0.2 endloop endfacet facet normal 0.658485 -0.752594 0 outer loop - vertex 20.3071 -22.4759 -0.1 + vertex 20.3071 -22.4759 -0.2 vertex 20.9665 -21.899 0 vertex 20.3071 -22.4759 0 endloop @@ -8199,13 +8199,13 @@ solid OpenSCAD_Model facet normal 0.658485 -0.752594 0 outer loop vertex 20.9665 -21.899 0 - vertex 20.3071 -22.4759 -0.1 - vertex 20.9665 -21.899 -0.1 + vertex 20.3071 -22.4759 -0.2 + vertex 20.9665 -21.899 -0.2 endloop endfacet facet normal 0.612713 -0.790306 0 outer loop - vertex 20.9665 -21.899 -0.1 + vertex 20.9665 -21.899 -0.2 vertex 21.6485 -21.3703 0 vertex 20.9665 -21.899 0 endloop @@ -8213,13 +8213,13 @@ solid OpenSCAD_Model facet normal 0.612713 -0.790306 0 outer loop vertex 21.6485 -21.3703 0 - vertex 20.9665 -21.899 -0.1 - vertex 21.6485 -21.3703 -0.1 + vertex 20.9665 -21.899 -0.2 + vertex 21.6485 -21.3703 -0.2 endloop endfacet facet normal 0.563707 -0.825975 0 outer loop - vertex 21.6485 -21.3703 -0.1 + vertex 21.6485 -21.3703 -0.2 vertex 22.3543 -20.8886 0 vertex 21.6485 -21.3703 0 endloop @@ -8227,13 +8227,13 @@ solid OpenSCAD_Model facet normal 0.563707 -0.825975 0 outer loop vertex 22.3543 -20.8886 0 - vertex 21.6485 -21.3703 -0.1 - vertex 22.3543 -20.8886 -0.1 + vertex 21.6485 -21.3703 -0.2 + vertex 22.3543 -20.8886 -0.2 endloop endfacet facet normal 0.512208 -0.858861 0 outer loop - vertex 22.3543 -20.8886 -0.1 + vertex 22.3543 -20.8886 -0.2 vertex 23.0854 -20.4525 0 vertex 22.3543 -20.8886 0 endloop @@ -8241,13 +8241,13 @@ solid OpenSCAD_Model facet normal 0.512208 -0.858861 0 outer loop vertex 23.0854 -20.4525 0 - vertex 22.3543 -20.8886 -0.1 - vertex 23.0854 -20.4525 -0.1 + vertex 22.3543 -20.8886 -0.2 + vertex 23.0854 -20.4525 -0.2 endloop endfacet facet normal 0.471781 -0.881716 0 outer loop - vertex 23.0854 -20.4525 -0.1 + vertex 23.0854 -20.4525 -0.2 vertex 23.7493 -20.0973 0 vertex 23.0854 -20.4525 0 endloop @@ -8255,13 +8255,13 @@ solid OpenSCAD_Model facet normal 0.471781 -0.881716 0 outer loop vertex 23.7493 -20.0973 0 - vertex 23.0854 -20.4525 -0.1 - vertex 23.7493 -20.0973 -0.1 + vertex 23.0854 -20.4525 -0.2 + vertex 23.7493 -20.0973 -0.2 endloop endfacet facet normal 0.433016 -0.901386 0 outer loop - vertex 23.7493 -20.0973 -0.1 + vertex 23.7493 -20.0973 -0.2 vertex 24.3497 -19.8089 0 vertex 23.7493 -20.0973 0 endloop @@ -8269,13 +8269,13 @@ solid OpenSCAD_Model facet normal 0.433016 -0.901386 0 outer loop vertex 24.3497 -19.8089 0 - vertex 23.7493 -20.0973 -0.1 - vertex 24.3497 -19.8089 -0.1 + vertex 23.7493 -20.0973 -0.2 + vertex 24.3497 -19.8089 -0.2 endloop endfacet facet normal 0.377334 -0.926077 0 outer loop - vertex 24.3497 -19.8089 -0.1 + vertex 24.3497 -19.8089 -0.2 vertex 24.9086 -19.5812 0 vertex 24.3497 -19.8089 0 endloop @@ -8283,13 +8283,13 @@ solid OpenSCAD_Model facet normal 0.377334 -0.926077 0 outer loop vertex 24.9086 -19.5812 0 - vertex 24.3497 -19.8089 -0.1 - vertex 24.9086 -19.5812 -0.1 + vertex 24.3497 -19.8089 -0.2 + vertex 24.9086 -19.5812 -0.2 endloop endfacet facet normal 0.305529 -0.952183 0 outer loop - vertex 24.9086 -19.5812 -0.1 + vertex 24.9086 -19.5812 -0.2 vertex 25.4477 -19.4082 0 vertex 24.9086 -19.5812 0 endloop @@ -8297,13 +8297,13 @@ solid OpenSCAD_Model facet normal 0.305529 -0.952183 0 outer loop vertex 25.4477 -19.4082 0 - vertex 24.9086 -19.5812 -0.1 - vertex 25.4477 -19.4082 -0.1 + vertex 24.9086 -19.5812 -0.2 + vertex 25.4477 -19.4082 -0.2 endloop endfacet facet normal 0.223751 -0.974646 0 outer loop - vertex 25.4477 -19.4082 -0.1 + vertex 25.4477 -19.4082 -0.2 vertex 25.9886 -19.284 0 vertex 25.4477 -19.4082 0 endloop @@ -8311,13 +8311,13 @@ solid OpenSCAD_Model facet normal 0.223751 -0.974646 0 outer loop vertex 25.9886 -19.284 0 - vertex 25.4477 -19.4082 -0.1 - vertex 25.9886 -19.284 -0.1 + vertex 25.4477 -19.4082 -0.2 + vertex 25.9886 -19.284 -0.2 endloop endfacet facet normal 0.142672 -0.98977 0 outer loop - vertex 25.9886 -19.284 -0.1 + vertex 25.9886 -19.284 -0.2 vertex 26.5531 -19.2026 0 vertex 25.9886 -19.284 0 endloop @@ -8325,13 +8325,13 @@ solid OpenSCAD_Model facet normal 0.142672 -0.98977 0 outer loop vertex 26.5531 -19.2026 0 - vertex 25.9886 -19.284 -0.1 - vertex 26.5531 -19.2026 -0.1 + vertex 25.9886 -19.284 -0.2 + vertex 26.5531 -19.2026 -0.2 endloop endfacet facet normal 0.072849 -0.997343 0 outer loop - vertex 26.5531 -19.2026 -0.1 + vertex 26.5531 -19.2026 -0.2 vertex 27.1629 -19.1581 0 vertex 26.5531 -19.2026 0 endloop @@ -8339,13 +8339,13 @@ solid OpenSCAD_Model facet normal 0.072849 -0.997343 0 outer loop vertex 27.1629 -19.1581 0 - vertex 26.5531 -19.2026 -0.1 - vertex 27.1629 -19.1581 -0.1 + vertex 26.5531 -19.2026 -0.2 + vertex 27.1629 -19.1581 -0.2 endloop endfacet facet normal 0.0202302 -0.999795 0 outer loop - vertex 27.1629 -19.1581 -0.1 + vertex 27.1629 -19.1581 -0.2 vertex 27.8398 -19.1444 0 vertex 27.1629 -19.1581 0 endloop @@ -8353,13 +8353,13 @@ solid OpenSCAD_Model facet normal 0.0202302 -0.999795 0 outer loop vertex 27.8398 -19.1444 0 - vertex 27.1629 -19.1581 -0.1 - vertex 27.8398 -19.1444 -0.1 + vertex 27.1629 -19.1581 -0.2 + vertex 27.8398 -19.1444 -0.2 endloop endfacet facet normal -0.0344796 -0.999405 0 outer loop - vertex 27.8398 -19.1444 -0.1 + vertex 27.8398 -19.1444 -0.2 vertex 28.4483 -19.1654 0 vertex 27.8398 -19.1444 0 endloop @@ -8367,13 +8367,13 @@ solid OpenSCAD_Model facet normal -0.0344796 -0.999405 -0 outer loop vertex 28.4483 -19.1654 0 - vertex 27.8398 -19.1444 -0.1 - vertex 28.4483 -19.1654 -0.1 + vertex 27.8398 -19.1444 -0.2 + vertex 28.4483 -19.1654 -0.2 endloop endfacet facet normal -0.149538 0.988756 0 outer loop - vertex 25.51 -21.8307 -0.1 + vertex 25.51 -21.8307 -0.2 vertex 25.181 -21.8805 0 vertex 25.51 -21.8307 0 endloop @@ -8381,13 +8381,13 @@ solid OpenSCAD_Model facet normal -0.149538 0.988756 0 outer loop vertex 25.181 -21.8805 0 - vertex 25.51 -21.8307 -0.1 - vertex 25.181 -21.8805 -0.1 + vertex 25.51 -21.8307 -0.2 + vertex 25.181 -21.8805 -0.2 endloop endfacet facet normal -0.215553 0.976492 0 outer loop - vertex 25.181 -21.8805 -0.1 + vertex 25.181 -21.8805 -0.2 vertex 24.827 -21.9586 0 vertex 25.181 -21.8805 0 endloop @@ -8395,13 +8395,13 @@ solid OpenSCAD_Model facet normal -0.215553 0.976492 0 outer loop vertex 24.827 -21.9586 0 - vertex 25.181 -21.8805 -0.1 - vertex 24.827 -21.9586 -0.1 + vertex 25.181 -21.8805 -0.2 + vertex 24.827 -21.9586 -0.2 endloop endfacet facet normal -0.27228 0.962218 0 outer loop - vertex 24.827 -21.9586 -0.1 + vertex 24.827 -21.9586 -0.2 vertex 24.5319 -22.0421 0 vertex 24.827 -21.9586 0 endloop @@ -8409,13 +8409,13 @@ solid OpenSCAD_Model facet normal -0.27228 0.962218 0 outer loop vertex 24.5319 -22.0421 0 - vertex 24.827 -21.9586 -0.1 - vertex 24.5319 -22.0421 -0.1 + vertex 24.827 -21.9586 -0.2 + vertex 24.5319 -22.0421 -0.2 endloop endfacet facet normal -0.339982 0.940432 0 outer loop - vertex 24.5319 -22.0421 -0.1 + vertex 24.5319 -22.0421 -0.2 vertex 24.2621 -22.1397 0 vertex 24.5319 -22.0421 0 endloop @@ -8423,13 +8423,13 @@ solid OpenSCAD_Model facet normal -0.339982 0.940432 0 outer loop vertex 24.2621 -22.1397 0 - vertex 24.5319 -22.0421 -0.1 - vertex 24.2621 -22.1397 -0.1 + vertex 24.5319 -22.0421 -0.2 + vertex 24.2621 -22.1397 -0.2 endloop endfacet facet normal -0.419841 0.907598 0 outer loop - vertex 24.2621 -22.1397 -0.1 + vertex 24.2621 -22.1397 -0.2 vertex 24.0091 -22.2567 0 vertex 24.2621 -22.1397 0 endloop @@ -8437,13 +8437,13 @@ solid OpenSCAD_Model facet normal -0.419841 0.907598 0 outer loop vertex 24.0091 -22.2567 0 - vertex 24.2621 -22.1397 -0.1 - vertex 24.0091 -22.2567 -0.1 + vertex 24.2621 -22.1397 -0.2 + vertex 24.0091 -22.2567 -0.2 endloop endfacet facet normal -0.501876 0.864939 0 outer loop - vertex 24.0091 -22.2567 -0.1 + vertex 24.0091 -22.2567 -0.2 vertex 23.7644 -22.3987 0 vertex 24.0091 -22.2567 0 endloop @@ -8451,13 +8451,13 @@ solid OpenSCAD_Model facet normal -0.501876 0.864939 0 outer loop vertex 23.7644 -22.3987 0 - vertex 24.0091 -22.2567 -0.1 - vertex 23.7644 -22.3987 -0.1 + vertex 24.0091 -22.2567 -0.2 + vertex 23.7644 -22.3987 -0.2 endloop endfacet facet normal -0.575619 0.817718 0 outer loop - vertex 23.7644 -22.3987 -0.1 + vertex 23.7644 -22.3987 -0.2 vertex 23.5194 -22.5712 0 vertex 23.7644 -22.3987 0 endloop @@ -8465,13 +8465,13 @@ solid OpenSCAD_Model facet normal -0.575619 0.817718 0 outer loop vertex 23.5194 -22.5712 0 - vertex 23.7644 -22.3987 -0.1 - vertex 23.5194 -22.5712 -0.1 + vertex 23.7644 -22.3987 -0.2 + vertex 23.5194 -22.5712 -0.2 endloop endfacet facet normal -0.634613 0.77283 0 outer loop - vertex 23.5194 -22.5712 -0.1 + vertex 23.5194 -22.5712 -0.2 vertex 23.2657 -22.7795 0 vertex 23.5194 -22.5712 0 endloop @@ -8479,13 +8479,13 @@ solid OpenSCAD_Model facet normal -0.634613 0.77283 0 outer loop vertex 23.2657 -22.7795 0 - vertex 23.5194 -22.5712 -0.1 - vertex 23.2657 -22.7795 -0.1 + vertex 23.5194 -22.5712 -0.2 + vertex 23.2657 -22.7795 -0.2 endloop endfacet facet normal -0.693326 0.720624 0 outer loop - vertex 23.2657 -22.7795 -0.1 + vertex 23.2657 -22.7795 -0.2 vertex 22.6979 -23.3258 0 vertex 23.2657 -22.7795 0 endloop @@ -8493,83 +8493,83 @@ solid OpenSCAD_Model facet normal -0.693326 0.720624 0 outer loop vertex 22.6979 -23.3258 0 - vertex 23.2657 -22.7795 -0.1 - vertex 22.6979 -23.3258 -0.1 + vertex 23.2657 -22.7795 -0.2 + vertex 22.6979 -23.3258 -0.2 endloop endfacet facet normal -0.729687 0.683781 0 outer loop - vertex 22.2832 -23.7683 -0.1 + vertex 22.2832 -23.7683 -0.2 vertex 22.6979 -23.3258 0 - vertex 22.6979 -23.3258 -0.1 + vertex 22.6979 -23.3258 -0.2 endloop endfacet facet normal -0.729687 0.683781 0 outer loop vertex 22.6979 -23.3258 0 - vertex 22.2832 -23.7683 -0.1 + vertex 22.2832 -23.7683 -0.2 vertex 22.2832 -23.7683 0 endloop endfacet facet normal -0.755777 0.65483 0 outer loop - vertex 21.9437 -24.1601 -0.1 + vertex 21.9437 -24.1601 -0.2 vertex 22.2832 -23.7683 0 - vertex 22.2832 -23.7683 -0.1 + vertex 22.2832 -23.7683 -0.2 endloop endfacet facet normal -0.755777 0.65483 0 outer loop vertex 22.2832 -23.7683 0 - vertex 21.9437 -24.1601 -0.1 + vertex 21.9437 -24.1601 -0.2 vertex 21.9437 -24.1601 0 endloop endfacet facet normal -0.793147 0.60903 0 outer loop - vertex 21.7143 -24.4589 -0.1 + vertex 21.7143 -24.4589 -0.2 vertex 21.9437 -24.1601 0 - vertex 21.9437 -24.1601 -0.1 + vertex 21.9437 -24.1601 -0.2 endloop endfacet facet normal -0.793147 0.60903 0 outer loop vertex 21.9437 -24.1601 0 - vertex 21.7143 -24.4589 -0.1 + vertex 21.7143 -24.4589 -0.2 vertex 21.7143 -24.4589 0 endloop endfacet facet normal -0.850912 0.525308 0 outer loop - vertex 21.6518 -24.5601 -0.1 + vertex 21.6518 -24.5601 -0.2 vertex 21.7143 -24.4589 0 - vertex 21.7143 -24.4589 -0.1 + vertex 21.7143 -24.4589 -0.2 endloop endfacet facet normal -0.850912 0.525308 0 outer loop vertex 21.7143 -24.4589 0 - vertex 21.6518 -24.5601 -0.1 + vertex 21.6518 -24.5601 -0.2 vertex 21.6518 -24.5601 0 endloop endfacet facet normal -0.943329 0.331858 0 outer loop - vertex 21.63 -24.6221 -0.1 + vertex 21.63 -24.6221 -0.2 vertex 21.6518 -24.5601 0 - vertex 21.6518 -24.5601 -0.1 + vertex 21.6518 -24.5601 -0.2 endloop endfacet facet normal -0.943329 0.331858 0 outer loop vertex 21.6518 -24.5601 0 - vertex 21.63 -24.6221 -0.1 + vertex 21.63 -24.6221 -0.2 vertex 21.63 -24.6221 0 endloop endfacet facet normal -0.568017 -0.823017 0 outer loop - vertex 21.63 -24.6221 -0.1 + vertex 21.63 -24.6221 -0.2 vertex 21.6873 -24.6616 0 vertex 21.63 -24.6221 0 endloop @@ -8577,13 +8577,13 @@ solid OpenSCAD_Model facet normal -0.568017 -0.823017 -0 outer loop vertex 21.6873 -24.6616 0 - vertex 21.63 -24.6221 -0.1 - vertex 21.6873 -24.6616 -0.1 + vertex 21.63 -24.6221 -0.2 + vertex 21.6873 -24.6616 -0.2 endloop endfacet facet normal -0.21919 -0.975682 0 outer loop - vertex 21.6873 -24.6616 -0.1 + vertex 21.6873 -24.6616 -0.2 vertex 21.8514 -24.6984 0 vertex 21.6873 -24.6616 0 endloop @@ -8591,13 +8591,13 @@ solid OpenSCAD_Model facet normal -0.21919 -0.975682 -0 outer loop vertex 21.8514 -24.6984 0 - vertex 21.6873 -24.6616 -0.1 - vertex 21.8514 -24.6984 -0.1 + vertex 21.6873 -24.6616 -0.2 + vertex 21.8514 -24.6984 -0.2 endloop endfacet facet normal -0.103226 -0.994658 0 outer loop - vertex 21.8514 -24.6984 -0.1 + vertex 21.8514 -24.6984 -0.2 vertex 22.454 -24.761 0 vertex 21.8514 -24.6984 0 endloop @@ -8605,13 +8605,13 @@ solid OpenSCAD_Model facet normal -0.103226 -0.994658 -0 outer loop vertex 22.454 -24.761 0 - vertex 21.8514 -24.6984 -0.1 - vertex 22.454 -24.761 -0.1 + vertex 21.8514 -24.6984 -0.2 + vertex 22.454 -24.761 -0.2 endloop endfacet facet normal -0.0473276 -0.998879 0 outer loop - vertex 22.454 -24.761 -0.1 + vertex 22.454 -24.761 -0.2 vertex 23.3459 -24.8032 0 vertex 22.454 -24.761 0 endloop @@ -8619,13 +8619,13 @@ solid OpenSCAD_Model facet normal -0.0473276 -0.998879 -0 outer loop vertex 23.3459 -24.8032 0 - vertex 22.454 -24.761 -0.1 - vertex 23.3459 -24.8032 -0.1 + vertex 22.454 -24.761 -0.2 + vertex 23.3459 -24.8032 -0.2 endloop endfacet facet normal -0.0142485 -0.999898 0 outer loop - vertex 23.3459 -24.8032 -0.1 + vertex 23.3459 -24.8032 -0.2 vertex 24.435 -24.8188 0 vertex 23.3459 -24.8032 0 endloop @@ -8633,13 +8633,13 @@ solid OpenSCAD_Model facet normal -0.0142485 -0.999898 -0 outer loop vertex 24.435 -24.8188 0 - vertex 23.3459 -24.8032 -0.1 - vertex 24.435 -24.8188 -0.1 + vertex 23.3459 -24.8032 -0.2 + vertex 24.435 -24.8188 -0.2 endloop endfacet facet normal 0 -1 0 outer loop - vertex 24.435 -24.8188 -0.1 + vertex 24.435 -24.8188 -0.2 vertex 27.2401 -24.8188 0 vertex 24.435 -24.8188 0 endloop @@ -8647,125 +8647,125 @@ solid OpenSCAD_Model facet normal 0 -1 -0 outer loop vertex 27.2401 -24.8188 0 - vertex 24.435 -24.8188 -0.1 - vertex 27.2401 -24.8188 -0.1 + vertex 24.435 -24.8188 -0.2 + vertex 27.2401 -24.8188 -0.2 endloop endfacet facet normal 0.986418 -0.164252 0 outer loop vertex 27.2401 -24.8188 0 - vertex 27.373 -24.0204 -0.1 + vertex 27.373 -24.0204 -0.2 vertex 27.373 -24.0204 0 endloop endfacet facet normal 0.986418 -0.164252 0 outer loop - vertex 27.373 -24.0204 -0.1 + vertex 27.373 -24.0204 -0.2 vertex 27.2401 -24.8188 0 - vertex 27.2401 -24.8188 -0.1 + vertex 27.2401 -24.8188 -0.2 endloop endfacet facet normal 0.99159 -0.129416 0 outer loop vertex 27.373 -24.0204 0 - vertex 27.4161 -23.6904 -0.1 + vertex 27.4161 -23.6904 -0.2 vertex 27.4161 -23.6904 0 endloop endfacet facet normal 0.99159 -0.129416 0 outer loop - vertex 27.4161 -23.6904 -0.1 + vertex 27.4161 -23.6904 -0.2 vertex 27.373 -24.0204 0 - vertex 27.373 -24.0204 -0.1 + vertex 27.373 -24.0204 -0.2 endloop endfacet facet normal 0.998763 -0.0497285 0 outer loop vertex 27.4161 -23.6904 0 - vertex 27.4312 -23.3865 -0.1 + vertex 27.4312 -23.3865 -0.2 vertex 27.4312 -23.3865 0 endloop endfacet facet normal 0.998763 -0.0497285 0 outer loop - vertex 27.4312 -23.3865 -0.1 + vertex 27.4312 -23.3865 -0.2 vertex 27.4161 -23.6904 0 - vertex 27.4161 -23.6904 -0.1 + vertex 27.4161 -23.6904 -0.2 endloop endfacet facet normal 0.998974 0.0452785 0 outer loop vertex 27.4312 -23.3865 0 - vertex 27.4186 -23.1088 -0.1 + vertex 27.4186 -23.1088 -0.2 vertex 27.4186 -23.1088 0 endloop endfacet facet normal 0.998974 0.0452785 0 outer loop - vertex 27.4186 -23.1088 -0.1 + vertex 27.4186 -23.1088 -0.2 vertex 27.4312 -23.3865 0 - vertex 27.4312 -23.3865 -0.1 + vertex 27.4312 -23.3865 -0.2 endloop endfacet facet normal 0.987512 0.157546 0 outer loop vertex 27.4186 -23.1088 0 - vertex 27.3785 -22.8574 -0.1 + vertex 27.3785 -22.8574 -0.2 vertex 27.3785 -22.8574 0 endloop endfacet facet normal 0.987512 0.157546 0 outer loop - vertex 27.3785 -22.8574 -0.1 + vertex 27.3785 -22.8574 -0.2 vertex 27.4186 -23.1088 0 - vertex 27.4186 -23.1088 -0.1 + vertex 27.4186 -23.1088 -0.2 endloop endfacet facet normal 0.957877 0.287177 0 outer loop vertex 27.3785 -22.8574 0 - vertex 27.3111 -22.6325 -0.1 + vertex 27.3111 -22.6325 -0.2 vertex 27.3111 -22.6325 0 endloop endfacet facet normal 0.957877 0.287177 0 outer loop - vertex 27.3111 -22.6325 -0.1 + vertex 27.3111 -22.6325 -0.2 vertex 27.3785 -22.8574 0 - vertex 27.3785 -22.8574 -0.1 + vertex 27.3785 -22.8574 -0.2 endloop endfacet facet normal 0.902589 0.430503 0 outer loop vertex 27.3111 -22.6325 0 - vertex 27.2166 -22.4344 -0.1 + vertex 27.2166 -22.4344 -0.2 vertex 27.2166 -22.4344 0 endloop endfacet facet normal 0.902589 0.430503 0 outer loop - vertex 27.2166 -22.4344 -0.1 + vertex 27.2166 -22.4344 -0.2 vertex 27.3111 -22.6325 0 - vertex 27.3111 -22.6325 -0.1 + vertex 27.3111 -22.6325 -0.2 endloop endfacet facet normal 0.815851 0.578262 0 outer loop vertex 27.2166 -22.4344 0 - vertex 27.0952 -22.2631 -0.1 + vertex 27.0952 -22.2631 -0.2 vertex 27.0952 -22.2631 0 endloop endfacet facet normal 0.815851 0.578262 0 outer loop - vertex 27.0952 -22.2631 -0.1 + vertex 27.0952 -22.2631 -0.2 vertex 27.2166 -22.4344 0 - vertex 27.2166 -22.4344 -0.1 + vertex 27.2166 -22.4344 -0.2 endloop endfacet facet normal 0.697754 0.716337 -0 outer loop - vertex 27.0952 -22.2631 -0.1 + vertex 27.0952 -22.2631 -0.2 vertex 26.9471 -22.1189 0 vertex 27.0952 -22.2631 0 endloop @@ -8773,13 +8773,13 @@ solid OpenSCAD_Model facet normal 0.697754 0.716337 0 outer loop vertex 26.9471 -22.1189 0 - vertex 27.0952 -22.2631 -0.1 - vertex 26.9471 -22.1189 -0.1 + vertex 27.0952 -22.2631 -0.2 + vertex 26.9471 -22.1189 -0.2 endloop endfacet facet normal 0.556877 0.830595 -0 outer loop - vertex 26.9471 -22.1189 -0.1 + vertex 26.9471 -22.1189 -0.2 vertex 26.7726 -22.0019 0 vertex 26.9471 -22.1189 0 endloop @@ -8787,13 +8787,13 @@ solid OpenSCAD_Model facet normal 0.556877 0.830595 0 outer loop vertex 26.7726 -22.0019 0 - vertex 26.9471 -22.1189 -0.1 - vertex 26.7726 -22.0019 -0.1 + vertex 26.9471 -22.1189 -0.2 + vertex 26.7726 -22.0019 -0.2 endloop endfacet facet normal 0.40766 0.913134 -0 outer loop - vertex 26.7726 -22.0019 -0.1 + vertex 26.7726 -22.0019 -0.2 vertex 26.5717 -21.9122 0 vertex 26.7726 -22.0019 0 endloop @@ -8801,13 +8801,13 @@ solid OpenSCAD_Model facet normal 0.40766 0.913134 0 outer loop vertex 26.5717 -21.9122 0 - vertex 26.7726 -22.0019 -0.1 - vertex 26.5717 -21.9122 -0.1 + vertex 26.7726 -22.0019 -0.2 + vertex 26.5717 -21.9122 -0.2 endloop endfacet facet normal 0.264042 0.964511 -0 outer loop - vertex 26.5717 -21.9122 -0.1 + vertex 26.5717 -21.9122 -0.2 vertex 26.3449 -21.8501 0 vertex 26.5717 -21.9122 0 endloop @@ -8815,13 +8815,13 @@ solid OpenSCAD_Model facet normal 0.264042 0.964511 0 outer loop vertex 26.3449 -21.8501 0 - vertex 26.5717 -21.9122 -0.1 - vertex 26.3449 -21.8501 -0.1 + vertex 26.5717 -21.9122 -0.2 + vertex 26.3449 -21.8501 -0.2 endloop endfacet facet normal 0.134852 0.990866 -0 outer loop - vertex 26.3449 -21.8501 -0.1 + vertex 26.3449 -21.8501 -0.2 vertex 26.0922 -21.8157 0 vertex 26.3449 -21.8501 0 endloop @@ -8829,13 +8829,13 @@ solid OpenSCAD_Model facet normal 0.134852 0.990866 0 outer loop vertex 26.0922 -21.8157 0 - vertex 26.3449 -21.8501 -0.1 - vertex 26.0922 -21.8157 -0.1 + vertex 26.3449 -21.8501 -0.2 + vertex 26.0922 -21.8157 -0.2 endloop endfacet facet normal 0.0233803 0.999727 -0 outer loop - vertex 26.0922 -21.8157 -0.1 + vertex 26.0922 -21.8157 -0.2 vertex 25.8138 -21.8092 0 vertex 26.0922 -21.8157 0 endloop @@ -8843,13 +8843,13 @@ solid OpenSCAD_Model facet normal 0.0233803 0.999727 0 outer loop vertex 25.8138 -21.8092 0 - vertex 26.0922 -21.8157 -0.1 - vertex 25.8138 -21.8092 -0.1 + vertex 26.0922 -21.8157 -0.2 + vertex 25.8138 -21.8092 -0.2 endloop endfacet facet normal -0.0707205 0.997496 0 outer loop - vertex 25.8138 -21.8092 -0.1 + vertex 25.8138 -21.8092 -0.2 vertex 25.51 -21.8307 0 vertex 25.8138 -21.8092 0 endloop @@ -8857,1868 +8857,1868 @@ solid OpenSCAD_Model facet normal -0.0707205 0.997496 0 outer loop vertex 25.51 -21.8307 0 - vertex 25.8138 -21.8092 -0.1 - vertex 25.51 -21.8307 -0.1 + vertex 25.8138 -21.8092 -0.2 + vertex 25.51 -21.8307 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.0431 -18.7102 -0.1 - vertex -32.1476 -18.5412 -0.1 - vertex -36.5163 -17.3821 -0.1 + vertex -37.0431 -18.7102 -0.2 + vertex -32.1476 -18.5412 -0.2 + vertex -36.5163 -17.3821 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.1476 -18.5412 -0.1 - vertex -37.0431 -18.7102 -0.1 - vertex -33.2902 -21.4299 -0.1 + vertex -32.1476 -18.5412 -0.2 + vertex -37.0431 -18.7102 -0.2 + vertex -33.2902 -21.4299 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.2902 -21.4299 -0.1 - vertex -37.0431 -18.7102 -0.1 - vertex -33.4325 -21.7956 -0.1 + vertex -33.2902 -21.4299 -0.2 + vertex -37.0431 -18.7102 -0.2 + vertex -33.4325 -21.7956 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.3469 -21.8682 -0.1 - vertex -33.4325 -21.7956 -0.1 - vertex -37.0431 -18.7102 -0.1 + vertex -38.3469 -21.8682 -0.2 + vertex -33.4325 -21.7956 -0.2 + vertex -37.0431 -18.7102 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.4325 -21.7956 -0.1 - vertex -38.3469 -21.8682 -0.1 - vertex -33.503 -22.0719 -0.1 + vertex -33.4325 -21.7956 -0.2 + vertex -38.3469 -21.8682 -0.2 + vertex -33.503 -22.0719 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.503 -22.0719 -0.1 - vertex -38.3469 -21.8682 -0.1 - vertex -34.9509 -25.4747 -0.1 + vertex -33.503 -22.0719 -0.2 + vertex -38.3469 -21.8682 -0.2 + vertex -34.9509 -25.4747 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.8955 -25.4747 -0.1 - vertex -34.9509 -25.4747 -0.1 - vertex -38.3469 -21.8682 -0.1 + vertex -39.8955 -25.4747 -0.2 + vertex -34.9509 -25.4747 -0.2 + vertex -38.3469 -21.8682 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.9509 -25.4747 -0.1 - vertex -39.8955 -25.4747 -0.1 - vertex -35.4707 -26.6225 -0.1 + vertex -34.9509 -25.4747 -0.2 + vertex -39.8955 -25.4747 -0.2 + vertex -35.4707 -26.6225 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.4707 -26.6225 -0.1 - vertex -39.8955 -25.4747 -0.1 - vertex -36.4516 -28.8697 -0.1 + vertex -35.4707 -26.6225 -0.2 + vertex -39.8955 -25.4747 -0.2 + vertex -36.4516 -28.8697 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -41.2695 -28.6585 -0.1 - vertex -36.4516 -28.8697 -0.1 - vertex -39.8955 -25.4747 -0.1 + vertex -41.2695 -28.6585 -0.2 + vertex -36.4516 -28.8697 -0.2 + vertex -39.8955 -25.4747 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.4516 -28.8697 -0.1 - vertex -41.2695 -28.6585 -0.1 - vertex -37.5165 -31.4193 -0.1 + vertex -36.4516 -28.8697 -0.2 + vertex -41.2695 -28.6585 -0.2 + vertex -37.5165 -31.4193 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -42.2252 -30.9405 -0.1 - vertex -37.5165 -31.4193 -0.1 - vertex -41.2695 -28.6585 -0.1 + vertex -42.2252 -30.9405 -0.2 + vertex -37.5165 -31.4193 -0.2 + vertex -41.2695 -28.6585 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.5165 -31.4193 -0.1 - vertex -42.2252 -30.9405 -0.1 - vertex -38.3711 -33.5534 -0.1 + vertex -37.5165 -31.4193 -0.2 + vertex -42.2252 -30.9405 -0.2 + vertex -38.3711 -33.5534 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4764 -11.5321 -0.1 - vertex -17.4002 -11.6639 -0.1 - vertex -17.4268 -11.5861 -0.1 + vertex -17.4764 -11.5321 -0.2 + vertex -17.4002 -11.6639 -0.2 + vertex -17.4268 -11.5861 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4002 -11.6639 -0.1 - vertex -17.5514 -11.4978 -0.1 - vertex -17.3941 -11.77 -0.1 + vertex -17.4002 -11.6639 -0.2 + vertex -17.5514 -11.4978 -0.2 + vertex -17.3941 -11.77 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4002 -11.6639 -0.1 - vertex -17.4764 -11.5321 -0.1 - vertex -17.5514 -11.4978 -0.1 + vertex -17.4002 -11.6639 -0.2 + vertex -17.4764 -11.5321 -0.2 + vertex -17.5514 -11.4978 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -17.3941 -11.77 -0.1 - vertex -17.5514 -11.4978 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -17.3941 -11.77 -0.2 + vertex -17.5514 -11.4978 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.3941 -11.77 -0.1 - vertex -17.7876 -11.4712 -0.1 - vertex -17.4339 -12.0833 -0.1 + vertex -17.3941 -11.77 -0.2 + vertex -17.7876 -11.4712 -0.2 + vertex -17.4339 -12.0833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4339 -12.0833 -0.1 - vertex -17.7876 -11.4712 -0.1 - vertex -17.5116 -12.3759 -0.1 + vertex -17.4339 -12.0833 -0.2 + vertex -17.7876 -11.4712 -0.2 + vertex -17.5116 -12.3759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.5116 -12.3759 -0.1 - vertex -17.7876 -11.4712 -0.1 - vertex -17.6664 -12.8441 -0.1 + vertex -17.5116 -12.3759 -0.2 + vertex -17.7876 -11.4712 -0.2 + vertex -17.6664 -12.8441 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.9412 -14.6683 -0.1 - vertex -17.6664 -12.8441 -0.1 - vertex -17.7876 -11.4712 -0.1 + vertex -21.9412 -14.6683 -0.2 + vertex -17.6664 -12.8441 -0.2 + vertex -17.7876 -11.4712 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.6664 -12.8441 -0.1 - vertex -21.9412 -14.6683 -0.1 - vertex -18.1466 -14.1495 -0.1 + vertex -17.6664 -12.8441 -0.2 + vertex -21.9412 -14.6683 -0.2 + vertex -18.1466 -14.1495 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex -21.6284 -15.0493 -0.1 - vertex -18.1466 -14.1495 -0.1 - vertex -21.6966 -14.8935 -0.1 + vertex -21.6284 -15.0493 -0.2 + vertex -18.1466 -14.1495 -0.2 + vertex -21.6966 -14.8935 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -21.5879 -15.2616 -0.1 - vertex -18.7537 -15.6836 -0.1 - vertex -21.6284 -15.0493 -0.1 + vertex -21.5879 -15.2616 -0.2 + vertex -18.7537 -15.6836 -0.2 + vertex -21.6284 -15.0493 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -21.5693 -15.5508 -0.1 - vertex -18.7537 -15.6836 -0.1 - vertex -21.5879 -15.2616 -0.1 + vertex -21.5693 -15.5508 -0.2 + vertex -18.7537 -15.6836 -0.2 + vertex -21.5879 -15.2616 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.5729 -16.4428 -0.1 - vertex -19.3667 -17.1305 -0.1 - vertex -21.5693 -15.5508 -0.1 + vertex -21.5729 -16.4428 -0.2 + vertex -19.3667 -17.1305 -0.2 + vertex -21.5693 -15.5508 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.3667 -17.1305 -0.1 - vertex -21.5729 -16.4428 -0.1 - vertex -19.4996 -17.3696 -0.1 + vertex -19.3667 -17.1305 -0.2 + vertex -21.5729 -16.4428 -0.2 + vertex -19.4996 -17.3696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.4996 -17.3696 -0.1 - vertex -21.5729 -16.4428 -0.1 - vertex -19.6713 -17.584 -0.1 + vertex -19.4996 -17.3696 -0.2 + vertex -21.5729 -16.4428 -0.2 + vertex -19.6713 -17.584 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.5774 -17.3273 -0.1 - vertex -19.8743 -17.7693 -0.1 - vertex -21.5729 -16.4428 -0.1 + vertex -21.5774 -17.3273 -0.2 + vertex -19.8743 -17.7693 -0.2 + vertex -21.5729 -16.4428 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.8743 -17.7693 -0.1 - vertex -21.5774 -17.3273 -0.1 - vertex -20.1009 -17.9213 -0.1 + vertex -19.8743 -17.7693 -0.2 + vertex -21.5774 -17.3273 -0.2 + vertex -20.1009 -17.9213 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.1009 -17.9213 -0.1 - vertex -21.5774 -17.3273 -0.1 - vertex -20.3435 -18.0357 -0.1 + vertex -20.1009 -17.9213 -0.2 + vertex -21.5774 -17.3273 -0.2 + vertex -20.3435 -18.0357 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.5945 -18.108 -0.1 - vertex -21.5774 -17.3273 -0.1 - vertex -20.8463 -18.1339 -0.1 + vertex -20.5945 -18.108 -0.2 + vertex -21.5774 -17.3273 -0.2 + vertex -20.8463 -18.1339 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -21.5614 -17.6077 -0.1 - vertex -20.8463 -18.1339 -0.1 - vertex -21.5774 -17.3273 -0.1 + vertex -21.5614 -17.6077 -0.2 + vertex -20.8463 -18.1339 -0.2 + vertex -21.5774 -17.3273 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.8463 -18.1339 -0.1 - vertex -21.5614 -17.6077 -0.1 - vertex -21.0912 -18.1093 -0.1 + vertex -20.8463 -18.1339 -0.2 + vertex -21.5614 -17.6077 -0.2 + vertex -21.0912 -18.1093 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.0912 -18.1093 -0.1 - vertex -21.5614 -17.6077 -0.1 - vertex -21.2545 -18.0693 -0.1 + vertex -21.0912 -18.1093 -0.2 + vertex -21.5614 -17.6077 -0.2 + vertex -21.2545 -18.0693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2545 -18.0693 -0.1 - vertex -21.5263 -17.8042 -0.1 - vertex -21.378 -18.0171 -0.1 + vertex -21.2545 -18.0693 -0.2 + vertex -21.5263 -17.8042 -0.2 + vertex -21.378 -18.0171 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.3435 -18.0357 -0.1 - vertex -21.5774 -17.3273 -0.1 - vertex -20.5945 -18.108 -0.1 + vertex -20.3435 -18.0357 -0.2 + vertex -21.5774 -17.3273 -0.2 + vertex -20.5945 -18.108 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.6713 -17.584 -0.1 - vertex -21.5729 -16.4428 -0.1 - vertex -19.8743 -17.7693 -0.1 + vertex -19.6713 -17.584 -0.2 + vertex -21.5729 -16.4428 -0.2 + vertex -19.8743 -17.7693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.7537 -15.6836 -0.1 - vertex -21.5693 -15.5508 -0.1 - vertex -19.3667 -17.1305 -0.1 + vertex -18.7537 -15.6836 -0.2 + vertex -21.5693 -15.5508 -0.2 + vertex -19.3667 -17.1305 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.1466 -14.1495 -0.1 - vertex -21.6284 -15.0493 -0.1 - vertex -18.7537 -15.6836 -0.1 + vertex -18.1466 -14.1495 -0.2 + vertex -21.6284 -15.0493 -0.2 + vertex -18.7537 -15.6836 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.1466 -14.1495 -0.1 - vertex -21.7989 -14.7733 -0.1 - vertex -21.6966 -14.8935 -0.1 + vertex -18.1466 -14.1495 -0.2 + vertex -21.7989 -14.7733 -0.2 + vertex -21.6966 -14.8935 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.1466 -14.1495 -0.1 - vertex -21.9412 -14.6683 -0.1 - vertex -21.7989 -14.7733 -0.1 + vertex -18.1466 -14.1495 -0.2 + vertex -21.9412 -14.6683 -0.2 + vertex -21.7989 -14.7733 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -22.1296 -14.5577 -0.1 - vertex -21.9412 -14.6683 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -22.1296 -14.5577 -0.2 + vertex -21.9412 -14.6683 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -22.3213 -14.4724 -0.1 - vertex -22.1296 -14.5577 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -22.3213 -14.4724 -0.2 + vertex -22.1296 -14.5577 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -22.5778 -14.3998 -0.1 - vertex -22.3213 -14.4724 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -22.5778 -14.3998 -0.2 + vertex -22.3213 -14.4724 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -22.9103 -14.3386 -0.1 - vertex -22.5778 -14.3998 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -22.9103 -14.3386 -0.2 + vertex -22.5778 -14.3998 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7876 -11.4712 -0.1 - vertex -23.3301 -14.2877 -0.1 - vertex -22.9103 -14.3386 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -23.3301 -14.2877 -0.2 + vertex -22.9103 -14.3386 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.175 -11.3523 -0.1 - vertex -23.3301 -14.2877 -0.1 - vertex -17.7876 -11.4712 -0.1 + vertex -27.175 -11.3523 -0.2 + vertex -23.3301 -14.2877 -0.2 + vertex -17.7876 -11.4712 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.3301 -14.2877 -0.1 - vertex -27.175 -11.3523 -0.1 - vertex -24.4767 -14.2125 -0.1 + vertex -23.3301 -14.2877 -0.2 + vertex -27.175 -11.3523 -0.2 + vertex -24.4767 -14.2125 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.4767 -14.2125 -0.1 - vertex -27.175 -11.3523 -0.1 - vertex -26.1077 -14.1654 -0.1 + vertex -24.4767 -14.2125 -0.2 + vertex -27.175 -11.3523 -0.2 + vertex -26.1077 -14.1654 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.175 -11.3523 -0.1 - vertex -28.2448 -14.1442 -0.1 - vertex -26.1077 -14.1654 -0.1 + vertex -27.175 -11.3523 -0.2 + vertex -28.2448 -14.1442 -0.2 + vertex -26.1077 -14.1654 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.175 -11.3523 -0.1 - vertex -28.9898 -14.1579 -0.1 - vertex -28.2448 -14.1442 -0.1 + vertex -27.175 -11.3523 -0.2 + vertex -28.9898 -14.1579 -0.2 + vertex -28.2448 -14.1442 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.175 -11.3523 -0.1 - vertex -29.549 -14.1906 -0.1 - vertex -28.9898 -14.1579 -0.1 + vertex -27.175 -11.3523 -0.2 + vertex -29.549 -14.1906 -0.2 + vertex -28.9898 -14.1579 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.0944 -11.3029 -0.1 - vertex -29.549 -14.1906 -0.1 - vertex -27.175 -11.3523 -0.1 + vertex -32.0944 -11.3029 -0.2 + vertex -29.549 -14.1906 -0.2 + vertex -27.175 -11.3523 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.549 -14.1906 -0.1 - vertex -32.0944 -11.3029 -0.1 - vertex -29.9449 -14.2443 -0.1 + vertex -29.549 -14.1906 -0.2 + vertex -32.0944 -11.3029 -0.2 + vertex -29.9449 -14.2443 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.9449 -14.2443 -0.1 - vertex -32.0944 -11.3029 -0.1 - vertex -30.1999 -14.321 -0.1 + vertex -29.9449 -14.2443 -0.2 + vertex -32.0944 -11.3029 -0.2 + vertex -30.1999 -14.321 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3673 -14.4836 -0.1 - vertex -30.4158 -14.7057 -0.1 - vertex -30.377 -14.5514 -0.1 + vertex -30.3673 -14.4836 -0.2 + vertex -30.4158 -14.7057 -0.2 + vertex -30.377 -14.5514 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3673 -14.4836 -0.1 - vertex -30.5215 -14.964 -0.1 - vertex -30.4158 -14.7057 -0.1 + vertex -30.3673 -14.4836 -0.2 + vertex -30.5215 -14.964 -0.2 + vertex -30.4158 -14.7057 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.4754 -14.1281 -0.1 - vertex -30.5215 -14.964 -0.1 - vertex -30.3673 -14.4836 -0.1 + vertex -35.4754 -14.1281 -0.2 + vertex -30.5215 -14.964 -0.2 + vertex -30.3673 -14.4836 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.5215 -14.964 -0.1 - vertex -35.4754 -14.1281 -0.1 - vertex -30.678 -15.2903 -0.1 + vertex -30.5215 -14.964 -0.2 + vertex -35.4754 -14.1281 -0.2 + vertex -30.678 -15.2903 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.678 -15.2903 -0.1 - vertex -35.4754 -14.1281 -0.1 - vertex -30.8691 -15.6487 -0.1 + vertex -30.678 -15.2903 -0.2 + vertex -35.4754 -14.1281 -0.2 + vertex -30.8691 -15.6487 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -35.5123 -14.4274 -0.1 - vertex -30.8691 -15.6487 -0.1 - vertex -35.4754 -14.1281 -0.1 + vertex -35.5123 -14.4274 -0.2 + vertex -30.8691 -15.6487 -0.2 + vertex -35.4754 -14.1281 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.1999 -14.321 -0.1 - vertex -32.0944 -11.3029 -0.1 - vertex -30.2816 -14.3686 -0.1 + vertex -30.1999 -14.321 -0.2 + vertex -32.0944 -11.3029 -0.2 + vertex -30.2816 -14.3686 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.0944 -11.3029 -0.1 - vertex -30.3364 -14.4227 -0.1 - vertex -30.2816 -14.3686 -0.1 + vertex -32.0944 -11.3029 -0.2 + vertex -30.3364 -14.4227 -0.2 + vertex -30.2816 -14.3686 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.0944 -11.3029 -0.1 - vertex -30.3673 -14.4836 -0.1 - vertex -30.3364 -14.4227 -0.1 + vertex -32.0944 -11.3029 -0.2 + vertex -30.3673 -14.4836 -0.2 + vertex -30.3364 -14.4227 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -35.4904 -13.894 -0.1 - vertex -30.3673 -14.4836 -0.1 - vertex -32.0944 -11.3029 -0.1 + vertex -35.4904 -13.894 -0.2 + vertex -30.3673 -14.4836 -0.2 + vertex -32.0944 -11.3029 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.8691 -15.6487 -0.1 - vertex -35.5123 -14.4274 -0.1 - vertex -31.1223 -16.1487 -0.1 + vertex -30.8691 -15.6487 -0.2 + vertex -35.5123 -14.4274 -0.2 + vertex -31.1223 -16.1487 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -35.5964 -14.799 -0.1 - vertex -31.1223 -16.1487 -0.1 - vertex -35.5123 -14.4274 -0.1 + vertex -35.5964 -14.799 -0.2 + vertex -31.1223 -16.1487 -0.2 + vertex -35.5123 -14.4274 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.1223 -16.1487 -0.1 - vertex -35.5964 -14.799 -0.1 - vertex -31.4477 -16.8607 -0.1 + vertex -31.1223 -16.1487 -0.2 + vertex -35.5964 -14.799 -0.2 + vertex -31.4477 -16.8607 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -35.7796 -15.3934 -0.1 - vertex -31.4477 -16.8607 -0.1 - vertex -35.5964 -14.799 -0.1 + vertex -35.7796 -15.3934 -0.2 + vertex -31.4477 -16.8607 -0.2 + vertex -35.5964 -14.799 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.4477 -16.8607 -0.1 - vertex -35.7796 -15.3934 -0.1 - vertex -31.8034 -17.6899 -0.1 + vertex -31.4477 -16.8607 -0.2 + vertex -35.7796 -15.3934 -0.2 + vertex -31.8034 -17.6899 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.4904 -13.894 -0.1 - vertex -32.0944 -11.3029 -0.1 - vertex -33.7011 -11.3017 -0.1 + vertex -35.4904 -13.894 -0.2 + vertex -32.0944 -11.3029 -0.2 + vertex -33.7011 -11.3017 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -21.5263 -17.8042 -0.1 - vertex -21.2545 -18.0693 -0.1 - vertex -21.5614 -17.6077 -0.1 + vertex -21.5263 -17.8042 -0.2 + vertex -21.2545 -18.0693 -0.2 + vertex -21.5614 -17.6077 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.378 -18.0171 -0.1 - vertex -21.5263 -17.8042 -0.1 - vertex -21.4669 -17.9347 -0.1 + vertex -21.378 -18.0171 -0.2 + vertex -21.5263 -17.8042 -0.2 + vertex -21.4669 -17.9347 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.4624 -26.9141 -0.1 - vertex -27.8988 -26.2055 -0.1 - vertex -27.8924 -26.5154 -0.1 + vertex -25.4624 -26.9141 -0.2 + vertex -27.8988 -26.2055 -0.2 + vertex -27.8924 -26.5154 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.2929 -22.2506 -0.1 - vertex -27.9236 -26.0946 -0.1 - vertex -27.8988 -26.2055 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -27.9236 -26.0946 -0.2 + vertex -27.8988 -26.2055 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.2929 -22.2506 -0.1 - vertex -27.9636 -26.0069 -0.1 - vertex -27.9236 -26.0946 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -27.9636 -26.0069 -0.2 + vertex -27.9236 -26.0946 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.2929 -22.2506 -0.1 - vertex -28.0195 -25.9379 -0.1 - vertex -27.9636 -26.0069 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -28.0195 -25.9379 -0.2 + vertex -27.9636 -26.0069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.2929 -22.2506 -0.1 - vertex -28.0919 -25.8829 -0.1 - vertex -28.0195 -25.9379 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -28.0919 -25.8829 -0.2 + vertex -28.0195 -25.9379 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.2888 -25.7968 -0.1 - vertex -27.6923 -22.3658 -0.1 - vertex -28.1242 -22.4577 -0.1 + vertex -28.2888 -25.7968 -0.2 + vertex -27.6923 -22.3658 -0.2 + vertex -28.1242 -22.4577 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.6923 -22.3658 -0.1 - vertex -28.2888 -25.7968 -0.1 - vertex -28.0919 -25.8829 -0.1 + vertex -27.6923 -22.3658 -0.2 + vertex -28.2888 -25.7968 -0.2 + vertex -28.0919 -25.8829 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.1242 -22.4577 -0.1 - vertex -28.5596 -25.7117 -0.1 - vertex -28.2888 -25.7968 -0.1 + vertex -28.1242 -22.4577 -0.2 + vertex -28.5596 -25.7117 -0.2 + vertex -28.2888 -25.7968 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -28.5914 -22.5277 -0.1 - vertex -28.5596 -25.7117 -0.1 - vertex -28.1242 -22.4577 -0.1 + vertex -28.5914 -22.5277 -0.2 + vertex -28.5596 -25.7117 -0.2 + vertex -28.1242 -22.4577 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.5914 -22.5277 -0.1 - vertex -28.7678 -25.6646 -0.1 - vertex -28.5596 -25.7117 -0.1 + vertex -28.5914 -22.5277 -0.2 + vertex -28.7678 -25.6646 -0.2 + vertex -28.5596 -25.7117 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.5914 -22.5277 -0.1 - vertex -29.0734 -25.6205 -0.1 - vertex -28.7678 -25.6646 -0.1 + vertex -28.5914 -22.5277 -0.2 + vertex -29.0734 -25.6205 -0.2 + vertex -28.7678 -25.6646 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.0966 -22.5767 -0.1 - vertex -29.0734 -25.6205 -0.1 - vertex -28.5914 -22.5277 -0.1 + vertex -29.0966 -22.5767 -0.2 + vertex -29.0734 -25.6205 -0.2 + vertex -28.5914 -22.5277 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.6427 -22.606 -0.1 - vertex -29.0734 -25.6205 -0.1 - vertex -29.0966 -22.5767 -0.1 + vertex -29.6427 -22.606 -0.2 + vertex -29.0734 -25.6205 -0.2 + vertex -29.0966 -22.5767 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.6427 -22.606 -0.1 - vertex -29.9179 -25.5457 -0.1 - vertex -29.0734 -25.6205 -0.1 + vertex -29.6427 -22.606 -0.2 + vertex -29.9179 -25.5457 -0.2 + vertex -29.0734 -25.6205 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -30.2322 -22.6168 -0.1 - vertex -29.9179 -25.5457 -0.1 - vertex -29.6427 -22.606 -0.1 + vertex -30.2322 -22.6168 -0.2 + vertex -29.9179 -25.5457 -0.2 + vertex -29.6427 -22.606 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.9759 -25.4949 -0.1 - vertex -30.2322 -22.6168 -0.1 - vertex -30.868 -22.6102 -0.1 + vertex -30.9759 -25.4949 -0.2 + vertex -30.2322 -22.6168 -0.2 + vertex -30.868 -22.6102 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.2322 -22.6168 -0.1 - vertex -30.9759 -25.4949 -0.1 - vertex -29.9179 -25.5457 -0.1 + vertex -30.2322 -22.6168 -0.2 + vertex -30.9759 -25.4949 -0.2 + vertex -29.9179 -25.5457 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.8095 -22.5865 -0.1 - vertex -30.9759 -25.4949 -0.1 - vertex -30.868 -22.6102 -0.1 + vertex -31.8095 -22.5865 -0.2 + vertex -30.9759 -25.4949 -0.2 + vertex -30.868 -22.6102 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.8095 -22.5865 -0.1 - vertex -32.1303 -25.4759 -0.1 - vertex -30.9759 -25.4949 -0.1 + vertex -31.8095 -22.5865 -0.2 + vertex -32.1303 -25.4759 -0.2 + vertex -30.9759 -25.4949 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.5132 -22.5543 -0.1 - vertex -32.1303 -25.4759 -0.1 - vertex -31.8095 -22.5865 -0.1 + vertex -32.5132 -22.5543 -0.2 + vertex -32.1303 -25.4759 -0.2 + vertex -31.8095 -22.5865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.0067 -22.5002 -0.1 - vertex -32.1303 -25.4759 -0.1 - vertex -32.5132 -22.5543 -0.1 + vertex -33.0067 -22.5002 -0.2 + vertex -32.1303 -25.4759 -0.2 + vertex -32.5132 -22.5543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.1833 -22.4608 -0.1 - vertex -32.1303 -25.4759 -0.1 - vertex -33.0067 -22.5002 -0.1 + vertex -33.1833 -22.4608 -0.2 + vertex -32.1303 -25.4759 -0.2 + vertex -33.0067 -22.5002 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.9509 -25.4747 -0.1 - vertex -33.1833 -22.4608 -0.1 - vertex -33.3177 -22.4108 -0.1 + vertex -34.9509 -25.4747 -0.2 + vertex -33.1833 -22.4608 -0.2 + vertex -33.3177 -22.4108 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.9509 -25.4747 -0.1 - vertex -33.3177 -22.4108 -0.1 - vertex -33.4135 -22.3486 -0.1 + vertex -34.9509 -25.4747 -0.2 + vertex -33.3177 -22.4108 -0.2 + vertex -33.4135 -22.3486 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.9509 -25.4747 -0.1 - vertex -33.4135 -22.3486 -0.1 - vertex -33.4739 -22.2725 -0.1 + vertex -34.9509 -25.4747 -0.2 + vertex -33.4135 -22.3486 -0.2 + vertex -33.4739 -22.2725 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.0907 -16.2655 -0.1 - vertex -31.8034 -17.6899 -0.1 - vertex -35.7796 -15.3934 -0.1 + vertex -36.0907 -16.2655 -0.2 + vertex -31.8034 -17.6899 -0.2 + vertex -35.7796 -15.3934 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.5622 -13.718 -0.1 - vertex -33.7011 -11.3017 -0.1 - vertex -34.8583 -11.3197 -0.1 + vertex -35.5622 -13.718 -0.2 + vertex -33.7011 -11.3017 -0.2 + vertex -34.8583 -11.3197 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.1833 -22.4608 -0.1 - vertex -34.9509 -25.4747 -0.1 - vertex -32.1303 -25.4759 -0.1 + vertex -33.1833 -22.4608 -0.2 + vertex -34.9509 -25.4747 -0.2 + vertex -32.1303 -25.4759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.5026 -22.1809 -0.1 - vertex -34.9509 -25.4747 -0.1 - vertex -33.4739 -22.2725 -0.1 + vertex -33.5026 -22.1809 -0.2 + vertex -34.9509 -25.4747 -0.2 + vertex -33.4739 -22.2725 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.8034 -17.6899 -0.1 - vertex -36.0907 -16.2655 -0.1 - vertex -32.1476 -18.5412 -0.1 + vertex -31.8034 -17.6899 -0.2 + vertex -36.0907 -16.2655 -0.2 + vertex -32.1476 -18.5412 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.503 -22.0719 -0.1 - vertex -34.9509 -25.4747 -0.1 - vertex -33.5026 -22.1809 -0.1 + vertex -33.503 -22.0719 -0.2 + vertex -34.9509 -25.4747 -0.2 + vertex -33.5026 -22.1809 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.5163 -17.3821 -0.1 - vertex -32.1476 -18.5412 -0.1 - vertex -36.0907 -16.2655 -0.1 + vertex -36.5163 -17.3821 -0.2 + vertex -32.1476 -18.5412 -0.2 + vertex -36.0907 -16.2655 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3673 -14.4836 -0.1 - vertex -35.4904 -13.894 -0.1 - vertex -35.4754 -14.1281 -0.1 + vertex -30.3673 -14.4836 -0.2 + vertex -35.4904 -13.894 -0.2 + vertex -35.4754 -14.1281 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.7011 -11.3017 -0.1 - vertex -35.5189 -13.7992 -0.1 - vertex -35.4904 -13.894 -0.1 + vertex -33.7011 -11.3017 -0.2 + vertex -35.5189 -13.7992 -0.2 + vertex -35.4904 -13.894 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.7011 -11.3017 -0.1 - vertex -35.5622 -13.718 -0.1 - vertex -35.5189 -13.7992 -0.1 + vertex -33.7011 -11.3017 -0.2 + vertex -35.5622 -13.718 -0.2 + vertex -35.5189 -13.7992 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.8583 -11.3197 -0.1 - vertex -35.6209 -13.6496 -0.1 - vertex -35.5622 -13.718 -0.1 + vertex -34.8583 -11.3197 -0.2 + vertex -35.6209 -13.6496 -0.2 + vertex -35.5622 -13.718 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.6956 -13.593 -0.1 - vertex -34.8583 -11.3197 -0.1 - vertex -35.6555 -11.3595 -0.1 + vertex -35.6956 -13.593 -0.2 + vertex -34.8583 -11.3197 -0.2 + vertex -35.6555 -11.3595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.8583 -11.3197 -0.1 - vertex -35.6956 -13.593 -0.1 - vertex -35.6209 -13.6496 -0.1 + vertex -34.8583 -11.3197 -0.2 + vertex -35.6956 -13.593 -0.2 + vertex -35.6209 -13.6496 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.6555 -11.3595 -0.1 - vertex -35.8956 -13.512 -0.1 - vertex -35.6956 -13.593 -0.1 + vertex -35.6555 -11.3595 -0.2 + vertex -35.8956 -13.512 -0.2 + vertex -35.6956 -13.593 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.1819 -11.4238 -0.1 - vertex -35.8956 -13.512 -0.1 - vertex -35.6555 -11.3595 -0.1 + vertex -36.1819 -11.4238 -0.2 + vertex -35.8956 -13.512 -0.2 + vertex -35.6555 -11.3595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.8956 -13.512 -0.1 - vertex -36.1819 -11.4238 -0.1 - vertex -36.1669 -13.4677 -0.1 + vertex -35.8956 -13.512 -0.2 + vertex -36.1819 -11.4238 -0.2 + vertex -36.1669 -13.4677 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.527 -11.5152 -0.1 - vertex -36.1669 -13.4677 -0.1 - vertex -36.1819 -11.4238 -0.1 + vertex -36.527 -11.5152 -0.2 + vertex -36.1669 -13.4677 -0.2 + vertex -36.1819 -11.4238 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.7802 -11.6364 -0.1 - vertex -36.1669 -13.4677 -0.1 - vertex -36.527 -11.5152 -0.1 + vertex -36.7802 -11.6364 -0.2 + vertex -36.1669 -13.4677 -0.2 + vertex -36.527 -11.5152 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.1669 -13.4677 -0.1 - vertex -36.7802 -11.6364 -0.1 - vertex -36.5145 -13.4531 -0.1 + vertex -36.1669 -13.4677 -0.2 + vertex -36.7802 -11.6364 -0.2 + vertex -36.5145 -13.4531 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -36.9755 -11.7636 -0.1 - vertex -36.5145 -13.4531 -0.1 - vertex -36.7802 -11.6364 -0.1 + vertex -36.9755 -11.7636 -0.2 + vertex -36.5145 -13.4531 -0.2 + vertex -36.7802 -11.6364 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.1409 -11.9004 -0.1 - vertex -36.5145 -13.4531 -0.1 - vertex -36.9755 -11.7636 -0.1 + vertex -37.1409 -11.9004 -0.2 + vertex -36.5145 -13.4531 -0.2 + vertex -36.9755 -11.7636 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.5145 -13.4531 -0.1 - vertex -37.1409 -11.9004 -0.1 - vertex -36.7305 -13.4387 -0.1 + vertex -36.5145 -13.4531 -0.2 + vertex -37.1409 -11.9004 -0.2 + vertex -36.7305 -13.4387 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.2767 -12.0443 -0.1 - vertex -36.7305 -13.4387 -0.1 - vertex -37.1409 -11.9004 -0.1 + vertex -37.2767 -12.0443 -0.2 + vertex -36.7305 -13.4387 -0.2 + vertex -37.1409 -11.9004 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.7305 -13.4387 -0.1 - vertex -37.2767 -12.0443 -0.1 - vertex -36.9216 -13.3997 -0.1 + vertex -36.7305 -13.4387 -0.2 + vertex -37.2767 -12.0443 -0.2 + vertex -36.9216 -13.3997 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.3834 -12.1929 -0.1 - vertex -36.9216 -13.3997 -0.1 - vertex -37.2767 -12.0443 -0.1 + vertex -37.3834 -12.1929 -0.2 + vertex -36.9216 -13.3997 -0.2 + vertex -37.2767 -12.0443 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.4611 -12.3438 -0.1 - vertex -36.9216 -13.3997 -0.1 - vertex -37.3834 -12.1929 -0.1 + vertex -37.4611 -12.3438 -0.2 + vertex -36.9216 -13.3997 -0.2 + vertex -37.3834 -12.1929 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.9216 -13.3997 -0.1 - vertex -37.4611 -12.3438 -0.1 - vertex -37.0874 -13.3385 -0.1 + vertex -36.9216 -13.3997 -0.2 + vertex -37.4611 -12.3438 -0.2 + vertex -37.0874 -13.3385 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.5104 -12.4945 -0.1 - vertex -37.0874 -13.3385 -0.1 - vertex -37.4611 -12.3438 -0.1 + vertex -37.5104 -12.4945 -0.2 + vertex -37.0874 -13.3385 -0.2 + vertex -37.4611 -12.3438 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.0874 -13.3385 -0.1 - vertex -37.5104 -12.4945 -0.1 - vertex -37.2276 -13.2576 -0.1 + vertex -37.0874 -13.3385 -0.2 + vertex -37.5104 -12.4945 -0.2 + vertex -37.2276 -13.2576 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -37.5315 -12.6425 -0.1 - vertex -37.2276 -13.2576 -0.1 - vertex -37.5104 -12.4945 -0.1 + vertex -37.5315 -12.6425 -0.2 + vertex -37.2276 -13.2576 -0.2 + vertex -37.5104 -12.4945 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.2276 -13.2576 -0.1 - vertex -37.5315 -12.6425 -0.1 - vertex -37.3418 -13.1594 -0.1 + vertex -37.2276 -13.2576 -0.2 + vertex -37.5315 -12.6425 -0.2 + vertex -37.3418 -13.1594 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.3418 -13.1594 -0.1 - vertex -37.5315 -12.6425 -0.1 - vertex -37.4296 -13.0463 -0.1 + vertex -37.3418 -13.1594 -0.2 + vertex -37.5315 -12.6425 -0.2 + vertex -37.4296 -13.0463 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.4296 -13.0463 -0.1 - vertex -37.5315 -12.6425 -0.1 - vertex -37.4908 -12.9209 -0.1 + vertex -37.4296 -13.0463 -0.2 + vertex -37.5315 -12.6425 -0.2 + vertex -37.4908 -12.9209 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.4908 -12.9209 -0.1 - vertex -37.5315 -12.6425 -0.1 - vertex -37.5249 -12.7854 -0.1 + vertex -37.4908 -12.9209 -0.2 + vertex -37.5315 -12.6425 -0.2 + vertex -37.5249 -12.7854 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.9739 -18.9651 -0.1 - vertex -22.585 -19.4947 -0.1 - vertex -22.594 -19.3555 -0.1 + vertex -22.9739 -18.9651 -0.2 + vertex -22.585 -19.4947 -0.2 + vertex -22.594 -19.3555 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.8524 -19.008 -0.1 - vertex -22.594 -19.3555 -0.1 - vertex -22.625 -19.2389 -0.1 + vertex -22.8524 -19.008 -0.2 + vertex -22.594 -19.3555 -0.2 + vertex -22.625 -19.2389 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.7539 -19.0668 -0.1 - vertex -22.625 -19.2389 -0.1 - vertex -22.6782 -19.1432 -0.1 + vertex -22.7539 -19.0668 -0.2 + vertex -22.625 -19.2389 -0.2 + vertex -22.6782 -19.1432 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.594 -19.3555 -0.1 - vertex -22.8524 -19.008 -0.1 - vertex -22.9739 -18.9651 -0.1 + vertex -22.594 -19.3555 -0.2 + vertex -22.8524 -19.008 -0.2 + vertex -22.9739 -18.9651 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.625 -19.2389 -0.1 - vertex -22.7539 -19.0668 -0.1 - vertex -22.8524 -19.008 -0.1 + vertex -22.625 -19.2389 -0.2 + vertex -22.7539 -19.0668 -0.2 + vertex -22.8524 -19.008 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.1186 -18.9365 -0.1 - vertex -22.585 -19.4947 -0.1 - vertex -22.9739 -18.9651 -0.1 + vertex -23.1186 -18.9365 -0.2 + vertex -22.585 -19.4947 -0.2 + vertex -22.9739 -18.9651 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.585 -19.4947 -0.1 - vertex -23.1186 -18.9365 -0.1 - vertex -22.5978 -19.6581 -0.1 + vertex -22.585 -19.4947 -0.2 + vertex -23.1186 -18.9365 -0.2 + vertex -22.5978 -19.6581 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4791 -18.9156 -0.1 - vertex -22.5978 -19.6581 -0.1 - vertex -23.1186 -18.9365 -0.1 + vertex -23.4791 -18.9156 -0.2 + vertex -22.5978 -19.6581 -0.2 + vertex -23.1186 -18.9365 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.5978 -19.6581 -0.1 - vertex -23.4791 -18.9156 -0.1 - vertex -22.6874 -20.0641 -0.1 + vertex -22.5978 -19.6581 -0.2 + vertex -23.4791 -18.9156 -0.2 + vertex -22.6874 -20.0641 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -23.6632 -18.9241 -0.1 - vertex -22.6874 -20.0641 -0.1 - vertex -23.4791 -18.9156 -0.1 + vertex -23.6632 -18.9241 -0.2 + vertex -22.6874 -20.0641 -0.2 + vertex -23.4791 -18.9156 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.3738 -19.4278 -0.1 - vertex -22.6874 -20.0641 -0.1 - vertex -24.2328 -19.2424 -0.1 + vertex -24.3738 -19.4278 -0.2 + vertex -22.6874 -20.0641 -0.2 + vertex -24.2328 -19.2424 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.6874 -20.0641 -0.1 - vertex -23.6632 -18.9241 -0.1 - vertex -24.2328 -19.2424 -0.1 + vertex -22.6874 -20.0641 -0.2 + vertex -23.6632 -18.9241 -0.2 + vertex -24.2328 -19.2424 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.0993 -19.1062 -0.1 - vertex -23.6632 -18.9241 -0.1 - vertex -23.8226 -18.954 -0.1 + vertex -24.0993 -19.1062 -0.2 + vertex -23.6632 -18.9241 -0.2 + vertex -23.8226 -18.954 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.0993 -19.1062 -0.1 - vertex -23.8226 -18.954 -0.1 - vertex -23.9653 -19.0124 -0.1 + vertex -24.0993 -19.1062 -0.2 + vertex -23.8226 -18.954 -0.2 + vertex -23.9653 -19.0124 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.6632 -18.9241 -0.1 - vertex -24.0993 -19.1062 -0.1 - vertex -24.2328 -19.2424 -0.1 + vertex -23.6632 -18.9241 -0.2 + vertex -24.0993 -19.1062 -0.2 + vertex -24.2328 -19.2424 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.6874 -20.0641 -0.1 - vertex -24.3738 -19.4278 -0.1 - vertex -22.8608 -20.5868 -0.1 + vertex -22.6874 -20.0641 -0.2 + vertex -24.3738 -19.4278 -0.2 + vertex -22.8608 -20.5868 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.7108 -19.9745 -0.1 - vertex -22.8608 -20.5868 -0.1 - vertex -24.3738 -19.4278 -0.1 + vertex -24.7108 -19.9745 -0.2 + vertex -22.8608 -20.5868 -0.2 + vertex -24.3738 -19.4278 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.8608 -20.5868 -0.1 - vertex -24.7108 -19.9745 -0.1 - vertex -23.116 -21.2395 -0.1 + vertex -22.8608 -20.5868 -0.2 + vertex -24.7108 -19.9745 -0.2 + vertex -23.116 -21.2395 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.9407 -20.3516 -0.1 - vertex -23.116 -21.2395 -0.1 - vertex -24.7108 -19.9745 -0.1 + vertex -24.9407 -20.3516 -0.2 + vertex -23.116 -21.2395 -0.2 + vertex -24.7108 -19.9745 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.1784 -20.695 -0.1 - vertex -23.116 -21.2395 -0.1 - vertex -24.9407 -20.3516 -0.1 + vertex -25.1784 -20.695 -0.2 + vertex -23.116 -21.2395 -0.2 + vertex -24.9407 -20.3516 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.4267 -21.0057 -0.1 - vertex -23.116 -21.2395 -0.1 - vertex -25.1784 -20.695 -0.1 + vertex -25.4267 -21.0057 -0.2 + vertex -23.116 -21.2395 -0.2 + vertex -25.1784 -20.695 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.6884 -21.2849 -0.1 - vertex -23.116 -21.2395 -0.1 - vertex -25.4267 -21.0057 -0.1 + vertex -25.6884 -21.2849 -0.2 + vertex -23.116 -21.2395 -0.2 + vertex -25.4267 -21.0057 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.116 -21.2395 -0.1 - vertex -25.6884 -21.2849 -0.1 - vertex -24.3958 -24.3815 -0.1 + vertex -23.116 -21.2395 -0.2 + vertex -25.6884 -21.2849 -0.2 + vertex -24.3958 -24.3815 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.9661 -21.5339 -0.1 - vertex -24.3958 -24.3815 -0.1 - vertex -25.6884 -21.2849 -0.1 + vertex -25.9661 -21.5339 -0.2 + vertex -24.3958 -24.3815 -0.2 + vertex -25.6884 -21.2849 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.2627 -21.7538 -0.1 - vertex -24.3958 -24.3815 -0.1 - vertex -25.9661 -21.5339 -0.1 + vertex -26.2627 -21.7538 -0.2 + vertex -24.3958 -24.3815 -0.2 + vertex -25.9661 -21.5339 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.5809 -21.9457 -0.1 - vertex -24.3958 -24.3815 -0.1 - vertex -26.2627 -21.7538 -0.1 + vertex -26.5809 -21.9457 -0.2 + vertex -24.3958 -24.3815 -0.2 + vertex -26.2627 -21.7538 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.9234 -22.1109 -0.1 - vertex -24.3958 -24.3815 -0.1 - vertex -26.5809 -21.9457 -0.1 + vertex -26.9234 -22.1109 -0.2 + vertex -24.3958 -24.3815 -0.2 + vertex -26.5809 -21.9457 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.2929 -22.2506 -0.1 - vertex -24.3958 -24.3815 -0.1 - vertex -26.9234 -22.1109 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -24.3958 -24.3815 -0.2 + vertex -26.9234 -22.1109 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.3958 -24.3815 -0.1 - vertex -27.2929 -22.2506 -0.1 - vertex -24.9793 -25.8003 -0.1 + vertex -24.3958 -24.3815 -0.2 + vertex -27.2929 -22.2506 -0.2 + vertex -24.9793 -25.8003 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.4624 -26.9141 -0.1 - vertex -27.8924 -26.5154 -0.1 - vertex -25.8688 -27.7587 -0.1 + vertex -25.4624 -26.9141 -0.2 + vertex -27.8924 -26.5154 -0.2 + vertex -25.8688 -27.7587 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.8688 -27.7587 -0.1 - vertex -27.9393 -26.9734 -0.1 - vertex -26.0506 -28.0911 -0.1 + vertex -25.8688 -27.7587 -0.2 + vertex -27.9393 -26.9734 -0.2 + vertex -26.0506 -28.0911 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.0506 -28.0911 -0.1 - vertex -27.9393 -26.9734 -0.1 - vertex -26.2221 -28.3696 -0.1 + vertex -26.0506 -28.0911 -0.2 + vertex -27.9393 -26.9734 -0.2 + vertex -26.2221 -28.3696 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.9393 -26.9734 -0.1 - vertex -25.8688 -27.7587 -0.1 - vertex -27.8924 -26.5154 -0.1 + vertex -27.9393 -26.9734 -0.2 + vertex -25.8688 -27.7587 -0.2 + vertex -27.8924 -26.5154 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.2221 -28.3696 -0.1 - vertex -27.9393 -26.9734 -0.1 - vertex -26.3861 -28.5987 -0.1 + vertex -26.2221 -28.3696 -0.2 + vertex -27.9393 -26.9734 -0.2 + vertex -26.3861 -28.5987 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -28.1721 -28.4809 -0.1 - vertex -26.3861 -28.5987 -0.1 - vertex -27.9393 -26.9734 -0.1 + vertex -28.1721 -28.4809 -0.2 + vertex -26.3861 -28.5987 -0.2 + vertex -27.9393 -26.9734 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.8988 -26.2055 -0.1 - vertex -24.9793 -25.8003 -0.1 - vertex -27.2929 -22.2506 -0.1 + vertex -27.8988 -26.2055 -0.2 + vertex -24.9793 -25.8003 -0.2 + vertex -27.2929 -22.2506 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.3861 -28.5987 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -26.5458 -28.7827 -0.1 + vertex -26.3861 -28.5987 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -26.5458 -28.7827 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.5458 -28.7827 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -26.7039 -28.9262 -0.1 + vertex -26.5458 -28.7827 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -26.7039 -28.9262 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.8988 -26.2055 -0.1 - vertex -25.4624 -26.9141 -0.1 - vertex -24.9793 -25.8003 -0.1 + vertex -27.8988 -26.2055 -0.2 + vertex -25.4624 -26.9141 -0.2 + vertex -24.9793 -25.8003 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.7039 -28.9262 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -26.8635 -29.0336 -0.1 + vertex -26.7039 -28.9262 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -26.8635 -29.0336 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.8635 -29.0336 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -27.0275 -29.1093 -0.1 + vertex -26.8635 -29.0336 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -27.0275 -29.1093 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.0919 -25.8829 -0.1 - vertex -27.2929 -22.2506 -0.1 - vertex -27.6923 -22.3658 -0.1 + vertex -28.0919 -25.8829 -0.2 + vertex -27.2929 -22.2506 -0.2 + vertex -27.6923 -22.3658 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.0275 -29.1093 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -27.1989 -29.1579 -0.1 + vertex -27.0275 -29.1093 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -27.1989 -29.1579 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.1989 -29.1579 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -27.3805 -29.1838 -0.1 + vertex -27.1989 -29.1579 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -27.3805 -29.1838 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.3805 -29.1838 -0.1 - vertex -28.1721 -28.4809 -0.1 - vertex -27.5755 -29.1914 -0.1 + vertex -27.3805 -29.1838 -0.2 + vertex -28.1721 -28.4809 -0.2 + vertex -27.5755 -29.1914 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -28.2235 -28.8853 -0.1 - vertex -27.5755 -29.1914 -0.1 - vertex -28.1721 -28.4809 -0.1 + vertex -28.2235 -28.8853 -0.2 + vertex -27.5755 -29.1914 -0.2 + vertex -28.1721 -28.4809 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.5755 -29.1914 -0.1 - vertex -28.2235 -28.8853 -0.1 - vertex -27.9775 -29.1782 -0.1 + vertex -27.5755 -29.1914 -0.2 + vertex -28.2235 -28.8853 -0.2 + vertex -27.9775 -29.1782 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.9775 -29.1782 -0.1 - vertex -28.2235 -28.8853 -0.1 - vertex -28.0989 -29.15 -0.1 + vertex -27.9775 -29.1782 -0.2 + vertex -28.2235 -28.8853 -0.2 + vertex -28.0989 -29.15 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -28.2154 -29.0113 -0.1 - vertex -28.0989 -29.15 -0.1 - vertex -28.2235 -28.8853 -0.1 + vertex -28.2154 -29.0113 -0.2 + vertex -28.0989 -29.15 -0.2 + vertex -28.2235 -28.8853 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.0989 -29.15 -0.1 - vertex -28.2154 -29.0113 -0.1 - vertex -28.176 -29.097 -0.1 + vertex -28.0989 -29.15 -0.2 + vertex -28.2154 -29.0113 -0.2 + vertex -28.176 -29.097 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4571 -30.6716 -0.1 - vertex -23.4513 -30.847 -0.1 - vertex -23.4345 -30.738 -0.1 + vertex -23.4571 -30.6716 -0.2 + vertex -23.4513 -30.847 -0.2 + vertex -23.4345 -30.738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.5012 -30.6026 -0.1 - vertex -23.4513 -30.847 -0.1 - vertex -23.4571 -30.6716 -0.1 + vertex -23.5012 -30.6026 -0.2 + vertex -23.4513 -30.847 -0.2 + vertex -23.4571 -30.6716 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.6433 -30.465 -0.1 - vertex -23.4513 -30.847 -0.1 - vertex -23.5012 -30.6026 -0.1 + vertex -23.6433 -30.465 -0.2 + vertex -23.4513 -30.847 -0.2 + vertex -23.5012 -30.6026 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4513 -30.847 -0.1 - vertex -23.6433 -30.465 -0.1 - vertex -23.5218 -31.031 -0.1 + vertex -23.4513 -30.847 -0.2 + vertex -23.6433 -30.465 -0.2 + vertex -23.5218 -31.031 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.8399 -30.3412 -0.1 - vertex -23.5218 -31.031 -0.1 - vertex -23.6433 -30.465 -0.1 + vertex -23.8399 -30.3412 -0.2 + vertex -23.5218 -31.031 -0.2 + vertex -23.6433 -30.465 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.0701 -30.2475 -0.1 - vertex -23.5218 -31.031 -0.1 - vertex -23.8399 -30.3412 -0.1 + vertex -24.0701 -30.2475 -0.2 + vertex -23.5218 -31.031 -0.2 + vertex -23.8399 -30.3412 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.5218 -31.031 -0.1 - vertex -24.0701 -30.2475 -0.1 - vertex -23.8031 -31.5911 -0.1 + vertex -23.5218 -31.031 -0.2 + vertex -24.0701 -30.2475 -0.2 + vertex -23.8031 -31.5911 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.8452 -30.2998 -0.1 - vertex -23.8031 -31.5911 -0.1 - vertex -24.0701 -30.2475 -0.1 + vertex -24.8452 -30.2998 -0.2 + vertex -23.8031 -31.5911 -0.2 + vertex -24.0701 -30.2475 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.8452 -30.2998 -0.1 - vertex -24.0701 -30.2475 -0.1 - vertex -24.2803 -30.1833 -0.1 + vertex -24.8452 -30.2998 -0.2 + vertex -24.0701 -30.2475 -0.2 + vertex -24.2803 -30.1833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.6311 -30.1847 -0.1 - vertex -24.2803 -30.1833 -0.1 - vertex -24.455 -30.1541 -0.1 + vertex -24.6311 -30.1847 -0.2 + vertex -24.2803 -30.1833 -0.2 + vertex -24.455 -30.1541 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.6311 -30.1847 -0.1 - vertex -24.455 -30.1541 -0.1 - vertex -24.5406 -30.1604 -0.1 + vertex -24.6311 -30.1847 -0.2 + vertex -24.455 -30.1541 -0.2 + vertex -24.5406 -30.1604 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.2803 -30.1833 -0.1 - vertex -24.6311 -30.1847 -0.1 - vertex -24.8452 -30.2998 -0.1 + vertex -24.2803 -30.1833 -0.2 + vertex -24.6311 -30.1847 -0.2 + vertex -24.8452 -30.2998 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.8031 -31.5911 -0.1 - vertex -24.8452 -30.2998 -0.1 - vertex -25.1341 -30.5242 -0.1 + vertex -23.8031 -31.5911 -0.2 + vertex -24.8452 -30.2998 -0.2 + vertex -25.1341 -30.5242 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.5344 -30.8827 -0.1 - vertex -23.8031 -31.5911 -0.1 - vertex -25.1341 -30.5242 -0.1 + vertex -25.5344 -30.8827 -0.2 + vertex -23.8031 -31.5911 -0.2 + vertex -25.1341 -30.5242 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.8031 -31.5911 -0.1 - vertex -25.5344 -30.8827 -0.1 - vertex -24.2375 -32.3527 -0.1 + vertex -23.8031 -31.5911 -0.2 + vertex -25.5344 -30.8827 -0.2 + vertex -24.2375 -32.3527 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.2375 -32.3527 -0.1 - vertex -25.5344 -30.8827 -0.1 - vertex -24.7839 -33.2498 -0.1 + vertex -24.2375 -32.3527 -0.2 + vertex -25.5344 -30.8827 -0.2 + vertex -24.7839 -33.2498 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.8166 -32.1012 -0.1 - vertex -24.7839 -33.2498 -0.1 - vertex -25.5344 -30.8827 -0.1 + vertex -26.8166 -32.1012 -0.2 + vertex -24.7839 -33.2498 -0.2 + vertex -25.5344 -30.8827 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.7839 -33.2498 -0.1 - vertex -26.8166 -32.1012 -0.1 - vertex -25.4011 -34.2168 -0.1 + vertex -24.7839 -33.2498 -0.2 + vertex -26.8166 -32.1012 -0.2 + vertex -25.4011 -34.2168 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.3602 -32.5933 -0.1 - vertex -25.4011 -34.2168 -0.1 - vertex -26.8166 -32.1012 -0.1 + vertex -27.3602 -32.5933 -0.2 + vertex -25.4011 -34.2168 -0.2 + vertex -26.8166 -32.1012 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.924 -33.0516 -0.1 - vertex -25.4011 -34.2168 -0.1 - vertex -27.3602 -32.5933 -0.1 + vertex -27.924 -33.0516 -0.2 + vertex -25.4011 -34.2168 -0.2 + vertex -27.3602 -32.5933 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.4011 -34.2168 -0.1 - vertex -27.924 -33.0516 -0.1 - vertex -26.0482 -35.1877 -0.1 + vertex -25.4011 -34.2168 -0.2 + vertex -27.924 -33.0516 -0.2 + vertex -26.0482 -35.1877 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -28.5012 -33.4718 -0.1 - vertex -26.0482 -35.1877 -0.1 - vertex -27.924 -33.0516 -0.1 + vertex -28.5012 -33.4718 -0.2 + vertex -26.0482 -35.1877 -0.2 + vertex -27.924 -33.0516 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.0482 -35.1877 -0.1 - vertex -28.5012 -33.4718 -0.1 - vertex -26.6839 -36.0968 -0.1 + vertex -26.0482 -35.1877 -0.2 + vertex -28.5012 -33.4718 -0.2 + vertex -26.6839 -36.0968 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.0852 -33.8499 -0.1 - vertex -26.6839 -36.0968 -0.1 - vertex -28.5012 -33.4718 -0.1 + vertex -29.0852 -33.8499 -0.2 + vertex -26.6839 -36.0968 -0.2 + vertex -28.5012 -33.4718 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.6839 -36.0968 -0.1 - vertex -29.0852 -33.8499 -0.1 - vertex -27.2673 -36.8782 -0.1 + vertex -26.6839 -36.0968 -0.2 + vertex -29.0852 -33.8499 -0.2 + vertex -27.2673 -36.8782 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.669 -34.1817 -0.1 - vertex -27.2673 -36.8782 -0.1 - vertex -29.0852 -33.8499 -0.1 + vertex -29.669 -34.1817 -0.2 + vertex -27.2673 -36.8782 -0.2 + vertex -29.0852 -33.8499 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -30.2461 -34.4632 -0.1 - vertex -27.2673 -36.8782 -0.1 - vertex -29.669 -34.1817 -0.1 + vertex -30.2461 -34.4632 -0.2 + vertex -27.2673 -36.8782 -0.2 + vertex -29.669 -34.1817 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.2673 -36.8782 -0.1 - vertex -30.2461 -34.4632 -0.1 - vertex -28.2718 -38.1638 -0.1 + vertex -27.2673 -36.8782 -0.2 + vertex -30.2461 -34.4632 -0.2 + vertex -28.2718 -38.1638 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -30.8095 -34.6902 -0.1 - vertex -28.2718 -38.1638 -0.1 - vertex -30.2461 -34.4632 -0.1 + vertex -30.8095 -34.6902 -0.2 + vertex -28.2718 -38.1638 -0.2 + vertex -30.2461 -34.4632 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -31.3526 -34.8586 -0.1 - vertex -28.2718 -38.1638 -0.1 - vertex -30.8095 -34.6902 -0.1 + vertex -31.3526 -34.8586 -0.2 + vertex -28.2718 -38.1638 -0.2 + vertex -30.8095 -34.6902 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -31.5797 -34.902 -0.1 - vertex -28.2718 -38.1638 -0.1 - vertex -31.3526 -34.8586 -0.1 + vertex -31.5797 -34.902 -0.2 + vertex -28.2718 -38.1638 -0.2 + vertex -31.3526 -34.8586 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -31.9023 -34.9414 -0.1 - vertex -28.2718 -38.1638 -0.1 - vertex -31.5797 -34.902 -0.1 + vertex -31.9023 -34.9414 -0.2 + vertex -28.2718 -38.1638 -0.2 + vertex -31.5797 -34.902 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -32.7769 -35.0076 -0.1 - vertex -28.2718 -38.1638 -0.1 - vertex -31.9023 -34.9414 -0.1 + vertex -32.7769 -35.0076 -0.2 + vertex -28.2718 -38.1638 -0.2 + vertex -31.9023 -34.9414 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.6203 -38.1325 -0.1 - vertex -32.7769 -35.0076 -0.1 - vertex -33.8615 -35.0556 -0.1 + vertex -37.6203 -38.1325 -0.2 + vertex -32.7769 -35.0076 -0.2 + vertex -33.8615 -35.0556 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.6203 -38.1325 -0.1 - vertex -33.8615 -35.0556 -0.1 - vertex -35.0412 -35.0835 -0.1 + vertex -37.6203 -38.1325 -0.2 + vertex -33.8615 -35.0556 -0.2 + vertex -35.0412 -35.0835 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.6203 -38.1325 -0.1 - vertex -35.0412 -35.0835 -0.1 - vertex -36.2012 -35.0898 -0.1 + vertex -37.6203 -38.1325 -0.2 + vertex -35.0412 -35.0835 -0.2 + vertex -36.2012 -35.0898 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.6203 -38.1325 -0.1 - vertex -36.2012 -35.0898 -0.1 - vertex -37.2267 -35.0727 -0.1 + vertex -37.6203 -38.1325 -0.2 + vertex -36.2012 -35.0898 -0.2 + vertex -37.2267 -35.0727 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.7769 -35.0076 -0.1 - vertex -37.6203 -38.1325 -0.1 - vertex -28.2718 -38.1638 -0.1 + vertex -32.7769 -35.0076 -0.2 + vertex -37.6203 -38.1325 -0.2 + vertex -28.2718 -38.1638 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.0027 -35.0306 -0.1 - vertex -37.6203 -38.1325 -0.1 - vertex -37.2267 -35.0727 -0.1 + vertex -38.0027 -35.0306 -0.2 + vertex -37.6203 -38.1325 -0.2 + vertex -37.2267 -35.0727 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.2613 -34.9997 -0.1 - vertex -37.6203 -38.1325 -0.1 - vertex -38.0027 -35.0306 -0.1 + vertex -38.2613 -34.9997 -0.2 + vertex -37.6203 -38.1325 -0.2 + vertex -38.0027 -35.0306 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.4144 -34.9619 -0.1 - vertex -37.6203 -38.1325 -0.1 - vertex -38.2613 -34.9997 -0.1 + vertex -38.4144 -34.9619 -0.2 + vertex -37.6203 -38.1325 -0.2 + vertex -38.2613 -34.9997 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -41.2883 -38.1087 -0.1 - vertex -38.4144 -34.9619 -0.1 - vertex -38.5336 -34.8886 -0.1 + vertex -41.2883 -38.1087 -0.2 + vertex -38.4144 -34.9619 -0.2 + vertex -38.5336 -34.8886 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -41.2883 -38.1087 -0.1 - vertex -38.5336 -34.8886 -0.1 - vertex -38.6312 -34.7874 -0.1 + vertex -41.2883 -38.1087 -0.2 + vertex -38.5336 -34.8886 -0.2 + vertex -38.6312 -34.7874 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -41.2883 -38.1087 -0.1 - vertex -38.6312 -34.7874 -0.1 - vertex -38.6971 -34.6715 -0.1 + vertex -41.2883 -38.1087 -0.2 + vertex -38.6312 -34.7874 -0.2 + vertex -38.6971 -34.6715 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -42.7651 -32.2453 -0.1 - vertex -38.3711 -33.5534 -0.1 - vertex -42.2252 -30.9405 -0.1 + vertex -42.7651 -32.2453 -0.2 + vertex -38.3711 -33.5534 -0.2 + vertex -42.2252 -30.9405 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.3711 -33.5534 -0.1 - vertex -42.7651 -32.2453 -0.1 - vertex -38.6277 -34.2404 -0.1 + vertex -38.3711 -33.5534 -0.2 + vertex -42.7651 -32.2453 -0.2 + vertex -38.6277 -34.2404 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.6277 -34.2404 -0.1 - vertex -42.7651 -32.2453 -0.1 - vertex -38.7214 -34.5543 -0.1 + vertex -38.6277 -34.2404 -0.2 + vertex -42.7651 -32.2453 -0.2 + vertex -38.7214 -34.5543 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -43.2426 -33.2915 -0.1 - vertex -38.7214 -34.5543 -0.1 - vertex -42.7651 -32.2453 -0.1 + vertex -43.2426 -33.2915 -0.2 + vertex -38.7214 -34.5543 -0.2 + vertex -42.7651 -32.2453 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -43.4655 -33.7273 -0.1 - vertex -38.7214 -34.5543 -0.1 - vertex -43.2426 -33.2915 -0.1 + vertex -43.4655 -33.7273 -0.2 + vertex -38.7214 -34.5543 -0.2 + vertex -43.2426 -33.2915 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.7214 -34.5543 -0.1 - vertex -43.4655 -33.7273 -0.1 - vertex -38.6971 -34.6715 -0.1 + vertex -38.7214 -34.5543 -0.2 + vertex -43.4655 -33.7273 -0.2 + vertex -38.6971 -34.6715 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.4144 -34.9619 -0.1 - vertex -41.2883 -38.1087 -0.1 - vertex -37.6203 -38.1325 -0.1 + vertex -38.4144 -34.9619 -0.2 + vertex -41.2883 -38.1087 -0.2 + vertex -37.6203 -38.1325 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -43.682 -34.1098 -0.1 - vertex -38.6971 -34.6715 -0.1 - vertex -43.4655 -33.7273 -0.1 + vertex -43.682 -34.1098 -0.2 + vertex -38.6971 -34.6715 -0.2 + vertex -43.4655 -33.7273 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.6971 -34.6715 -0.1 - vertex -43.682 -34.1098 -0.1 - vertex -41.2883 -38.1087 -0.1 + vertex -38.6971 -34.6715 -0.2 + vertex -43.682 -34.1098 -0.2 + vertex -41.2883 -38.1087 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -43.8952 -34.443 -0.1 - vertex -41.2883 -38.1087 -0.1 - vertex -43.682 -34.1098 -0.1 + vertex -43.8952 -34.443 -0.2 + vertex -41.2883 -38.1087 -0.2 + vertex -43.682 -34.1098 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -44.108 -34.7306 -0.1 - vertex -41.2883 -38.1087 -0.1 - vertex -43.8952 -34.443 -0.1 + vertex -44.108 -34.7306 -0.2 + vertex -41.2883 -38.1087 -0.2 + vertex -43.8952 -34.443 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -44.3237 -34.9765 -0.1 - vertex -41.2883 -38.1087 -0.1 - vertex -44.108 -34.7306 -0.1 + vertex -44.3237 -34.9765 -0.2 + vertex -41.2883 -38.1087 -0.2 + vertex -44.108 -34.7306 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -44.3237 -34.9765 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -41.2883 -38.1087 -0.1 + vertex -44.3237 -34.9765 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -41.2883 -38.1087 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -44.5451 -35.1844 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -44.3237 -34.9765 -0.1 + vertex -44.5451 -35.1844 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -44.3237 -34.9765 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -44.7755 -35.3583 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -44.5451 -35.1844 -0.1 + vertex -44.7755 -35.3583 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -44.5451 -35.1844 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -45.0179 -35.5019 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -44.7755 -35.3583 -0.1 + vertex -45.0179 -35.5019 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -44.7755 -35.3583 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -45.2753 -35.6191 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -45.0179 -35.5019 -0.1 + vertex -45.2753 -35.6191 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -45.0179 -35.5019 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -45.5508 -35.7136 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -45.2753 -35.6191 -0.1 + vertex -45.5508 -35.7136 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -45.2753 -35.6191 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -45.8475 -35.7893 -0.1 - vertex -44.3648 -38.0673 -0.1 - vertex -45.5508 -35.7136 -0.1 + vertex -45.8475 -35.7893 -0.2 + vertex -44.3648 -38.0673 -0.2 + vertex -45.5508 -35.7136 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -46.5272 -38.014 -0.1 - vertex -45.8475 -35.7893 -0.1 - vertex -46.1684 -35.8499 -0.1 + vertex -46.5272 -38.014 -0.2 + vertex -45.8475 -35.7893 -0.2 + vertex -46.1684 -35.8499 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -46.5272 -38.014 -0.1 - vertex -46.1684 -35.8499 -0.1 - vertex -46.4544 -35.9117 -0.1 + vertex -46.5272 -38.014 -0.2 + vertex -46.1684 -35.8499 -0.2 + vertex -46.4544 -35.9117 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -45.8475 -35.7893 -0.1 - vertex -46.5272 -38.014 -0.1 - vertex -44.3648 -38.0673 -0.1 + vertex -45.8475 -35.7893 -0.2 + vertex -46.5272 -38.014 -0.2 + vertex -44.3648 -38.0673 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -46.7228 -35.999 -0.1 - vertex -46.5272 -38.014 -0.1 - vertex -46.4544 -35.9117 -0.1 + vertex -46.7228 -35.999 -0.2 + vertex -46.5272 -38.014 -0.2 + vertex -46.4544 -35.9117 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -46.9715 -36.1082 -0.1 - vertex -46.5272 -38.014 -0.1 - vertex -46.7228 -35.999 -0.1 + vertex -46.9715 -36.1082 -0.2 + vertex -46.5272 -38.014 -0.2 + vertex -46.7228 -35.999 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.1985 -36.2359 -0.1 - vertex -46.5272 -38.014 -0.1 - vertex -46.9715 -36.1082 -0.1 + vertex -47.1985 -36.2359 -0.2 + vertex -46.5272 -38.014 -0.2 + vertex -46.9715 -36.1082 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.4015 -36.3788 -0.1 - vertex -46.5272 -38.014 -0.1 - vertex -47.1985 -36.2359 -0.1 + vertex -47.4015 -36.3788 -0.2 + vertex -46.5272 -38.014 -0.2 + vertex -47.1985 -36.2359 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -46.5272 -38.014 -0.1 - vertex -47.4015 -36.3788 -0.1 - vertex -47.1648 -37.9848 -0.1 + vertex -46.5272 -38.014 -0.2 + vertex -47.4015 -36.3788 -0.2 + vertex -47.1648 -37.9848 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.5785 -36.5332 -0.1 - vertex -47.1648 -37.9848 -0.1 - vertex -47.4015 -36.3788 -0.1 + vertex -47.5785 -36.5332 -0.2 + vertex -47.1648 -37.9848 -0.2 + vertex -47.4015 -36.3788 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.7274 -36.6957 -0.1 - vertex -47.1648 -37.9848 -0.1 - vertex -47.5785 -36.5332 -0.1 + vertex -47.7274 -36.6957 -0.2 + vertex -47.1648 -37.9848 -0.2 + vertex -47.5785 -36.5332 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.846 -36.863 -0.1 - vertex -47.1648 -37.9848 -0.1 - vertex -47.7274 -36.6957 -0.1 + vertex -47.846 -36.863 -0.2 + vertex -47.1648 -37.9848 -0.2 + vertex -47.7274 -36.6957 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -47.1648 -37.9848 -0.1 - vertex -47.846 -36.863 -0.1 - vertex -47.4529 -37.9547 -0.1 + vertex -47.1648 -37.9848 -0.2 + vertex -47.846 -36.863 -0.2 + vertex -47.4529 -37.9547 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.9322 -37.0315 -0.1 - vertex -47.4529 -37.9547 -0.1 - vertex -47.846 -36.863 -0.1 + vertex -47.9322 -37.0315 -0.2 + vertex -47.4529 -37.9547 -0.2 + vertex -47.846 -36.863 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -47.4529 -37.9547 -0.1 - vertex -47.9322 -37.0315 -0.1 - vertex -47.6522 -37.8745 -0.1 + vertex -47.4529 -37.9547 -0.2 + vertex -47.9322 -37.0315 -0.2 + vertex -47.6522 -37.8745 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.984 -37.1977 -0.1 - vertex -47.6522 -37.8745 -0.1 - vertex -47.9322 -37.0315 -0.1 + vertex -47.984 -37.1977 -0.2 + vertex -47.6522 -37.8745 -0.2 + vertex -47.9322 -37.0315 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -47.6522 -37.8745 -0.1 - vertex -47.984 -37.1977 -0.1 - vertex -47.8044 -37.7712 -0.1 + vertex -47.6522 -37.8745 -0.2 + vertex -47.984 -37.1977 -0.2 + vertex -47.8044 -37.7712 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -47.9993 -37.3583 -0.1 - vertex -47.8044 -37.7712 -0.1 - vertex -47.984 -37.1977 -0.1 + vertex -47.9993 -37.3583 -0.2 + vertex -47.8044 -37.7712 -0.2 + vertex -47.984 -37.1977 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -47.8044 -37.7712 -0.1 - vertex -47.9993 -37.3583 -0.1 - vertex -47.9115 -37.6485 -0.1 + vertex -47.8044 -37.7712 -0.2 + vertex -47.9993 -37.3583 -0.2 + vertex -47.9115 -37.6485 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -47.9115 -37.6485 -0.1 - vertex -47.9993 -37.3583 -0.1 - vertex -47.9758 -37.5097 -0.1 + vertex -47.9115 -37.6485 -0.2 + vertex -47.9993 -37.3583 -0.2 + vertex -47.9758 -37.5097 -0.2 endloop endfacet facet normal -0.0100487 -0.99995 0 outer loop - vertex -32.0944 -11.3029 -0.1 + vertex -32.0944 -11.3029 -0.2 vertex -27.175 -11.3523 0 vertex -32.0944 -11.3029 0 endloop @@ -10726,13 +10726,13 @@ solid OpenSCAD_Model facet normal -0.0100487 -0.99995 -0 outer loop vertex -27.175 -11.3523 0 - vertex -32.0944 -11.3029 -0.1 - vertex -27.175 -11.3523 -0.1 + vertex -32.0944 -11.3029 -0.2 + vertex -27.175 -11.3523 -0.2 endloop endfacet facet normal -0.0126654 -0.99992 0 outer loop - vertex -27.175 -11.3523 -0.1 + vertex -27.175 -11.3523 -0.2 vertex -17.7876 -11.4712 0 vertex -27.175 -11.3523 0 endloop @@ -10740,13 +10740,13 @@ solid OpenSCAD_Model facet normal -0.0126654 -0.99992 -0 outer loop vertex -17.7876 -11.4712 0 - vertex -27.175 -11.3523 -0.1 - vertex -17.7876 -11.4712 -0.1 + vertex -27.175 -11.3523 -0.2 + vertex -17.7876 -11.4712 -0.2 endloop endfacet facet normal -0.111827 -0.993728 0 outer loop - vertex -17.7876 -11.4712 -0.1 + vertex -17.7876 -11.4712 -0.2 vertex -17.5514 -11.4978 0 vertex -17.7876 -11.4712 0 endloop @@ -10754,13 +10754,13 @@ solid OpenSCAD_Model facet normal -0.111827 -0.993728 -0 outer loop vertex -17.5514 -11.4978 0 - vertex -17.7876 -11.4712 -0.1 - vertex -17.5514 -11.4978 -0.1 + vertex -17.7876 -11.4712 -0.2 + vertex -17.5514 -11.4978 -0.2 endloop endfacet facet normal -0.415864 -0.909427 0 outer loop - vertex -17.5514 -11.4978 -0.1 + vertex -17.5514 -11.4978 -0.2 vertex -17.4764 -11.5321 0 vertex -17.5514 -11.4978 0 endloop @@ -10768,167 +10768,167 @@ solid OpenSCAD_Model facet normal -0.415864 -0.909427 -0 outer loop vertex -17.4764 -11.5321 0 - vertex -17.5514 -11.4978 -0.1 - vertex -17.4764 -11.5321 -0.1 + vertex -17.5514 -11.4978 -0.2 + vertex -17.4764 -11.5321 -0.2 endloop endfacet facet normal -0.736355 -0.676596 0 outer loop - vertex -17.4268 -11.5861 -0.1 + vertex -17.4268 -11.5861 -0.2 vertex -17.4764 -11.5321 0 - vertex -17.4764 -11.5321 -0.1 + vertex -17.4764 -11.5321 -0.2 endloop endfacet facet normal -0.736355 -0.676596 0 outer loop vertex -17.4764 -11.5321 0 - vertex -17.4268 -11.5861 -0.1 + vertex -17.4268 -11.5861 -0.2 vertex -17.4268 -11.5861 0 endloop endfacet facet normal -0.946306 -0.323273 0 outer loop - vertex -17.4002 -11.6639 -0.1 + vertex -17.4002 -11.6639 -0.2 vertex -17.4268 -11.5861 0 - vertex -17.4268 -11.5861 -0.1 + vertex -17.4268 -11.5861 -0.2 endloop endfacet facet normal -0.946306 -0.323273 0 outer loop vertex -17.4268 -11.5861 0 - vertex -17.4002 -11.6639 -0.1 + vertex -17.4002 -11.6639 -0.2 vertex -17.4002 -11.6639 0 endloop endfacet facet normal -0.998372 -0.057036 0 outer loop - vertex -17.3941 -11.77 -0.1 + vertex -17.3941 -11.77 -0.2 vertex -17.4002 -11.6639 0 - vertex -17.4002 -11.6639 -0.1 + vertex -17.4002 -11.6639 -0.2 endloop endfacet facet normal -0.998372 -0.057036 0 outer loop vertex -17.4002 -11.6639 0 - vertex -17.3941 -11.77 -0.1 + vertex -17.3941 -11.77 -0.2 vertex -17.3941 -11.77 0 endloop endfacet facet normal -0.992058 0.125781 0 outer loop - vertex -17.4339 -12.0833 -0.1 + vertex -17.4339 -12.0833 -0.2 vertex -17.3941 -11.77 0 - vertex -17.3941 -11.77 -0.1 + vertex -17.3941 -11.77 -0.2 endloop endfacet facet normal -0.992058 0.125781 0 outer loop vertex -17.3941 -11.77 0 - vertex -17.4339 -12.0833 -0.1 + vertex -17.4339 -12.0833 -0.2 vertex -17.4339 -12.0833 0 endloop endfacet facet normal -0.966487 0.256715 0 outer loop - vertex -17.5116 -12.3759 -0.1 + vertex -17.5116 -12.3759 -0.2 vertex -17.4339 -12.0833 0 - vertex -17.4339 -12.0833 -0.1 + vertex -17.4339 -12.0833 -0.2 endloop endfacet facet normal -0.966487 0.256715 0 outer loop vertex -17.4339 -12.0833 0 - vertex -17.5116 -12.3759 -0.1 + vertex -17.5116 -12.3759 -0.2 vertex -17.5116 -12.3759 0 endloop endfacet facet normal -0.949465 0.313873 0 outer loop - vertex -17.6664 -12.8441 -0.1 + vertex -17.6664 -12.8441 -0.2 vertex -17.5116 -12.3759 0 - vertex -17.5116 -12.3759 -0.1 + vertex -17.5116 -12.3759 -0.2 endloop endfacet facet normal -0.949465 0.313873 0 outer loop vertex -17.5116 -12.3759 0 - vertex -17.6664 -12.8441 -0.1 + vertex -17.6664 -12.8441 -0.2 vertex -17.6664 -12.8441 0 endloop endfacet facet normal -0.938494 0.345297 0 outer loop - vertex -18.1466 -14.1495 -0.1 + vertex -18.1466 -14.1495 -0.2 vertex -17.6664 -12.8441 0 - vertex -17.6664 -12.8441 -0.1 + vertex -17.6664 -12.8441 -0.2 endloop endfacet facet normal -0.938494 0.345297 0 outer loop vertex -17.6664 -12.8441 0 - vertex -18.1466 -14.1495 -0.1 + vertex -18.1466 -14.1495 -0.2 vertex -18.1466 -14.1495 0 endloop endfacet facet normal -0.929834 0.367979 0 outer loop - vertex -18.7537 -15.6836 -0.1 + vertex -18.7537 -15.6836 -0.2 vertex -18.1466 -14.1495 0 - vertex -18.1466 -14.1495 -0.1 + vertex -18.1466 -14.1495 -0.2 endloop endfacet facet normal -0.929834 0.367979 0 outer loop vertex -18.1466 -14.1495 0 - vertex -18.7537 -15.6836 -0.1 + vertex -18.7537 -15.6836 -0.2 vertex -18.7537 -15.6836 0 endloop endfacet facet normal -0.920782 0.390077 0 outer loop - vertex -19.3667 -17.1305 -0.1 + vertex -19.3667 -17.1305 -0.2 vertex -18.7537 -15.6836 0 - vertex -18.7537 -15.6836 -0.1 + vertex -18.7537 -15.6836 -0.2 endloop endfacet facet normal -0.920782 0.390077 0 outer loop vertex -18.7537 -15.6836 0 - vertex -19.3667 -17.1305 -0.1 + vertex -19.3667 -17.1305 -0.2 vertex -19.3667 -17.1305 0 endloop endfacet facet normal -0.87414 0.485675 0 outer loop - vertex -19.4996 -17.3696 -0.1 + vertex -19.4996 -17.3696 -0.2 vertex -19.3667 -17.1305 0 - vertex -19.3667 -17.1305 -0.1 + vertex -19.3667 -17.1305 -0.2 endloop endfacet facet normal -0.87414 0.485675 0 outer loop vertex -19.3667 -17.1305 0 - vertex -19.4996 -17.3696 -0.1 + vertex -19.4996 -17.3696 -0.2 vertex -19.4996 -17.3696 0 endloop endfacet facet normal -0.780486 0.625173 0 outer loop - vertex -19.6713 -17.584 -0.1 + vertex -19.6713 -17.584 -0.2 vertex -19.4996 -17.3696 0 - vertex -19.4996 -17.3696 -0.1 + vertex -19.4996 -17.3696 -0.2 endloop endfacet facet normal -0.780486 0.625173 0 outer loop vertex -19.4996 -17.3696 0 - vertex -19.6713 -17.584 -0.1 + vertex -19.6713 -17.584 -0.2 vertex -19.6713 -17.584 0 endloop endfacet facet normal -0.674318 0.738441 0 outer loop - vertex -19.6713 -17.584 -0.1 + vertex -19.6713 -17.584 -0.2 vertex -19.8743 -17.7693 0 vertex -19.6713 -17.584 0 endloop @@ -10936,13 +10936,13 @@ solid OpenSCAD_Model facet normal -0.674318 0.738441 0 outer loop vertex -19.8743 -17.7693 0 - vertex -19.6713 -17.584 -0.1 - vertex -19.8743 -17.7693 -0.1 + vertex -19.6713 -17.584 -0.2 + vertex -19.8743 -17.7693 -0.2 endloop endfacet facet normal -0.55704 0.830486 0 outer loop - vertex -19.8743 -17.7693 -0.1 + vertex -19.8743 -17.7693 -0.2 vertex -20.1009 -17.9213 0 vertex -19.8743 -17.7693 0 endloop @@ -10950,13 +10950,13 @@ solid OpenSCAD_Model facet normal -0.55704 0.830486 0 outer loop vertex -20.1009 -17.9213 0 - vertex -19.8743 -17.7693 -0.1 - vertex -20.1009 -17.9213 -0.1 + vertex -19.8743 -17.7693 -0.2 + vertex -20.1009 -17.9213 -0.2 endloop endfacet facet normal -0.42623 0.904615 0 outer loop - vertex -20.1009 -17.9213 -0.1 + vertex -20.1009 -17.9213 -0.2 vertex -20.3435 -18.0357 0 vertex -20.1009 -17.9213 0 endloop @@ -10964,13 +10964,13 @@ solid OpenSCAD_Model facet normal -0.42623 0.904615 0 outer loop vertex -20.3435 -18.0357 0 - vertex -20.1009 -17.9213 -0.1 - vertex -20.3435 -18.0357 -0.1 + vertex -20.1009 -17.9213 -0.2 + vertex -20.3435 -18.0357 -0.2 endloop endfacet facet normal -0.276826 0.96092 0 outer loop - vertex -20.3435 -18.0357 -0.1 + vertex -20.3435 -18.0357 -0.2 vertex -20.5945 -18.108 0 vertex -20.3435 -18.0357 0 endloop @@ -10978,13 +10978,13 @@ solid OpenSCAD_Model facet normal -0.276826 0.96092 0 outer loop vertex -20.5945 -18.108 0 - vertex -20.3435 -18.0357 -0.1 - vertex -20.5945 -18.108 -0.1 + vertex -20.3435 -18.0357 -0.2 + vertex -20.5945 -18.108 -0.2 endloop endfacet facet normal -0.102621 0.994721 0 outer loop - vertex -20.5945 -18.108 -0.1 + vertex -20.5945 -18.108 -0.2 vertex -20.8463 -18.1339 0 vertex -20.5945 -18.108 0 endloop @@ -10992,13 +10992,13 @@ solid OpenSCAD_Model facet normal -0.102621 0.994721 0 outer loop vertex -20.8463 -18.1339 0 - vertex -20.5945 -18.108 -0.1 - vertex -20.8463 -18.1339 -0.1 + vertex -20.5945 -18.108 -0.2 + vertex -20.8463 -18.1339 -0.2 endloop endfacet facet normal 0.100283 0.994959 -0 outer loop - vertex -20.8463 -18.1339 -0.1 + vertex -20.8463 -18.1339 -0.2 vertex -21.0912 -18.1093 0 vertex -20.8463 -18.1339 0 endloop @@ -11006,13 +11006,13 @@ solid OpenSCAD_Model facet normal 0.100283 0.994959 0 outer loop vertex -21.0912 -18.1093 0 - vertex -20.8463 -18.1339 -0.1 - vertex -21.0912 -18.1093 -0.1 + vertex -20.8463 -18.1339 -0.2 + vertex -21.0912 -18.1093 -0.2 endloop endfacet facet normal 0.237758 0.971324 -0 outer loop - vertex -21.0912 -18.1093 -0.1 + vertex -21.0912 -18.1093 -0.2 vertex -21.2545 -18.0693 0 vertex -21.0912 -18.1093 0 endloop @@ -11020,13 +11020,13 @@ solid OpenSCAD_Model facet normal 0.237758 0.971324 0 outer loop vertex -21.2545 -18.0693 0 - vertex -21.0912 -18.1093 -0.1 - vertex -21.2545 -18.0693 -0.1 + vertex -21.0912 -18.1093 -0.2 + vertex -21.2545 -18.0693 -0.2 endloop endfacet facet normal 0.389432 0.921055 -0 outer loop - vertex -21.2545 -18.0693 -0.1 + vertex -21.2545 -18.0693 -0.2 vertex -21.378 -18.0171 0 vertex -21.2545 -18.0693 0 endloop @@ -11034,13 +11034,13 @@ solid OpenSCAD_Model facet normal 0.389432 0.921055 0 outer loop vertex -21.378 -18.0171 0 - vertex -21.2545 -18.0693 -0.1 - vertex -21.378 -18.0171 -0.1 + vertex -21.2545 -18.0693 -0.2 + vertex -21.378 -18.0171 -0.2 endloop endfacet facet normal 0.679889 0.733315 -0 outer loop - vertex -21.378 -18.0171 -0.1 + vertex -21.378 -18.0171 -0.2 vertex -21.4669 -17.9347 0 vertex -21.378 -18.0171 0 endloop @@ -11048,139 +11048,139 @@ solid OpenSCAD_Model facet normal 0.679889 0.733315 0 outer loop vertex -21.4669 -17.9347 0 - vertex -21.378 -18.0171 -0.1 - vertex -21.4669 -17.9347 -0.1 + vertex -21.378 -18.0171 -0.2 + vertex -21.4669 -17.9347 -0.2 endloop endfacet facet normal 0.910139 0.414303 0 outer loop vertex -21.4669 -17.9347 0 - vertex -21.5263 -17.8042 -0.1 + vertex -21.5263 -17.8042 -0.2 vertex -21.5263 -17.8042 0 endloop endfacet facet normal 0.910139 0.414303 0 outer loop - vertex -21.5263 -17.8042 -0.1 + vertex -21.5263 -17.8042 -0.2 vertex -21.4669 -17.9347 0 - vertex -21.4669 -17.9347 -0.1 + vertex -21.4669 -17.9347 -0.2 endloop endfacet facet normal 0.984407 0.175905 0 outer loop vertex -21.5263 -17.8042 0 - vertex -21.5614 -17.6077 -0.1 + vertex -21.5614 -17.6077 -0.2 vertex -21.5614 -17.6077 0 endloop endfacet facet normal 0.984407 0.175905 0 outer loop - vertex -21.5614 -17.6077 -0.1 + vertex -21.5614 -17.6077 -0.2 vertex -21.5263 -17.8042 0 - vertex -21.5263 -17.8042 -0.1 + vertex -21.5263 -17.8042 -0.2 endloop endfacet facet normal 0.998374 0.057002 0 outer loop vertex -21.5614 -17.6077 0 - vertex -21.5774 -17.3273 -0.1 + vertex -21.5774 -17.3273 -0.2 vertex -21.5774 -17.3273 0 endloop endfacet facet normal 0.998374 0.057002 0 outer loop - vertex -21.5774 -17.3273 -0.1 + vertex -21.5774 -17.3273 -0.2 vertex -21.5614 -17.6077 0 - vertex -21.5614 -17.6077 -0.1 + vertex -21.5614 -17.6077 -0.2 endloop endfacet facet normal 0.999987 -0.00513458 0 outer loop vertex -21.5774 -17.3273 0 - vertex -21.5729 -16.4428 -0.1 + vertex -21.5729 -16.4428 -0.2 vertex -21.5729 -16.4428 0 endloop endfacet facet normal 0.999987 -0.00513458 0 outer loop - vertex -21.5729 -16.4428 -0.1 + vertex -21.5729 -16.4428 -0.2 vertex -21.5774 -17.3273 0 - vertex -21.5774 -17.3273 -0.1 + vertex -21.5774 -17.3273 -0.2 endloop endfacet facet normal 0.999992 -0.00401347 0 outer loop vertex -21.5729 -16.4428 0 - vertex -21.5693 -15.5508 -0.1 + vertex -21.5693 -15.5508 -0.2 vertex -21.5693 -15.5508 0 endloop endfacet facet normal 0.999992 -0.00401347 0 outer loop - vertex -21.5693 -15.5508 -0.1 + vertex -21.5693 -15.5508 -0.2 vertex -21.5729 -16.4428 0 - vertex -21.5729 -16.4428 -0.1 + vertex -21.5729 -16.4428 -0.2 endloop endfacet facet normal 0.997925 0.0643945 0 outer loop vertex -21.5693 -15.5508 0 - vertex -21.5879 -15.2616 -0.1 + vertex -21.5879 -15.2616 -0.2 vertex -21.5879 -15.2616 0 endloop endfacet facet normal 0.997925 0.0643945 0 outer loop - vertex -21.5879 -15.2616 -0.1 + vertex -21.5879 -15.2616 -0.2 vertex -21.5693 -15.5508 0 - vertex -21.5693 -15.5508 -0.1 + vertex -21.5693 -15.5508 -0.2 endloop endfacet facet normal 0.982338 0.187114 0 outer loop vertex -21.5879 -15.2616 0 - vertex -21.6284 -15.0493 -0.1 + vertex -21.6284 -15.0493 -0.2 vertex -21.6284 -15.0493 0 endloop endfacet facet normal 0.982338 0.187114 0 outer loop - vertex -21.6284 -15.0493 -0.1 + vertex -21.6284 -15.0493 -0.2 vertex -21.5879 -15.2616 0 - vertex -21.5879 -15.2616 -0.1 + vertex -21.5879 -15.2616 -0.2 endloop endfacet facet normal 0.915958 0.401274 0 outer loop vertex -21.6284 -15.0493 0 - vertex -21.6966 -14.8935 -0.1 + vertex -21.6966 -14.8935 -0.2 vertex -21.6966 -14.8935 0 endloop endfacet facet normal 0.915958 0.401274 0 outer loop - vertex -21.6966 -14.8935 -0.1 + vertex -21.6966 -14.8935 -0.2 vertex -21.6284 -15.0493 0 - vertex -21.6284 -15.0493 -0.1 + vertex -21.6284 -15.0493 -0.2 endloop endfacet facet normal 0.761577 0.648074 0 outer loop vertex -21.6966 -14.8935 0 - vertex -21.7989 -14.7733 -0.1 + vertex -21.7989 -14.7733 -0.2 vertex -21.7989 -14.7733 0 endloop endfacet facet normal 0.761577 0.648074 0 outer loop - vertex -21.7989 -14.7733 -0.1 + vertex -21.7989 -14.7733 -0.2 vertex -21.6966 -14.8935 0 - vertex -21.6966 -14.8935 -0.1 + vertex -21.6966 -14.8935 -0.2 endloop endfacet facet normal 0.593991 0.804472 -0 outer loop - vertex -21.7989 -14.7733 -0.1 + vertex -21.7989 -14.7733 -0.2 vertex -21.9412 -14.6683 0 vertex -21.7989 -14.7733 0 endloop @@ -11188,13 +11188,13 @@ solid OpenSCAD_Model facet normal 0.593991 0.804472 0 outer loop vertex -21.9412 -14.6683 0 - vertex -21.7989 -14.7733 -0.1 - vertex -21.9412 -14.6683 -0.1 + vertex -21.7989 -14.7733 -0.2 + vertex -21.9412 -14.6683 -0.2 endloop endfacet facet normal 0.506241 0.862392 -0 outer loop - vertex -21.9412 -14.6683 -0.1 + vertex -21.9412 -14.6683 -0.2 vertex -22.1296 -14.5577 0 vertex -21.9412 -14.6683 0 endloop @@ -11202,13 +11202,13 @@ solid OpenSCAD_Model facet normal 0.506241 0.862392 0 outer loop vertex -22.1296 -14.5577 0 - vertex -21.9412 -14.6683 -0.1 - vertex -22.1296 -14.5577 -0.1 + vertex -21.9412 -14.6683 -0.2 + vertex -22.1296 -14.5577 -0.2 endloop endfacet facet normal 0.406178 0.913794 -0 outer loop - vertex -22.1296 -14.5577 -0.1 + vertex -22.1296 -14.5577 -0.2 vertex -22.3213 -14.4724 0 vertex -22.1296 -14.5577 0 endloop @@ -11216,13 +11216,13 @@ solid OpenSCAD_Model facet normal 0.406178 0.913794 0 outer loop vertex -22.3213 -14.4724 0 - vertex -22.1296 -14.5577 -0.1 - vertex -22.3213 -14.4724 -0.1 + vertex -22.1296 -14.5577 -0.2 + vertex -22.3213 -14.4724 -0.2 endloop endfacet facet normal 0.272589 0.962131 -0 outer loop - vertex -22.3213 -14.4724 -0.1 + vertex -22.3213 -14.4724 -0.2 vertex -22.5778 -14.3998 0 vertex -22.3213 -14.4724 0 endloop @@ -11230,13 +11230,13 @@ solid OpenSCAD_Model facet normal 0.272589 0.962131 0 outer loop vertex -22.5778 -14.3998 0 - vertex -22.3213 -14.4724 -0.1 - vertex -22.5778 -14.3998 -0.1 + vertex -22.3213 -14.4724 -0.2 + vertex -22.5778 -14.3998 -0.2 endloop endfacet facet normal 0.181059 0.983472 -0 outer loop - vertex -22.5778 -14.3998 -0.1 + vertex -22.5778 -14.3998 -0.2 vertex -22.9103 -14.3386 0 vertex -22.5778 -14.3998 0 endloop @@ -11244,13 +11244,13 @@ solid OpenSCAD_Model facet normal 0.181059 0.983472 0 outer loop vertex -22.9103 -14.3386 0 - vertex -22.5778 -14.3998 -0.1 - vertex -22.9103 -14.3386 -0.1 + vertex -22.5778 -14.3998 -0.2 + vertex -22.9103 -14.3386 -0.2 endloop endfacet facet normal 0.120311 0.992736 -0 outer loop - vertex -22.9103 -14.3386 -0.1 + vertex -22.9103 -14.3386 -0.2 vertex -23.3301 -14.2877 0 vertex -22.9103 -14.3386 0 endloop @@ -11258,13 +11258,13 @@ solid OpenSCAD_Model facet normal 0.120311 0.992736 0 outer loop vertex -23.3301 -14.2877 0 - vertex -22.9103 -14.3386 -0.1 - vertex -23.3301 -14.2877 -0.1 + vertex -22.9103 -14.3386 -0.2 + vertex -23.3301 -14.2877 -0.2 endloop endfacet facet normal 0.0654234 0.997858 -0 outer loop - vertex -23.3301 -14.2877 -0.1 + vertex -23.3301 -14.2877 -0.2 vertex -24.4767 -14.2125 0 vertex -23.3301 -14.2877 0 endloop @@ -11272,13 +11272,13 @@ solid OpenSCAD_Model facet normal 0.0654234 0.997858 0 outer loop vertex -24.4767 -14.2125 0 - vertex -23.3301 -14.2877 -0.1 - vertex -24.4767 -14.2125 -0.1 + vertex -23.3301 -14.2877 -0.2 + vertex -24.4767 -14.2125 -0.2 endloop endfacet facet normal 0.0288976 0.999582 -0 outer loop - vertex -24.4767 -14.2125 -0.1 + vertex -24.4767 -14.2125 -0.2 vertex -26.1077 -14.1654 0 vertex -24.4767 -14.2125 0 endloop @@ -11286,13 +11286,13 @@ solid OpenSCAD_Model facet normal 0.0288976 0.999582 0 outer loop vertex -26.1077 -14.1654 0 - vertex -24.4767 -14.2125 -0.1 - vertex -26.1077 -14.1654 -0.1 + vertex -24.4767 -14.2125 -0.2 + vertex -26.1077 -14.1654 -0.2 endloop endfacet facet normal 0.0099076 0.999951 -0 outer loop - vertex -26.1077 -14.1654 -0.1 + vertex -26.1077 -14.1654 -0.2 vertex -28.2448 -14.1442 0 vertex -26.1077 -14.1654 0 endloop @@ -11300,13 +11300,13 @@ solid OpenSCAD_Model facet normal 0.0099076 0.999951 0 outer loop vertex -28.2448 -14.1442 0 - vertex -26.1077 -14.1654 -0.1 - vertex -28.2448 -14.1442 -0.1 + vertex -26.1077 -14.1654 -0.2 + vertex -28.2448 -14.1442 -0.2 endloop endfacet facet normal -0.0184714 0.999829 0 outer loop - vertex -28.2448 -14.1442 -0.1 + vertex -28.2448 -14.1442 -0.2 vertex -28.9898 -14.1579 0 vertex -28.2448 -14.1442 0 endloop @@ -11314,13 +11314,13 @@ solid OpenSCAD_Model facet normal -0.0184714 0.999829 0 outer loop vertex -28.9898 -14.1579 0 - vertex -28.2448 -14.1442 -0.1 - vertex -28.9898 -14.1579 -0.1 + vertex -28.2448 -14.1442 -0.2 + vertex -28.9898 -14.1579 -0.2 endloop endfacet facet normal -0.0583775 0.998295 0 outer loop - vertex -28.9898 -14.1579 -0.1 + vertex -28.9898 -14.1579 -0.2 vertex -29.549 -14.1906 0 vertex -28.9898 -14.1579 0 endloop @@ -11328,13 +11328,13 @@ solid OpenSCAD_Model facet normal -0.0583775 0.998295 0 outer loop vertex -29.549 -14.1906 0 - vertex -28.9898 -14.1579 -0.1 - vertex -29.549 -14.1906 -0.1 + vertex -28.9898 -14.1579 -0.2 + vertex -29.549 -14.1906 -0.2 endloop endfacet facet normal -0.134346 0.990934 0 outer loop - vertex -29.549 -14.1906 -0.1 + vertex -29.549 -14.1906 -0.2 vertex -29.9449 -14.2443 0 vertex -29.549 -14.1906 0 endloop @@ -11342,13 +11342,13 @@ solid OpenSCAD_Model facet normal -0.134346 0.990934 0 outer loop vertex -29.9449 -14.2443 0 - vertex -29.549 -14.1906 -0.1 - vertex -29.9449 -14.2443 -0.1 + vertex -29.549 -14.1906 -0.2 + vertex -29.9449 -14.2443 -0.2 endloop endfacet facet normal -0.287948 0.957646 0 outer loop - vertex -29.9449 -14.2443 -0.1 + vertex -29.9449 -14.2443 -0.2 vertex -30.1999 -14.321 0 vertex -29.9449 -14.2443 0 endloop @@ -11356,13 +11356,13 @@ solid OpenSCAD_Model facet normal -0.287948 0.957646 0 outer loop vertex -30.1999 -14.321 0 - vertex -29.9449 -14.2443 -0.1 - vertex -30.1999 -14.321 -0.1 + vertex -29.9449 -14.2443 -0.2 + vertex -30.1999 -14.321 -0.2 endloop endfacet facet normal -0.503498 0.863996 0 outer loop - vertex -30.1999 -14.321 -0.1 + vertex -30.1999 -14.321 -0.2 vertex -30.2816 -14.3686 0 vertex -30.1999 -14.321 0 endloop @@ -11370,13 +11370,13 @@ solid OpenSCAD_Model facet normal -0.503498 0.863996 0 outer loop vertex -30.2816 -14.3686 0 - vertex -30.1999 -14.321 -0.1 - vertex -30.2816 -14.3686 -0.1 + vertex -30.1999 -14.321 -0.2 + vertex -30.2816 -14.3686 -0.2 endloop endfacet facet normal -0.702151 0.712028 0 outer loop - vertex -30.2816 -14.3686 -0.1 + vertex -30.2816 -14.3686 -0.2 vertex -30.3364 -14.4227 0 vertex -30.2816 -14.3686 0 endloop @@ -11384,237 +11384,237 @@ solid OpenSCAD_Model facet normal -0.702151 0.712028 0 outer loop vertex -30.3364 -14.4227 0 - vertex -30.2816 -14.3686 -0.1 - vertex -30.3364 -14.4227 -0.1 + vertex -30.2816 -14.3686 -0.2 + vertex -30.3364 -14.4227 -0.2 endloop endfacet facet normal -0.891918 0.452198 0 outer loop - vertex -30.3673 -14.4836 -0.1 + vertex -30.3673 -14.4836 -0.2 vertex -30.3364 -14.4227 0 - vertex -30.3364 -14.4227 -0.1 + vertex -30.3364 -14.4227 -0.2 endloop endfacet facet normal -0.891918 0.452198 0 outer loop vertex -30.3364 -14.4227 0 - vertex -30.3673 -14.4836 -0.1 + vertex -30.3673 -14.4836 -0.2 vertex -30.3673 -14.4836 0 endloop endfacet facet normal -0.990022 0.140913 0 outer loop - vertex -30.377 -14.5514 -0.1 + vertex -30.377 -14.5514 -0.2 vertex -30.3673 -14.4836 0 - vertex -30.3673 -14.4836 -0.1 + vertex -30.3673 -14.4836 -0.2 endloop endfacet facet normal -0.990022 0.140913 0 outer loop vertex -30.3673 -14.4836 0 - vertex -30.377 -14.5514 -0.1 + vertex -30.377 -14.5514 -0.2 vertex -30.377 -14.5514 0 endloop endfacet facet normal -0.969743 0.244126 0 outer loop - vertex -30.4158 -14.7057 -0.1 + vertex -30.4158 -14.7057 -0.2 vertex -30.377 -14.5514 0 - vertex -30.377 -14.5514 -0.1 + vertex -30.377 -14.5514 -0.2 endloop endfacet facet normal -0.969743 0.244126 0 outer loop vertex -30.377 -14.5514 0 - vertex -30.4158 -14.7057 -0.1 + vertex -30.4158 -14.7057 -0.2 vertex -30.4158 -14.7057 0 endloop endfacet facet normal -0.925454 0.378859 0 outer loop - vertex -30.5215 -14.964 -0.1 + vertex -30.5215 -14.964 -0.2 vertex -30.4158 -14.7057 0 - vertex -30.4158 -14.7057 -0.1 + vertex -30.4158 -14.7057 -0.2 endloop endfacet facet normal -0.925454 0.378859 0 outer loop vertex -30.4158 -14.7057 0 - vertex -30.5215 -14.964 -0.1 + vertex -30.5215 -14.964 -0.2 vertex -30.5215 -14.964 0 endloop endfacet facet normal -0.901668 0.432429 0 outer loop - vertex -30.678 -15.2903 -0.1 + vertex -30.678 -15.2903 -0.2 vertex -30.5215 -14.964 0 - vertex -30.5215 -14.964 -0.1 + vertex -30.5215 -14.964 -0.2 endloop endfacet facet normal -0.901668 0.432429 0 outer loop vertex -30.5215 -14.964 0 - vertex -30.678 -15.2903 -0.1 + vertex -30.678 -15.2903 -0.2 vertex -30.678 -15.2903 0 endloop endfacet facet normal -0.882363 0.47057 0 outer loop - vertex -30.8691 -15.6487 -0.1 + vertex -30.8691 -15.6487 -0.2 vertex -30.678 -15.2903 0 - vertex -30.678 -15.2903 -0.1 + vertex -30.678 -15.2903 -0.2 endloop endfacet facet normal -0.882363 0.47057 0 outer loop vertex -30.678 -15.2903 0 - vertex -30.8691 -15.6487 -0.1 + vertex -30.8691 -15.6487 -0.2 vertex -30.8691 -15.6487 0 endloop endfacet facet normal -0.892172 0.451696 0 outer loop - vertex -31.1223 -16.1487 -0.1 + vertex -31.1223 -16.1487 -0.2 vertex -30.8691 -15.6487 0 - vertex -30.8691 -15.6487 -0.1 + vertex -30.8691 -15.6487 -0.2 endloop endfacet facet normal -0.892172 0.451696 0 outer loop vertex -30.8691 -15.6487 0 - vertex -31.1223 -16.1487 -0.1 + vertex -31.1223 -16.1487 -0.2 vertex -31.1223 -16.1487 0 endloop endfacet facet normal -0.909515 0.415671 0 outer loop - vertex -31.4477 -16.8607 -0.1 + vertex -31.4477 -16.8607 -0.2 vertex -31.1223 -16.1487 0 - vertex -31.1223 -16.1487 -0.1 + vertex -31.1223 -16.1487 -0.2 endloop endfacet facet normal -0.909515 0.415671 0 outer loop vertex -31.1223 -16.1487 0 - vertex -31.4477 -16.8607 -0.1 + vertex -31.4477 -16.8607 -0.2 vertex -31.4477 -16.8607 0 endloop endfacet facet normal -0.918988 0.394285 0 outer loop - vertex -31.8034 -17.6899 -0.1 + vertex -31.8034 -17.6899 -0.2 vertex -31.4477 -16.8607 0 - vertex -31.4477 -16.8607 -0.1 + vertex -31.4477 -16.8607 -0.2 endloop endfacet facet normal -0.918988 0.394285 0 outer loop vertex -31.4477 -16.8607 0 - vertex -31.8034 -17.6899 -0.1 + vertex -31.8034 -17.6899 -0.2 vertex -31.8034 -17.6899 0 endloop endfacet facet normal -0.927129 0.374741 0 outer loop - vertex -32.1476 -18.5412 -0.1 + vertex -32.1476 -18.5412 -0.2 vertex -31.8034 -17.6899 0 - vertex -31.8034 -17.6899 -0.1 + vertex -31.8034 -17.6899 -0.2 endloop endfacet facet normal -0.927129 0.374741 0 outer loop vertex -31.8034 -17.6899 0 - vertex -32.1476 -18.5412 -0.1 + vertex -32.1476 -18.5412 -0.2 vertex -32.1476 -18.5412 0 endloop endfacet facet normal -0.929897 0.36782 0 outer loop - vertex -33.2902 -21.4299 -0.1 + vertex -33.2902 -21.4299 -0.2 vertex -32.1476 -18.5412 0 - vertex -32.1476 -18.5412 -0.1 + vertex -32.1476 -18.5412 -0.2 endloop endfacet facet normal -0.929897 0.36782 0 outer loop vertex -32.1476 -18.5412 0 - vertex -33.2902 -21.4299 -0.1 + vertex -33.2902 -21.4299 -0.2 vertex -33.2902 -21.4299 0 endloop endfacet facet normal -0.931897 0.362724 0 outer loop - vertex -33.4325 -21.7956 -0.1 + vertex -33.4325 -21.7956 -0.2 vertex -33.2902 -21.4299 0 - vertex -33.2902 -21.4299 -0.1 + vertex -33.2902 -21.4299 -0.2 endloop endfacet facet normal -0.931897 0.362724 0 outer loop vertex -33.2902 -21.4299 0 - vertex -33.4325 -21.7956 -0.1 + vertex -33.4325 -21.7956 -0.2 vertex -33.4325 -21.7956 0 endloop endfacet facet normal -0.968991 0.247098 0 outer loop - vertex -33.503 -22.0719 -0.1 + vertex -33.503 -22.0719 -0.2 vertex -33.4325 -21.7956 0 - vertex -33.4325 -21.7956 -0.1 + vertex -33.4325 -21.7956 -0.2 endloop endfacet facet normal -0.968991 0.247098 0 outer loop vertex -33.4325 -21.7956 0 - vertex -33.503 -22.0719 -0.1 + vertex -33.503 -22.0719 -0.2 vertex -33.503 -22.0719 0 endloop endfacet facet normal -0.999995 -0.00318704 0 outer loop - vertex -33.5026 -22.1809 -0.1 + vertex -33.5026 -22.1809 -0.2 vertex -33.503 -22.0719 0 - vertex -33.503 -22.0719 -0.1 + vertex -33.503 -22.0719 -0.2 endloop endfacet facet normal -0.999995 -0.00318704 0 outer loop vertex -33.503 -22.0719 0 - vertex -33.5026 -22.1809 -0.1 + vertex -33.5026 -22.1809 -0.2 vertex -33.5026 -22.1809 0 endloop endfacet facet normal -0.954349 -0.298693 0 outer loop - vertex -33.4739 -22.2725 -0.1 + vertex -33.4739 -22.2725 -0.2 vertex -33.5026 -22.1809 0 - vertex -33.5026 -22.1809 -0.1 + vertex -33.5026 -22.1809 -0.2 endloop endfacet facet normal -0.954349 -0.298693 0 outer loop vertex -33.5026 -22.1809 0 - vertex -33.4739 -22.2725 -0.1 + vertex -33.4739 -22.2725 -0.2 vertex -33.4739 -22.2725 0 endloop endfacet facet normal -0.782807 -0.622265 0 outer loop - vertex -33.4135 -22.3486 -0.1 + vertex -33.4135 -22.3486 -0.2 vertex -33.4739 -22.2725 0 - vertex -33.4739 -22.2725 -0.1 + vertex -33.4739 -22.2725 -0.2 endloop endfacet facet normal -0.782807 -0.622265 0 outer loop vertex -33.4739 -22.2725 0 - vertex -33.4135 -22.3486 -0.1 + vertex -33.4135 -22.3486 -0.2 vertex -33.4135 -22.3486 0 endloop endfacet facet normal -0.544751 -0.838598 0 outer loop - vertex -33.4135 -22.3486 -0.1 + vertex -33.4135 -22.3486 -0.2 vertex -33.3177 -22.4108 0 vertex -33.4135 -22.3486 0 endloop @@ -11622,13 +11622,13 @@ solid OpenSCAD_Model facet normal -0.544751 -0.838598 -0 outer loop vertex -33.3177 -22.4108 0 - vertex -33.4135 -22.3486 -0.1 - vertex -33.3177 -22.4108 -0.1 + vertex -33.4135 -22.3486 -0.2 + vertex -33.3177 -22.4108 -0.2 endloop endfacet facet normal -0.348432 -0.937334 0 outer loop - vertex -33.3177 -22.4108 -0.1 + vertex -33.3177 -22.4108 -0.2 vertex -33.1833 -22.4608 0 vertex -33.3177 -22.4108 0 endloop @@ -11636,13 +11636,13 @@ solid OpenSCAD_Model facet normal -0.348432 -0.937334 -0 outer loop vertex -33.1833 -22.4608 0 - vertex -33.3177 -22.4108 -0.1 - vertex -33.1833 -22.4608 -0.1 + vertex -33.3177 -22.4108 -0.2 + vertex -33.1833 -22.4608 -0.2 endloop endfacet facet normal -0.218014 -0.975946 0 outer loop - vertex -33.1833 -22.4608 -0.1 + vertex -33.1833 -22.4608 -0.2 vertex -33.0067 -22.5002 0 vertex -33.1833 -22.4608 0 endloop @@ -11650,13 +11650,13 @@ solid OpenSCAD_Model facet normal -0.218014 -0.975946 -0 outer loop vertex -33.0067 -22.5002 0 - vertex -33.1833 -22.4608 -0.1 - vertex -33.0067 -22.5002 -0.1 + vertex -33.1833 -22.4608 -0.2 + vertex -33.0067 -22.5002 -0.2 endloop endfacet facet normal -0.108894 -0.994053 0 outer loop - vertex -33.0067 -22.5002 -0.1 + vertex -33.0067 -22.5002 -0.2 vertex -32.5132 -22.5543 0 vertex -33.0067 -22.5002 0 endloop @@ -11664,13 +11664,13 @@ solid OpenSCAD_Model facet normal -0.108894 -0.994053 -0 outer loop vertex -32.5132 -22.5543 0 - vertex -33.0067 -22.5002 -0.1 - vertex -32.5132 -22.5543 -0.1 + vertex -33.0067 -22.5002 -0.2 + vertex -32.5132 -22.5543 -0.2 endloop endfacet facet normal -0.0456949 -0.998955 0 outer loop - vertex -32.5132 -22.5543 -0.1 + vertex -32.5132 -22.5543 -0.2 vertex -31.8095 -22.5865 0 vertex -32.5132 -22.5543 0 endloop @@ -11678,13 +11678,13 @@ solid OpenSCAD_Model facet normal -0.0456949 -0.998955 -0 outer loop vertex -31.8095 -22.5865 0 - vertex -32.5132 -22.5543 -0.1 - vertex -31.8095 -22.5865 -0.1 + vertex -32.5132 -22.5543 -0.2 + vertex -31.8095 -22.5865 -0.2 endloop endfacet facet normal -0.0252584 -0.999681 0 outer loop - vertex -31.8095 -22.5865 -0.1 + vertex -31.8095 -22.5865 -0.2 vertex -30.868 -22.6102 0 vertex -31.8095 -22.5865 0 endloop @@ -11692,13 +11692,13 @@ solid OpenSCAD_Model facet normal -0.0252584 -0.999681 -0 outer loop vertex -30.868 -22.6102 0 - vertex -31.8095 -22.5865 -0.1 - vertex -30.868 -22.6102 -0.1 + vertex -31.8095 -22.5865 -0.2 + vertex -30.868 -22.6102 -0.2 endloop endfacet facet normal -0.0103281 -0.999947 0 outer loop - vertex -30.868 -22.6102 -0.1 + vertex -30.868 -22.6102 -0.2 vertex -30.2322 -22.6168 0 vertex -30.868 -22.6102 0 endloop @@ -11706,13 +11706,13 @@ solid OpenSCAD_Model facet normal -0.0103281 -0.999947 -0 outer loop vertex -30.2322 -22.6168 0 - vertex -30.868 -22.6102 -0.1 - vertex -30.2322 -22.6168 -0.1 + vertex -30.868 -22.6102 -0.2 + vertex -30.2322 -22.6168 -0.2 endloop endfacet facet normal 0.0183057 -0.999832 0 outer loop - vertex -30.2322 -22.6168 -0.1 + vertex -30.2322 -22.6168 -0.2 vertex -29.6427 -22.606 0 vertex -30.2322 -22.6168 0 endloop @@ -11720,13 +11720,13 @@ solid OpenSCAD_Model facet normal 0.0183057 -0.999832 0 outer loop vertex -29.6427 -22.606 0 - vertex -30.2322 -22.6168 -0.1 - vertex -29.6427 -22.606 -0.1 + vertex -30.2322 -22.6168 -0.2 + vertex -29.6427 -22.606 -0.2 endloop endfacet facet normal 0.0536309 -0.998561 0 outer loop - vertex -29.6427 -22.606 -0.1 + vertex -29.6427 -22.606 -0.2 vertex -29.0966 -22.5767 0 vertex -29.6427 -22.606 0 endloop @@ -11734,13 +11734,13 @@ solid OpenSCAD_Model facet normal 0.0536309 -0.998561 0 outer loop vertex -29.0966 -22.5767 0 - vertex -29.6427 -22.606 -0.1 - vertex -29.0966 -22.5767 -0.1 + vertex -29.6427 -22.606 -0.2 + vertex -29.0966 -22.5767 -0.2 endloop endfacet facet normal 0.0966018 -0.995323 0 outer loop - vertex -29.0966 -22.5767 -0.1 + vertex -29.0966 -22.5767 -0.2 vertex -28.5914 -22.5277 0 vertex -29.0966 -22.5767 0 endloop @@ -11748,13 +11748,13 @@ solid OpenSCAD_Model facet normal 0.0966018 -0.995323 0 outer loop vertex -28.5914 -22.5277 0 - vertex -29.0966 -22.5767 -0.1 - vertex -28.5914 -22.5277 -0.1 + vertex -29.0966 -22.5767 -0.2 + vertex -28.5914 -22.5277 -0.2 endloop endfacet facet normal 0.148005 -0.988987 0 outer loop - vertex -28.5914 -22.5277 -0.1 + vertex -28.5914 -22.5277 -0.2 vertex -28.1242 -22.4577 0 vertex -28.5914 -22.5277 0 endloop @@ -11762,13 +11762,13 @@ solid OpenSCAD_Model facet normal 0.148005 -0.988987 0 outer loop vertex -28.1242 -22.4577 0 - vertex -28.5914 -22.5277 -0.1 - vertex -28.1242 -22.4577 -0.1 + vertex -28.5914 -22.5277 -0.2 + vertex -28.1242 -22.4577 -0.2 endloop endfacet facet normal 0.208284 -0.978068 0 outer loop - vertex -28.1242 -22.4577 -0.1 + vertex -28.1242 -22.4577 -0.2 vertex -27.6923 -22.3658 0 vertex -28.1242 -22.4577 0 endloop @@ -11776,13 +11776,13 @@ solid OpenSCAD_Model facet normal 0.208284 -0.978068 0 outer loop vertex -27.6923 -22.3658 0 - vertex -28.1242 -22.4577 -0.1 - vertex -27.6923 -22.3658 -0.1 + vertex -28.1242 -22.4577 -0.2 + vertex -27.6923 -22.3658 -0.2 endloop endfacet facet normal 0.277178 -0.960818 0 outer loop - vertex -27.6923 -22.3658 -0.1 + vertex -27.6923 -22.3658 -0.2 vertex -27.2929 -22.2506 0 vertex -27.6923 -22.3658 0 endloop @@ -11790,13 +11790,13 @@ solid OpenSCAD_Model facet normal 0.277178 -0.960818 0 outer loop vertex -27.2929 -22.2506 0 - vertex -27.6923 -22.3658 -0.1 - vertex -27.2929 -22.2506 -0.1 + vertex -27.6923 -22.3658 -0.2 + vertex -27.2929 -22.2506 -0.2 endloop endfacet facet normal 0.353412 -0.935468 0 outer loop - vertex -27.2929 -22.2506 -0.1 + vertex -27.2929 -22.2506 -0.2 vertex -26.9234 -22.1109 0 vertex -27.2929 -22.2506 0 endloop @@ -11804,13 +11804,13 @@ solid OpenSCAD_Model facet normal 0.353412 -0.935468 0 outer loop vertex -26.9234 -22.1109 0 - vertex -27.2929 -22.2506 -0.1 - vertex -26.9234 -22.1109 -0.1 + vertex -27.2929 -22.2506 -0.2 + vertex -26.9234 -22.1109 -0.2 endloop endfacet facet normal 0.434442 -0.9007 0 outer loop - vertex -26.9234 -22.1109 -0.1 + vertex -26.9234 -22.1109 -0.2 vertex -26.5809 -21.9457 0 vertex -26.9234 -22.1109 0 endloop @@ -11818,13 +11818,13 @@ solid OpenSCAD_Model facet normal 0.434442 -0.9007 0 outer loop vertex -26.5809 -21.9457 0 - vertex -26.9234 -22.1109 -0.1 - vertex -26.5809 -21.9457 -0.1 + vertex -26.9234 -22.1109 -0.2 + vertex -26.5809 -21.9457 -0.2 endloop endfacet facet normal 0.516567 -0.856247 0 outer loop - vertex -26.5809 -21.9457 -0.1 + vertex -26.5809 -21.9457 -0.2 vertex -26.2627 -21.7538 0 vertex -26.5809 -21.9457 0 endloop @@ -11832,13 +11832,13 @@ solid OpenSCAD_Model facet normal 0.516567 -0.856247 0 outer loop vertex -26.2627 -21.7538 0 - vertex -26.5809 -21.9457 -0.1 - vertex -26.2627 -21.7538 -0.1 + vertex -26.5809 -21.9457 -0.2 + vertex -26.2627 -21.7538 -0.2 endloop endfacet facet normal 0.595538 -0.803327 0 outer loop - vertex -26.2627 -21.7538 -0.1 + vertex -26.2627 -21.7538 -0.2 vertex -25.9661 -21.5339 0 vertex -26.2627 -21.7538 0 endloop @@ -11846,13 +11846,13 @@ solid OpenSCAD_Model facet normal 0.595538 -0.803327 0 outer loop vertex -25.9661 -21.5339 0 - vertex -26.2627 -21.7538 -0.1 - vertex -25.9661 -21.5339 -0.1 + vertex -26.2627 -21.7538 -0.2 + vertex -25.9661 -21.5339 -0.2 endloop endfacet facet normal 0.667477 -0.744631 0 outer loop - vertex -25.9661 -21.5339 -0.1 + vertex -25.9661 -21.5339 -0.2 vertex -25.6884 -21.2849 0 vertex -25.9661 -21.5339 0 endloop @@ -11860,111 +11860,111 @@ solid OpenSCAD_Model facet normal 0.667477 -0.744631 0 outer loop vertex -25.6884 -21.2849 0 - vertex -25.9661 -21.5339 -0.1 - vertex -25.6884 -21.2849 -0.1 + vertex -25.9661 -21.5339 -0.2 + vertex -25.6884 -21.2849 -0.2 endloop endfacet facet normal 0.729709 -0.683757 0 outer loop vertex -25.6884 -21.2849 0 - vertex -25.4267 -21.0057 -0.1 + vertex -25.4267 -21.0057 -0.2 vertex -25.4267 -21.0057 0 endloop endfacet facet normal 0.729709 -0.683757 0 outer loop - vertex -25.4267 -21.0057 -0.1 + vertex -25.4267 -21.0057 -0.2 vertex -25.6884 -21.2849 0 - vertex -25.6884 -21.2849 -0.1 + vertex -25.6884 -21.2849 -0.2 endloop endfacet facet normal 0.781167 -0.624322 0 outer loop vertex -25.4267 -21.0057 0 - vertex -25.1784 -20.695 -0.1 + vertex -25.1784 -20.695 -0.2 vertex -25.1784 -20.695 0 endloop endfacet facet normal 0.781167 -0.624322 0 outer loop - vertex -25.1784 -20.695 -0.1 + vertex -25.1784 -20.695 -0.2 vertex -25.4267 -21.0057 0 - vertex -25.4267 -21.0057 -0.1 + vertex -25.4267 -21.0057 -0.2 endloop endfacet facet normal 0.82216 -0.569257 0 outer loop vertex -25.1784 -20.695 0 - vertex -24.9407 -20.3516 -0.1 + vertex -24.9407 -20.3516 -0.2 vertex -24.9407 -20.3516 0 endloop endfacet facet normal 0.82216 -0.569257 0 outer loop - vertex -24.9407 -20.3516 -0.1 + vertex -24.9407 -20.3516 -0.2 vertex -25.1784 -20.695 0 - vertex -25.1784 -20.695 -0.1 + vertex -25.1784 -20.695 -0.2 endloop endfacet facet normal 0.853894 -0.520447 0 outer loop vertex -24.9407 -20.3516 0 - vertex -24.7108 -19.9745 -0.1 + vertex -24.7108 -19.9745 -0.2 vertex -24.7108 -19.9745 0 endloop endfacet facet normal 0.853894 -0.520447 0 outer loop - vertex -24.7108 -19.9745 -0.1 + vertex -24.7108 -19.9745 -0.2 vertex -24.9407 -20.3516 0 - vertex -24.9407 -20.3516 -0.1 + vertex -24.9407 -20.3516 -0.2 endloop endfacet facet normal 0.85126 -0.524745 0 outer loop vertex -24.7108 -19.9745 0 - vertex -24.3738 -19.4278 -0.1 + vertex -24.3738 -19.4278 -0.2 vertex -24.3738 -19.4278 0 endloop endfacet facet normal 0.85126 -0.524745 0 outer loop - vertex -24.3738 -19.4278 -0.1 + vertex -24.3738 -19.4278 -0.2 vertex -24.7108 -19.9745 0 - vertex -24.7108 -19.9745 -0.1 + vertex -24.7108 -19.9745 -0.2 endloop endfacet facet normal 0.796036 -0.60525 0 outer loop vertex -24.3738 -19.4278 0 - vertex -24.2328 -19.2424 -0.1 + vertex -24.2328 -19.2424 -0.2 vertex -24.2328 -19.2424 0 endloop endfacet facet normal 0.796036 -0.60525 0 outer loop - vertex -24.2328 -19.2424 -0.1 + vertex -24.2328 -19.2424 -0.2 vertex -24.3738 -19.4278 0 - vertex -24.3738 -19.4278 -0.1 + vertex -24.3738 -19.4278 -0.2 endloop endfacet facet normal 0.714094 -0.70005 0 outer loop vertex -24.2328 -19.2424 0 - vertex -24.0993 -19.1062 -0.1 + vertex -24.0993 -19.1062 -0.2 vertex -24.0993 -19.1062 0 endloop endfacet facet normal 0.714094 -0.70005 0 outer loop - vertex -24.0993 -19.1062 -0.1 + vertex -24.0993 -19.1062 -0.2 vertex -24.2328 -19.2424 0 - vertex -24.2328 -19.2424 -0.1 + vertex -24.2328 -19.2424 -0.2 endloop endfacet facet normal 0.573399 -0.819276 0 outer loop - vertex -24.0993 -19.1062 -0.1 + vertex -24.0993 -19.1062 -0.2 vertex -23.9653 -19.0124 0 vertex -24.0993 -19.1062 0 endloop @@ -11972,13 +11972,13 @@ solid OpenSCAD_Model facet normal 0.573399 -0.819276 0 outer loop vertex -23.9653 -19.0124 0 - vertex -24.0993 -19.1062 -0.1 - vertex -23.9653 -19.0124 -0.1 + vertex -24.0993 -19.1062 -0.2 + vertex -23.9653 -19.0124 -0.2 endloop endfacet facet normal 0.378849 -0.925458 0 outer loop - vertex -23.9653 -19.0124 -0.1 + vertex -23.9653 -19.0124 -0.2 vertex -23.8226 -18.954 0 vertex -23.9653 -19.0124 0 endloop @@ -11986,13 +11986,13 @@ solid OpenSCAD_Model facet normal 0.378849 -0.925458 0 outer loop vertex -23.8226 -18.954 0 - vertex -23.9653 -19.0124 -0.1 - vertex -23.8226 -18.954 -0.1 + vertex -23.9653 -19.0124 -0.2 + vertex -23.8226 -18.954 -0.2 endloop endfacet facet normal 0.184661 -0.982802 0 outer loop - vertex -23.8226 -18.954 -0.1 + vertex -23.8226 -18.954 -0.2 vertex -23.6632 -18.9241 0 vertex -23.8226 -18.954 0 endloop @@ -12000,13 +12000,13 @@ solid OpenSCAD_Model facet normal 0.184661 -0.982802 0 outer loop vertex -23.6632 -18.9241 0 - vertex -23.8226 -18.954 -0.1 - vertex -23.6632 -18.9241 -0.1 + vertex -23.8226 -18.954 -0.2 + vertex -23.6632 -18.9241 -0.2 endloop endfacet facet normal 0.0457652 -0.998952 0 outer loop - vertex -23.6632 -18.9241 -0.1 + vertex -23.6632 -18.9241 -0.2 vertex -23.4791 -18.9156 0 vertex -23.6632 -18.9241 0 endloop @@ -12014,13 +12014,13 @@ solid OpenSCAD_Model facet normal 0.0457652 -0.998952 0 outer loop vertex -23.4791 -18.9156 0 - vertex -23.6632 -18.9241 -0.1 - vertex -23.4791 -18.9156 -0.1 + vertex -23.6632 -18.9241 -0.2 + vertex -23.4791 -18.9156 -0.2 endloop endfacet facet normal -0.0578368 -0.998326 0 outer loop - vertex -23.4791 -18.9156 -0.1 + vertex -23.4791 -18.9156 -0.2 vertex -23.1186 -18.9365 0 vertex -23.4791 -18.9156 0 endloop @@ -12028,13 +12028,13 @@ solid OpenSCAD_Model facet normal -0.0578368 -0.998326 -0 outer loop vertex -23.1186 -18.9365 0 - vertex -23.4791 -18.9156 -0.1 - vertex -23.1186 -18.9365 -0.1 + vertex -23.4791 -18.9156 -0.2 + vertex -23.1186 -18.9365 -0.2 endloop endfacet facet normal -0.193675 -0.981066 0 outer loop - vertex -23.1186 -18.9365 -0.1 + vertex -23.1186 -18.9365 -0.2 vertex -22.9739 -18.9651 0 vertex -23.1186 -18.9365 0 endloop @@ -12042,13 +12042,13 @@ solid OpenSCAD_Model facet normal -0.193675 -0.981066 -0 outer loop vertex -22.9739 -18.9651 0 - vertex -23.1186 -18.9365 -0.1 - vertex -22.9739 -18.9651 -0.1 + vertex -23.1186 -18.9365 -0.2 + vertex -22.9739 -18.9651 -0.2 endloop endfacet facet normal -0.332798 -0.942998 0 outer loop - vertex -22.9739 -18.9651 -0.1 + vertex -22.9739 -18.9651 -0.2 vertex -22.8524 -19.008 0 vertex -22.9739 -18.9651 0 endloop @@ -12056,13 +12056,13 @@ solid OpenSCAD_Model facet normal -0.332798 -0.942998 -0 outer loop vertex -22.8524 -19.008 0 - vertex -22.9739 -18.9651 -0.1 - vertex -22.8524 -19.008 -0.1 + vertex -22.9739 -18.9651 -0.2 + vertex -22.8524 -19.008 -0.2 endloop endfacet facet normal -0.512852 -0.858477 0 outer loop - vertex -22.8524 -19.008 -0.1 + vertex -22.8524 -19.008 -0.2 vertex -22.7539 -19.0668 0 vertex -22.8524 -19.008 0 endloop @@ -12070,237 +12070,237 @@ solid OpenSCAD_Model facet normal -0.512852 -0.858477 -0 outer loop vertex -22.7539 -19.0668 0 - vertex -22.8524 -19.008 -0.1 - vertex -22.7539 -19.0668 -0.1 + vertex -22.8524 -19.008 -0.2 + vertex -22.7539 -19.0668 -0.2 endloop endfacet facet normal -0.710432 -0.703766 0 outer loop - vertex -22.6782 -19.1432 -0.1 + vertex -22.6782 -19.1432 -0.2 vertex -22.7539 -19.0668 0 - vertex -22.7539 -19.0668 -0.1 + vertex -22.7539 -19.0668 -0.2 endloop endfacet facet normal -0.710432 -0.703766 0 outer loop vertex -22.7539 -19.0668 0 - vertex -22.6782 -19.1432 -0.1 + vertex -22.6782 -19.1432 -0.2 vertex -22.6782 -19.1432 0 endloop endfacet facet normal -0.873955 -0.486007 0 outer loop - vertex -22.625 -19.2389 -0.1 + vertex -22.625 -19.2389 -0.2 vertex -22.6782 -19.1432 0 - vertex -22.6782 -19.1432 -0.1 + vertex -22.6782 -19.1432 -0.2 endloop endfacet facet normal -0.873955 -0.486007 0 outer loop vertex -22.6782 -19.1432 0 - vertex -22.625 -19.2389 -0.1 + vertex -22.625 -19.2389 -0.2 vertex -22.625 -19.2389 0 endloop endfacet facet normal -0.966491 -0.256701 0 outer loop - vertex -22.594 -19.3555 -0.1 + vertex -22.594 -19.3555 -0.2 vertex -22.625 -19.2389 0 - vertex -22.625 -19.2389 -0.1 + vertex -22.625 -19.2389 -0.2 endloop endfacet facet normal -0.966491 -0.256701 0 outer loop vertex -22.625 -19.2389 0 - vertex -22.594 -19.3555 -0.1 + vertex -22.594 -19.3555 -0.2 vertex -22.594 -19.3555 0 endloop endfacet facet normal -0.997923 -0.0644192 0 outer loop - vertex -22.585 -19.4947 -0.1 + vertex -22.585 -19.4947 -0.2 vertex -22.594 -19.3555 0 - vertex -22.594 -19.3555 -0.1 + vertex -22.594 -19.3555 -0.2 endloop endfacet facet normal -0.997923 -0.0644192 0 outer loop vertex -22.594 -19.3555 0 - vertex -22.585 -19.4947 -0.1 + vertex -22.585 -19.4947 -0.2 vertex -22.585 -19.4947 0 endloop endfacet facet normal -0.996972 0.0777592 0 outer loop - vertex -22.5978 -19.6581 -0.1 + vertex -22.5978 -19.6581 -0.2 vertex -22.585 -19.4947 0 - vertex -22.585 -19.4947 -0.1 + vertex -22.585 -19.4947 -0.2 endloop endfacet facet normal -0.996972 0.0777592 0 outer loop vertex -22.585 -19.4947 0 - vertex -22.5978 -19.6581 -0.1 + vertex -22.5978 -19.6581 -0.2 vertex -22.5978 -19.6581 0 endloop endfacet facet normal -0.976488 0.215571 0 outer loop - vertex -22.6874 -20.0641 -0.1 + vertex -22.6874 -20.0641 -0.2 vertex -22.5978 -19.6581 0 - vertex -22.5978 -19.6581 -0.1 + vertex -22.5978 -19.6581 -0.2 endloop endfacet facet normal -0.976488 0.215571 0 outer loop vertex -22.5978 -19.6581 0 - vertex -22.6874 -20.0641 -0.1 + vertex -22.6874 -20.0641 -0.2 vertex -22.6874 -20.0641 0 endloop endfacet facet normal -0.949119 0.314918 0 outer loop - vertex -22.8608 -20.5868 -0.1 + vertex -22.8608 -20.5868 -0.2 vertex -22.6874 -20.0641 0 - vertex -22.6874 -20.0641 -0.1 + vertex -22.6874 -20.0641 -0.2 endloop endfacet facet normal -0.949119 0.314918 0 outer loop vertex -22.6874 -20.0641 0 - vertex -22.8608 -20.5868 -0.1 + vertex -22.8608 -20.5868 -0.2 vertex -22.8608 -20.5868 0 endloop endfacet facet normal -0.931342 0.364145 0 outer loop - vertex -23.116 -21.2395 -0.1 + vertex -23.116 -21.2395 -0.2 vertex -22.8608 -20.5868 0 - vertex -22.8608 -20.5868 -0.1 + vertex -22.8608 -20.5868 -0.2 endloop endfacet facet normal -0.931342 0.364145 0 outer loop vertex -22.8608 -20.5868 0 - vertex -23.116 -21.2395 -0.1 + vertex -23.116 -21.2395 -0.2 vertex -23.116 -21.2395 0 endloop endfacet facet normal -0.926122 0.377225 0 outer loop - vertex -24.3958 -24.3815 -0.1 + vertex -24.3958 -24.3815 -0.2 vertex -23.116 -21.2395 0 - vertex -23.116 -21.2395 -0.1 + vertex -23.116 -21.2395 -0.2 endloop endfacet facet normal -0.926122 0.377225 0 outer loop vertex -23.116 -21.2395 0 - vertex -24.3958 -24.3815 -0.1 + vertex -24.3958 -24.3815 -0.2 vertex -24.3958 -24.3815 0 endloop endfacet facet normal -0.92485 0.380332 0 outer loop - vertex -24.9793 -25.8003 -0.1 + vertex -24.9793 -25.8003 -0.2 vertex -24.3958 -24.3815 0 - vertex -24.3958 -24.3815 -0.1 + vertex -24.3958 -24.3815 -0.2 endloop endfacet facet normal -0.92485 0.380332 0 outer loop vertex -24.3958 -24.3815 0 - vertex -24.9793 -25.8003 -0.1 + vertex -24.9793 -25.8003 -0.2 vertex -24.9793 -25.8003 0 endloop endfacet facet normal -0.917414 0.397935 0 outer loop - vertex -25.4624 -26.9141 -0.1 + vertex -25.4624 -26.9141 -0.2 vertex -24.9793 -25.8003 0 - vertex -24.9793 -25.8003 -0.1 + vertex -24.9793 -25.8003 -0.2 endloop endfacet facet normal -0.917414 0.397935 0 outer loop vertex -24.9793 -25.8003 0 - vertex -25.4624 -26.9141 -0.1 + vertex -25.4624 -26.9141 -0.2 vertex -25.4624 -26.9141 0 endloop endfacet facet normal -0.901103 0.433605 0 outer loop - vertex -25.8688 -27.7587 -0.1 + vertex -25.8688 -27.7587 -0.2 vertex -25.4624 -26.9141 0 - vertex -25.4624 -26.9141 -0.1 + vertex -25.4624 -26.9141 -0.2 endloop endfacet facet normal -0.901103 0.433605 0 outer loop vertex -25.4624 -26.9141 0 - vertex -25.8688 -27.7587 -0.1 + vertex -25.8688 -27.7587 -0.2 vertex -25.8688 -27.7587 0 endloop endfacet facet normal -0.87739 0.479778 0 outer loop - vertex -26.0506 -28.0911 -0.1 + vertex -26.0506 -28.0911 -0.2 vertex -25.8688 -27.7587 0 - vertex -25.8688 -27.7587 -0.1 + vertex -25.8688 -27.7587 -0.2 endloop endfacet facet normal -0.87739 0.479778 0 outer loop vertex -25.8688 -27.7587 0 - vertex -26.0506 -28.0911 -0.1 + vertex -26.0506 -28.0911 -0.2 vertex -26.0506 -28.0911 0 endloop endfacet facet normal -0.851572 0.524237 0 outer loop - vertex -26.2221 -28.3696 -0.1 + vertex -26.2221 -28.3696 -0.2 vertex -26.0506 -28.0911 0 - vertex -26.0506 -28.0911 -0.1 + vertex -26.0506 -28.0911 -0.2 endloop endfacet facet normal -0.851572 0.524237 0 outer loop vertex -26.0506 -28.0911 0 - vertex -26.2221 -28.3696 -0.1 + vertex -26.2221 -28.3696 -0.2 vertex -26.2221 -28.3696 0 endloop endfacet facet normal -0.812951 0.582331 0 outer loop - vertex -26.3861 -28.5987 -0.1 + vertex -26.3861 -28.5987 -0.2 vertex -26.2221 -28.3696 0 - vertex -26.2221 -28.3696 -0.1 + vertex -26.2221 -28.3696 -0.2 endloop endfacet facet normal -0.812951 0.582331 0 outer loop vertex -26.2221 -28.3696 0 - vertex -26.3861 -28.5987 -0.1 + vertex -26.3861 -28.5987 -0.2 vertex -26.3861 -28.5987 0 endloop endfacet facet normal -0.755407 0.655255 0 outer loop - vertex -26.5458 -28.7827 -0.1 + vertex -26.5458 -28.7827 -0.2 vertex -26.3861 -28.5987 0 - vertex -26.3861 -28.5987 -0.1 + vertex -26.3861 -28.5987 -0.2 endloop endfacet facet normal -0.755407 0.655255 0 outer loop vertex -26.3861 -28.5987 0 - vertex -26.5458 -28.7827 -0.1 + vertex -26.5458 -28.7827 -0.2 vertex -26.5458 -28.7827 0 endloop endfacet facet normal -0.671936 0.740609 0 outer loop - vertex -26.5458 -28.7827 -0.1 + vertex -26.5458 -28.7827 -0.2 vertex -26.7039 -28.9262 0 vertex -26.5458 -28.7827 0 endloop @@ -12308,13 +12308,13 @@ solid OpenSCAD_Model facet normal -0.671936 0.740609 0 outer loop vertex -26.7039 -28.9262 0 - vertex -26.5458 -28.7827 -0.1 - vertex -26.7039 -28.9262 -0.1 + vertex -26.5458 -28.7827 -0.2 + vertex -26.7039 -28.9262 -0.2 endloop endfacet facet normal -0.558253 0.829671 0 outer loop - vertex -26.7039 -28.9262 -0.1 + vertex -26.7039 -28.9262 -0.2 vertex -26.8635 -29.0336 0 vertex -26.7039 -28.9262 0 endloop @@ -12322,13 +12322,13 @@ solid OpenSCAD_Model facet normal -0.558253 0.829671 0 outer loop vertex -26.8635 -29.0336 0 - vertex -26.7039 -28.9262 -0.1 - vertex -26.8635 -29.0336 -0.1 + vertex -26.7039 -28.9262 -0.2 + vertex -26.8635 -29.0336 -0.2 endloop endfacet facet normal -0.419339 0.90783 0 outer loop - vertex -26.8635 -29.0336 -0.1 + vertex -26.8635 -29.0336 -0.2 vertex -27.0275 -29.1093 0 vertex -26.8635 -29.0336 0 endloop @@ -12336,13 +12336,13 @@ solid OpenSCAD_Model facet normal -0.419339 0.90783 0 outer loop vertex -27.0275 -29.1093 0 - vertex -26.8635 -29.0336 -0.1 - vertex -27.0275 -29.1093 -0.1 + vertex -26.8635 -29.0336 -0.2 + vertex -27.0275 -29.1093 -0.2 endloop endfacet facet normal -0.272797 0.962072 0 outer loop - vertex -27.0275 -29.1093 -0.1 + vertex -27.0275 -29.1093 -0.2 vertex -27.1989 -29.1579 0 vertex -27.0275 -29.1093 0 endloop @@ -12350,13 +12350,13 @@ solid OpenSCAD_Model facet normal -0.272797 0.962072 0 outer loop vertex -27.1989 -29.1579 0 - vertex -27.0275 -29.1093 -0.1 - vertex -27.1989 -29.1579 -0.1 + vertex -27.0275 -29.1093 -0.2 + vertex -27.1989 -29.1579 -0.2 endloop endfacet facet normal -0.141044 0.990003 0 outer loop - vertex -27.1989 -29.1579 -0.1 + vertex -27.1989 -29.1579 -0.2 vertex -27.3805 -29.1838 0 vertex -27.1989 -29.1579 0 endloop @@ -12364,13 +12364,13 @@ solid OpenSCAD_Model facet normal -0.141044 0.990003 0 outer loop vertex -27.3805 -29.1838 0 - vertex -27.1989 -29.1579 -0.1 - vertex -27.3805 -29.1838 -0.1 + vertex -27.1989 -29.1579 -0.2 + vertex -27.3805 -29.1838 -0.2 endloop endfacet facet normal -0.0391387 0.999234 0 outer loop - vertex -27.3805 -29.1838 -0.1 + vertex -27.3805 -29.1838 -0.2 vertex -27.5755 -29.1914 0 vertex -27.3805 -29.1838 0 endloop @@ -12378,13 +12378,13 @@ solid OpenSCAD_Model facet normal -0.0391387 0.999234 0 outer loop vertex -27.5755 -29.1914 0 - vertex -27.3805 -29.1838 -0.1 - vertex -27.5755 -29.1914 -0.1 + vertex -27.3805 -29.1838 -0.2 + vertex -27.5755 -29.1914 -0.2 endloop endfacet facet normal 0.0328742 0.999459 -0 outer loop - vertex -27.5755 -29.1914 -0.1 + vertex -27.5755 -29.1914 -0.2 vertex -27.9775 -29.1782 0 vertex -27.5755 -29.1914 0 endloop @@ -12392,13 +12392,13 @@ solid OpenSCAD_Model facet normal 0.0328742 0.999459 0 outer loop vertex -27.9775 -29.1782 0 - vertex -27.5755 -29.1914 -0.1 - vertex -27.9775 -29.1782 -0.1 + vertex -27.5755 -29.1914 -0.2 + vertex -27.9775 -29.1782 -0.2 endloop endfacet facet normal 0.226397 0.974035 -0 outer loop - vertex -27.9775 -29.1782 -0.1 + vertex -27.9775 -29.1782 -0.2 vertex -28.0989 -29.15 0 vertex -27.9775 -29.1782 0 endloop @@ -12406,13 +12406,13 @@ solid OpenSCAD_Model facet normal 0.226397 0.974035 0 outer loop vertex -28.0989 -29.15 0 - vertex -27.9775 -29.1782 -0.1 - vertex -28.0989 -29.15 -0.1 + vertex -27.9775 -29.1782 -0.2 + vertex -28.0989 -29.15 -0.2 endloop endfacet facet normal 0.566674 0.823942 -0 outer loop - vertex -28.0989 -29.15 -0.1 + vertex -28.0989 -29.15 -0.2 vertex -28.176 -29.097 0 vertex -28.0989 -29.15 0 endloop @@ -12420,139 +12420,139 @@ solid OpenSCAD_Model facet normal 0.566674 0.823942 0 outer loop vertex -28.176 -29.097 0 - vertex -28.0989 -29.15 -0.1 - vertex -28.176 -29.097 -0.1 + vertex -28.0989 -29.15 -0.2 + vertex -28.176 -29.097 -0.2 endloop endfacet facet normal 0.908757 0.417326 0 outer loop vertex -28.176 -29.097 0 - vertex -28.2154 -29.0113 -0.1 + vertex -28.2154 -29.0113 -0.2 vertex -28.2154 -29.0113 0 endloop endfacet facet normal 0.908757 0.417326 0 outer loop - vertex -28.2154 -29.0113 -0.1 + vertex -28.2154 -29.0113 -0.2 vertex -28.176 -29.097 0 - vertex -28.176 -29.097 -0.1 + vertex -28.176 -29.097 -0.2 endloop endfacet facet normal 0.997947 0.0640397 0 outer loop vertex -28.2154 -29.0113 0 - vertex -28.2235 -28.8853 -0.1 + vertex -28.2235 -28.8853 -0.2 vertex -28.2235 -28.8853 0 endloop endfacet facet normal 0.997947 0.0640397 0 outer loop - vertex -28.2235 -28.8853 -0.1 + vertex -28.2235 -28.8853 -0.2 vertex -28.2154 -29.0113 0 - vertex -28.2154 -29.0113 -0.1 + vertex -28.2154 -29.0113 -0.2 endloop endfacet facet normal 0.992038 -0.125943 0 outer loop vertex -28.2235 -28.8853 0 - vertex -28.1721 -28.4809 -0.1 + vertex -28.1721 -28.4809 -0.2 vertex -28.1721 -28.4809 0 endloop endfacet facet normal 0.992038 -0.125943 0 outer loop - vertex -28.1721 -28.4809 -0.1 + vertex -28.1721 -28.4809 -0.2 vertex -28.2235 -28.8853 0 - vertex -28.2235 -28.8853 -0.1 + vertex -28.2235 -28.8853 -0.2 endloop endfacet facet normal 0.988281 -0.152644 0 outer loop vertex -28.1721 -28.4809 0 - vertex -27.9393 -26.9734 -0.1 + vertex -27.9393 -26.9734 -0.2 vertex -27.9393 -26.9734 0 endloop endfacet facet normal 0.988281 -0.152644 0 outer loop - vertex -27.9393 -26.9734 -0.1 + vertex -27.9393 -26.9734 -0.2 vertex -28.1721 -28.4809 0 - vertex -28.1721 -28.4809 -0.1 + vertex -28.1721 -28.4809 -0.2 endloop endfacet facet normal 0.994809 -0.101759 0 outer loop vertex -27.9393 -26.9734 0 - vertex -27.8924 -26.5154 -0.1 + vertex -27.8924 -26.5154 -0.2 vertex -27.8924 -26.5154 0 endloop endfacet facet normal 0.994809 -0.101759 0 outer loop - vertex -27.8924 -26.5154 -0.1 + vertex -27.8924 -26.5154 -0.2 vertex -27.9393 -26.9734 0 - vertex -27.9393 -26.9734 -0.1 + vertex -27.9393 -26.9734 -0.2 endloop endfacet facet normal 0.999788 0.0205947 0 outer loop vertex -27.8924 -26.5154 0 - vertex -27.8988 -26.2055 -0.1 + vertex -27.8988 -26.2055 -0.2 vertex -27.8988 -26.2055 0 endloop endfacet facet normal 0.999788 0.0205947 0 outer loop - vertex -27.8988 -26.2055 -0.1 + vertex -27.8988 -26.2055 -0.2 vertex -27.8924 -26.5154 0 - vertex -27.8924 -26.5154 -0.1 + vertex -27.8924 -26.5154 -0.2 endloop endfacet facet normal 0.975965 0.217927 0 outer loop vertex -27.8988 -26.2055 0 - vertex -27.9236 -26.0946 -0.1 + vertex -27.9236 -26.0946 -0.2 vertex -27.9236 -26.0946 0 endloop endfacet facet normal 0.975965 0.217927 0 outer loop - vertex -27.9236 -26.0946 -0.1 + vertex -27.9236 -26.0946 -0.2 vertex -27.8988 -26.2055 0 - vertex -27.8988 -26.2055 -0.1 + vertex -27.8988 -26.2055 -0.2 endloop endfacet facet normal 0.909758 0.415139 0 outer loop vertex -27.9236 -26.0946 0 - vertex -27.9636 -26.0069 -0.1 + vertex -27.9636 -26.0069 -0.2 vertex -27.9636 -26.0069 0 endloop endfacet facet normal 0.909758 0.415139 0 outer loop - vertex -27.9636 -26.0069 -0.1 + vertex -27.9636 -26.0069 -0.2 vertex -27.9236 -26.0946 0 - vertex -27.9236 -26.0946 -0.1 + vertex -27.9236 -26.0946 -0.2 endloop endfacet facet normal 0.777135 0.629334 0 outer loop vertex -27.9636 -26.0069 0 - vertex -28.0195 -25.9379 -0.1 + vertex -28.0195 -25.9379 -0.2 vertex -28.0195 -25.9379 0 endloop endfacet facet normal 0.777135 0.629334 0 outer loop - vertex -28.0195 -25.9379 -0.1 + vertex -28.0195 -25.9379 -0.2 vertex -27.9636 -26.0069 0 - vertex -27.9636 -26.0069 -0.1 + vertex -27.9636 -26.0069 -0.2 endloop endfacet facet normal 0.604573 0.79655 -0 outer loop - vertex -28.0195 -25.9379 -0.1 + vertex -28.0195 -25.9379 -0.2 vertex -28.0919 -25.8829 0 vertex -28.0195 -25.9379 0 endloop @@ -12560,13 +12560,13 @@ solid OpenSCAD_Model facet normal 0.604573 0.79655 0 outer loop vertex -28.0919 -25.8829 0 - vertex -28.0195 -25.9379 -0.1 - vertex -28.0919 -25.8829 -0.1 + vertex -28.0195 -25.9379 -0.2 + vertex -28.0919 -25.8829 -0.2 endloop endfacet facet normal 0.400676 0.91622 -0 outer loop - vertex -28.0919 -25.8829 -0.1 + vertex -28.0919 -25.8829 -0.2 vertex -28.2888 -25.7968 0 vertex -28.0919 -25.8829 0 endloop @@ -12574,13 +12574,13 @@ solid OpenSCAD_Model facet normal 0.400676 0.91622 0 outer loop vertex -28.2888 -25.7968 0 - vertex -28.0919 -25.8829 -0.1 - vertex -28.2888 -25.7968 -0.1 + vertex -28.0919 -25.8829 -0.2 + vertex -28.2888 -25.7968 -0.2 endloop endfacet facet normal 0.299723 0.954026 -0 outer loop - vertex -28.2888 -25.7968 -0.1 + vertex -28.2888 -25.7968 -0.2 vertex -28.5596 -25.7117 0 vertex -28.2888 -25.7968 0 endloop @@ -12588,13 +12588,13 @@ solid OpenSCAD_Model facet normal 0.299723 0.954026 0 outer loop vertex -28.5596 -25.7117 0 - vertex -28.2888 -25.7968 -0.1 - vertex -28.5596 -25.7117 -0.1 + vertex -28.2888 -25.7968 -0.2 + vertex -28.5596 -25.7117 -0.2 endloop endfacet facet normal 0.220879 0.975301 -0 outer loop - vertex -28.5596 -25.7117 -0.1 + vertex -28.5596 -25.7117 -0.2 vertex -28.7678 -25.6646 0 vertex -28.5596 -25.7117 0 endloop @@ -12602,13 +12602,13 @@ solid OpenSCAD_Model facet normal 0.220879 0.975301 0 outer loop vertex -28.7678 -25.6646 0 - vertex -28.5596 -25.7117 -0.1 - vertex -28.7678 -25.6646 -0.1 + vertex -28.5596 -25.7117 -0.2 + vertex -28.7678 -25.6646 -0.2 endloop endfacet facet normal 0.142669 0.98977 -0 outer loop - vertex -28.7678 -25.6646 -0.1 + vertex -28.7678 -25.6646 -0.2 vertex -29.0734 -25.6205 0 vertex -28.7678 -25.6646 0 endloop @@ -12616,13 +12616,13 @@ solid OpenSCAD_Model facet normal 0.142669 0.98977 0 outer loop vertex -29.0734 -25.6205 0 - vertex -28.7678 -25.6646 -0.1 - vertex -29.0734 -25.6205 -0.1 + vertex -28.7678 -25.6646 -0.2 + vertex -29.0734 -25.6205 -0.2 endloop endfacet facet normal 0.0883121 0.996093 -0 outer loop - vertex -29.0734 -25.6205 -0.1 + vertex -29.0734 -25.6205 -0.2 vertex -29.9179 -25.5457 0 vertex -29.0734 -25.6205 0 endloop @@ -12630,13 +12630,13 @@ solid OpenSCAD_Model facet normal 0.0883121 0.996093 0 outer loop vertex -29.9179 -25.5457 0 - vertex -29.0734 -25.6205 -0.1 - vertex -29.9179 -25.5457 -0.1 + vertex -29.0734 -25.6205 -0.2 + vertex -29.9179 -25.5457 -0.2 endloop endfacet facet normal 0.0479595 0.998849 -0 outer loop - vertex -29.9179 -25.5457 -0.1 + vertex -29.9179 -25.5457 -0.2 vertex -30.9759 -25.4949 0 vertex -29.9179 -25.5457 0 endloop @@ -12644,13 +12644,13 @@ solid OpenSCAD_Model facet normal 0.0479595 0.998849 0 outer loop vertex -30.9759 -25.4949 0 - vertex -29.9179 -25.5457 -0.1 - vertex -30.9759 -25.4949 -0.1 + vertex -29.9179 -25.5457 -0.2 + vertex -30.9759 -25.4949 -0.2 endloop endfacet facet normal 0.0164478 0.999865 -0 outer loop - vertex -30.9759 -25.4949 -0.1 + vertex -30.9759 -25.4949 -0.2 vertex -32.1303 -25.4759 0 vertex -30.9759 -25.4949 0 endloop @@ -12658,13 +12658,13 @@ solid OpenSCAD_Model facet normal 0.0164478 0.999865 0 outer loop vertex -32.1303 -25.4759 0 - vertex -30.9759 -25.4949 -0.1 - vertex -32.1303 -25.4759 -0.1 + vertex -30.9759 -25.4949 -0.2 + vertex -32.1303 -25.4759 -0.2 endloop endfacet facet normal 0.000432102 1 -0 outer loop - vertex -32.1303 -25.4759 -0.1 + vertex -32.1303 -25.4759 -0.2 vertex -34.9509 -25.4747 0 vertex -32.1303 -25.4759 0 endloop @@ -12672,139 +12672,139 @@ solid OpenSCAD_Model facet normal 0.000432102 1 0 outer loop vertex -34.9509 -25.4747 0 - vertex -32.1303 -25.4759 -0.1 - vertex -34.9509 -25.4747 -0.1 + vertex -32.1303 -25.4759 -0.2 + vertex -34.9509 -25.4747 -0.2 endloop endfacet facet normal -0.910935 0.41255 0 outer loop - vertex -35.4707 -26.6225 -0.1 + vertex -35.4707 -26.6225 -0.2 vertex -34.9509 -25.4747 0 - vertex -34.9509 -25.4747 -0.1 + vertex -34.9509 -25.4747 -0.2 endloop endfacet facet normal -0.910935 0.41255 0 outer loop vertex -34.9509 -25.4747 0 - vertex -35.4707 -26.6225 -0.1 + vertex -35.4707 -26.6225 -0.2 vertex -35.4707 -26.6225 0 endloop endfacet facet normal -0.916492 0.400054 0 outer loop - vertex -36.4516 -28.8697 -0.1 + vertex -36.4516 -28.8697 -0.2 vertex -35.4707 -26.6225 0 - vertex -35.4707 -26.6225 -0.1 + vertex -35.4707 -26.6225 -0.2 endloop endfacet facet normal -0.916492 0.400054 0 outer loop vertex -35.4707 -26.6225 0 - vertex -36.4516 -28.8697 -0.1 + vertex -36.4516 -28.8697 -0.2 vertex -36.4516 -28.8697 0 endloop endfacet facet normal -0.92275 0.385399 0 outer loop - vertex -37.5165 -31.4193 -0.1 + vertex -37.5165 -31.4193 -0.2 vertex -36.4516 -28.8697 0 - vertex -36.4516 -28.8697 -0.1 + vertex -36.4516 -28.8697 -0.2 endloop endfacet facet normal -0.92275 0.385399 0 outer loop vertex -36.4516 -28.8697 0 - vertex -37.5165 -31.4193 -0.1 + vertex -37.5165 -31.4193 -0.2 vertex -37.5165 -31.4193 0 endloop endfacet facet normal -0.928331 0.371754 0 outer loop - vertex -38.3711 -33.5534 -0.1 + vertex -38.3711 -33.5534 -0.2 vertex -37.5165 -31.4193 0 - vertex -37.5165 -31.4193 -0.1 + vertex -37.5165 -31.4193 -0.2 endloop endfacet facet normal -0.928331 0.371754 0 outer loop vertex -37.5165 -31.4193 0 - vertex -38.3711 -33.5534 -0.1 + vertex -38.3711 -33.5534 -0.2 vertex -38.3711 -33.5534 0 endloop endfacet facet normal -0.936805 0.349851 0 outer loop - vertex -38.6277 -34.2404 -0.1 + vertex -38.6277 -34.2404 -0.2 vertex -38.3711 -33.5534 0 - vertex -38.3711 -33.5534 -0.1 + vertex -38.3711 -33.5534 -0.2 endloop endfacet facet normal -0.936805 0.349851 0 outer loop vertex -38.3711 -33.5534 0 - vertex -38.6277 -34.2404 -0.1 + vertex -38.6277 -34.2404 -0.2 vertex -38.6277 -34.2404 0 endloop endfacet facet normal -0.958246 0.285946 0 outer loop - vertex -38.7214 -34.5543 -0.1 + vertex -38.7214 -34.5543 -0.2 vertex -38.6277 -34.2404 0 - vertex -38.6277 -34.2404 -0.1 + vertex -38.6277 -34.2404 -0.2 endloop endfacet facet normal -0.958246 0.285946 0 outer loop vertex -38.6277 -34.2404 0 - vertex -38.7214 -34.5543 -0.1 + vertex -38.7214 -34.5543 -0.2 vertex -38.7214 -34.5543 0 endloop endfacet facet normal -0.979296 -0.202433 0 outer loop - vertex -38.6971 -34.6715 -0.1 + vertex -38.6971 -34.6715 -0.2 vertex -38.7214 -34.5543 0 - vertex -38.7214 -34.5543 -0.1 + vertex -38.7214 -34.5543 -0.2 endloop endfacet facet normal -0.979296 -0.202433 0 outer loop vertex -38.7214 -34.5543 0 - vertex -38.6971 -34.6715 -0.1 + vertex -38.6971 -34.6715 -0.2 vertex -38.6971 -34.6715 0 endloop endfacet facet normal -0.869155 -0.494539 0 outer loop - vertex -38.6312 -34.7874 -0.1 + vertex -38.6312 -34.7874 -0.2 vertex -38.6971 -34.6715 0 - vertex -38.6971 -34.6715 -0.1 + vertex -38.6971 -34.6715 -0.2 endloop endfacet facet normal -0.869155 -0.494539 0 outer loop vertex -38.6971 -34.6715 0 - vertex -38.6312 -34.7874 -0.1 + vertex -38.6312 -34.7874 -0.2 vertex -38.6312 -34.7874 0 endloop endfacet facet normal -0.719928 -0.694049 0 outer loop - vertex -38.5336 -34.8886 -0.1 + vertex -38.5336 -34.8886 -0.2 vertex -38.6312 -34.7874 0 - vertex -38.6312 -34.7874 -0.1 + vertex -38.6312 -34.7874 -0.2 endloop endfacet facet normal -0.719928 -0.694049 0 outer loop vertex -38.6312 -34.7874 0 - vertex -38.5336 -34.8886 -0.1 + vertex -38.5336 -34.8886 -0.2 vertex -38.5336 -34.8886 0 endloop endfacet facet normal -0.523423 -0.852073 0 outer loop - vertex -38.5336 -34.8886 -0.1 + vertex -38.5336 -34.8886 -0.2 vertex -38.4144 -34.9619 0 vertex -38.5336 -34.8886 0 endloop @@ -12812,13 +12812,13 @@ solid OpenSCAD_Model facet normal -0.523423 -0.852073 -0 outer loop vertex -38.4144 -34.9619 0 - vertex -38.5336 -34.8886 -0.1 - vertex -38.4144 -34.9619 -0.1 + vertex -38.5336 -34.8886 -0.2 + vertex -38.4144 -34.9619 -0.2 endloop endfacet facet normal -0.239855 -0.970809 0 outer loop - vertex -38.4144 -34.9619 -0.1 + vertex -38.4144 -34.9619 -0.2 vertex -38.2613 -34.9997 0 vertex -38.4144 -34.9619 0 endloop @@ -12826,13 +12826,13 @@ solid OpenSCAD_Model facet normal -0.239855 -0.970809 -0 outer loop vertex -38.2613 -34.9997 0 - vertex -38.4144 -34.9619 -0.1 - vertex -38.2613 -34.9997 -0.1 + vertex -38.4144 -34.9619 -0.2 + vertex -38.2613 -34.9997 -0.2 endloop endfacet facet normal -0.118843 -0.992913 0 outer loop - vertex -38.2613 -34.9997 -0.1 + vertex -38.2613 -34.9997 -0.2 vertex -38.0027 -35.0306 0 vertex -38.2613 -34.9997 0 endloop @@ -12840,13 +12840,13 @@ solid OpenSCAD_Model facet normal -0.118843 -0.992913 -0 outer loop vertex -38.0027 -35.0306 0 - vertex -38.2613 -34.9997 -0.1 - vertex -38.0027 -35.0306 -0.1 + vertex -38.2613 -34.9997 -0.2 + vertex -38.0027 -35.0306 -0.2 endloop endfacet facet normal -0.0541463 -0.998533 0 outer loop - vertex -38.0027 -35.0306 -0.1 + vertex -38.0027 -35.0306 -0.2 vertex -37.2267 -35.0727 0 vertex -38.0027 -35.0306 0 endloop @@ -12854,13 +12854,13 @@ solid OpenSCAD_Model facet normal -0.0541463 -0.998533 -0 outer loop vertex -37.2267 -35.0727 0 - vertex -38.0027 -35.0306 -0.1 - vertex -37.2267 -35.0727 -0.1 + vertex -38.0027 -35.0306 -0.2 + vertex -37.2267 -35.0727 -0.2 endloop endfacet facet normal -0.0166336 -0.999862 0 outer loop - vertex -37.2267 -35.0727 -0.1 + vertex -37.2267 -35.0727 -0.2 vertex -36.2012 -35.0898 0 vertex -37.2267 -35.0727 0 endloop @@ -12868,13 +12868,13 @@ solid OpenSCAD_Model facet normal -0.0166336 -0.999862 -0 outer loop vertex -36.2012 -35.0898 0 - vertex -37.2267 -35.0727 -0.1 - vertex -36.2012 -35.0898 -0.1 + vertex -37.2267 -35.0727 -0.2 + vertex -36.2012 -35.0898 -0.2 endloop endfacet facet normal 0.00541272 -0.999985 0 outer loop - vertex -36.2012 -35.0898 -0.1 + vertex -36.2012 -35.0898 -0.2 vertex -35.0412 -35.0835 0 vertex -36.2012 -35.0898 0 endloop @@ -12882,13 +12882,13 @@ solid OpenSCAD_Model facet normal 0.00541272 -0.999985 0 outer loop vertex -35.0412 -35.0835 0 - vertex -36.2012 -35.0898 -0.1 - vertex -35.0412 -35.0835 -0.1 + vertex -36.2012 -35.0898 -0.2 + vertex -35.0412 -35.0835 -0.2 endloop endfacet facet normal 0.0236788 -0.99972 0 outer loop - vertex -35.0412 -35.0835 -0.1 + vertex -35.0412 -35.0835 -0.2 vertex -33.8615 -35.0556 0 vertex -35.0412 -35.0835 0 endloop @@ -12896,13 +12896,13 @@ solid OpenSCAD_Model facet normal 0.0236788 -0.99972 0 outer loop vertex -33.8615 -35.0556 0 - vertex -35.0412 -35.0835 -0.1 - vertex -33.8615 -35.0556 -0.1 + vertex -35.0412 -35.0835 -0.2 + vertex -33.8615 -35.0556 -0.2 endloop endfacet facet normal 0.0441434 -0.999025 0 outer loop - vertex -33.8615 -35.0556 -0.1 + vertex -33.8615 -35.0556 -0.2 vertex -32.7769 -35.0076 0 vertex -33.8615 -35.0556 0 endloop @@ -12910,13 +12910,13 @@ solid OpenSCAD_Model facet normal 0.0441434 -0.999025 0 outer loop vertex -32.7769 -35.0076 0 - vertex -33.8615 -35.0556 -0.1 - vertex -32.7769 -35.0076 -0.1 + vertex -33.8615 -35.0556 -0.2 + vertex -32.7769 -35.0076 -0.2 endloop endfacet facet normal 0.0755008 -0.997146 0 outer loop - vertex -32.7769 -35.0076 -0.1 + vertex -32.7769 -35.0076 -0.2 vertex -31.9023 -34.9414 0 vertex -32.7769 -35.0076 0 endloop @@ -12924,13 +12924,13 @@ solid OpenSCAD_Model facet normal 0.0755008 -0.997146 0 outer loop vertex -31.9023 -34.9414 0 - vertex -32.7769 -35.0076 -0.1 - vertex -31.9023 -34.9414 -0.1 + vertex -32.7769 -35.0076 -0.2 + vertex -31.9023 -34.9414 -0.2 endloop endfacet facet normal 0.121377 -0.992606 0 outer loop - vertex -31.9023 -34.9414 -0.1 + vertex -31.9023 -34.9414 -0.2 vertex -31.5797 -34.902 0 vertex -31.9023 -34.9414 0 endloop @@ -12938,13 +12938,13 @@ solid OpenSCAD_Model facet normal 0.121377 -0.992606 0 outer loop vertex -31.5797 -34.902 0 - vertex -31.9023 -34.9414 -0.1 - vertex -31.5797 -34.902 -0.1 + vertex -31.9023 -34.9414 -0.2 + vertex -31.5797 -34.902 -0.2 endloop endfacet facet normal 0.187713 -0.982224 0 outer loop - vertex -31.5797 -34.902 -0.1 + vertex -31.5797 -34.902 -0.2 vertex -31.3526 -34.8586 0 vertex -31.5797 -34.902 0 endloop @@ -12952,13 +12952,13 @@ solid OpenSCAD_Model facet normal 0.187713 -0.982224 0 outer loop vertex -31.3526 -34.8586 0 - vertex -31.5797 -34.902 -0.1 - vertex -31.3526 -34.8586 -0.1 + vertex -31.5797 -34.902 -0.2 + vertex -31.3526 -34.8586 -0.2 endloop endfacet facet normal 0.296204 -0.955125 0 outer loop - vertex -31.3526 -34.8586 -0.1 + vertex -31.3526 -34.8586 -0.2 vertex -30.8095 -34.6902 0 vertex -31.3526 -34.8586 0 endloop @@ -12966,13 +12966,13 @@ solid OpenSCAD_Model facet normal 0.296204 -0.955125 0 outer loop vertex -30.8095 -34.6902 0 - vertex -31.3526 -34.8586 -0.1 - vertex -30.8095 -34.6902 -0.1 + vertex -31.3526 -34.8586 -0.2 + vertex -30.8095 -34.6902 -0.2 endloop endfacet facet normal 0.373689 -0.927554 0 outer loop - vertex -30.8095 -34.6902 -0.1 + vertex -30.8095 -34.6902 -0.2 vertex -30.2461 -34.4632 0 vertex -30.8095 -34.6902 0 endloop @@ -12980,13 +12980,13 @@ solid OpenSCAD_Model facet normal 0.373689 -0.927554 0 outer loop vertex -30.2461 -34.4632 0 - vertex -30.8095 -34.6902 -0.1 - vertex -30.2461 -34.4632 -0.1 + vertex -30.8095 -34.6902 -0.2 + vertex -30.2461 -34.4632 -0.2 endloop endfacet facet normal 0.438403 -0.898778 0 outer loop - vertex -30.2461 -34.4632 -0.1 + vertex -30.2461 -34.4632 -0.2 vertex -29.669 -34.1817 0 vertex -30.2461 -34.4632 0 endloop @@ -12994,13 +12994,13 @@ solid OpenSCAD_Model facet normal 0.438403 -0.898778 0 outer loop vertex -29.669 -34.1817 0 - vertex -30.2461 -34.4632 -0.1 - vertex -29.669 -34.1817 -0.1 + vertex -30.2461 -34.4632 -0.2 + vertex -29.669 -34.1817 -0.2 endloop endfacet facet normal 0.494095 -0.869408 0 outer loop - vertex -29.669 -34.1817 -0.1 + vertex -29.669 -34.1817 -0.2 vertex -29.0852 -33.8499 0 vertex -29.669 -34.1817 0 endloop @@ -13008,13 +13008,13 @@ solid OpenSCAD_Model facet normal 0.494095 -0.869408 0 outer loop vertex -29.0852 -33.8499 0 - vertex -29.669 -34.1817 -0.1 - vertex -29.0852 -33.8499 -0.1 + vertex -29.669 -34.1817 -0.2 + vertex -29.0852 -33.8499 -0.2 endloop endfacet facet normal 0.543479 -0.839423 0 outer loop - vertex -29.0852 -33.8499 -0.1 + vertex -29.0852 -33.8499 -0.2 vertex -28.5012 -33.4718 0 vertex -29.0852 -33.8499 0 endloop @@ -13022,13 +13022,13 @@ solid OpenSCAD_Model facet normal 0.543479 -0.839423 0 outer loop vertex -28.5012 -33.4718 0 - vertex -29.0852 -33.8499 -0.1 - vertex -28.5012 -33.4718 -0.1 + vertex -29.0852 -33.8499 -0.2 + vertex -28.5012 -33.4718 -0.2 endloop endfacet facet normal 0.588526 -0.808478 0 outer loop - vertex -28.5012 -33.4718 -0.1 + vertex -28.5012 -33.4718 -0.2 vertex -27.924 -33.0516 0 vertex -28.5012 -33.4718 0 endloop @@ -13036,13 +13036,13 @@ solid OpenSCAD_Model facet normal 0.588526 -0.808478 0 outer loop vertex -27.924 -33.0516 0 - vertex -28.5012 -33.4718 -0.1 - vertex -27.924 -33.0516 -0.1 + vertex -28.5012 -33.4718 -0.2 + vertex -27.924 -33.0516 -0.2 endloop endfacet facet normal 0.630713 -0.776016 0 outer loop - vertex -27.924 -33.0516 -0.1 + vertex -27.924 -33.0516 -0.2 vertex -27.3602 -32.5933 0 vertex -27.924 -33.0516 0 endloop @@ -13050,13 +13050,13 @@ solid OpenSCAD_Model facet normal 0.630713 -0.776016 0 outer loop vertex -27.3602 -32.5933 0 - vertex -27.924 -33.0516 -0.1 - vertex -27.3602 -32.5933 -0.1 + vertex -27.924 -33.0516 -0.2 + vertex -27.3602 -32.5933 -0.2 endloop endfacet facet normal 0.671162 -0.741311 0 outer loop - vertex -27.3602 -32.5933 -0.1 + vertex -27.3602 -32.5933 -0.2 vertex -26.8166 -32.1012 0 vertex -27.3602 -32.5933 0 endloop @@ -13064,13 +13064,13 @@ solid OpenSCAD_Model facet normal 0.671162 -0.741311 0 outer loop vertex -26.8166 -32.1012 0 - vertex -27.3602 -32.5933 -0.1 - vertex -26.8166 -32.1012 -0.1 + vertex -27.3602 -32.5933 -0.2 + vertex -26.8166 -32.1012 -0.2 endloop endfacet facet normal 0.688884 -0.724872 0 outer loop - vertex -26.8166 -32.1012 -0.1 + vertex -26.8166 -32.1012 -0.2 vertex -25.5344 -30.8827 0 vertex -26.8166 -32.1012 0 endloop @@ -13078,13 +13078,13 @@ solid OpenSCAD_Model facet normal 0.688884 -0.724872 0 outer loop vertex -25.5344 -30.8827 0 - vertex -26.8166 -32.1012 -0.1 - vertex -25.5344 -30.8827 -0.1 + vertex -26.8166 -32.1012 -0.2 + vertex -25.5344 -30.8827 -0.2 endloop endfacet facet normal 0.667079 -0.744987 0 outer loop - vertex -25.5344 -30.8827 -0.1 + vertex -25.5344 -30.8827 -0.2 vertex -25.1341 -30.5242 0 vertex -25.5344 -30.8827 0 endloop @@ -13092,13 +13092,13 @@ solid OpenSCAD_Model facet normal 0.667079 -0.744987 0 outer loop vertex -25.1341 -30.5242 0 - vertex -25.5344 -30.8827 -0.1 - vertex -25.1341 -30.5242 -0.1 + vertex -25.5344 -30.8827 -0.2 + vertex -25.1341 -30.5242 -0.2 endloop endfacet facet normal 0.613469 -0.789718 0 outer loop - vertex -25.1341 -30.5242 -0.1 + vertex -25.1341 -30.5242 -0.2 vertex -24.8452 -30.2998 0 vertex -25.1341 -30.5242 0 endloop @@ -13106,13 +13106,13 @@ solid OpenSCAD_Model facet normal 0.613469 -0.789718 0 outer loop vertex -24.8452 -30.2998 0 - vertex -25.1341 -30.5242 -0.1 - vertex -24.8452 -30.2998 -0.1 + vertex -25.1341 -30.5242 -0.2 + vertex -24.8452 -30.2998 -0.2 endloop endfacet facet normal 0.473466 -0.880812 0 outer loop - vertex -24.8452 -30.2998 -0.1 + vertex -24.8452 -30.2998 -0.2 vertex -24.6311 -30.1847 0 vertex -24.8452 -30.2998 0 endloop @@ -13120,13 +13120,13 @@ solid OpenSCAD_Model facet normal 0.473466 -0.880812 0 outer loop vertex -24.6311 -30.1847 0 - vertex -24.8452 -30.2998 -0.1 - vertex -24.6311 -30.1847 -0.1 + vertex -24.8452 -30.2998 -0.2 + vertex -24.6311 -30.1847 -0.2 endloop endfacet facet normal 0.259354 -0.965782 0 outer loop - vertex -24.6311 -30.1847 -0.1 + vertex -24.6311 -30.1847 -0.2 vertex -24.5406 -30.1604 0 vertex -24.6311 -30.1847 0 endloop @@ -13134,13 +13134,13 @@ solid OpenSCAD_Model facet normal 0.259354 -0.965782 0 outer loop vertex -24.5406 -30.1604 0 - vertex -24.6311 -30.1847 -0.1 - vertex -24.5406 -30.1604 -0.1 + vertex -24.6311 -30.1847 -0.2 + vertex -24.5406 -30.1604 -0.2 endloop endfacet facet normal 0.0730053 -0.997332 0 outer loop - vertex -24.5406 -30.1604 -0.1 + vertex -24.5406 -30.1604 -0.2 vertex -24.455 -30.1541 0 vertex -24.5406 -30.1604 0 endloop @@ -13148,13 +13148,13 @@ solid OpenSCAD_Model facet normal 0.0730053 -0.997332 0 outer loop vertex -24.455 -30.1541 0 - vertex -24.5406 -30.1604 -0.1 - vertex -24.455 -30.1541 -0.1 + vertex -24.5406 -30.1604 -0.2 + vertex -24.455 -30.1541 -0.2 endloop endfacet facet normal -0.164732 -0.986338 0 outer loop - vertex -24.455 -30.1541 -0.1 + vertex -24.455 -30.1541 -0.2 vertex -24.2803 -30.1833 0 vertex -24.455 -30.1541 0 endloop @@ -13162,13 +13162,13 @@ solid OpenSCAD_Model facet normal -0.164732 -0.986338 -0 outer loop vertex -24.2803 -30.1833 0 - vertex -24.455 -30.1541 -0.1 - vertex -24.2803 -30.1833 -0.1 + vertex -24.455 -30.1541 -0.2 + vertex -24.2803 -30.1833 -0.2 endloop endfacet facet normal -0.291983 -0.956423 0 outer loop - vertex -24.2803 -30.1833 -0.1 + vertex -24.2803 -30.1833 -0.2 vertex -24.0701 -30.2475 0 vertex -24.2803 -30.1833 0 endloop @@ -13176,13 +13176,13 @@ solid OpenSCAD_Model facet normal -0.291983 -0.956423 -0 outer loop vertex -24.0701 -30.2475 0 - vertex -24.2803 -30.1833 -0.1 - vertex -24.0701 -30.2475 -0.1 + vertex -24.2803 -30.1833 -0.2 + vertex -24.0701 -30.2475 -0.2 endloop endfacet facet normal -0.377094 -0.926175 0 outer loop - vertex -24.0701 -30.2475 -0.1 + vertex -24.0701 -30.2475 -0.2 vertex -23.8399 -30.3412 0 vertex -24.0701 -30.2475 0 endloop @@ -13190,13 +13190,13 @@ solid OpenSCAD_Model facet normal -0.377094 -0.926175 -0 outer loop vertex -23.8399 -30.3412 0 - vertex -24.0701 -30.2475 -0.1 - vertex -23.8399 -30.3412 -0.1 + vertex -24.0701 -30.2475 -0.2 + vertex -23.8399 -30.3412 -0.2 endloop endfacet facet normal -0.532683 -0.846315 0 outer loop - vertex -23.8399 -30.3412 -0.1 + vertex -23.8399 -30.3412 -0.2 vertex -23.6433 -30.465 0 vertex -23.8399 -30.3412 0 endloop @@ -13204,13 +13204,13 @@ solid OpenSCAD_Model facet normal -0.532683 -0.846315 -0 outer loop vertex -23.6433 -30.465 0 - vertex -23.8399 -30.3412 -0.1 - vertex -23.6433 -30.465 -0.1 + vertex -23.8399 -30.3412 -0.2 + vertex -23.6433 -30.465 -0.2 endloop endfacet facet normal -0.695789 -0.718246 0 outer loop - vertex -23.6433 -30.465 -0.1 + vertex -23.6433 -30.465 -0.2 vertex -23.5012 -30.6026 0 vertex -23.6433 -30.465 0 endloop @@ -13218,181 +13218,181 @@ solid OpenSCAD_Model facet normal -0.695789 -0.718246 -0 outer loop vertex -23.5012 -30.6026 0 - vertex -23.6433 -30.465 -0.1 - vertex -23.5012 -30.6026 -0.1 + vertex -23.6433 -30.465 -0.2 + vertex -23.5012 -30.6026 -0.2 endloop endfacet facet normal -0.84273 -0.538337 0 outer loop - vertex -23.4571 -30.6716 -0.1 + vertex -23.4571 -30.6716 -0.2 vertex -23.5012 -30.6026 0 - vertex -23.5012 -30.6026 -0.1 + vertex -23.5012 -30.6026 -0.2 endloop endfacet facet normal -0.84273 -0.538337 0 outer loop vertex -23.5012 -30.6026 0 - vertex -23.4571 -30.6716 -0.1 + vertex -23.4571 -30.6716 -0.2 vertex -23.4571 -30.6716 0 endloop endfacet facet normal -0.946617 -0.322361 0 outer loop - vertex -23.4345 -30.738 -0.1 + vertex -23.4345 -30.738 -0.2 vertex -23.4571 -30.6716 0 - vertex -23.4571 -30.6716 -0.1 + vertex -23.4571 -30.6716 -0.2 endloop endfacet facet normal -0.946617 -0.322361 0 outer loop vertex -23.4571 -30.6716 0 - vertex -23.4345 -30.738 -0.1 + vertex -23.4345 -30.738 -0.2 vertex -23.4345 -30.738 0 endloop endfacet facet normal -0.988328 0.152339 0 outer loop - vertex -23.4513 -30.847 -0.1 + vertex -23.4513 -30.847 -0.2 vertex -23.4345 -30.738 0 - vertex -23.4345 -30.738 -0.1 + vertex -23.4345 -30.738 -0.2 endloop endfacet facet normal -0.988328 0.152339 0 outer loop vertex -23.4345 -30.738 0 - vertex -23.4513 -30.847 -0.1 + vertex -23.4513 -30.847 -0.2 vertex -23.4513 -30.847 0 endloop endfacet facet normal -0.933862 0.357635 0 outer loop - vertex -23.5218 -31.031 -0.1 + vertex -23.5218 -31.031 -0.2 vertex -23.4513 -30.847 0 - vertex -23.4513 -30.847 -0.1 + vertex -23.4513 -30.847 -0.2 endloop endfacet facet normal -0.933862 0.357635 0 outer loop vertex -23.4513 -30.847 0 - vertex -23.5218 -31.031 -0.1 + vertex -23.5218 -31.031 -0.2 vertex -23.5218 -31.031 0 endloop endfacet facet normal -0.893602 0.44886 0 outer loop - vertex -23.8031 -31.5911 -0.1 + vertex -23.8031 -31.5911 -0.2 vertex -23.5218 -31.031 0 - vertex -23.5218 -31.031 -0.1 + vertex -23.5218 -31.031 -0.2 endloop endfacet facet normal -0.893602 0.44886 0 outer loop vertex -23.5218 -31.031 0 - vertex -23.8031 -31.5911 -0.1 + vertex -23.8031 -31.5911 -0.2 vertex -23.8031 -31.5911 0 endloop endfacet facet normal -0.86862 0.495478 0 outer loop - vertex -24.2375 -32.3527 -0.1 + vertex -24.2375 -32.3527 -0.2 vertex -23.8031 -31.5911 0 - vertex -23.8031 -31.5911 -0.1 + vertex -23.8031 -31.5911 -0.2 endloop endfacet facet normal -0.86862 0.495478 0 outer loop vertex -23.8031 -31.5911 0 - vertex -24.2375 -32.3527 -0.1 + vertex -24.2375 -32.3527 -0.2 vertex -24.2375 -32.3527 0 endloop endfacet facet normal -0.854086 0.520132 0 outer loop - vertex -24.7839 -33.2498 -0.1 + vertex -24.7839 -33.2498 -0.2 vertex -24.2375 -32.3527 0 - vertex -24.2375 -32.3527 -0.1 + vertex -24.2375 -32.3527 -0.2 endloop endfacet facet normal -0.854086 0.520132 0 outer loop vertex -24.2375 -32.3527 0 - vertex -24.7839 -33.2498 -0.1 + vertex -24.7839 -33.2498 -0.2 vertex -24.7839 -33.2498 0 endloop endfacet facet normal -0.842904 0.538064 0 outer loop - vertex -25.4011 -34.2168 -0.1 + vertex -25.4011 -34.2168 -0.2 vertex -24.7839 -33.2498 0 - vertex -24.7839 -33.2498 -0.1 + vertex -24.7839 -33.2498 -0.2 endloop endfacet facet normal -0.842904 0.538064 0 outer loop vertex -24.7839 -33.2498 0 - vertex -25.4011 -34.2168 -0.1 + vertex -25.4011 -34.2168 -0.2 vertex -25.4011 -34.2168 0 endloop endfacet facet normal -0.832144 0.55456 0 outer loop - vertex -26.0482 -35.1877 -0.1 + vertex -26.0482 -35.1877 -0.2 vertex -25.4011 -34.2168 0 - vertex -25.4011 -34.2168 -0.1 + vertex -25.4011 -34.2168 -0.2 endloop endfacet facet normal -0.832144 0.55456 0 outer loop vertex -25.4011 -34.2168 0 - vertex -26.0482 -35.1877 -0.1 + vertex -26.0482 -35.1877 -0.2 vertex -26.0482 -35.1877 0 endloop endfacet facet normal -0.819486 0.573099 0 outer loop - vertex -26.6839 -36.0968 -0.1 + vertex -26.6839 -36.0968 -0.2 vertex -26.0482 -35.1877 0 - vertex -26.0482 -35.1877 -0.1 + vertex -26.0482 -35.1877 -0.2 endloop endfacet facet normal -0.819486 0.573099 0 outer loop vertex -26.0482 -35.1877 0 - vertex -26.6839 -36.0968 -0.1 + vertex -26.6839 -36.0968 -0.2 vertex -26.6839 -36.0968 0 endloop endfacet facet normal -0.801319 0.598238 0 outer loop - vertex -27.2673 -36.8782 -0.1 + vertex -27.2673 -36.8782 -0.2 vertex -26.6839 -36.0968 0 - vertex -26.6839 -36.0968 -0.1 + vertex -26.6839 -36.0968 -0.2 endloop endfacet facet normal -0.801319 0.598238 0 outer loop vertex -26.6839 -36.0968 0 - vertex -27.2673 -36.8782 -0.1 + vertex -27.2673 -36.8782 -0.2 vertex -27.2673 -36.8782 0 endloop endfacet facet normal -0.788011 0.615661 0 outer loop - vertex -28.2718 -38.1638 -0.1 + vertex -28.2718 -38.1638 -0.2 vertex -27.2673 -36.8782 0 - vertex -27.2673 -36.8782 -0.1 + vertex -27.2673 -36.8782 -0.2 endloop endfacet facet normal -0.788011 0.615661 0 outer loop vertex -27.2673 -36.8782 0 - vertex -28.2718 -38.1638 -0.1 + vertex -28.2718 -38.1638 -0.2 vertex -28.2718 -38.1638 0 endloop endfacet facet normal 0.00335501 0.999994 -0 outer loop - vertex -28.2718 -38.1638 -0.1 + vertex -28.2718 -38.1638 -0.2 vertex -37.6203 -38.1325 0 vertex -28.2718 -38.1638 0 endloop @@ -13400,13 +13400,13 @@ solid OpenSCAD_Model facet normal 0.00335501 0.999994 0 outer loop vertex -37.6203 -38.1325 0 - vertex -28.2718 -38.1638 -0.1 - vertex -37.6203 -38.1325 -0.1 + vertex -28.2718 -38.1638 -0.2 + vertex -37.6203 -38.1325 -0.2 endloop endfacet facet normal 0.00646856 0.999979 -0 outer loop - vertex -37.6203 -38.1325 -0.1 + vertex -37.6203 -38.1325 -0.2 vertex -41.2883 -38.1087 0 vertex -37.6203 -38.1325 0 endloop @@ -13414,13 +13414,13 @@ solid OpenSCAD_Model facet normal 0.00646856 0.999979 0 outer loop vertex -41.2883 -38.1087 0 - vertex -37.6203 -38.1325 -0.1 - vertex -41.2883 -38.1087 -0.1 + vertex -37.6203 -38.1325 -0.2 + vertex -41.2883 -38.1087 -0.2 endloop endfacet facet normal 0.013462 0.999909 -0 outer loop - vertex -41.2883 -38.1087 -0.1 + vertex -41.2883 -38.1087 -0.2 vertex -44.3648 -38.0673 0 vertex -41.2883 -38.1087 0 endloop @@ -13428,13 +13428,13 @@ solid OpenSCAD_Model facet normal 0.013462 0.999909 0 outer loop vertex -44.3648 -38.0673 0 - vertex -41.2883 -38.1087 -0.1 - vertex -44.3648 -38.0673 -0.1 + vertex -41.2883 -38.1087 -0.2 + vertex -44.3648 -38.0673 -0.2 endloop endfacet facet normal 0.0246353 0.999697 -0 outer loop - vertex -44.3648 -38.0673 -0.1 + vertex -44.3648 -38.0673 -0.2 vertex -46.5272 -38.014 0 vertex -44.3648 -38.0673 0 endloop @@ -13442,13 +13442,13 @@ solid OpenSCAD_Model facet normal 0.0246353 0.999697 0 outer loop vertex -46.5272 -38.014 0 - vertex -44.3648 -38.0673 -0.1 - vertex -46.5272 -38.014 -0.1 + vertex -44.3648 -38.0673 -0.2 + vertex -46.5272 -38.014 -0.2 endloop endfacet facet normal 0.0458604 0.998948 -0 outer loop - vertex -46.5272 -38.014 -0.1 + vertex -46.5272 -38.014 -0.2 vertex -47.1648 -37.9848 0 vertex -46.5272 -38.014 0 endloop @@ -13456,13 +13456,13 @@ solid OpenSCAD_Model facet normal 0.0458604 0.998948 0 outer loop vertex -47.1648 -37.9848 0 - vertex -46.5272 -38.014 -0.1 - vertex -47.1648 -37.9848 -0.1 + vertex -46.5272 -38.014 -0.2 + vertex -47.1648 -37.9848 -0.2 endloop endfacet facet normal 0.103752 0.994603 -0 outer loop - vertex -47.1648 -37.9848 -0.1 + vertex -47.1648 -37.9848 -0.2 vertex -47.4529 -37.9547 0 vertex -47.1648 -37.9848 0 endloop @@ -13470,13 +13470,13 @@ solid OpenSCAD_Model facet normal 0.103752 0.994603 0 outer loop vertex -47.4529 -37.9547 0 - vertex -47.1648 -37.9848 -0.1 - vertex -47.4529 -37.9547 -0.1 + vertex -47.1648 -37.9848 -0.2 + vertex -47.4529 -37.9547 -0.2 endloop endfacet facet normal 0.373487 0.927636 -0 outer loop - vertex -47.4529 -37.9547 -0.1 + vertex -47.4529 -37.9547 -0.2 vertex -47.6522 -37.8745 0 vertex -47.4529 -37.9547 0 endloop @@ -13484,13 +13484,13 @@ solid OpenSCAD_Model facet normal 0.373487 0.927636 0 outer loop vertex -47.6522 -37.8745 0 - vertex -47.4529 -37.9547 -0.1 - vertex -47.6522 -37.8745 -0.1 + vertex -47.4529 -37.9547 -0.2 + vertex -47.6522 -37.8745 -0.2 endloop endfacet facet normal 0.561365 0.827568 -0 outer loop - vertex -47.6522 -37.8745 -0.1 + vertex -47.6522 -37.8745 -0.2 vertex -47.8044 -37.7712 0 vertex -47.6522 -37.8745 0 endloop @@ -13498,125 +13498,125 @@ solid OpenSCAD_Model facet normal 0.561365 0.827568 0 outer loop vertex -47.8044 -37.7712 0 - vertex -47.6522 -37.8745 -0.1 - vertex -47.8044 -37.7712 -0.1 + vertex -47.6522 -37.8745 -0.2 + vertex -47.8044 -37.7712 -0.2 endloop endfacet facet normal 0.753293 0.657685 0 outer loop vertex -47.8044 -37.7712 0 - vertex -47.9115 -37.6485 -0.1 + vertex -47.9115 -37.6485 -0.2 vertex -47.9115 -37.6485 0 endloop endfacet facet normal 0.753293 0.657685 0 outer loop - vertex -47.9115 -37.6485 -0.1 + vertex -47.9115 -37.6485 -0.2 vertex -47.8044 -37.7712 0 - vertex -47.8044 -37.7712 -0.1 + vertex -47.8044 -37.7712 -0.2 endloop endfacet facet normal 0.907474 0.420108 0 outer loop vertex -47.9115 -37.6485 0 - vertex -47.9758 -37.5097 -0.1 + vertex -47.9758 -37.5097 -0.2 vertex -47.9758 -37.5097 0 endloop endfacet facet normal 0.907474 0.420108 0 outer loop - vertex -47.9758 -37.5097 -0.1 + vertex -47.9758 -37.5097 -0.2 vertex -47.9115 -37.6485 0 - vertex -47.9115 -37.6485 -0.1 + vertex -47.9115 -37.6485 -0.2 endloop endfacet facet normal 0.988205 0.153137 0 outer loop vertex -47.9758 -37.5097 0 - vertex -47.9993 -37.3583 -0.1 + vertex -47.9993 -37.3583 -0.2 vertex -47.9993 -37.3583 0 endloop endfacet facet normal 0.988205 0.153137 0 outer loop - vertex -47.9993 -37.3583 -0.1 + vertex -47.9993 -37.3583 -0.2 vertex -47.9758 -37.5097 0 - vertex -47.9758 -37.5097 -0.1 + vertex -47.9758 -37.5097 -0.2 endloop endfacet facet normal 0.995535 -0.0943972 0 outer loop vertex -47.9993 -37.3583 0 - vertex -47.984 -37.1977 -0.1 + vertex -47.984 -37.1977 -0.2 vertex -47.984 -37.1977 0 endloop endfacet facet normal 0.995535 -0.0943972 0 outer loop - vertex -47.984 -37.1977 -0.1 + vertex -47.984 -37.1977 -0.2 vertex -47.9993 -37.3583 0 - vertex -47.9993 -37.3583 -0.1 + vertex -47.9993 -37.3583 -0.2 endloop endfacet facet normal 0.954736 -0.297455 0 outer loop vertex -47.984 -37.1977 0 - vertex -47.9322 -37.0315 -0.1 + vertex -47.9322 -37.0315 -0.2 vertex -47.9322 -37.0315 0 endloop endfacet facet normal 0.954736 -0.297455 0 outer loop - vertex -47.9322 -37.0315 -0.1 + vertex -47.9322 -37.0315 -0.2 vertex -47.984 -37.1977 0 - vertex -47.984 -37.1977 -0.1 + vertex -47.984 -37.1977 -0.2 endloop endfacet facet normal 0.890101 -0.455763 0 outer loop vertex -47.9322 -37.0315 0 - vertex -47.846 -36.863 -0.1 + vertex -47.846 -36.863 -0.2 vertex -47.846 -36.863 0 endloop endfacet facet normal 0.890101 -0.455763 0 outer loop - vertex -47.846 -36.863 -0.1 + vertex -47.846 -36.863 -0.2 vertex -47.9322 -37.0315 0 - vertex -47.9322 -37.0315 -0.1 + vertex -47.9322 -37.0315 -0.2 endloop endfacet facet normal 0.815677 -0.578507 0 outer loop vertex -47.846 -36.863 0 - vertex -47.7274 -36.6957 -0.1 + vertex -47.7274 -36.6957 -0.2 vertex -47.7274 -36.6957 0 endloop endfacet facet normal 0.815677 -0.578507 0 outer loop - vertex -47.7274 -36.6957 -0.1 + vertex -47.7274 -36.6957 -0.2 vertex -47.846 -36.863 0 - vertex -47.846 -36.863 -0.1 + vertex -47.846 -36.863 -0.2 endloop endfacet facet normal 0.737497 -0.67535 0 outer loop vertex -47.7274 -36.6957 0 - vertex -47.5785 -36.5332 -0.1 + vertex -47.5785 -36.5332 -0.2 vertex -47.5785 -36.5332 0 endloop endfacet facet normal 0.737497 -0.67535 0 outer loop - vertex -47.5785 -36.5332 -0.1 + vertex -47.5785 -36.5332 -0.2 vertex -47.7274 -36.6957 0 - vertex -47.7274 -36.6957 -0.1 + vertex -47.7274 -36.6957 -0.2 endloop endfacet facet normal 0.65739 -0.753551 0 outer loop - vertex -47.5785 -36.5332 -0.1 + vertex -47.5785 -36.5332 -0.2 vertex -47.4015 -36.3788 0 vertex -47.5785 -36.5332 0 endloop @@ -13624,13 +13624,13 @@ solid OpenSCAD_Model facet normal 0.65739 -0.753551 0 outer loop vertex -47.4015 -36.3788 0 - vertex -47.5785 -36.5332 -0.1 - vertex -47.4015 -36.3788 -0.1 + vertex -47.5785 -36.5332 -0.2 + vertex -47.4015 -36.3788 -0.2 endloop endfacet facet normal 0.575341 -0.817914 0 outer loop - vertex -47.4015 -36.3788 -0.1 + vertex -47.4015 -36.3788 -0.2 vertex -47.1985 -36.2359 0 vertex -47.4015 -36.3788 0 endloop @@ -13638,13 +13638,13 @@ solid OpenSCAD_Model facet normal 0.575341 -0.817914 0 outer loop vertex -47.1985 -36.2359 0 - vertex -47.4015 -36.3788 -0.1 - vertex -47.1985 -36.2359 -0.1 + vertex -47.4015 -36.3788 -0.2 + vertex -47.1985 -36.2359 -0.2 endloop endfacet facet normal 0.490533 -0.871423 0 outer loop - vertex -47.1985 -36.2359 -0.1 + vertex -47.1985 -36.2359 -0.2 vertex -46.9715 -36.1082 0 vertex -47.1985 -36.2359 0 endloop @@ -13652,13 +13652,13 @@ solid OpenSCAD_Model facet normal 0.490533 -0.871423 0 outer loop vertex -46.9715 -36.1082 0 - vertex -47.1985 -36.2359 -0.1 - vertex -46.9715 -36.1082 -0.1 + vertex -47.1985 -36.2359 -0.2 + vertex -46.9715 -36.1082 -0.2 endloop endfacet facet normal 0.402049 -0.915618 0 outer loop - vertex -46.9715 -36.1082 -0.1 + vertex -46.9715 -36.1082 -0.2 vertex -46.7228 -35.999 0 vertex -46.9715 -36.1082 0 endloop @@ -13666,13 +13666,13 @@ solid OpenSCAD_Model facet normal 0.402049 -0.915618 0 outer loop vertex -46.7228 -35.999 0 - vertex -46.9715 -36.1082 -0.1 - vertex -46.7228 -35.999 -0.1 + vertex -46.9715 -36.1082 -0.2 + vertex -46.7228 -35.999 -0.2 endloop endfacet facet normal 0.309107 -0.951027 0 outer loop - vertex -46.7228 -35.999 -0.1 + vertex -46.7228 -35.999 -0.2 vertex -46.4544 -35.9117 0 vertex -46.7228 -35.999 0 endloop @@ -13680,13 +13680,13 @@ solid OpenSCAD_Model facet normal 0.309107 -0.951027 0 outer loop vertex -46.4544 -35.9117 0 - vertex -46.7228 -35.999 -0.1 - vertex -46.4544 -35.9117 -0.1 + vertex -46.7228 -35.999 -0.2 + vertex -46.4544 -35.9117 -0.2 endloop endfacet facet normal 0.211211 -0.977441 0 outer loop - vertex -46.4544 -35.9117 -0.1 + vertex -46.4544 -35.9117 -0.2 vertex -46.1684 -35.8499 0 vertex -46.4544 -35.9117 0 endloop @@ -13694,13 +13694,13 @@ solid OpenSCAD_Model facet normal 0.211211 -0.977441 0 outer loop vertex -46.1684 -35.8499 0 - vertex -46.4544 -35.9117 -0.1 - vertex -46.1684 -35.8499 -0.1 + vertex -46.4544 -35.9117 -0.2 + vertex -46.1684 -35.8499 -0.2 endloop endfacet facet normal 0.185786 -0.98259 0 outer loop - vertex -46.1684 -35.8499 -0.1 + vertex -46.1684 -35.8499 -0.2 vertex -45.8475 -35.7893 0 vertex -46.1684 -35.8499 0 endloop @@ -13708,13 +13708,13 @@ solid OpenSCAD_Model facet normal 0.185786 -0.98259 0 outer loop vertex -45.8475 -35.7893 0 - vertex -46.1684 -35.8499 -0.1 - vertex -45.8475 -35.7893 -0.1 + vertex -46.1684 -35.8499 -0.2 + vertex -45.8475 -35.7893 -0.2 endloop endfacet facet normal 0.247179 -0.96897 0 outer loop - vertex -45.8475 -35.7893 -0.1 + vertex -45.8475 -35.7893 -0.2 vertex -45.5508 -35.7136 0 vertex -45.8475 -35.7893 0 endloop @@ -13722,13 +13722,13 @@ solid OpenSCAD_Model facet normal 0.247179 -0.96897 0 outer loop vertex -45.5508 -35.7136 0 - vertex -45.8475 -35.7893 -0.1 - vertex -45.5508 -35.7136 -0.1 + vertex -45.8475 -35.7893 -0.2 + vertex -45.5508 -35.7136 -0.2 endloop endfacet facet normal 0.324475 -0.945894 0 outer loop - vertex -45.5508 -35.7136 -0.1 + vertex -45.5508 -35.7136 -0.2 vertex -45.2753 -35.6191 0 vertex -45.5508 -35.7136 0 endloop @@ -13736,13 +13736,13 @@ solid OpenSCAD_Model facet normal 0.324475 -0.945894 0 outer loop vertex -45.2753 -35.6191 0 - vertex -45.5508 -35.7136 -0.1 - vertex -45.2753 -35.6191 -0.1 + vertex -45.5508 -35.7136 -0.2 + vertex -45.2753 -35.6191 -0.2 endloop endfacet facet normal 0.414245 -0.910165 0 outer loop - vertex -45.2753 -35.6191 -0.1 + vertex -45.2753 -35.6191 -0.2 vertex -45.0179 -35.5019 0 vertex -45.2753 -35.6191 0 endloop @@ -13750,13 +13750,13 @@ solid OpenSCAD_Model facet normal 0.414245 -0.910165 0 outer loop vertex -45.0179 -35.5019 0 - vertex -45.2753 -35.6191 -0.1 - vertex -45.0179 -35.5019 -0.1 + vertex -45.2753 -35.6191 -0.2 + vertex -45.0179 -35.5019 -0.2 endloop endfacet facet normal 0.509766 -0.860313 0 outer loop - vertex -45.0179 -35.5019 -0.1 + vertex -45.0179 -35.5019 -0.2 vertex -44.7755 -35.3583 0 vertex -45.0179 -35.5019 0 endloop @@ -13764,13 +13764,13 @@ solid OpenSCAD_Model facet normal 0.509766 -0.860313 0 outer loop vertex -44.7755 -35.3583 0 - vertex -45.0179 -35.5019 -0.1 - vertex -44.7755 -35.3583 -0.1 + vertex -45.0179 -35.5019 -0.2 + vertex -44.7755 -35.3583 -0.2 endloop endfacet facet normal 0.602421 -0.798179 0 outer loop - vertex -44.7755 -35.3583 -0.1 + vertex -44.7755 -35.3583 -0.2 vertex -44.5451 -35.1844 0 vertex -44.7755 -35.3583 0 endloop @@ -13778,13 +13778,13 @@ solid OpenSCAD_Model facet normal 0.602421 -0.798179 0 outer loop vertex -44.5451 -35.1844 0 - vertex -44.7755 -35.3583 -0.1 - vertex -44.5451 -35.1844 -0.1 + vertex -44.7755 -35.3583 -0.2 + vertex -44.5451 -35.1844 -0.2 endloop endfacet facet normal 0.684546 -0.728969 0 outer loop - vertex -44.5451 -35.1844 -0.1 + vertex -44.5451 -35.1844 -0.2 vertex -44.3237 -34.9765 0 vertex -44.5451 -35.1844 0 endloop @@ -13792,307 +13792,307 @@ solid OpenSCAD_Model facet normal 0.684546 -0.728969 0 outer loop vertex -44.3237 -34.9765 0 - vertex -44.5451 -35.1844 -0.1 - vertex -44.3237 -34.9765 -0.1 + vertex -44.5451 -35.1844 -0.2 + vertex -44.3237 -34.9765 -0.2 endloop endfacet facet normal 0.751841 -0.659345 0 outer loop vertex -44.3237 -34.9765 0 - vertex -44.108 -34.7306 -0.1 + vertex -44.108 -34.7306 -0.2 vertex -44.108 -34.7306 0 endloop endfacet facet normal 0.751841 -0.659345 0 outer loop - vertex -44.108 -34.7306 -0.1 + vertex -44.108 -34.7306 -0.2 vertex -44.3237 -34.9765 0 - vertex -44.3237 -34.9765 -0.1 + vertex -44.3237 -34.9765 -0.2 endloop endfacet facet normal 0.803805 -0.594893 0 outer loop vertex -44.108 -34.7306 0 - vertex -43.8952 -34.443 -0.1 + vertex -43.8952 -34.443 -0.2 vertex -43.8952 -34.443 0 endloop endfacet facet normal 0.803805 -0.594893 0 outer loop - vertex -43.8952 -34.443 -0.1 + vertex -43.8952 -34.443 -0.2 vertex -44.108 -34.7306 0 - vertex -44.108 -34.7306 -0.1 + vertex -44.108 -34.7306 -0.2 endloop endfacet facet normal 0.842352 -0.538928 0 outer loop vertex -43.8952 -34.443 0 - vertex -43.682 -34.1098 -0.1 + vertex -43.682 -34.1098 -0.2 vertex -43.682 -34.1098 0 endloop endfacet facet normal 0.842352 -0.538928 0 outer loop - vertex -43.682 -34.1098 -0.1 + vertex -43.682 -34.1098 -0.2 vertex -43.8952 -34.443 0 - vertex -43.8952 -34.443 -0.1 + vertex -43.8952 -34.443 -0.2 endloop endfacet facet normal 0.870266 -0.492581 0 outer loop vertex -43.682 -34.1098 0 - vertex -43.4655 -33.7273 -0.1 + vertex -43.4655 -33.7273 -0.2 vertex -43.4655 -33.7273 0 endloop endfacet facet normal 0.870266 -0.492581 0 outer loop - vertex -43.4655 -33.7273 -0.1 + vertex -43.4655 -33.7273 -0.2 vertex -43.682 -34.1098 0 - vertex -43.682 -34.1098 -0.1 + vertex -43.682 -34.1098 -0.2 endloop endfacet facet normal 0.890236 -0.4555 0 outer loop vertex -43.4655 -33.7273 0 - vertex -43.2426 -33.2915 -0.1 + vertex -43.2426 -33.2915 -0.2 vertex -43.2426 -33.2915 0 endloop endfacet facet normal 0.890236 -0.4555 0 outer loop - vertex -43.2426 -33.2915 -0.1 + vertex -43.2426 -33.2915 -0.2 vertex -43.4655 -33.7273 0 - vertex -43.4655 -33.7273 -0.1 + vertex -43.4655 -33.7273 -0.2 endloop endfacet facet normal 0.909757 -0.41514 0 outer loop vertex -43.2426 -33.2915 0 - vertex -42.7651 -32.2453 -0.1 + vertex -42.7651 -32.2453 -0.2 vertex -42.7651 -32.2453 0 endloop endfacet facet normal 0.909757 -0.41514 0 outer loop - vertex -42.7651 -32.2453 -0.1 + vertex -42.7651 -32.2453 -0.2 vertex -43.2426 -33.2915 0 - vertex -43.2426 -33.2915 -0.1 + vertex -43.2426 -33.2915 -0.2 endloop endfacet facet normal 0.924016 -0.382355 0 outer loop vertex -42.7651 -32.2453 0 - vertex -42.2252 -30.9405 -0.1 + vertex -42.2252 -30.9405 -0.2 vertex -42.2252 -30.9405 0 endloop endfacet facet normal 0.924016 -0.382355 0 outer loop - vertex -42.2252 -30.9405 -0.1 + vertex -42.2252 -30.9405 -0.2 vertex -42.7651 -32.2453 0 - vertex -42.7651 -32.2453 -0.1 + vertex -42.7651 -32.2453 -0.2 endloop endfacet facet normal 0.922377 -0.38629 0 outer loop vertex -42.2252 -30.9405 0 - vertex -41.2695 -28.6585 -0.1 + vertex -41.2695 -28.6585 -0.2 vertex -41.2695 -28.6585 0 endloop endfacet facet normal 0.922377 -0.38629 0 outer loop - vertex -41.2695 -28.6585 -0.1 + vertex -41.2695 -28.6585 -0.2 vertex -42.2252 -30.9405 0 - vertex -42.2252 -30.9405 -0.1 + vertex -42.2252 -30.9405 -0.2 endloop endfacet facet normal 0.918146 -0.396243 0 outer loop vertex -41.2695 -28.6585 0 - vertex -39.8955 -25.4747 -0.1 + vertex -39.8955 -25.4747 -0.2 vertex -39.8955 -25.4747 0 endloop endfacet facet normal 0.918146 -0.396243 0 outer loop - vertex -39.8955 -25.4747 -0.1 + vertex -39.8955 -25.4747 -0.2 vertex -41.2695 -28.6585 0 - vertex -41.2695 -28.6585 -0.1 + vertex -41.2695 -28.6585 -0.2 endloop endfacet facet normal 0.918872 -0.394555 0 outer loop vertex -39.8955 -25.4747 0 - vertex -38.3469 -21.8682 -0.1 + vertex -38.3469 -21.8682 -0.2 vertex -38.3469 -21.8682 0 endloop endfacet facet normal 0.918872 -0.394555 0 outer loop - vertex -38.3469 -21.8682 -0.1 + vertex -38.3469 -21.8682 -0.2 vertex -39.8955 -25.4747 0 - vertex -39.8955 -25.4747 -0.1 + vertex -39.8955 -25.4747 -0.2 endloop endfacet facet normal 0.92432 -0.381618 0 outer loop vertex -38.3469 -21.8682 0 - vertex -37.0431 -18.7102 -0.1 + vertex -37.0431 -18.7102 -0.2 vertex -37.0431 -18.7102 0 endloop endfacet facet normal 0.92432 -0.381618 0 outer loop - vertex -37.0431 -18.7102 -0.1 + vertex -37.0431 -18.7102 -0.2 vertex -38.3469 -21.8682 0 - vertex -38.3469 -21.8682 -0.1 + vertex -38.3469 -21.8682 -0.2 endloop endfacet facet normal 0.929541 -0.368719 0 outer loop vertex -37.0431 -18.7102 0 - vertex -36.5163 -17.3821 -0.1 + vertex -36.5163 -17.3821 -0.2 vertex -36.5163 -17.3821 0 endloop endfacet facet normal 0.929541 -0.368719 0 outer loop - vertex -36.5163 -17.3821 -0.1 + vertex -36.5163 -17.3821 -0.2 vertex -37.0431 -18.7102 0 - vertex -37.0431 -18.7102 -0.1 + vertex -37.0431 -18.7102 -0.2 endloop endfacet facet normal 0.934424 -0.356162 0 outer loop vertex -36.5163 -17.3821 0 - vertex -36.0907 -16.2655 -0.1 + vertex -36.0907 -16.2655 -0.2 vertex -36.0907 -16.2655 0 endloop endfacet facet normal 0.934424 -0.356162 0 outer loop - vertex -36.0907 -16.2655 -0.1 + vertex -36.0907 -16.2655 -0.2 vertex -36.5163 -17.3821 0 - vertex -36.5163 -17.3821 -0.1 + vertex -36.5163 -17.3821 -0.2 endloop endfacet facet normal 0.941869 -0.335981 0 outer loop vertex -36.0907 -16.2655 0 - vertex -35.7796 -15.3934 -0.1 + vertex -35.7796 -15.3934 -0.2 vertex -35.7796 -15.3934 0 endloop endfacet facet normal 0.941869 -0.335981 0 outer loop - vertex -35.7796 -15.3934 -0.1 + vertex -35.7796 -15.3934 -0.2 vertex -36.0907 -16.2655 0 - vertex -36.0907 -16.2655 -0.1 + vertex -36.0907 -16.2655 -0.2 endloop endfacet facet normal 0.955627 -0.294578 0 outer loop vertex -35.7796 -15.3934 0 - vertex -35.5964 -14.799 -0.1 + vertex -35.5964 -14.799 -0.2 vertex -35.5964 -14.799 0 endloop endfacet facet normal 0.955627 -0.294578 0 outer loop - vertex -35.5964 -14.799 -0.1 + vertex -35.5964 -14.799 -0.2 vertex -35.7796 -15.3934 0 - vertex -35.7796 -15.3934 -0.1 + vertex -35.7796 -15.3934 -0.2 endloop endfacet facet normal 0.97537 -0.220574 0 outer loop vertex -35.5964 -14.799 0 - vertex -35.5123 -14.4274 -0.1 + vertex -35.5123 -14.4274 -0.2 vertex -35.5123 -14.4274 0 endloop endfacet facet normal 0.97537 -0.220574 0 outer loop - vertex -35.5123 -14.4274 -0.1 + vertex -35.5123 -14.4274 -0.2 vertex -35.5964 -14.799 0 - vertex -35.5964 -14.799 -0.1 + vertex -35.5964 -14.799 -0.2 endloop endfacet facet normal 0.992467 -0.122514 0 outer loop vertex -35.5123 -14.4274 0 - vertex -35.4754 -14.1281 -0.1 + vertex -35.4754 -14.1281 -0.2 vertex -35.4754 -14.1281 0 endloop endfacet facet normal 0.992467 -0.122514 0 outer loop - vertex -35.4754 -14.1281 -0.1 + vertex -35.4754 -14.1281 -0.2 vertex -35.5123 -14.4274 0 - vertex -35.5123 -14.4274 -0.1 + vertex -35.5123 -14.4274 -0.2 endloop endfacet facet normal 0.997952 0.0639612 0 outer loop vertex -35.4754 -14.1281 0 - vertex -35.4904 -13.894 -0.1 + vertex -35.4904 -13.894 -0.2 vertex -35.4904 -13.894 0 endloop endfacet facet normal 0.997952 0.0639612 0 outer loop - vertex -35.4904 -13.894 -0.1 + vertex -35.4904 -13.894 -0.2 vertex -35.4754 -14.1281 0 - vertex -35.4754 -14.1281 -0.1 + vertex -35.4754 -14.1281 -0.2 endloop endfacet facet normal 0.957653 0.287925 0 outer loop vertex -35.4904 -13.894 0 - vertex -35.5189 -13.7992 -0.1 + vertex -35.5189 -13.7992 -0.2 vertex -35.5189 -13.7992 0 endloop endfacet facet normal 0.957653 0.287925 0 outer loop - vertex -35.5189 -13.7992 -0.1 + vertex -35.5189 -13.7992 -0.2 vertex -35.4904 -13.894 0 - vertex -35.4904 -13.894 -0.1 + vertex -35.4904 -13.894 -0.2 endloop endfacet facet normal 0.882255 0.470771 0 outer loop vertex -35.5189 -13.7992 0 - vertex -35.5622 -13.718 -0.1 + vertex -35.5622 -13.718 -0.2 vertex -35.5622 -13.718 0 endloop endfacet facet normal 0.882255 0.470771 0 outer loop - vertex -35.5622 -13.718 -0.1 + vertex -35.5622 -13.718 -0.2 vertex -35.5189 -13.7992 0 - vertex -35.5189 -13.7992 -0.1 + vertex -35.5189 -13.7992 -0.2 endloop endfacet facet normal 0.758808 0.651314 0 outer loop vertex -35.5622 -13.718 0 - vertex -35.6209 -13.6496 -0.1 + vertex -35.6209 -13.6496 -0.2 vertex -35.6209 -13.6496 0 endloop endfacet facet normal 0.758808 0.651314 0 outer loop - vertex -35.6209 -13.6496 -0.1 + vertex -35.6209 -13.6496 -0.2 vertex -35.5622 -13.718 0 - vertex -35.5622 -13.718 -0.1 + vertex -35.5622 -13.718 -0.2 endloop endfacet facet normal 0.603335 0.797487 -0 outer loop - vertex -35.6209 -13.6496 -0.1 + vertex -35.6209 -13.6496 -0.2 vertex -35.6956 -13.593 0 vertex -35.6209 -13.6496 0 endloop @@ -14100,13 +14100,13 @@ solid OpenSCAD_Model facet normal 0.603335 0.797487 0 outer loop vertex -35.6956 -13.593 0 - vertex -35.6209 -13.6496 -0.1 - vertex -35.6956 -13.593 -0.1 + vertex -35.6209 -13.6496 -0.2 + vertex -35.6956 -13.593 -0.2 endloop endfacet facet normal 0.375678 0.92675 -0 outer loop - vertex -35.6956 -13.593 -0.1 + vertex -35.6956 -13.593 -0.2 vertex -35.8956 -13.512 0 vertex -35.6956 -13.593 0 endloop @@ -14114,13 +14114,13 @@ solid OpenSCAD_Model facet normal 0.375678 0.92675 0 outer loop vertex -35.8956 -13.512 0 - vertex -35.6956 -13.593 -0.1 - vertex -35.8956 -13.512 -0.1 + vertex -35.6956 -13.593 -0.2 + vertex -35.8956 -13.512 -0.2 endloop endfacet facet normal 0.161053 0.986946 -0 outer loop - vertex -35.8956 -13.512 -0.1 + vertex -35.8956 -13.512 -0.2 vertex -36.1669 -13.4677 0 vertex -35.8956 -13.512 0 endloop @@ -14128,13 +14128,13 @@ solid OpenSCAD_Model facet normal 0.161053 0.986946 0 outer loop vertex -36.1669 -13.4677 0 - vertex -35.8956 -13.512 -0.1 - vertex -36.1669 -13.4677 -0.1 + vertex -35.8956 -13.512 -0.2 + vertex -36.1669 -13.4677 -0.2 endloop endfacet facet normal 0.0419804 0.999118 -0 outer loop - vertex -36.1669 -13.4677 -0.1 + vertex -36.1669 -13.4677 -0.2 vertex -36.5145 -13.4531 0 vertex -36.1669 -13.4677 0 endloop @@ -14142,13 +14142,13 @@ solid OpenSCAD_Model facet normal 0.0419804 0.999118 0 outer loop vertex -36.5145 -13.4531 0 - vertex -36.1669 -13.4677 -0.1 - vertex -36.5145 -13.4531 -0.1 + vertex -36.1669 -13.4677 -0.2 + vertex -36.5145 -13.4531 -0.2 endloop endfacet facet normal 0.0664354 0.997791 -0 outer loop - vertex -36.5145 -13.4531 -0.1 + vertex -36.5145 -13.4531 -0.2 vertex -36.7305 -13.4387 0 vertex -36.5145 -13.4531 0 endloop @@ -14156,13 +14156,13 @@ solid OpenSCAD_Model facet normal 0.0664354 0.997791 0 outer loop vertex -36.7305 -13.4387 0 - vertex -36.5145 -13.4531 -0.1 - vertex -36.7305 -13.4387 -0.1 + vertex -36.5145 -13.4531 -0.2 + vertex -36.7305 -13.4387 -0.2 endloop endfacet facet normal 0.199985 0.979799 -0 outer loop - vertex -36.7305 -13.4387 -0.1 + vertex -36.7305 -13.4387 -0.2 vertex -36.9216 -13.3997 0 vertex -36.7305 -13.4387 0 endloop @@ -14170,13 +14170,13 @@ solid OpenSCAD_Model facet normal 0.199985 0.979799 0 outer loop vertex -36.9216 -13.3997 0 - vertex -36.7305 -13.4387 -0.1 - vertex -36.9216 -13.3997 -0.1 + vertex -36.7305 -13.4387 -0.2 + vertex -36.9216 -13.3997 -0.2 endloop endfacet facet normal 0.346161 0.938175 -0 outer loop - vertex -36.9216 -13.3997 -0.1 + vertex -36.9216 -13.3997 -0.2 vertex -37.0874 -13.3385 0 vertex -36.9216 -13.3997 0 endloop @@ -14184,13 +14184,13 @@ solid OpenSCAD_Model facet normal 0.346161 0.938175 0 outer loop vertex -37.0874 -13.3385 0 - vertex -36.9216 -13.3997 -0.1 - vertex -37.0874 -13.3385 -0.1 + vertex -36.9216 -13.3997 -0.2 + vertex -37.0874 -13.3385 -0.2 endloop endfacet facet normal 0.49992 0.866072 -0 outer loop - vertex -37.0874 -13.3385 -0.1 + vertex -37.0874 -13.3385 -0.2 vertex -37.2276 -13.2576 0 vertex -37.0874 -13.3385 0 endloop @@ -14198,13 +14198,13 @@ solid OpenSCAD_Model facet normal 0.49992 0.866072 0 outer loop vertex -37.2276 -13.2576 0 - vertex -37.0874 -13.3385 -0.1 - vertex -37.2276 -13.2576 -0.1 + vertex -37.0874 -13.3385 -0.2 + vertex -37.2276 -13.2576 -0.2 endloop endfacet facet normal 0.652051 0.758175 -0 outer loop - vertex -37.2276 -13.2576 -0.1 + vertex -37.2276 -13.2576 -0.2 vertex -37.3418 -13.1594 0 vertex -37.2276 -13.2576 0 endloop @@ -14212,139 +14212,139 @@ solid OpenSCAD_Model facet normal 0.652051 0.758175 0 outer loop vertex -37.3418 -13.1594 0 - vertex -37.2276 -13.2576 -0.1 - vertex -37.3418 -13.1594 -0.1 + vertex -37.2276 -13.2576 -0.2 + vertex -37.3418 -13.1594 -0.2 endloop endfacet facet normal 0.789664 0.613539 0 outer loop vertex -37.3418 -13.1594 0 - vertex -37.4296 -13.0463 -0.1 + vertex -37.4296 -13.0463 -0.2 vertex -37.4296 -13.0463 0 endloop endfacet facet normal 0.789664 0.613539 0 outer loop - vertex -37.4296 -13.0463 -0.1 + vertex -37.4296 -13.0463 -0.2 vertex -37.3418 -13.1594 0 - vertex -37.3418 -13.1594 -0.1 + vertex -37.3418 -13.1594 -0.2 endloop endfacet facet normal 0.898957 0.438037 0 outer loop vertex -37.4296 -13.0463 0 - vertex -37.4908 -12.9209 -0.1 + vertex -37.4908 -12.9209 -0.2 vertex -37.4908 -12.9209 0 endloop endfacet facet normal 0.898957 0.438037 0 outer loop - vertex -37.4908 -12.9209 -0.1 + vertex -37.4908 -12.9209 -0.2 vertex -37.4296 -13.0463 0 - vertex -37.4296 -13.0463 -0.1 + vertex -37.4296 -13.0463 -0.2 endloop endfacet facet normal 0.969773 0.244009 0 outer loop vertex -37.4908 -12.9209 0 - vertex -37.5249 -12.7854 -0.1 + vertex -37.5249 -12.7854 -0.2 vertex -37.5249 -12.7854 0 endloop endfacet facet normal 0.969773 0.244009 0 outer loop - vertex -37.5249 -12.7854 -0.1 + vertex -37.5249 -12.7854 -0.2 vertex -37.4908 -12.9209 0 - vertex -37.4908 -12.9209 -0.1 + vertex -37.4908 -12.9209 -0.2 endloop endfacet facet normal 0.99892 0.0464614 0 outer loop vertex -37.5249 -12.7854 0 - vertex -37.5315 -12.6425 -0.1 + vertex -37.5315 -12.6425 -0.2 vertex -37.5315 -12.6425 0 endloop endfacet facet normal 0.99892 0.0464614 0 outer loop - vertex -37.5315 -12.6425 -0.1 + vertex -37.5315 -12.6425 -0.2 vertex -37.5249 -12.7854 0 - vertex -37.5249 -12.7854 -0.1 + vertex -37.5249 -12.7854 -0.2 endloop endfacet facet normal 0.989966 -0.141306 0 outer loop vertex -37.5315 -12.6425 0 - vertex -37.5104 -12.4945 -0.1 + vertex -37.5104 -12.4945 -0.2 vertex -37.5104 -12.4945 0 endloop endfacet facet normal 0.989966 -0.141306 0 outer loop - vertex -37.5104 -12.4945 -0.1 + vertex -37.5104 -12.4945 -0.2 vertex -37.5315 -12.6425 0 - vertex -37.5315 -12.6425 -0.1 + vertex -37.5315 -12.6425 -0.2 endloop endfacet facet normal 0.950483 -0.310777 0 outer loop vertex -37.5104 -12.4945 0 - vertex -37.4611 -12.3438 -0.1 + vertex -37.4611 -12.3438 -0.2 vertex -37.4611 -12.3438 0 endloop endfacet facet normal 0.950483 -0.310777 0 outer loop - vertex -37.4611 -12.3438 -0.1 + vertex -37.4611 -12.3438 -0.2 vertex -37.5104 -12.4945 0 - vertex -37.5104 -12.4945 -0.1 + vertex -37.5104 -12.4945 -0.2 endloop endfacet facet normal 0.888869 -0.458162 0 outer loop vertex -37.4611 -12.3438 0 - vertex -37.3834 -12.1929 -0.1 + vertex -37.3834 -12.1929 -0.2 vertex -37.3834 -12.1929 0 endloop endfacet facet normal 0.888869 -0.458162 0 outer loop - vertex -37.3834 -12.1929 -0.1 + vertex -37.3834 -12.1929 -0.2 vertex -37.4611 -12.3438 0 - vertex -37.4611 -12.3438 -0.1 + vertex -37.4611 -12.3438 -0.2 endloop endfacet facet normal 0.812527 -0.582923 0 outer loop vertex -37.3834 -12.1929 0 - vertex -37.2767 -12.0443 -0.1 + vertex -37.2767 -12.0443 -0.2 vertex -37.2767 -12.0443 0 endloop endfacet facet normal 0.812527 -0.582923 0 outer loop - vertex -37.2767 -12.0443 -0.1 + vertex -37.2767 -12.0443 -0.2 vertex -37.3834 -12.1929 0 - vertex -37.3834 -12.1929 -0.1 + vertex -37.3834 -12.1929 -0.2 endloop endfacet facet normal 0.727267 -0.686355 0 outer loop vertex -37.2767 -12.0443 0 - vertex -37.1409 -11.9004 -0.1 + vertex -37.1409 -11.9004 -0.2 vertex -37.1409 -11.9004 0 endloop endfacet facet normal 0.727267 -0.686355 0 outer loop - vertex -37.1409 -11.9004 -0.1 + vertex -37.1409 -11.9004 -0.2 vertex -37.2767 -12.0443 0 - vertex -37.2767 -12.0443 -0.1 + vertex -37.2767 -12.0443 -0.2 endloop endfacet facet normal 0.637301 -0.770615 0 outer loop - vertex -37.1409 -11.9004 -0.1 + vertex -37.1409 -11.9004 -0.2 vertex -36.9755 -11.7636 0 vertex -37.1409 -11.9004 0 endloop @@ -14352,13 +14352,13 @@ solid OpenSCAD_Model facet normal 0.637301 -0.770615 0 outer loop vertex -36.9755 -11.7636 0 - vertex -37.1409 -11.9004 -0.1 - vertex -36.9755 -11.7636 -0.1 + vertex -37.1409 -11.9004 -0.2 + vertex -36.9755 -11.7636 -0.2 endloop endfacet facet normal 0.545722 -0.837967 0 outer loop - vertex -36.9755 -11.7636 -0.1 + vertex -36.9755 -11.7636 -0.2 vertex -36.7802 -11.6364 0 vertex -36.9755 -11.7636 0 endloop @@ -14366,13 +14366,13 @@ solid OpenSCAD_Model facet normal 0.545722 -0.837967 0 outer loop vertex -36.7802 -11.6364 0 - vertex -36.9755 -11.7636 -0.1 - vertex -36.7802 -11.6364 -0.1 + vertex -36.9755 -11.7636 -0.2 + vertex -36.7802 -11.6364 -0.2 endloop endfacet facet normal 0.431805 -0.901967 0 outer loop - vertex -36.7802 -11.6364 -0.1 + vertex -36.7802 -11.6364 -0.2 vertex -36.527 -11.5152 0 vertex -36.7802 -11.6364 0 endloop @@ -14380,13 +14380,13 @@ solid OpenSCAD_Model facet normal 0.431805 -0.901967 0 outer loop vertex -36.527 -11.5152 0 - vertex -36.7802 -11.6364 -0.1 - vertex -36.527 -11.5152 -0.1 + vertex -36.7802 -11.6364 -0.2 + vertex -36.527 -11.5152 -0.2 endloop endfacet facet normal 0.256105 -0.966649 0 outer loop - vertex -36.527 -11.5152 -0.1 + vertex -36.527 -11.5152 -0.2 vertex -36.1819 -11.4238 0 vertex -36.527 -11.5152 0 endloop @@ -14394,13 +14394,13 @@ solid OpenSCAD_Model facet normal 0.256105 -0.966649 0 outer loop vertex -36.1819 -11.4238 0 - vertex -36.527 -11.5152 -0.1 - vertex -36.1819 -11.4238 -0.1 + vertex -36.527 -11.5152 -0.2 + vertex -36.1819 -11.4238 -0.2 endloop endfacet facet normal 0.121259 -0.992621 0 outer loop - vertex -36.1819 -11.4238 -0.1 + vertex -36.1819 -11.4238 -0.2 vertex -35.6555 -11.3595 0 vertex -36.1819 -11.4238 0 endloop @@ -14408,13 +14408,13 @@ solid OpenSCAD_Model facet normal 0.121259 -0.992621 0 outer loop vertex -35.6555 -11.3595 0 - vertex -36.1819 -11.4238 -0.1 - vertex -35.6555 -11.3595 -0.1 + vertex -36.1819 -11.4238 -0.2 + vertex -35.6555 -11.3595 -0.2 endloop endfacet facet normal 0.0498988 -0.998754 0 outer loop - vertex -35.6555 -11.3595 -0.1 + vertex -35.6555 -11.3595 -0.2 vertex -34.8583 -11.3197 0 vertex -35.6555 -11.3595 0 endloop @@ -14422,13 +14422,13 @@ solid OpenSCAD_Model facet normal 0.0498988 -0.998754 0 outer loop vertex -34.8583 -11.3197 0 - vertex -35.6555 -11.3595 -0.1 - vertex -34.8583 -11.3197 -0.1 + vertex -35.6555 -11.3595 -0.2 + vertex -34.8583 -11.3197 -0.2 endloop endfacet facet normal 0.0155398 -0.999879 0 outer loop - vertex -34.8583 -11.3197 -0.1 + vertex -34.8583 -11.3197 -0.2 vertex -33.7011 -11.3017 0 vertex -34.8583 -11.3197 0 endloop @@ -14436,13 +14436,13 @@ solid OpenSCAD_Model facet normal 0.0155398 -0.999879 0 outer loop vertex -33.7011 -11.3017 0 - vertex -34.8583 -11.3197 -0.1 - vertex -33.7011 -11.3017 -0.1 + vertex -34.8583 -11.3197 -0.2 + vertex -33.7011 -11.3017 -0.2 endloop endfacet facet normal -0.000753226 -1 0 outer loop - vertex -33.7011 -11.3017 -0.1 + vertex -33.7011 -11.3017 -0.2 vertex -32.0944 -11.3029 0 vertex -33.7011 -11.3017 0 endloop @@ -14450,1616 +14450,1616 @@ solid OpenSCAD_Model facet normal -0.000753226 -1 -0 outer loop vertex -32.0944 -11.3029 0 - vertex -33.7011 -11.3017 -0.1 - vertex -32.0944 -11.3029 -0.1 + vertex -33.7011 -11.3017 -0.2 + vertex -32.0944 -11.3029 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0792 -19.1571 -0.1 - vertex -11.6557 -19.6804 -0.1 - vertex -11.6899 -19.4898 -0.1 + vertex -12.0792 -19.1571 -0.2 + vertex -11.6557 -19.6804 -0.2 + vertex -11.6899 -19.4898 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.302 -19.1333 -0.1 - vertex -11.6557 -19.6804 -0.1 - vertex -12.0792 -19.1571 -0.1 + vertex -12.302 -19.1333 -0.2 + vertex -11.6557 -19.6804 -0.2 + vertex -12.0792 -19.1571 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.9023 -19.2259 -0.1 - vertex -11.6899 -19.4898 -0.1 - vertex -11.7723 -19.3375 -0.1 + vertex -11.9023 -19.2259 -0.2 + vertex -11.6899 -19.4898 -0.2 + vertex -11.7723 -19.3375 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.6557 -19.6804 -0.1 - vertex -12.302 -19.1333 -0.1 - vertex -11.6707 -19.9072 -0.1 + vertex -11.6557 -19.6804 -0.2 + vertex -12.302 -19.1333 -0.2 + vertex -11.6707 -19.9072 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.6899 -19.4898 -0.1 - vertex -11.9023 -19.2259 -0.1 - vertex -12.0792 -19.1571 -0.1 + vertex -11.6899 -19.4898 -0.2 + vertex -11.9023 -19.2259 -0.2 + vertex -12.0792 -19.1571 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -12.6849 -19.1929 -0.1 - vertex -11.6707 -19.9072 -0.1 - vertex -12.302 -19.1333 -0.1 + vertex -12.6849 -19.1929 -0.2 + vertex -11.6707 -19.9072 -0.2 + vertex -12.302 -19.1333 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.7355 -20.1677 -0.1 - vertex -12.6849 -19.1929 -0.1 - vertex -11.851 -20.4599 -0.1 + vertex -11.7355 -20.1677 -0.2 + vertex -12.6849 -19.1929 -0.2 + vertex -11.851 -20.4599 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.6707 -19.9072 -0.1 - vertex -12.6849 -19.1929 -0.1 - vertex -11.7355 -20.1677 -0.1 + vertex -11.6707 -19.9072 -0.2 + vertex -12.6849 -19.1929 -0.2 + vertex -11.7355 -20.1677 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.01943 -23.5295 -0.1 - vertex -8.48242 -23.1923 -0.1 - vertex -8.45645 -23.4267 -0.1 + vertex -4.01943 -23.5295 -0.2 + vertex -8.48242 -23.1923 -0.2 + vertex -8.45645 -23.4267 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.06691 -19.2358 -0.1 - vertex -8.54451 -22.9989 -0.1 - vertex -8.48242 -23.1923 -0.1 + vertex -8.06691 -19.2358 -0.2 + vertex -8.54451 -22.9989 -0.2 + vertex -8.48242 -23.1923 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.06691 -19.2358 -0.1 - vertex -8.64279 -22.8439 -0.1 - vertex -8.54451 -22.9989 -0.1 + vertex -8.06691 -19.2358 -0.2 + vertex -8.64279 -22.8439 -0.2 + vertex -8.54451 -22.9989 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.94827 -22.6394 -0.1 - vertex -8.43701 -19.2929 -0.1 - vertex -8.77447 -19.378 -0.1 + vertex -8.94827 -22.6394 -0.2 + vertex -8.43701 -19.2929 -0.2 + vertex -8.77447 -19.378 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.06691 -19.2358 -0.1 - vertex -8.77736 -22.7249 -0.1 - vertex -8.64279 -22.8439 -0.1 + vertex -8.06691 -19.2358 -0.2 + vertex -8.77736 -22.7249 -0.2 + vertex -8.64279 -22.8439 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.43701 -19.2929 -0.1 - vertex -8.94827 -22.6394 -0.1 - vertex -8.77736 -22.7249 -0.1 + vertex -8.43701 -19.2929 -0.2 + vertex -8.94827 -22.6394 -0.2 + vertex -8.77736 -22.7249 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -9.10766 -19.4997 -0.1 - vertex -8.94827 -22.6394 -0.1 - vertex -8.77447 -19.378 -0.1 + vertex -9.10766 -19.4997 -0.2 + vertex -8.94827 -22.6394 -0.2 + vertex -8.77447 -19.378 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -9.46489 -19.667 -0.1 - vertex -8.94827 -22.6394 -0.1 - vertex -9.10766 -19.4997 -0.1 + vertex -9.46489 -19.667 -0.2 + vertex -8.94827 -22.6394 -0.2 + vertex -9.10766 -19.4997 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.94827 -22.6394 -0.1 - vertex -9.46489 -19.667 -0.1 - vertex -9.15561 -22.5851 -0.1 + vertex -8.94827 -22.6394 -0.2 + vertex -9.46489 -19.667 -0.2 + vertex -9.15561 -22.5851 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -9.87453 -19.8884 -0.1 - vertex -9.15561 -22.5851 -0.1 - vertex -9.46489 -19.667 -0.1 + vertex -9.87453 -19.8884 -0.2 + vertex -9.15561 -22.5851 -0.2 + vertex -9.46489 -19.667 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.15561 -22.5851 -0.1 - vertex -9.87453 -19.8884 -0.1 - vertex -9.39946 -22.5595 -0.1 + vertex -9.15561 -22.5851 -0.2 + vertex -9.87453 -19.8884 -0.2 + vertex -9.39946 -22.5595 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -10.3649 -20.1728 -0.1 - vertex -9.39946 -22.5595 -0.1 - vertex -9.87453 -19.8884 -0.1 + vertex -10.3649 -20.1728 -0.2 + vertex -9.39946 -22.5595 -0.2 + vertex -9.87453 -19.8884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.39946 -22.5595 -0.1 - vertex -10.3649 -20.1728 -0.1 - vertex -9.67988 -22.56 -0.1 + vertex -9.39946 -22.5595 -0.2 + vertex -10.3649 -20.1728 -0.2 + vertex -9.67988 -22.56 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.67988 -22.56 -0.1 - vertex -10.3649 -20.1728 -0.1 - vertex -10.0796 -22.6123 -0.1 + vertex -9.67988 -22.56 -0.2 + vertex -10.3649 -20.1728 -0.2 + vertex -10.0796 -22.6123 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -11.5073 -20.829 -0.1 - vertex -10.0796 -22.6123 -0.1 - vertex -10.3649 -20.1728 -0.1 + vertex -11.5073 -20.829 -0.2 + vertex -10.0796 -22.6123 -0.2 + vertex -10.3649 -20.1728 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.0796 -22.6123 -0.1 - vertex -11.5073 -20.829 -0.1 - vertex -10.5344 -22.7271 -0.1 + vertex -10.0796 -22.6123 -0.2 + vertex -11.5073 -20.829 -0.2 + vertex -10.5344 -22.7271 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5344 -22.7271 -0.1 - vertex -11.5073 -20.829 -0.1 - vertex -10.9881 -22.8877 -0.1 + vertex -10.5344 -22.7271 -0.2 + vertex -11.5073 -20.829 -0.2 + vertex -10.9881 -22.8877 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -11.8784 -21.0286 -0.1 - vertex -10.9881 -22.8877 -0.1 - vertex -11.5073 -20.829 -0.1 + vertex -11.8784 -21.0286 -0.2 + vertex -10.9881 -22.8877 -0.2 + vertex -11.5073 -20.829 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -12.0427 -21.102 -0.1 - vertex -10.9881 -22.8877 -0.1 - vertex -11.8784 -21.0286 -0.1 + vertex -12.0427 -21.102 -0.2 + vertex -10.9881 -22.8877 -0.2 + vertex -11.8784 -21.0286 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.9881 -22.8877 -0.1 - vertex -12.0427 -21.102 -0.1 - vertex -11.3849 -23.0769 -0.1 + vertex -10.9881 -22.8877 -0.2 + vertex -12.0427 -21.102 -0.2 + vertex -11.3849 -23.0769 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.3849 -23.0769 -0.1 - vertex -12.0427 -21.102 -0.1 - vertex -11.9359 -23.4045 -0.1 + vertex -11.3849 -23.0769 -0.2 + vertex -12.0427 -21.102 -0.2 + vertex -11.9359 -23.4045 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.4007 -23.7203 -0.1 - vertex -12.0427 -21.102 -0.1 - vertex -12.0573 -21.0889 -0.1 + vertex -12.4007 -23.7203 -0.2 + vertex -12.0427 -21.102 -0.2 + vertex -12.0573 -21.0889 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.1989 -19.5967 -0.1 - vertex -12.0573 -21.0889 -0.1 - vertex -12.0594 -21.0513 -0.1 + vertex -14.1989 -19.5967 -0.2 + vertex -12.0573 -21.0889 -0.2 + vertex -12.0594 -21.0513 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.3483 -19.3556 -0.1 - vertex -11.851 -20.4599 -0.1 - vertex -12.6849 -19.1929 -0.1 + vertex -13.3483 -19.3556 -0.2 + vertex -11.851 -20.4599 -0.2 + vertex -12.6849 -19.1929 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.851 -20.4599 -0.1 - vertex -13.3483 -19.3556 -0.1 - vertex -12.0288 -20.9134 -0.1 + vertex -11.851 -20.4599 -0.2 + vertex -13.3483 -19.3556 -0.2 + vertex -12.0288 -20.9134 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0288 -20.9134 -0.1 - vertex -13.3483 -19.3556 -0.1 - vertex -12.0594 -21.0513 -0.1 + vertex -12.0288 -20.9134 -0.2 + vertex -13.3483 -19.3556 -0.2 + vertex -12.0594 -21.0513 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.1989 -19.5967 -0.1 - vertex -12.0594 -21.0513 -0.1 - vertex -13.3483 -19.3556 -0.1 + vertex -14.1989 -19.5967 -0.2 + vertex -12.0594 -21.0513 -0.2 + vertex -13.3483 -19.3556 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0573 -21.0889 -0.1 - vertex -14.1989 -19.5967 -0.1 - vertex -15.1436 -19.8912 -0.1 + vertex -12.0573 -21.0889 -0.2 + vertex -14.1989 -19.5967 -0.2 + vertex -15.1436 -19.8912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0427 -21.102 -0.1 - vertex -12.4007 -23.7203 -0.1 - vertex -11.9359 -23.4045 -0.1 + vertex -12.0427 -21.102 -0.2 + vertex -12.4007 -23.7203 -0.2 + vertex -11.9359 -23.4045 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0573 -21.0889 -0.1 - vertex -15.1436 -19.8912 -0.1 - vertex -12.7941 -24.0414 -0.1 + vertex -12.0573 -21.0889 -0.2 + vertex -15.1436 -19.8912 -0.2 + vertex -12.7941 -24.0414 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.0573 -21.0889 -0.1 - vertex -12.7941 -24.0414 -0.1 - vertex -12.4007 -23.7203 -0.1 + vertex -12.0573 -21.0889 -0.2 + vertex -12.7941 -24.0414 -0.2 + vertex -12.4007 -23.7203 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.2249 -22.8126 -0.1 - vertex -12.7941 -24.0414 -0.1 - vertex -15.1436 -19.8912 -0.1 + vertex -17.2249 -22.8126 -0.2 + vertex -12.7941 -24.0414 -0.2 + vertex -15.1436 -19.8912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.7941 -24.0414 -0.1 - vertex -17.2249 -22.8126 -0.1 - vertex -13.131 -24.3848 -0.1 + vertex -12.7941 -24.0414 -0.2 + vertex -17.2249 -22.8126 -0.2 + vertex -13.131 -24.3848 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -17.2226 -22.9371 -0.1 - vertex -13.131 -24.3848 -0.1 - vertex -17.2249 -22.8126 -0.1 + vertex -17.2226 -22.9371 -0.2 + vertex -13.131 -24.3848 -0.2 + vertex -17.2249 -22.8126 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.131 -24.3848 -0.1 - vertex -17.2226 -22.9371 -0.1 - vertex -13.4262 -24.7676 -0.1 + vertex -13.131 -24.3848 -0.2 + vertex -17.2226 -22.9371 -0.2 + vertex -13.4262 -24.7676 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.2873 -23.335 -0.1 - vertex -13.4262 -24.7676 -0.1 - vertex -17.2226 -22.9371 -0.1 + vertex -17.2873 -23.335 -0.2 + vertex -13.4262 -24.7676 -0.2 + vertex -17.2226 -22.9371 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.4084 -23.7485 -0.1 - vertex -13.6945 -25.2068 -0.1 - vertex -17.2873 -23.335 -0.1 + vertex -17.4084 -23.7485 -0.2 + vertex -13.6945 -25.2068 -0.2 + vertex -17.2873 -23.335 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.6656 -24.469 -0.1 - vertex -13.9508 -25.7195 -0.1 - vertex -17.4084 -23.7485 -0.1 + vertex -17.6656 -24.469 -0.2 + vertex -13.9508 -25.7195 -0.2 + vertex -17.4084 -23.7485 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.2578 -22.7276 -0.1 - vertex -15.1436 -19.8912 -0.1 - vertex -16.9393 -20.461 -0.1 + vertex -17.2578 -22.7276 -0.2 + vertex -15.1436 -19.8912 -0.2 + vertex -16.9393 -20.461 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.6945 -25.2068 -0.1 - vertex -17.4084 -23.7485 -0.1 - vertex -13.9508 -25.7195 -0.1 + vertex -13.6945 -25.2068 -0.2 + vertex -17.4084 -23.7485 -0.2 + vertex -13.9508 -25.7195 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.9508 -25.7195 -0.1 - vertex -17.6656 -24.469 -0.1 - vertex -14.2098 -26.3227 -0.1 + vertex -13.9508 -25.7195 -0.2 + vertex -17.6656 -24.469 -0.2 + vertex -14.2098 -26.3227 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.4262 -24.7676 -0.1 - vertex -17.2873 -23.335 -0.1 - vertex -13.6945 -25.2068 -0.1 + vertex -13.4262 -24.7676 -0.2 + vertex -17.2873 -23.335 -0.2 + vertex -13.6945 -25.2068 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.1436 -19.8912 -0.1 - vertex -17.2578 -22.7276 -0.1 - vertex -17.2249 -22.8126 -0.1 + vertex -15.1436 -19.8912 -0.2 + vertex -17.2578 -22.7276 -0.2 + vertex -17.2249 -22.8126 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.9393 -20.461 -0.1 - vertex -17.3267 -22.6747 -0.1 - vertex -17.2578 -22.7276 -0.1 + vertex -16.9393 -20.461 -0.2 + vertex -17.3267 -22.6747 -0.2 + vertex -17.2578 -22.7276 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.9393 -20.461 -0.1 - vertex -17.4374 -22.6462 -0.1 - vertex -17.3267 -22.6747 -0.1 + vertex -16.9393 -20.461 -0.2 + vertex -17.4374 -22.6462 -0.2 + vertex -17.3267 -22.6747 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.9865 -20.7653 -0.1 - vertex -17.4374 -22.6462 -0.1 - vertex -16.9393 -20.461 -0.1 + vertex -17.9865 -20.7653 -0.2 + vertex -17.4374 -22.6462 -0.2 + vertex -16.9393 -20.461 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4374 -22.6462 -0.1 - vertex -17.9865 -20.7653 -0.1 - vertex -17.8061 -22.6324 -0.1 + vertex -17.4374 -22.6462 -0.2 + vertex -17.9865 -20.7653 -0.2 + vertex -17.8061 -22.6324 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -18.5788 -21.2283 -0.1 - vertex -17.8061 -22.6324 -0.1 - vertex -17.9865 -20.7653 -0.1 + vertex -18.5788 -21.2283 -0.2 + vertex -17.8061 -22.6324 -0.2 + vertex -17.9865 -20.7653 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5053 -21.1105 -0.1 - vertex -17.9865 -20.7653 -0.1 - vertex -18.1109 -20.8023 -0.1 + vertex -18.5053 -21.1105 -0.2 + vertex -17.9865 -20.7653 -0.2 + vertex -18.1109 -20.8023 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5053 -21.1105 -0.1 - vertex -18.1109 -20.8023 -0.1 - vertex -18.2248 -20.8552 -0.1 + vertex -18.5053 -21.1105 -0.2 + vertex -18.1109 -20.8023 -0.2 + vertex -18.2248 -20.8552 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5053 -21.1105 -0.1 - vertex -18.2248 -20.8552 -0.1 - vertex -18.3284 -20.924 -0.1 + vertex -18.5053 -21.1105 -0.2 + vertex -18.2248 -20.8552 -0.2 + vertex -18.3284 -20.924 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -18.6967 -21.5139 -0.1 - vertex -17.8061 -22.6324 -0.1 - vertex -18.5788 -21.2283 -0.1 + vertex -18.6967 -21.5139 -0.2 + vertex -17.8061 -22.6324 -0.2 + vertex -18.5788 -21.2283 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5053 -21.1105 -0.1 - vertex -18.3284 -20.924 -0.1 - vertex -18.4218 -21.0091 -0.1 + vertex -18.5053 -21.1105 -0.2 + vertex -18.3284 -20.924 -0.2 + vertex -18.4218 -21.0091 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.9865 -20.7653 -0.1 - vertex -18.5053 -21.1105 -0.1 - vertex -18.5788 -21.2283 -0.1 + vertex -17.9865 -20.7653 -0.2 + vertex -18.5053 -21.1105 -0.2 + vertex -18.5788 -21.2283 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.8061 -22.6324 -0.1 - vertex -18.6967 -21.5139 -0.1 - vertex -18.1091 -22.6172 -0.1 + vertex -17.8061 -22.6324 -0.2 + vertex -18.6967 -21.5139 -0.2 + vertex -18.1091 -22.6172 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -18.766 -21.7922 -0.1 - vertex -18.1091 -22.6172 -0.1 - vertex -18.6967 -21.5139 -0.1 + vertex -18.766 -21.7922 -0.2 + vertex -18.1091 -22.6172 -0.2 + vertex -18.6967 -21.5139 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.1091 -22.6172 -0.1 - vertex -18.766 -21.7922 -0.1 - vertex -18.3541 -22.5704 -0.1 + vertex -18.1091 -22.6172 -0.2 + vertex -18.766 -21.7922 -0.2 + vertex -18.3541 -22.5704 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -18.7869 -22.0269 -0.1 - vertex -18.3541 -22.5704 -0.1 - vertex -18.766 -21.7922 -0.1 + vertex -18.7869 -22.0269 -0.2 + vertex -18.3541 -22.5704 -0.2 + vertex -18.766 -21.7922 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.3541 -22.5704 -0.1 - vertex -18.7869 -22.0269 -0.1 - vertex -18.5429 -22.4899 -0.1 + vertex -18.3541 -22.5704 -0.2 + vertex -18.7869 -22.0269 -0.2 + vertex -18.5429 -22.4899 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -18.7577 -22.2202 -0.1 - vertex -18.5429 -22.4899 -0.1 - vertex -18.7869 -22.0269 -0.1 + vertex -18.7577 -22.2202 -0.2 + vertex -18.5429 -22.4899 -0.2 + vertex -18.7869 -22.0269 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5429 -22.4899 -0.1 - vertex -18.7577 -22.2202 -0.1 - vertex -18.6769 -22.3738 -0.1 + vertex -18.5429 -22.4899 -0.2 + vertex -18.7577 -22.2202 -0.2 + vertex -18.6769 -22.3738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.82849 -22.2203 -0.1 - vertex -3.84473 -21.6547 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.82849 -22.2203 -0.2 + vertex -3.84473 -21.6547 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.84473 -21.6547 -0.1 - vertex -3.87719 -21.3353 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.84473 -21.6547 -0.2 + vertex -3.87719 -21.3353 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.84589 -22.5177 -0.1 - vertex -3.82849 -22.2203 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.84589 -22.5177 -0.2 + vertex -3.82849 -22.2203 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.47107 -20.0532 -0.1 - vertex -3.87719 -21.3353 -0.1 - vertex -3.91934 -21.0662 -0.1 + vertex -4.47107 -20.0532 -0.2 + vertex -3.87719 -21.3353 -0.2 + vertex -3.91934 -21.0662 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.88244 -22.8317 -0.1 - vertex -3.84589 -22.5177 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.88244 -22.8317 -0.2 + vertex -3.84589 -22.5177 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.29663 -20.2518 -0.1 - vertex -3.91934 -21.0662 -0.1 - vertex -3.97677 -20.8354 -0.1 + vertex -4.29663 -20.2518 -0.2 + vertex -3.91934 -21.0662 -0.2 + vertex -3.97677 -20.8354 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.93975 -23.1672 -0.1 - vertex -3.88244 -22.8317 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.93975 -23.1672 -0.2 + vertex -3.88244 -22.8317 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.15983 -20.4402 -0.1 - vertex -3.97677 -20.8354 -0.1 - vertex -4.05507 -20.6308 -0.1 + vertex -4.15983 -20.4402 -0.2 + vertex -3.97677 -20.8354 -0.2 + vertex -4.05507 -20.6308 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.97677 -20.8354 -0.1 - vertex -4.15983 -20.4402 -0.1 - vertex -4.29663 -20.2518 -0.1 + vertex -3.97677 -20.8354 -0.2 + vertex -4.15983 -20.4402 -0.2 + vertex -4.29663 -20.2518 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -4.01943 -23.5295 -0.1 - vertex -3.93975 -23.1672 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -4.01943 -23.5295 -0.2 + vertex -3.93975 -23.1672 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.91934 -21.0662 -0.1 - vertex -4.29663 -20.2518 -0.1 - vertex -4.47107 -20.0532 -0.1 + vertex -3.91934 -21.0662 -0.2 + vertex -4.29663 -20.2518 -0.2 + vertex -4.47107 -20.0532 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.68872 -19.8327 -0.1 - vertex -3.87719 -21.3353 -0.1 - vertex -4.47107 -20.0532 -0.1 + vertex -4.68872 -19.8327 -0.2 + vertex -3.87719 -21.3353 -0.2 + vertex -4.47107 -20.0532 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.01943 -23.5295 -0.1 - vertex -8.45645 -23.4267 -0.1 - vertex -4.25232 -24.3543 -0.1 + vertex -4.01943 -23.5295 -0.2 + vertex -8.45645 -23.4267 -0.2 + vertex -4.25232 -24.3543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -3.87719 -21.3353 -0.1 - vertex -4.68872 -19.8327 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -3.87719 -21.3353 -0.2 + vertex -4.68872 -19.8327 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.14058 -19.1411 -0.1 - vertex -4.68872 -19.8327 -0.1 - vertex -4.93899 -19.592 -0.1 + vertex -6.14058 -19.1411 -0.2 + vertex -4.68872 -19.8327 -0.2 + vertex -4.93899 -19.592 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -8.46654 -23.7044 -0.1 - vertex -4.25232 -24.3543 -0.1 - vertex -8.45645 -23.4267 -0.1 + vertex -8.46654 -23.7044 -0.2 + vertex -4.25232 -24.3543 -0.2 + vertex -8.45645 -23.4267 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.8145 -19.1562 -0.1 - vertex -4.93899 -19.592 -0.1 - vertex -5.14898 -19.4116 -0.1 + vertex -5.8145 -19.1562 -0.2 + vertex -4.93899 -19.592 -0.2 + vertex -5.14898 -19.4116 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.55901 -19.2012 -0.1 - vertex -5.14898 -19.4116 -0.1 - vertex -5.34642 -19.2839 -0.1 + vertex -5.55901 -19.2012 -0.2 + vertex -5.14898 -19.4116 -0.2 + vertex -5.34642 -19.2839 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.14898 -19.4116 -0.1 - vertex -5.55901 -19.2012 -0.1 - vertex -5.8145 -19.1562 -0.1 + vertex -5.14898 -19.4116 -0.2 + vertex -5.55901 -19.2012 -0.2 + vertex -5.8145 -19.1562 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.25232 -24.3543 -0.1 - vertex -8.46654 -23.7044 -0.1 - vertex -4.59396 -25.347 -0.1 + vertex -4.25232 -24.3543 -0.2 + vertex -8.46654 -23.7044 -0.2 + vertex -4.59396 -25.347 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.93899 -19.592 -0.1 - vertex -5.8145 -19.1562 -0.1 - vertex -6.14058 -19.1411 -0.1 + vertex -4.93899 -19.592 -0.2 + vertex -5.8145 -19.1562 -0.2 + vertex -6.14058 -19.1411 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -4.68872 -19.8327 -0.1 - vertex -6.14058 -19.1411 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -4.68872 -19.8327 -0.2 + vertex -6.14058 -19.1411 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -8.51259 -24.0278 -0.1 - vertex -4.59396 -25.347 -0.1 - vertex -8.46654 -23.7044 -0.1 + vertex -8.51259 -24.0278 -0.2 + vertex -4.59396 -25.347 -0.2 + vertex -8.46654 -23.7044 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -6.14058 -19.1411 -0.1 - vertex -7.11547 -19.1706 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -6.14058 -19.1411 -0.2 + vertex -7.11547 -19.1706 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -7.11547 -19.1706 -0.1 - vertex -7.63584 -19.198 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -7.11547 -19.1706 -0.2 + vertex -7.63584 -19.198 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -8.59455 -24.3995 -0.1 - vertex -4.59396 -25.347 -0.1 - vertex -8.51259 -24.0278 -0.1 + vertex -8.59455 -24.3995 -0.2 + vertex -4.59396 -25.347 -0.2 + vertex -8.51259 -24.0278 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.48242 -23.1923 -0.1 - vertex -7.63584 -19.198 -0.1 - vertex -8.06691 -19.2358 -0.1 + vertex -8.48242 -23.1923 -0.2 + vertex -7.63584 -19.198 -0.2 + vertex -8.06691 -19.2358 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.59396 -25.347 -0.1 - vertex -8.71232 -24.8218 -0.1 - vertex -5.05721 -26.548 -0.1 + vertex -4.59396 -25.347 -0.2 + vertex -8.71232 -24.8218 -0.2 + vertex -5.05721 -26.548 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -9.05502 -25.8283 -0.1 - vertex -5.05721 -26.548 -0.1 - vertex -8.71232 -24.8218 -0.1 + vertex -9.05502 -25.8283 -0.2 + vertex -5.05721 -26.548 -0.2 + vertex -8.71232 -24.8218 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.77736 -22.7249 -0.1 - vertex -8.06691 -19.2358 -0.1 - vertex -8.43701 -19.2929 -0.1 + vertex -8.77736 -22.7249 -0.2 + vertex -8.06691 -19.2358 -0.2 + vertex -8.43701 -19.2929 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -8.71232 -24.8218 -0.1 - vertex -4.59396 -25.347 -0.1 - vertex -8.59455 -24.3995 -0.1 + vertex -8.71232 -24.8218 -0.2 + vertex -4.59396 -25.347 -0.2 + vertex -8.59455 -24.3995 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.05721 -26.548 -0.1 - vertex -9.05502 -25.8283 -0.1 - vertex -5.65492 -27.9982 -0.1 + vertex -5.05721 -26.548 -0.2 + vertex -9.05502 -25.8283 -0.2 + vertex -5.65492 -27.9982 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -9.5401 -27.0667 -0.1 - vertex -5.65492 -27.9982 -0.1 - vertex -9.05502 -25.8283 -0.1 + vertex -9.5401 -27.0667 -0.2 + vertex -5.65492 -27.9982 -0.2 + vertex -9.05502 -25.8283 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.65492 -27.9982 -0.1 - vertex -9.5401 -27.0667 -0.1 - vertex -6.39994 -29.738 -0.1 + vertex -5.65492 -27.9982 -0.2 + vertex -9.5401 -27.0667 -0.2 + vertex -6.39994 -29.738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.5815 -32.143 -0.1 - vertex -6.39994 -29.738 -0.1 - vertex -9.5401 -27.0667 -0.1 + vertex -11.5815 -32.143 -0.2 + vertex -6.39994 -29.738 -0.2 + vertex -9.5401 -27.0667 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.39994 -29.738 -0.1 - vertex -11.5815 -32.143 -0.1 - vertex -7.70823 -32.8163 -0.1 + vertex -6.39994 -29.738 -0.2 + vertex -11.5815 -32.143 -0.2 + vertex -7.70823 -32.8163 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.30266 -36.7536 -0.1 - vertex -7.30695 -36.9638 -0.1 - vertex -7.29619 -36.8569 -0.1 + vertex -7.30266 -36.7536 -0.2 + vertex -7.30695 -36.9638 -0.2 + vertex -7.29619 -36.8569 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.32635 -36.6539 -0.1 - vertex -7.30695 -36.9638 -0.1 - vertex -7.30266 -36.7536 -0.1 + vertex -7.32635 -36.6539 -0.2 + vertex -7.30695 -36.9638 -0.2 + vertex -7.30266 -36.7536 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.36727 -36.5579 -0.1 - vertex -7.30695 -36.9638 -0.1 - vertex -7.32635 -36.6539 -0.1 + vertex -7.36727 -36.5579 -0.2 + vertex -7.30695 -36.9638 -0.2 + vertex -7.32635 -36.6539 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.50076 -36.3769 -0.1 - vertex -7.30695 -36.9638 -0.1 - vertex -7.36727 -36.5579 -0.1 + vertex -7.50076 -36.3769 -0.2 + vertex -7.30695 -36.9638 -0.2 + vertex -7.36727 -36.5579 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.30695 -36.9638 -0.1 - vertex -7.50076 -36.3769 -0.1 - vertex -7.38017 -37.1883 -0.1 + vertex -7.30695 -36.9638 -0.2 + vertex -7.50076 -36.3769 -0.2 + vertex -7.38017 -37.1883 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.70312 -36.2106 -0.1 - vertex -7.38017 -37.1883 -0.1 - vertex -7.50076 -36.3769 -0.1 + vertex -7.70312 -36.2106 -0.2 + vertex -7.38017 -37.1883 -0.2 + vertex -7.50076 -36.3769 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.38017 -37.1883 -0.1 - vertex -7.70312 -36.2106 -0.1 - vertex -7.52232 -37.4271 -0.1 + vertex -7.38017 -37.1883 -0.2 + vertex -7.70312 -36.2106 -0.2 + vertex -7.52232 -37.4271 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.97432 -36.0592 -0.1 - vertex -7.52232 -37.4271 -0.1 - vertex -7.70312 -36.2106 -0.1 + vertex -7.97432 -36.0592 -0.2 + vertex -7.52232 -37.4271 -0.2 + vertex -7.70312 -36.2106 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.52232 -37.4271 -0.1 - vertex -7.97432 -36.0592 -0.1 - vertex -7.73344 -37.6801 -0.1 + vertex -7.52232 -37.4271 -0.2 + vertex -7.97432 -36.0592 -0.2 + vertex -7.73344 -37.6801 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.73344 -37.6801 -0.1 - vertex -7.97432 -36.0592 -0.1 - vertex -7.8903 -37.8311 -0.1 + vertex -7.73344 -37.6801 -0.2 + vertex -7.97432 -36.0592 -0.2 + vertex -7.8903 -37.8311 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.30871 -38.0303 -0.1 - vertex -7.8903 -37.8311 -0.1 - vertex -7.97432 -36.0592 -0.1 + vertex -8.30871 -38.0303 -0.2 + vertex -7.8903 -37.8311 -0.2 + vertex -7.97432 -36.0592 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.30871 -38.0303 -0.1 - vertex -7.97432 -36.0592 -0.1 - vertex -8.30497 -35.8814 -0.1 + vertex -8.30871 -38.0303 -0.2 + vertex -7.97432 -36.0592 -0.2 + vertex -8.30497 -35.8814 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.8903 -37.8311 -0.1 - vertex -8.30871 -38.0303 -0.1 - vertex -8.0676 -37.9462 -0.1 + vertex -7.8903 -37.8311 -0.2 + vertex -8.30871 -38.0303 -0.2 + vertex -8.0676 -37.9462 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.15585 -38.1249 -0.1 - vertex -8.30497 -35.8814 -0.1 - vertex -8.41808 -35.7975 -0.1 + vertex -9.15585 -38.1249 -0.2 + vertex -8.30497 -35.8814 -0.2 + vertex -8.41808 -35.7975 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.15585 -38.1249 -0.1 - vertex -8.41808 -35.7975 -0.1 - vertex -8.49955 -35.7129 -0.1 + vertex -9.15585 -38.1249 -0.2 + vertex -8.41808 -35.7975 -0.2 + vertex -8.49955 -35.7129 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.84865 -38.1451 -0.1 - vertex -8.49955 -35.7129 -0.1 - vertex -8.55176 -35.6244 -0.1 + vertex -9.84865 -38.1451 -0.2 + vertex -8.49955 -35.7129 -0.2 + vertex -8.55176 -35.6244 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.84865 -38.1451 -0.1 - vertex -8.55176 -35.6244 -0.1 - vertex -8.57707 -35.529 -0.1 + vertex -9.84865 -38.1451 -0.2 + vertex -8.55176 -35.6244 -0.2 + vertex -8.57707 -35.529 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.30497 -35.8814 -0.1 - vertex -8.657 -38.0883 -0.1 - vertex -8.30871 -38.0303 -0.1 + vertex -8.30497 -35.8814 -0.2 + vertex -8.657 -38.0883 -0.2 + vertex -8.30871 -38.0303 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.6843 -34.4922 -0.1 - vertex -8.57707 -35.529 -0.1 - vertex -8.57785 -35.4236 -0.1 + vertex -12.6843 -34.4922 -0.2 + vertex -8.57707 -35.529 -0.2 + vertex -8.57785 -35.4236 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.70823 -32.8163 -0.1 - vertex -11.5815 -32.143 -0.1 - vertex -8.13453 -33.8652 -0.1 + vertex -7.70823 -32.8163 -0.2 + vertex -11.5815 -32.143 -0.2 + vertex -8.13453 -33.8652 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -11.9595 -33.0513 -0.1 - vertex -8.13453 -33.8652 -0.1 - vertex -11.5815 -32.143 -0.1 + vertex -11.9595 -33.0513 -0.2 + vertex -8.13453 -33.8652 -0.2 + vertex -11.5815 -32.143 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.13453 -33.8652 -0.1 - vertex -11.9595 -33.0513 -0.1 - vertex -8.32474 -34.384 -0.1 + vertex -8.13453 -33.8652 -0.2 + vertex -11.9595 -33.0513 -0.2 + vertex -8.32474 -34.384 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -12.3268 -33.8339 -0.1 - vertex -8.32474 -34.384 -0.1 - vertex -11.9595 -33.0513 -0.1 + vertex -12.3268 -33.8339 -0.2 + vertex -8.32474 -34.384 -0.2 + vertex -11.9595 -33.0513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.32474 -34.384 -0.1 - vertex -12.3268 -33.8339 -0.1 - vertex -8.55649 -35.3052 -0.1 + vertex -8.32474 -34.384 -0.2 + vertex -12.3268 -33.8339 -0.2 + vertex -8.55649 -35.3052 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.55649 -35.3052 -0.1 - vertex -12.3268 -33.8339 -0.1 - vertex -8.57785 -35.4236 -0.1 + vertex -8.55649 -35.3052 -0.2 + vertex -12.3268 -33.8339 -0.2 + vertex -8.57785 -35.4236 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.30497 -35.8814 -0.1 - vertex -9.15585 -38.1249 -0.1 - vertex -8.657 -38.0883 -0.1 + vertex -8.30497 -35.8814 -0.2 + vertex -9.15585 -38.1249 -0.2 + vertex -8.657 -38.0883 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -12.6843 -34.4922 -0.1 - vertex -8.57785 -35.4236 -0.1 - vertex -12.3268 -33.8339 -0.1 + vertex -12.6843 -34.4922 -0.2 + vertex -8.57785 -35.4236 -0.2 + vertex -12.3268 -33.8339 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.49955 -35.7129 -0.1 - vertex -9.84865 -38.1451 -0.1 - vertex -9.15585 -38.1249 -0.1 + vertex -8.49955 -35.7129 -0.2 + vertex -9.84865 -38.1451 -0.2 + vertex -9.15585 -38.1249 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -8.57707 -35.529 -0.1 - vertex -12.6843 -34.4922 -0.1 - vertex -9.84865 -38.1451 -0.1 + vertex -8.57707 -35.529 -0.2 + vertex -12.6843 -34.4922 -0.2 + vertex -9.84865 -38.1451 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.0331 -35.0276 -0.1 - vertex -9.84865 -38.1451 -0.1 - vertex -12.6843 -34.4922 -0.1 + vertex -13.0331 -35.0276 -0.2 + vertex -9.84865 -38.1451 -0.2 + vertex -12.6843 -34.4922 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.84865 -38.1451 -0.1 - vertex -13.0331 -35.0276 -0.1 - vertex -11.9896 -38.1555 -0.1 + vertex -9.84865 -38.1451 -0.2 + vertex -13.0331 -35.0276 -0.2 + vertex -11.9896 -38.1555 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.2045 -35.2497 -0.1 - vertex -11.9896 -38.1555 -0.1 - vertex -13.0331 -35.0276 -0.1 + vertex -13.2045 -35.2497 -0.2 + vertex -11.9896 -38.1555 -0.2 + vertex -13.0331 -35.0276 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.3741 -35.4417 -0.1 - vertex -11.9896 -38.1555 -0.1 - vertex -13.2045 -35.2497 -0.1 + vertex -13.3741 -35.4417 -0.2 + vertex -11.9896 -38.1555 -0.2 + vertex -13.2045 -35.2497 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.5421 -35.6036 -0.1 - vertex -11.9896 -38.1555 -0.1 - vertex -13.3741 -35.4417 -0.1 + vertex -13.5421 -35.6036 -0.2 + vertex -11.9896 -38.1555 -0.2 + vertex -13.3741 -35.4417 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.7085 -35.7356 -0.1 - vertex -11.9896 -38.1555 -0.1 - vertex -13.5421 -35.6036 -0.1 + vertex -13.7085 -35.7356 -0.2 + vertex -11.9896 -38.1555 -0.2 + vertex -13.5421 -35.6036 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.8736 -35.838 -0.1 - vertex -11.9896 -38.1555 -0.1 - vertex -13.7085 -35.7356 -0.1 + vertex -13.8736 -35.838 -0.2 + vertex -11.9896 -38.1555 -0.2 + vertex -13.7085 -35.7356 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.1677 -38.1469 -0.1 - vertex -13.8736 -35.838 -0.1 - vertex -14.0373 -35.911 -0.1 + vertex -14.1677 -38.1469 -0.2 + vertex -13.8736 -35.838 -0.2 + vertex -14.0373 -35.911 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.8736 -35.838 -0.1 - vertex -14.1677 -38.1469 -0.1 - vertex -11.9896 -38.1555 -0.1 + vertex -13.8736 -35.838 -0.2 + vertex -14.1677 -38.1469 -0.2 + vertex -11.9896 -38.1555 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.1999 -35.9546 -0.1 - vertex -14.1677 -38.1469 -0.1 - vertex -14.0373 -35.911 -0.1 + vertex -14.1999 -35.9546 -0.2 + vertex -14.1677 -38.1469 -0.2 + vertex -14.0373 -35.911 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.3614 -35.9691 -0.1 - vertex -14.1677 -38.1469 -0.1 - vertex -14.1999 -35.9546 -0.1 + vertex -14.3614 -35.9691 -0.2 + vertex -14.1677 -38.1469 -0.2 + vertex -14.1999 -35.9546 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.5979 -36.0176 -0.1 - vertex -14.3614 -35.9691 -0.1 - vertex -14.4713 -35.9816 -0.1 + vertex -14.5979 -36.0176 -0.2 + vertex -14.3614 -35.9691 -0.2 + vertex -14.4713 -35.9816 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.3614 -35.9691 -0.1 - vertex -14.5979 -36.0176 -0.1 - vertex -14.1677 -38.1469 -0.1 + vertex -14.3614 -35.9691 -0.2 + vertex -14.5979 -36.0176 -0.2 + vertex -14.1677 -38.1469 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.8831 -36.1495 -0.1 - vertex -14.1677 -38.1469 -0.1 - vertex -14.5979 -36.0176 -0.1 + vertex -14.8831 -36.1495 -0.2 + vertex -14.1677 -38.1469 -0.2 + vertex -14.5979 -36.0176 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.1813 -36.3448 -0.1 - vertex -14.1677 -38.1469 -0.1 - vertex -14.8831 -36.1495 -0.1 + vertex -15.1813 -36.3448 -0.2 + vertex -14.1677 -38.1469 -0.2 + vertex -14.8831 -36.1495 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.1677 -38.1469 -0.1 - vertex -15.1813 -36.3448 -0.1 - vertex -14.8486 -38.1282 -0.1 + vertex -14.1677 -38.1469 -0.2 + vertex -15.1813 -36.3448 -0.2 + vertex -14.8486 -38.1282 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.4564 -36.5832 -0.1 - vertex -14.8486 -38.1282 -0.1 - vertex -15.1813 -36.3448 -0.1 + vertex -15.4564 -36.5832 -0.2 + vertex -14.8486 -38.1282 -0.2 + vertex -15.1813 -36.3448 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.7439 -36.902 -0.1 - vertex -14.8486 -38.1282 -0.1 - vertex -15.4564 -36.5832 -0.1 + vertex -15.7439 -36.902 -0.2 + vertex -14.8486 -38.1282 -0.2 + vertex -15.4564 -36.5832 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.8486 -38.1282 -0.1 - vertex -15.7439 -36.902 -0.1 - vertex -15.316 -38.0928 -0.1 + vertex -14.8486 -38.1282 -0.2 + vertex -15.7439 -36.902 -0.2 + vertex -15.316 -38.0928 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.8411 -37.0399 -0.1 - vertex -15.316 -38.0928 -0.1 - vertex -15.7439 -36.902 -0.1 + vertex -15.8411 -37.0399 -0.2 + vertex -15.316 -38.0928 -0.2 + vertex -15.7439 -36.902 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.9096 -37.1689 -0.1 - vertex -15.316 -38.0928 -0.1 - vertex -15.8411 -37.0399 -0.1 + vertex -15.9096 -37.1689 -0.2 + vertex -15.316 -38.0928 -0.2 + vertex -15.8411 -37.0399 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.9604 -37.5428 -0.1 - vertex -15.316 -38.0928 -0.1 - vertex -15.9096 -37.1689 -0.1 + vertex -15.9604 -37.5428 -0.2 + vertex -15.316 -38.0928 -0.2 + vertex -15.9096 -37.1689 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.316 -38.0928 -0.1 - vertex -15.9604 -37.5428 -0.1 - vertex -15.614 -38.0352 -0.1 + vertex -15.316 -38.0928 -0.2 + vertex -15.9604 -37.5428 -0.2 + vertex -15.614 -38.0352 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.614 -38.0352 -0.1 - vertex -15.8777 -37.8324 -0.1 - vertex -15.7132 -37.9965 -0.1 + vertex -15.614 -38.0352 -0.2 + vertex -15.8777 -37.8324 -0.2 + vertex -15.7132 -37.9965 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.7132 -37.9965 -0.1 - vertex -15.8777 -37.8324 -0.1 - vertex -15.7865 -37.9502 -0.1 + vertex -15.7132 -37.9965 -0.2 + vertex -15.8777 -37.8324 -0.2 + vertex -15.7865 -37.9502 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -15.9316 -37.6764 -0.1 - vertex -15.614 -38.0352 -0.1 - vertex -15.9604 -37.5428 -0.1 + vertex -15.9316 -37.6764 -0.2 + vertex -15.614 -38.0352 -0.2 + vertex -15.9604 -37.5428 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.7865 -37.9502 -0.1 - vertex -15.8777 -37.8324 -0.1 - vertex -15.8396 -37.8957 -0.1 + vertex -15.7865 -37.9502 -0.2 + vertex -15.8777 -37.8324 -0.2 + vertex -15.8396 -37.8957 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.9604 -37.5428 -0.1 - vertex -15.9096 -37.1689 -0.1 - vertex -15.9511 -37.293 -0.1 + vertex -15.9604 -37.5428 -0.2 + vertex -15.9096 -37.1689 -0.2 + vertex -15.9511 -37.293 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -15.8777 -37.8324 -0.1 - vertex -15.614 -38.0352 -0.1 - vertex -15.9316 -37.6764 -0.1 + vertex -15.8777 -37.8324 -0.2 + vertex -15.614 -38.0352 -0.2 + vertex -15.9316 -37.6764 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex -15.9604 -37.5428 -0.1 - vertex -15.9511 -37.293 -0.1 - vertex -15.9675 -37.4163 -0.1 + vertex -15.9604 -37.5428 -0.2 + vertex -15.9511 -37.293 -0.2 + vertex -15.9675 -37.4163 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5311 -26.6889 -0.1 - vertex -14.2098 -26.3227 -0.1 - vertex -17.6656 -24.469 -0.1 + vertex -18.5311 -26.6889 -0.2 + vertex -14.2098 -26.3227 -0.2 + vertex -17.6656 -24.469 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.2098 -26.3227 -0.1 - vertex -18.5311 -26.6889 -0.1 - vertex -15.3777 -29.1914 -0.1 + vertex -14.2098 -26.3227 -0.2 + vertex -18.5311 -26.6889 -0.2 + vertex -15.3777 -29.1914 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.7699 -29.7113 -0.1 - vertex -15.3777 -29.1914 -0.1 - vertex -18.5311 -26.6889 -0.1 + vertex -19.7699 -29.7113 -0.2 + vertex -15.3777 -29.1914 -0.2 + vertex -18.5311 -26.6889 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.3777 -29.1914 -0.1 - vertex -19.7699 -29.7113 -0.1 - vertex -16.8163 -32.7116 -0.1 + vertex -15.3777 -29.1914 -0.2 + vertex -19.7699 -29.7113 -0.2 + vertex -16.8163 -32.7116 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2682 -33.2523 -0.1 - vertex -16.8163 -32.7116 -0.1 - vertex -19.7699 -29.7113 -0.1 + vertex -21.2682 -33.2523 -0.2 + vertex -16.8163 -32.7116 -0.2 + vertex -19.7699 -29.7113 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.8163 -32.7116 -0.1 - vertex -21.2682 -33.2523 -0.1 - vertex -17.1674 -33.591 -0.1 + vertex -16.8163 -32.7116 -0.2 + vertex -21.2682 -33.2523 -0.2 + vertex -17.1674 -33.591 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.1674 -33.591 -0.1 - vertex -21.2682 -33.2523 -0.1 - vertex -17.4329 -34.3072 -0.1 + vertex -17.1674 -33.591 -0.2 + vertex -21.2682 -33.2523 -0.2 + vertex -17.4329 -34.3072 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4329 -34.3072 -0.1 - vertex -21.2682 -33.2523 -0.1 - vertex -17.6153 -34.8741 -0.1 + vertex -17.4329 -34.3072 -0.2 + vertex -21.2682 -33.2523 -0.2 + vertex -17.6153 -34.8741 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.6072 -34.0169 -0.1 - vertex -17.6153 -34.8741 -0.1 - vertex -21.2682 -33.2523 -0.1 + vertex -21.6072 -34.0169 -0.2 + vertex -17.6153 -34.8741 -0.2 + vertex -21.2682 -33.2523 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.6153 -34.8741 -0.1 - vertex -21.6072 -34.0169 -0.1 - vertex -17.7168 -35.3062 -0.1 + vertex -17.6153 -34.8741 -0.2 + vertex -21.6072 -34.0169 -0.2 + vertex -17.7168 -35.3062 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7168 -35.3062 -0.1 - vertex -21.6072 -34.0169 -0.1 - vertex -17.738 -35.4761 -0.1 + vertex -17.7168 -35.3062 -0.2 + vertex -21.6072 -34.0169 -0.2 + vertex -17.738 -35.4761 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.9074 -34.6287 -0.1 - vertex -17.738 -35.4761 -0.1 - vertex -21.6072 -34.0169 -0.1 + vertex -21.9074 -34.6287 -0.2 + vertex -17.738 -35.4761 -0.2 + vertex -21.6072 -34.0169 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7399 -35.6175 -0.1 - vertex -18.7028 -38.1359 -0.1 - vertex -18.0369 -38.1201 -0.1 + vertex -17.7399 -35.6175 -0.2 + vertex -18.7028 -38.1359 -0.2 + vertex -18.0369 -38.1201 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.738 -35.4761 -0.1 - vertex -21.9074 -34.6287 -0.1 - vertex -17.7399 -35.6175 -0.1 + vertex -17.738 -35.4761 -0.2 + vertex -21.9074 -34.6287 -0.2 + vertex -17.7399 -35.6175 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex -20.8109 -38.1301 -0.1 - vertex -17.7399 -35.6175 -0.1 - vertex -21.9074 -34.6287 -0.1 + vertex -20.8109 -38.1301 -0.2 + vertex -17.7399 -35.6175 -0.2 + vertex -21.9074 -34.6287 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.7399 -35.6175 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -18.7028 -38.1359 -0.1 + vertex -17.7399 -35.6175 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -18.7028 -38.1359 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.1824 -35.1035 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -21.9074 -34.6287 -0.1 + vertex -22.1824 -35.1035 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -21.9074 -34.6287 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.4463 -35.4568 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -22.1824 -35.1035 -0.1 + vertex -22.4463 -35.4568 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -22.1824 -35.1035 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.5782 -35.5929 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -22.4463 -35.4568 -0.1 + vertex -22.5782 -35.5929 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -22.4463 -35.4568 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.7126 -35.7044 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -22.5782 -35.5929 -0.1 + vertex -22.7126 -35.7044 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -22.5782 -35.5929 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.8511 -35.7934 -0.1 - vertex -20.8109 -38.1301 -0.1 - vertex -22.7126 -35.7044 -0.1 + vertex -22.8511 -35.7934 -0.2 + vertex -20.8109 -38.1301 -0.2 + vertex -22.7126 -35.7044 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4866 -38.0828 -0.1 - vertex -22.8511 -35.7934 -0.1 - vertex -22.9953 -35.8619 -0.1 + vertex -23.4866 -38.0828 -0.2 + vertex -22.8511 -35.7934 -0.2 + vertex -22.9953 -35.8619 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4866 -38.0828 -0.1 - vertex -22.9953 -35.8619 -0.1 - vertex -23.1471 -35.9117 -0.1 + vertex -23.4866 -38.0828 -0.2 + vertex -22.9953 -35.8619 -0.2 + vertex -23.1471 -35.9117 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4866 -38.0828 -0.1 - vertex -23.1471 -35.9117 -0.1 - vertex -23.3082 -35.9449 -0.1 + vertex -23.4866 -38.0828 -0.2 + vertex -23.1471 -35.9117 -0.2 + vertex -23.3082 -35.9449 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.8511 -35.7934 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -20.8109 -38.1301 -0.1 + vertex -22.8511 -35.7934 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -20.8109 -38.1301 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -23.665 -35.9691 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -23.3082 -35.9449 -0.1 + vertex -23.665 -35.9691 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -23.3082 -35.9449 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -23.8593 -35.9891 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -23.665 -35.9691 -0.1 + vertex -23.8593 -35.9891 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -23.665 -35.9691 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.0497 -36.0458 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -23.8593 -35.9891 -0.1 + vertex -24.0497 -36.0458 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -23.8593 -35.9891 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.2334 -36.1344 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -24.0497 -36.0458 -0.1 + vertex -24.2334 -36.1344 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -24.0497 -36.0458 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.4077 -36.2501 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -24.2334 -36.1344 -0.1 + vertex -24.4077 -36.2501 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -24.2334 -36.1344 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.57 -36.3881 -0.1 - vertex -23.4866 -38.0828 -0.1 - vertex -24.4077 -36.2501 -0.1 + vertex -24.57 -36.3881 -0.2 + vertex -23.4866 -38.0828 -0.2 + vertex -24.4077 -36.2501 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.4866 -38.0828 -0.1 - vertex -24.57 -36.3881 -0.1 - vertex -24.3782 -38.0456 -0.1 + vertex -23.4866 -38.0828 -0.2 + vertex -24.57 -36.3881 -0.2 + vertex -24.3782 -38.0456 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.7177 -36.5437 -0.1 - vertex -24.3782 -38.0456 -0.1 - vertex -24.57 -36.3881 -0.1 + vertex -24.7177 -36.5437 -0.2 + vertex -24.3782 -38.0456 -0.2 + vertex -24.57 -36.3881 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.8479 -36.7119 -0.1 - vertex -24.3782 -38.0456 -0.1 - vertex -24.7177 -36.5437 -0.1 + vertex -24.8479 -36.7119 -0.2 + vertex -24.3782 -38.0456 -0.2 + vertex -24.7177 -36.5437 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.9582 -36.888 -0.1 - vertex -24.3782 -38.0456 -0.1 - vertex -24.8479 -36.7119 -0.1 + vertex -24.9582 -36.888 -0.2 + vertex -24.3782 -38.0456 -0.2 + vertex -24.8479 -36.7119 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.0457 -37.0673 -0.1 - vertex -24.3782 -38.0456 -0.1 - vertex -24.9582 -36.888 -0.1 + vertex -25.0457 -37.0673 -0.2 + vertex -24.3782 -38.0456 -0.2 + vertex -24.9582 -36.888 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.1078 -37.2448 -0.1 - vertex -24.3782 -38.0456 -0.1 - vertex -25.0457 -37.0673 -0.1 + vertex -25.1078 -37.2448 -0.2 + vertex -24.3782 -38.0456 -0.2 + vertex -25.0457 -37.0673 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.3782 -38.0456 -0.1 - vertex -25.1078 -37.2448 -0.1 - vertex -24.7978 -38.0047 -0.1 + vertex -24.3782 -38.0456 -0.2 + vertex -25.1078 -37.2448 -0.2 + vertex -24.7978 -38.0047 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.1419 -37.4158 -0.1 - vertex -24.7978 -38.0047 -0.1 - vertex -25.1078 -37.2448 -0.1 + vertex -25.1419 -37.4158 -0.2 + vertex -24.7978 -38.0047 -0.2 + vertex -25.1078 -37.2448 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -25.1453 -37.5754 -0.1 - vertex -24.7978 -38.0047 -0.1 - vertex -25.1419 -37.4158 -0.1 + vertex -25.1453 -37.5754 -0.2 + vertex -24.7978 -38.0047 -0.2 + vertex -25.1419 -37.4158 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.7978 -38.0047 -0.1 - vertex -25.1453 -37.5754 -0.1 - vertex -24.9442 -37.9384 -0.1 + vertex -24.7978 -38.0047 -0.2 + vertex -25.1453 -37.5754 -0.2 + vertex -24.9442 -37.9384 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -25.1152 -37.719 -0.1 - vertex -24.9442 -37.9384 -0.1 - vertex -25.1453 -37.5754 -0.1 + vertex -25.1152 -37.719 -0.2 + vertex -24.9442 -37.9384 -0.2 + vertex -25.1453 -37.5754 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.9442 -37.9384 -0.1 - vertex -25.1152 -37.719 -0.1 - vertex -25.0491 -37.8416 -0.1 + vertex -24.9442 -37.9384 -0.2 + vertex -25.1152 -37.719 -0.2 + vertex -25.0491 -37.8416 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.237 -36.6071 -0.1 - vertex -16.2485 -36.9225 -0.1 - vertex -16.2109 -36.752 -0.1 + vertex -16.237 -36.6071 -0.2 + vertex -16.2485 -36.9225 -0.2 + vertex -16.2109 -36.752 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.3106 -36.4662 -0.1 - vertex -16.2485 -36.9225 -0.1 - vertex -16.237 -36.6071 -0.1 + vertex -16.3106 -36.4662 -0.2 + vertex -16.2485 -36.9225 -0.2 + vertex -16.237 -36.6071 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.4249 -36.334 -0.1 - vertex -16.2485 -36.9225 -0.1 - vertex -16.3106 -36.4662 -0.1 + vertex -16.4249 -36.334 -0.2 + vertex -16.2485 -36.9225 -0.2 + vertex -16.3106 -36.4662 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.2485 -36.9225 -0.1 - vertex -16.4249 -36.334 -0.1 - vertex -16.3508 -37.1428 -0.1 + vertex -16.2485 -36.9225 -0.2 + vertex -16.4249 -36.334 -0.2 + vertex -16.3508 -37.1428 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.5729 -36.2152 -0.1 - vertex -16.3508 -37.1428 -0.1 - vertex -16.4249 -36.334 -0.1 + vertex -16.5729 -36.2152 -0.2 + vertex -16.3508 -37.1428 -0.2 + vertex -16.4249 -36.334 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.7476 -36.1146 -0.1 - vertex -16.3508 -37.1428 -0.1 - vertex -16.5729 -36.2152 -0.1 + vertex -16.7476 -36.1146 -0.2 + vertex -16.3508 -37.1428 -0.2 + vertex -16.5729 -36.2152 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.3508 -37.1428 -0.1 - vertex -16.7476 -36.1146 -0.1 - vertex -16.5023 -37.3844 -0.1 + vertex -16.3508 -37.1428 -0.2 + vertex -16.7476 -36.1146 -0.2 + vertex -16.5023 -37.3844 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.942 -36.0369 -0.1 - vertex -16.5023 -37.3844 -0.1 - vertex -16.7476 -36.1146 -0.1 + vertex -16.942 -36.0369 -0.2 + vertex -16.5023 -37.3844 -0.2 + vertex -16.7476 -36.1146 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.1493 -35.9869 -0.1 - vertex -16.5023 -37.3844 -0.1 - vertex -16.942 -36.0369 -0.1 + vertex -17.1493 -35.9869 -0.2 + vertex -16.5023 -37.3844 -0.2 + vertex -16.942 -36.0369 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.5023 -37.3844 -0.1 - vertex -17.1493 -35.9869 -0.1 - vertex -16.6872 -37.6188 -0.1 + vertex -16.5023 -37.3844 -0.2 + vertex -17.1493 -35.9869 -0.2 + vertex -16.6872 -37.6188 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.3625 -35.9691 -0.1 - vertex -16.6872 -37.6188 -0.1 - vertex -17.1493 -35.9869 -0.1 + vertex -17.3625 -35.9691 -0.2 + vertex -16.6872 -37.6188 -0.2 + vertex -17.1493 -35.9869 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4702 -35.9608 -0.1 - vertex -16.6872 -37.6188 -0.1 - vertex -17.3625 -35.9691 -0.1 + vertex -17.4702 -35.9608 -0.2 + vertex -16.6872 -37.6188 -0.2 + vertex -17.3625 -35.9691 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.6872 -37.6188 -0.1 - vertex -17.4702 -35.9608 -0.1 - vertex -16.8516 -37.795 -0.1 + vertex -16.6872 -37.6188 -0.2 + vertex -17.4702 -35.9608 -0.2 + vertex -16.8516 -37.795 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex -17.2437 -38.0218 -0.1 - vertex -16.8516 -37.795 -0.1 - vertex -17.4702 -35.9608 -0.1 + vertex -17.2437 -38.0218 -0.2 + vertex -16.8516 -37.795 -0.2 + vertex -17.4702 -35.9608 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.8516 -37.795 -0.1 - vertex -17.2437 -38.0218 -0.1 - vertex -17.0213 -37.9274 -0.1 + vertex -16.8516 -37.795 -0.2 + vertex -17.2437 -38.0218 -0.2 + vertex -17.0213 -37.9274 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.5664 -38.0841 -0.1 - vertex -17.4702 -35.9608 -0.1 - vertex -17.5603 -35.9348 -0.1 + vertex -17.5664 -38.0841 -0.2 + vertex -17.4702 -35.9608 -0.2 + vertex -17.5603 -35.9348 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.4702 -35.9608 -0.1 - vertex -17.5664 -38.0841 -0.1 - vertex -17.2437 -38.0218 -0.1 + vertex -17.4702 -35.9608 -0.2 + vertex -17.5664 -38.0841 -0.2 + vertex -17.2437 -38.0218 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.0369 -38.1201 -0.1 - vertex -17.5603 -35.9348 -0.1 - vertex -17.6327 -35.8892 -0.1 + vertex -18.0369 -38.1201 -0.2 + vertex -17.5603 -35.9348 -0.2 + vertex -17.6327 -35.8892 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.0369 -38.1201 -0.1 - vertex -17.6327 -35.8892 -0.1 - vertex -17.6869 -35.8223 -0.1 + vertex -18.0369 -38.1201 -0.2 + vertex -17.6327 -35.8892 -0.2 + vertex -17.6869 -35.8223 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.0369 -38.1201 -0.1 - vertex -17.6869 -35.8223 -0.1 - vertex -17.7228 -35.7323 -0.1 + vertex -18.0369 -38.1201 -0.2 + vertex -17.6869 -35.8223 -0.2 + vertex -17.7228 -35.7323 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.0369 -38.1201 -0.1 - vertex -17.7228 -35.7323 -0.1 - vertex -17.7399 -35.6175 -0.1 + vertex -18.0369 -38.1201 -0.2 + vertex -17.7228 -35.7323 -0.2 + vertex -17.7399 -35.6175 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.5603 -35.9348 -0.1 - vertex -18.0369 -38.1201 -0.1 - vertex -17.5664 -38.0841 -0.1 + vertex -17.5603 -35.9348 -0.2 + vertex -18.0369 -38.1201 -0.2 + vertex -17.5664 -38.0841 -0.2 endloop endfacet facet normal -0.362708 -0.931903 0 outer loop - vertex -12.0792 -19.1571 -0.1 + vertex -12.0792 -19.1571 -0.2 vertex -11.9023 -19.2259 0 vertex -12.0792 -19.1571 0 endloop @@ -16067,13 +16067,13 @@ solid OpenSCAD_Model facet normal -0.362708 -0.931903 -0 outer loop vertex -11.9023 -19.2259 0 - vertex -12.0792 -19.1571 -0.1 - vertex -11.9023 -19.2259 -0.1 + vertex -12.0792 -19.1571 -0.2 + vertex -11.9023 -19.2259 -0.2 endloop endfacet facet normal -0.651552 -0.758604 0 outer loop - vertex -11.9023 -19.2259 -0.1 + vertex -11.9023 -19.2259 -0.2 vertex -11.7723 -19.3375 0 vertex -11.9023 -19.2259 0 endloop @@ -16081,125 +16081,125 @@ solid OpenSCAD_Model facet normal -0.651552 -0.758604 -0 outer loop vertex -11.7723 -19.3375 0 - vertex -11.9023 -19.2259 -0.1 - vertex -11.7723 -19.3375 -0.1 + vertex -11.9023 -19.2259 -0.2 + vertex -11.7723 -19.3375 -0.2 endloop endfacet facet normal -0.879356 -0.476164 0 outer loop - vertex -11.6899 -19.4898 -0.1 + vertex -11.6899 -19.4898 -0.2 vertex -11.7723 -19.3375 0 - vertex -11.7723 -19.3375 -0.1 + vertex -11.7723 -19.3375 -0.2 endloop endfacet facet normal -0.879356 -0.476164 0 outer loop vertex -11.7723 -19.3375 0 - vertex -11.6899 -19.4898 -0.1 + vertex -11.6899 -19.4898 -0.2 vertex -11.6899 -19.4898 0 endloop endfacet facet normal -0.98435 -0.176224 0 outer loop - vertex -11.6557 -19.6804 -0.1 + vertex -11.6557 -19.6804 -0.2 vertex -11.6899 -19.4898 0 - vertex -11.6899 -19.4898 -0.1 + vertex -11.6899 -19.4898 -0.2 endloop endfacet facet normal -0.98435 -0.176224 0 outer loop vertex -11.6899 -19.4898 0 - vertex -11.6557 -19.6804 -0.1 + vertex -11.6557 -19.6804 -0.2 vertex -11.6557 -19.6804 0 endloop endfacet facet normal -0.997828 0.0658663 0 outer loop - vertex -11.6707 -19.9072 -0.1 + vertex -11.6707 -19.9072 -0.2 vertex -11.6557 -19.6804 0 - vertex -11.6557 -19.6804 -0.1 + vertex -11.6557 -19.6804 -0.2 endloop endfacet facet normal -0.997828 0.0658663 0 outer loop vertex -11.6557 -19.6804 0 - vertex -11.6707 -19.9072 -0.1 + vertex -11.6707 -19.9072 -0.2 vertex -11.6707 -19.9072 0 endloop endfacet facet normal -0.970423 0.241411 0 outer loop - vertex -11.7355 -20.1677 -0.1 + vertex -11.7355 -20.1677 -0.2 vertex -11.6707 -19.9072 0 - vertex -11.6707 -19.9072 -0.1 + vertex -11.6707 -19.9072 -0.2 endloop endfacet facet normal -0.970423 0.241411 0 outer loop vertex -11.6707 -19.9072 0 - vertex -11.7355 -20.1677 -0.1 + vertex -11.7355 -20.1677 -0.2 vertex -11.7355 -20.1677 0 endloop endfacet facet normal -0.930032 0.367479 0 outer loop - vertex -11.851 -20.4599 -0.1 + vertex -11.851 -20.4599 -0.2 vertex -11.7355 -20.1677 0 - vertex -11.7355 -20.1677 -0.1 + vertex -11.7355 -20.1677 -0.2 endloop endfacet facet normal -0.930032 0.367479 0 outer loop vertex -11.7355 -20.1677 0 - vertex -11.851 -20.4599 -0.1 + vertex -11.851 -20.4599 -0.2 vertex -11.851 -20.4599 0 endloop endfacet facet normal -0.930941 0.365169 0 outer loop - vertex -12.0288 -20.9134 -0.1 + vertex -12.0288 -20.9134 -0.2 vertex -11.851 -20.4599 0 - vertex -11.851 -20.4599 -0.1 + vertex -11.851 -20.4599 -0.2 endloop endfacet facet normal -0.930941 0.365169 0 outer loop vertex -11.851 -20.4599 0 - vertex -12.0288 -20.9134 -0.1 + vertex -12.0288 -20.9134 -0.2 vertex -12.0288 -20.9134 0 endloop endfacet facet normal -0.976329 0.216289 0 outer loop - vertex -12.0594 -21.0513 -0.1 + vertex -12.0594 -21.0513 -0.2 vertex -12.0288 -20.9134 0 - vertex -12.0288 -20.9134 -0.1 + vertex -12.0288 -20.9134 -0.2 endloop endfacet facet normal -0.976329 0.216289 0 outer loop vertex -12.0288 -20.9134 0 - vertex -12.0594 -21.0513 -0.1 + vertex -12.0594 -21.0513 -0.2 vertex -12.0594 -21.0513 0 endloop endfacet facet normal -0.998491 -0.0549167 0 outer loop - vertex -12.0573 -21.0889 -0.1 + vertex -12.0573 -21.0889 -0.2 vertex -12.0594 -21.0513 0 - vertex -12.0594 -21.0513 -0.1 + vertex -12.0594 -21.0513 -0.2 endloop endfacet facet normal -0.998491 -0.0549167 0 outer loop vertex -12.0594 -21.0513 0 - vertex -12.0573 -21.0889 -0.1 + vertex -12.0573 -21.0889 -0.2 vertex -12.0573 -21.0889 0 endloop endfacet facet normal -0.666017 -0.745937 0 outer loop - vertex -12.0573 -21.0889 -0.1 + vertex -12.0573 -21.0889 -0.2 vertex -12.0427 -21.102 0 vertex -12.0573 -21.0889 0 endloop @@ -16207,13 +16207,13 @@ solid OpenSCAD_Model facet normal -0.666017 -0.745937 -0 outer loop vertex -12.0427 -21.102 0 - vertex -12.0573 -21.0889 -0.1 - vertex -12.0427 -21.102 -0.1 + vertex -12.0573 -21.0889 -0.2 + vertex -12.0427 -21.102 -0.2 endloop endfacet facet normal 0.407619 -0.913152 0 outer loop - vertex -12.0427 -21.102 -0.1 + vertex -12.0427 -21.102 -0.2 vertex -11.8784 -21.0286 0 vertex -12.0427 -21.102 0 endloop @@ -16221,13 +16221,13 @@ solid OpenSCAD_Model facet normal 0.407619 -0.913152 0 outer loop vertex -11.8784 -21.0286 0 - vertex -12.0427 -21.102 -0.1 - vertex -11.8784 -21.0286 -0.1 + vertex -12.0427 -21.102 -0.2 + vertex -11.8784 -21.0286 -0.2 endloop endfacet facet normal 0.473772 -0.880648 0 outer loop - vertex -11.8784 -21.0286 -0.1 + vertex -11.8784 -21.0286 -0.2 vertex -11.5073 -20.829 0 vertex -11.8784 -21.0286 0 endloop @@ -16235,13 +16235,13 @@ solid OpenSCAD_Model facet normal 0.473772 -0.880648 0 outer loop vertex -11.5073 -20.829 0 - vertex -11.8784 -21.0286 -0.1 - vertex -11.5073 -20.829 -0.1 + vertex -11.8784 -21.0286 -0.2 + vertex -11.5073 -20.829 -0.2 endloop endfacet facet normal 0.498101 -0.867119 0 outer loop - vertex -11.5073 -20.829 -0.1 + vertex -11.5073 -20.829 -0.2 vertex -10.3649 -20.1728 0 vertex -11.5073 -20.829 0 endloop @@ -16249,13 +16249,13 @@ solid OpenSCAD_Model facet normal 0.498101 -0.867119 0 outer loop vertex -10.3649 -20.1728 0 - vertex -11.5073 -20.829 -0.1 - vertex -10.3649 -20.1728 -0.1 + vertex -11.5073 -20.829 -0.2 + vertex -10.3649 -20.1728 -0.2 endloop endfacet facet normal 0.501647 -0.865072 0 outer loop - vertex -10.3649 -20.1728 -0.1 + vertex -10.3649 -20.1728 -0.2 vertex -9.87453 -19.8884 0 vertex -10.3649 -20.1728 0 endloop @@ -16263,13 +16263,13 @@ solid OpenSCAD_Model facet normal 0.501647 -0.865072 0 outer loop vertex -9.87453 -19.8884 0 - vertex -10.3649 -20.1728 -0.1 - vertex -9.87453 -19.8884 -0.1 + vertex -10.3649 -20.1728 -0.2 + vertex -9.87453 -19.8884 -0.2 endloop endfacet facet normal 0.475521 -0.879704 0 outer loop - vertex -9.87453 -19.8884 -0.1 + vertex -9.87453 -19.8884 -0.2 vertex -9.46489 -19.667 0 vertex -9.87453 -19.8884 0 endloop @@ -16277,13 +16277,13 @@ solid OpenSCAD_Model facet normal 0.475521 -0.879704 0 outer loop vertex -9.46489 -19.667 0 - vertex -9.87453 -19.8884 -0.1 - vertex -9.46489 -19.667 -0.1 + vertex -9.87453 -19.8884 -0.2 + vertex -9.46489 -19.667 -0.2 endloop endfacet facet normal 0.423964 -0.905679 0 outer loop - vertex -9.46489 -19.667 -0.1 + vertex -9.46489 -19.667 -0.2 vertex -9.10766 -19.4997 0 vertex -9.46489 -19.667 0 endloop @@ -16291,13 +16291,13 @@ solid OpenSCAD_Model facet normal 0.423964 -0.905679 0 outer loop vertex -9.10766 -19.4997 0 - vertex -9.46489 -19.667 -0.1 - vertex -9.10766 -19.4997 -0.1 + vertex -9.46489 -19.667 -0.2 + vertex -9.10766 -19.4997 -0.2 endloop endfacet facet normal 0.343275 -0.939235 0 outer loop - vertex -9.10766 -19.4997 -0.1 + vertex -9.10766 -19.4997 -0.2 vertex -8.77447 -19.378 0 vertex -9.10766 -19.4997 0 endloop @@ -16305,13 +16305,13 @@ solid OpenSCAD_Model facet normal 0.343275 -0.939235 0 outer loop vertex -8.77447 -19.378 0 - vertex -9.10766 -19.4997 -0.1 - vertex -8.77447 -19.378 -0.1 + vertex -9.10766 -19.4997 -0.2 + vertex -8.77447 -19.378 -0.2 endloop endfacet facet normal 0.244399 -0.969675 0 outer loop - vertex -8.77447 -19.378 -0.1 + vertex -8.77447 -19.378 -0.2 vertex -8.43701 -19.2929 0 vertex -8.77447 -19.378 0 endloop @@ -16319,13 +16319,13 @@ solid OpenSCAD_Model facet normal 0.244399 -0.969675 0 outer loop vertex -8.43701 -19.2929 0 - vertex -8.77447 -19.378 -0.1 - vertex -8.43701 -19.2929 -0.1 + vertex -8.77447 -19.378 -0.2 + vertex -8.43701 -19.2929 -0.2 endloop endfacet facet normal 0.152431 -0.988314 0 outer loop - vertex -8.43701 -19.2929 -0.1 + vertex -8.43701 -19.2929 -0.2 vertex -8.06691 -19.2358 0 vertex -8.43701 -19.2929 0 endloop @@ -16333,13 +16333,13 @@ solid OpenSCAD_Model facet normal 0.152431 -0.988314 0 outer loop vertex -8.06691 -19.2358 0 - vertex -8.43701 -19.2929 -0.1 - vertex -8.06691 -19.2358 -0.1 + vertex -8.43701 -19.2929 -0.2 + vertex -8.06691 -19.2358 -0.2 endloop endfacet facet normal 0.0874592 -0.996168 0 outer loop - vertex -8.06691 -19.2358 -0.1 + vertex -8.06691 -19.2358 -0.2 vertex -7.63584 -19.198 0 vertex -8.06691 -19.2358 0 endloop @@ -16347,13 +16347,13 @@ solid OpenSCAD_Model facet normal 0.0874592 -0.996168 0 outer loop vertex -7.63584 -19.198 0 - vertex -8.06691 -19.2358 -0.1 - vertex -7.63584 -19.198 -0.1 + vertex -8.06691 -19.2358 -0.2 + vertex -7.63584 -19.198 -0.2 endloop endfacet facet normal 0.0524883 -0.998622 0 outer loop - vertex -7.63584 -19.198 -0.1 + vertex -7.63584 -19.198 -0.2 vertex -7.11547 -19.1706 0 vertex -7.63584 -19.198 0 endloop @@ -16361,13 +16361,13 @@ solid OpenSCAD_Model facet normal 0.0524883 -0.998622 0 outer loop vertex -7.11547 -19.1706 0 - vertex -7.63584 -19.198 -0.1 - vertex -7.11547 -19.1706 -0.1 + vertex -7.63584 -19.198 -0.2 + vertex -7.11547 -19.1706 -0.2 endloop endfacet facet normal 0.0303019 -0.999541 0 outer loop - vertex -7.11547 -19.1706 -0.1 + vertex -7.11547 -19.1706 -0.2 vertex -6.14058 -19.1411 0 vertex -7.11547 -19.1706 0 endloop @@ -16375,13 +16375,13 @@ solid OpenSCAD_Model facet normal 0.0303019 -0.999541 0 outer loop vertex -6.14058 -19.1411 0 - vertex -7.11547 -19.1706 -0.1 - vertex -6.14058 -19.1411 -0.1 + vertex -7.11547 -19.1706 -0.2 + vertex -6.14058 -19.1411 -0.2 endloop endfacet facet normal -0.0462057 -0.998932 0 outer loop - vertex -6.14058 -19.1411 -0.1 + vertex -6.14058 -19.1411 -0.2 vertex -5.8145 -19.1562 0 vertex -6.14058 -19.1411 0 endloop @@ -16389,13 +16389,13 @@ solid OpenSCAD_Model facet normal -0.0462057 -0.998932 -0 outer loop vertex -5.8145 -19.1562 0 - vertex -6.14058 -19.1411 -0.1 - vertex -5.8145 -19.1562 -0.1 + vertex -6.14058 -19.1411 -0.2 + vertex -5.8145 -19.1562 -0.2 endloop endfacet facet normal -0.173732 -0.984793 0 outer loop - vertex -5.8145 -19.1562 -0.1 + vertex -5.8145 -19.1562 -0.2 vertex -5.55901 -19.2012 0 vertex -5.8145 -19.1562 0 endloop @@ -16403,13 +16403,13 @@ solid OpenSCAD_Model facet normal -0.173732 -0.984793 -0 outer loop vertex -5.55901 -19.2012 0 - vertex -5.8145 -19.1562 -0.1 - vertex -5.55901 -19.2012 -0.1 + vertex -5.8145 -19.1562 -0.2 + vertex -5.55901 -19.2012 -0.2 endloop endfacet facet normal -0.362239 -0.932085 0 outer loop - vertex -5.55901 -19.2012 -0.1 + vertex -5.55901 -19.2012 -0.2 vertex -5.34642 -19.2839 0 vertex -5.55901 -19.2012 0 endloop @@ -16417,13 +16417,13 @@ solid OpenSCAD_Model facet normal -0.362239 -0.932085 -0 outer loop vertex -5.34642 -19.2839 0 - vertex -5.55901 -19.2012 -0.1 - vertex -5.34642 -19.2839 -0.1 + vertex -5.55901 -19.2012 -0.2 + vertex -5.34642 -19.2839 -0.2 endloop endfacet facet normal -0.543204 -0.8396 0 outer loop - vertex -5.34642 -19.2839 -0.1 + vertex -5.34642 -19.2839 -0.2 vertex -5.14898 -19.4116 0 vertex -5.34642 -19.2839 0 endloop @@ -16431,13 +16431,13 @@ solid OpenSCAD_Model facet normal -0.543204 -0.8396 -0 outer loop vertex -5.14898 -19.4116 0 - vertex -5.34642 -19.2839 -0.1 - vertex -5.14898 -19.4116 -0.1 + vertex -5.34642 -19.2839 -0.2 + vertex -5.14898 -19.4116 -0.2 endloop endfacet facet normal -0.651669 -0.758504 0 outer loop - vertex -5.14898 -19.4116 -0.1 + vertex -5.14898 -19.4116 -0.2 vertex -4.93899 -19.592 0 vertex -5.14898 -19.4116 0 endloop @@ -16445,13 +16445,13 @@ solid OpenSCAD_Model facet normal -0.651669 -0.758504 -0 outer loop vertex -4.93899 -19.592 0 - vertex -5.14898 -19.4116 -0.1 - vertex -4.93899 -19.592 -0.1 + vertex -5.14898 -19.4116 -0.2 + vertex -4.93899 -19.592 -0.2 endloop endfacet facet normal -0.693118 -0.720824 0 outer loop - vertex -4.93899 -19.592 -0.1 + vertex -4.93899 -19.592 -0.2 vertex -4.68872 -19.8327 0 vertex -4.93899 -19.592 0 endloop @@ -16459,391 +16459,391 @@ solid OpenSCAD_Model facet normal -0.693118 -0.720824 -0 outer loop vertex -4.68872 -19.8327 0 - vertex -4.93899 -19.592 -0.1 - vertex -4.68872 -19.8327 -0.1 + vertex -4.93899 -19.592 -0.2 + vertex -4.68872 -19.8327 -0.2 endloop endfacet facet normal -0.711815 -0.702367 0 outer loop - vertex -4.47107 -20.0532 -0.1 + vertex -4.47107 -20.0532 -0.2 vertex -4.68872 -19.8327 0 - vertex -4.68872 -19.8327 -0.1 + vertex -4.68872 -19.8327 -0.2 endloop endfacet facet normal -0.711815 -0.702367 0 outer loop vertex -4.68872 -19.8327 0 - vertex -4.47107 -20.0532 -0.1 + vertex -4.47107 -20.0532 -0.2 vertex -4.47107 -20.0532 0 endloop endfacet facet normal -0.751184 -0.660092 0 outer loop - vertex -4.29663 -20.2518 -0.1 + vertex -4.29663 -20.2518 -0.2 vertex -4.47107 -20.0532 0 - vertex -4.47107 -20.0532 -0.1 + vertex -4.47107 -20.0532 -0.2 endloop endfacet facet normal -0.751184 -0.660092 0 outer loop vertex -4.47107 -20.0532 0 - vertex -4.29663 -20.2518 -0.1 + vertex -4.29663 -20.2518 -0.2 vertex -4.29663 -20.2518 0 endloop endfacet facet normal -0.80931 -0.587382 0 outer loop - vertex -4.15983 -20.4402 -0.1 + vertex -4.15983 -20.4402 -0.2 vertex -4.29663 -20.2518 0 - vertex -4.29663 -20.2518 -0.1 + vertex -4.29663 -20.2518 -0.2 endloop endfacet facet normal -0.80931 -0.587382 0 outer loop vertex -4.29663 -20.2518 0 - vertex -4.15983 -20.4402 -0.1 + vertex -4.15983 -20.4402 -0.2 vertex -4.15983 -20.4402 0 endloop endfacet facet normal -0.876288 -0.481787 0 outer loop - vertex -4.05507 -20.6308 -0.1 + vertex -4.05507 -20.6308 -0.2 vertex -4.15983 -20.4402 0 - vertex -4.15983 -20.4402 -0.1 + vertex -4.15983 -20.4402 -0.2 endloop endfacet facet normal -0.876288 -0.481787 0 outer loop vertex -4.15983 -20.4402 0 - vertex -4.05507 -20.6308 -0.1 + vertex -4.05507 -20.6308 -0.2 vertex -4.05507 -20.6308 0 endloop endfacet facet normal -0.93397 -0.357351 0 outer loop - vertex -3.97677 -20.8354 -0.1 + vertex -3.97677 -20.8354 -0.2 vertex -4.05507 -20.6308 0 - vertex -4.05507 -20.6308 -0.1 + vertex -4.05507 -20.6308 -0.2 endloop endfacet facet normal -0.93397 -0.357351 0 outer loop vertex -4.05507 -20.6308 0 - vertex -3.97677 -20.8354 -0.1 + vertex -3.97677 -20.8354 -0.2 vertex -3.97677 -20.8354 0 endloop endfacet facet normal -0.970412 -0.241456 0 outer loop - vertex -3.91934 -21.0662 -0.1 + vertex -3.91934 -21.0662 -0.2 vertex -3.97677 -20.8354 0 - vertex -3.97677 -20.8354 -0.1 + vertex -3.97677 -20.8354 -0.2 endloop endfacet facet normal -0.970412 -0.241456 0 outer loop vertex -3.97677 -20.8354 0 - vertex -3.91934 -21.0662 -0.1 + vertex -3.91934 -21.0662 -0.2 vertex -3.91934 -21.0662 0 endloop endfacet facet normal -0.987949 -0.154777 0 outer loop - vertex -3.87719 -21.3353 -0.1 + vertex -3.87719 -21.3353 -0.2 vertex -3.91934 -21.0662 0 - vertex -3.91934 -21.0662 -0.1 + vertex -3.91934 -21.0662 -0.2 endloop endfacet facet normal -0.987949 -0.154777 0 outer loop vertex -3.91934 -21.0662 0 - vertex -3.87719 -21.3353 -0.1 + vertex -3.87719 -21.3353 -0.2 vertex -3.87719 -21.3353 0 endloop endfacet facet normal -0.994874 -0.10112 0 outer loop - vertex -3.84473 -21.6547 -0.1 + vertex -3.84473 -21.6547 -0.2 vertex -3.87719 -21.3353 0 - vertex -3.87719 -21.3353 -0.1 + vertex -3.87719 -21.3353 -0.2 endloop endfacet facet normal -0.994874 -0.10112 0 outer loop vertex -3.87719 -21.3353 0 - vertex -3.84473 -21.6547 -0.1 + vertex -3.84473 -21.6547 -0.2 vertex -3.84473 -21.6547 0 endloop endfacet facet normal -0.999588 -0.0286991 0 outer loop - vertex -3.82849 -22.2203 -0.1 + vertex -3.82849 -22.2203 -0.2 vertex -3.84473 -21.6547 0 - vertex -3.84473 -21.6547 -0.1 + vertex -3.84473 -21.6547 -0.2 endloop endfacet facet normal -0.999588 -0.0286991 0 outer loop vertex -3.84473 -21.6547 0 - vertex -3.82849 -22.2203 -0.1 + vertex -3.82849 -22.2203 -0.2 vertex -3.82849 -22.2203 0 endloop endfacet facet normal -0.998294 0.058395 0 outer loop - vertex -3.84589 -22.5177 -0.1 + vertex -3.84589 -22.5177 -0.2 vertex -3.82849 -22.2203 0 - vertex -3.82849 -22.2203 -0.1 + vertex -3.82849 -22.2203 -0.2 endloop endfacet facet normal -0.998294 0.058395 0 outer loop vertex -3.82849 -22.2203 0 - vertex -3.84589 -22.5177 -0.1 + vertex -3.84589 -22.5177 -0.2 vertex -3.84589 -22.5177 0 endloop endfacet facet normal -0.99329 0.115647 0 outer loop - vertex -3.88244 -22.8317 -0.1 + vertex -3.88244 -22.8317 -0.2 vertex -3.84589 -22.5177 0 - vertex -3.84589 -22.5177 -0.1 + vertex -3.84589 -22.5177 -0.2 endloop endfacet facet normal -0.99329 0.115647 0 outer loop vertex -3.84589 -22.5177 0 - vertex -3.88244 -22.8317 -0.1 + vertex -3.88244 -22.8317 -0.2 vertex -3.88244 -22.8317 0 endloop endfacet facet normal -0.985725 0.168361 0 outer loop - vertex -3.93975 -23.1672 -0.1 + vertex -3.93975 -23.1672 -0.2 vertex -3.88244 -22.8317 0 - vertex -3.88244 -22.8317 -0.1 + vertex -3.88244 -22.8317 -0.2 endloop endfacet facet normal -0.985725 0.168361 0 outer loop vertex -3.88244 -22.8317 0 - vertex -3.93975 -23.1672 -0.1 + vertex -3.93975 -23.1672 -0.2 vertex -3.93975 -23.1672 0 endloop endfacet facet normal -0.976652 0.214827 0 outer loop - vertex -4.01943 -23.5295 -0.1 + vertex -4.01943 -23.5295 -0.2 vertex -3.93975 -23.1672 0 - vertex -3.93975 -23.1672 -0.1 + vertex -3.93975 -23.1672 -0.2 endloop endfacet facet normal -0.976652 0.214827 0 outer loop vertex -3.93975 -23.1672 0 - vertex -4.01943 -23.5295 -0.1 + vertex -4.01943 -23.5295 -0.2 vertex -4.01943 -23.5295 0 endloop endfacet facet normal -0.962379 0.27171 0 outer loop - vertex -4.25232 -24.3543 -0.1 + vertex -4.25232 -24.3543 -0.2 vertex -4.01943 -23.5295 0 - vertex -4.01943 -23.5295 -0.1 + vertex -4.01943 -23.5295 -0.2 endloop endfacet facet normal -0.962379 0.27171 0 outer loop vertex -4.01943 -23.5295 0 - vertex -4.25232 -24.3543 -0.1 + vertex -4.25232 -24.3543 -0.2 vertex -4.25232 -24.3543 0 endloop endfacet facet normal -0.945562 0.325441 0 outer loop - vertex -4.59396 -25.347 -0.1 + vertex -4.59396 -25.347 -0.2 vertex -4.25232 -24.3543 0 - vertex -4.25232 -24.3543 -0.1 + vertex -4.25232 -24.3543 -0.2 endloop endfacet facet normal -0.945562 0.325441 0 outer loop vertex -4.25232 -24.3543 0 - vertex -4.59396 -25.347 -0.1 + vertex -4.59396 -25.347 -0.2 vertex -4.59396 -25.347 0 endloop endfacet facet normal -0.933005 0.359863 0 outer loop - vertex -5.05721 -26.548 -0.1 + vertex -5.05721 -26.548 -0.2 vertex -4.59396 -25.347 0 - vertex -4.59396 -25.347 -0.1 + vertex -4.59396 -25.347 -0.2 endloop endfacet facet normal -0.933005 0.359863 0 outer loop vertex -4.59396 -25.347 0 - vertex -5.05721 -26.548 -0.1 + vertex -5.05721 -26.548 -0.2 vertex -5.05721 -26.548 0 endloop endfacet facet normal -0.924544 0.381075 0 outer loop - vertex -5.65492 -27.9982 -0.1 + vertex -5.65492 -27.9982 -0.2 vertex -5.05721 -26.548 0 - vertex -5.05721 -26.548 -0.1 + vertex -5.05721 -26.548 -0.2 endloop endfacet facet normal -0.924544 0.381075 0 outer loop vertex -5.05721 -26.548 0 - vertex -5.65492 -27.9982 -0.1 + vertex -5.65492 -27.9982 -0.2 vertex -5.65492 -27.9982 0 endloop endfacet facet normal -0.919267 0.393635 0 outer loop - vertex -6.39994 -29.738 -0.1 + vertex -6.39994 -29.738 -0.2 vertex -5.65492 -27.9982 0 - vertex -5.65492 -27.9982 -0.1 + vertex -5.65492 -27.9982 -0.2 endloop endfacet facet normal -0.919267 0.393635 0 outer loop vertex -5.65492 -27.9982 0 - vertex -6.39994 -29.738 -0.1 + vertex -6.39994 -29.738 -0.2 vertex -6.39994 -29.738 0 endloop endfacet facet normal -0.920331 0.391141 0 outer loop - vertex -7.70823 -32.8163 -0.1 + vertex -7.70823 -32.8163 -0.2 vertex -6.39994 -29.738 0 - vertex -6.39994 -29.738 -0.1 + vertex -6.39994 -29.738 -0.2 endloop endfacet facet normal -0.920331 0.391141 0 outer loop vertex -6.39994 -29.738 0 - vertex -7.70823 -32.8163 -0.1 + vertex -7.70823 -32.8163 -0.2 vertex -7.70823 -32.8163 0 endloop endfacet facet normal -0.926406 0.376526 0 outer loop - vertex -8.13453 -33.8652 -0.1 + vertex -8.13453 -33.8652 -0.2 vertex -7.70823 -32.8163 0 - vertex -7.70823 -32.8163 -0.1 + vertex -7.70823 -32.8163 -0.2 endloop endfacet facet normal -0.926406 0.376526 0 outer loop vertex -7.70823 -32.8163 0 - vertex -8.13453 -33.8652 -0.1 + vertex -8.13453 -33.8652 -0.2 vertex -8.13453 -33.8652 0 endloop endfacet facet normal -0.938884 0.344234 0 outer loop - vertex -8.32474 -34.384 -0.1 + vertex -8.32474 -34.384 -0.2 vertex -8.13453 -33.8652 0 - vertex -8.13453 -33.8652 -0.1 + vertex -8.13453 -33.8652 -0.2 endloop endfacet facet normal -0.938884 0.344234 0 outer loop vertex -8.13453 -33.8652 0 - vertex -8.32474 -34.384 -0.1 + vertex -8.32474 -34.384 -0.2 vertex -8.32474 -34.384 0 endloop endfacet facet normal -0.969782 0.243972 0 outer loop - vertex -8.55649 -35.3052 -0.1 + vertex -8.55649 -35.3052 -0.2 vertex -8.32474 -34.384 0 - vertex -8.32474 -34.384 -0.1 + vertex -8.32474 -34.384 -0.2 endloop endfacet facet normal -0.969782 0.243972 0 outer loop vertex -8.32474 -34.384 0 - vertex -8.55649 -35.3052 -0.1 + vertex -8.55649 -35.3052 -0.2 vertex -8.55649 -35.3052 0 endloop endfacet facet normal -0.98411 0.17756 0 outer loop - vertex -8.57785 -35.4236 -0.1 + vertex -8.57785 -35.4236 -0.2 vertex -8.55649 -35.3052 0 - vertex -8.55649 -35.3052 -0.1 + vertex -8.55649 -35.3052 -0.2 endloop endfacet facet normal -0.98411 0.17756 0 outer loop vertex -8.55649 -35.3052 0 - vertex -8.57785 -35.4236 -0.1 + vertex -8.57785 -35.4236 -0.2 vertex -8.57785 -35.4236 0 endloop endfacet facet normal -0.999972 -0.00745735 0 outer loop - vertex -8.57707 -35.529 -0.1 + vertex -8.57707 -35.529 -0.2 vertex -8.57785 -35.4236 0 - vertex -8.57785 -35.4236 -0.1 + vertex -8.57785 -35.4236 -0.2 endloop endfacet facet normal -0.999972 -0.00745735 0 outer loop vertex -8.57785 -35.4236 0 - vertex -8.57707 -35.529 -0.1 + vertex -8.57707 -35.529 -0.2 vertex -8.57707 -35.529 0 endloop endfacet facet normal -0.966564 -0.256425 0 outer loop - vertex -8.55176 -35.6244 -0.1 + vertex -8.55176 -35.6244 -0.2 vertex -8.57707 -35.529 0 - vertex -8.57707 -35.529 -0.1 + vertex -8.57707 -35.529 -0.2 endloop endfacet facet normal -0.966564 -0.256425 0 outer loop vertex -8.57707 -35.529 0 - vertex -8.55176 -35.6244 -0.1 + vertex -8.55176 -35.6244 -0.2 vertex -8.55176 -35.6244 0 endloop endfacet facet normal -0.861289 -0.508115 0 outer loop - vertex -8.49955 -35.7129 -0.1 + vertex -8.49955 -35.7129 -0.2 vertex -8.55176 -35.6244 0 - vertex -8.55176 -35.6244 -0.1 + vertex -8.55176 -35.6244 -0.2 endloop endfacet facet normal -0.861289 -0.508115 0 outer loop vertex -8.55176 -35.6244 0 - vertex -8.49955 -35.7129 -0.1 + vertex -8.49955 -35.7129 -0.2 vertex -8.49955 -35.7129 0 endloop endfacet facet normal -0.720516 -0.693438 0 outer loop - vertex -8.41808 -35.7975 -0.1 + vertex -8.41808 -35.7975 -0.2 vertex -8.49955 -35.7129 0 - vertex -8.49955 -35.7129 -0.1 + vertex -8.49955 -35.7129 -0.2 endloop endfacet facet normal -0.720516 -0.693438 0 outer loop vertex -8.49955 -35.7129 0 - vertex -8.41808 -35.7975 -0.1 + vertex -8.41808 -35.7975 -0.2 vertex -8.41808 -35.7975 0 endloop endfacet facet normal -0.595759 -0.803164 0 outer loop - vertex -8.41808 -35.7975 -0.1 + vertex -8.41808 -35.7975 -0.2 vertex -8.30497 -35.8814 0 vertex -8.41808 -35.7975 0 endloop @@ -16851,13 +16851,13 @@ solid OpenSCAD_Model facet normal -0.595759 -0.803164 -0 outer loop vertex -8.30497 -35.8814 0 - vertex -8.41808 -35.7975 -0.1 - vertex -8.30497 -35.8814 -0.1 + vertex -8.41808 -35.7975 -0.2 + vertex -8.30497 -35.8814 -0.2 endloop endfacet facet normal -0.473656 -0.88071 0 outer loop - vertex -8.30497 -35.8814 -0.1 + vertex -8.30497 -35.8814 -0.2 vertex -7.97432 -36.0592 0 vertex -8.30497 -35.8814 0 endloop @@ -16865,13 +16865,13 @@ solid OpenSCAD_Model facet normal -0.473656 -0.88071 -0 outer loop vertex -7.97432 -36.0592 0 - vertex -8.30497 -35.8814 -0.1 - vertex -7.97432 -36.0592 -0.1 + vertex -8.30497 -35.8814 -0.2 + vertex -7.97432 -36.0592 -0.2 endloop endfacet facet normal -0.487345 -0.873209 0 outer loop - vertex -7.97432 -36.0592 -0.1 + vertex -7.97432 -36.0592 -0.2 vertex -7.70312 -36.2106 0 vertex -7.97432 -36.0592 0 endloop @@ -16879,13 +16879,13 @@ solid OpenSCAD_Model facet normal -0.487345 -0.873209 -0 outer loop vertex -7.70312 -36.2106 0 - vertex -7.97432 -36.0592 -0.1 - vertex -7.70312 -36.2106 -0.1 + vertex -7.97432 -36.0592 -0.2 + vertex -7.70312 -36.2106 -0.2 endloop endfacet facet normal -0.634834 -0.772648 0 outer loop - vertex -7.70312 -36.2106 -0.1 + vertex -7.70312 -36.2106 -0.2 vertex -7.50076 -36.3769 0 vertex -7.70312 -36.2106 0 endloop @@ -16893,125 +16893,125 @@ solid OpenSCAD_Model facet normal -0.634834 -0.772648 -0 outer loop vertex -7.50076 -36.3769 0 - vertex -7.70312 -36.2106 -0.1 - vertex -7.50076 -36.3769 -0.1 + vertex -7.70312 -36.2106 -0.2 + vertex -7.50076 -36.3769 -0.2 endloop endfacet facet normal -0.80484 -0.593492 0 outer loop - vertex -7.36727 -36.5579 -0.1 + vertex -7.36727 -36.5579 -0.2 vertex -7.50076 -36.3769 0 - vertex -7.50076 -36.3769 -0.1 + vertex -7.50076 -36.3769 -0.2 endloop endfacet facet normal -0.80484 -0.593492 0 outer loop vertex -7.50076 -36.3769 0 - vertex -7.36727 -36.5579 -0.1 + vertex -7.36727 -36.5579 -0.2 vertex -7.36727 -36.5579 0 endloop endfacet facet normal -0.919952 -0.39203 0 outer loop - vertex -7.32635 -36.6539 -0.1 + vertex -7.32635 -36.6539 -0.2 vertex -7.36727 -36.5579 0 - vertex -7.36727 -36.5579 -0.1 + vertex -7.36727 -36.5579 -0.2 endloop endfacet facet normal -0.919952 -0.39203 0 outer loop vertex -7.36727 -36.5579 0 - vertex -7.32635 -36.6539 -0.1 + vertex -7.32635 -36.6539 -0.2 vertex -7.32635 -36.6539 0 endloop endfacet facet normal -0.972883 -0.231299 0 outer loop - vertex -7.30266 -36.7536 -0.1 + vertex -7.30266 -36.7536 -0.2 vertex -7.32635 -36.6539 0 - vertex -7.32635 -36.6539 -0.1 + vertex -7.32635 -36.6539 -0.2 endloop endfacet facet normal -0.972883 -0.231299 0 outer loop vertex -7.32635 -36.6539 0 - vertex -7.30266 -36.7536 -0.1 + vertex -7.30266 -36.7536 -0.2 vertex -7.30266 -36.7536 0 endloop endfacet facet normal -0.998045 -0.0625022 0 outer loop - vertex -7.29619 -36.8569 -0.1 + vertex -7.29619 -36.8569 -0.2 vertex -7.30266 -36.7536 0 - vertex -7.30266 -36.7536 -0.1 + vertex -7.30266 -36.7536 -0.2 endloop endfacet facet normal -0.998045 -0.0625022 0 outer loop vertex -7.30266 -36.7536 0 - vertex -7.29619 -36.8569 -0.1 + vertex -7.29619 -36.8569 -0.2 vertex -7.29619 -36.8569 0 endloop endfacet facet normal -0.994972 0.100157 0 outer loop - vertex -7.30695 -36.9638 -0.1 + vertex -7.30695 -36.9638 -0.2 vertex -7.29619 -36.8569 0 - vertex -7.29619 -36.8569 -0.1 + vertex -7.29619 -36.8569 -0.2 endloop endfacet facet normal -0.994972 0.100157 0 outer loop vertex -7.29619 -36.8569 0 - vertex -7.30695 -36.9638 -0.1 + vertex -7.30695 -36.9638 -0.2 vertex -7.30695 -36.9638 0 endloop endfacet facet normal -0.950745 0.309974 0 outer loop - vertex -7.38017 -37.1883 -0.1 + vertex -7.38017 -37.1883 -0.2 vertex -7.30695 -36.9638 0 - vertex -7.30695 -36.9638 -0.1 + vertex -7.30695 -36.9638 -0.2 endloop endfacet facet normal -0.950745 0.309974 0 outer loop vertex -7.30695 -36.9638 0 - vertex -7.38017 -37.1883 -0.1 + vertex -7.38017 -37.1883 -0.2 vertex -7.38017 -37.1883 0 endloop endfacet facet normal -0.859288 0.511491 0 outer loop - vertex -7.52232 -37.4271 -0.1 + vertex -7.52232 -37.4271 -0.2 vertex -7.38017 -37.1883 0 - vertex -7.38017 -37.1883 -0.1 + vertex -7.38017 -37.1883 -0.2 endloop endfacet facet normal -0.859288 0.511491 0 outer loop vertex -7.38017 -37.1883 0 - vertex -7.52232 -37.4271 -0.1 + vertex -7.52232 -37.4271 -0.2 vertex -7.52232 -37.4271 0 endloop endfacet facet normal -0.767721 0.640785 0 outer loop - vertex -7.73344 -37.6801 -0.1 + vertex -7.73344 -37.6801 -0.2 vertex -7.52232 -37.4271 0 - vertex -7.52232 -37.4271 -0.1 + vertex -7.52232 -37.4271 -0.2 endloop endfacet facet normal -0.767721 0.640785 0 outer loop vertex -7.52232 -37.4271 0 - vertex -7.73344 -37.6801 -0.1 + vertex -7.73344 -37.6801 -0.2 vertex -7.73344 -37.6801 0 endloop endfacet facet normal -0.693467 0.720489 0 outer loop - vertex -7.73344 -37.6801 -0.1 + vertex -7.73344 -37.6801 -0.2 vertex -7.8903 -37.8311 0 vertex -7.73344 -37.6801 0 endloop @@ -17019,13 +17019,13 @@ solid OpenSCAD_Model facet normal -0.693467 0.720489 0 outer loop vertex -7.8903 -37.8311 0 - vertex -7.73344 -37.6801 -0.1 - vertex -7.8903 -37.8311 -0.1 + vertex -7.73344 -37.6801 -0.2 + vertex -7.8903 -37.8311 -0.2 endloop endfacet facet normal -0.544632 0.838675 0 outer loop - vertex -7.8903 -37.8311 -0.1 + vertex -7.8903 -37.8311 -0.2 vertex -8.0676 -37.9462 0 vertex -7.8903 -37.8311 0 endloop @@ -17033,13 +17033,13 @@ solid OpenSCAD_Model facet normal -0.544632 0.838675 0 outer loop vertex -8.0676 -37.9462 0 - vertex -7.8903 -37.8311 -0.1 - vertex -8.0676 -37.9462 -0.1 + vertex -7.8903 -37.8311 -0.2 + vertex -8.0676 -37.9462 -0.2 endloop endfacet facet normal -0.329452 0.944172 0 outer loop - vertex -8.0676 -37.9462 -0.1 + vertex -8.0676 -37.9462 -0.2 vertex -8.30871 -38.0303 0 vertex -8.0676 -37.9462 0 endloop @@ -17047,13 +17047,13 @@ solid OpenSCAD_Model facet normal -0.329452 0.944172 0 outer loop vertex -8.30871 -38.0303 0 - vertex -8.0676 -37.9462 -0.1 - vertex -8.30871 -38.0303 -0.1 + vertex -8.0676 -37.9462 -0.2 + vertex -8.30871 -38.0303 -0.2 endloop endfacet facet normal -0.164178 0.986431 0 outer loop - vertex -8.30871 -38.0303 -0.1 + vertex -8.30871 -38.0303 -0.2 vertex -8.657 -38.0883 0 vertex -8.30871 -38.0303 0 endloop @@ -17061,13 +17061,13 @@ solid OpenSCAD_Model facet normal -0.164178 0.986431 0 outer loop vertex -8.657 -38.0883 0 - vertex -8.30871 -38.0303 -0.1 - vertex -8.657 -38.0883 -0.1 + vertex -8.30871 -38.0303 -0.2 + vertex -8.657 -38.0883 -0.2 endloop endfacet facet normal -0.0732736 0.997312 0 outer loop - vertex -8.657 -38.0883 -0.1 + vertex -8.657 -38.0883 -0.2 vertex -9.15585 -38.1249 0 vertex -8.657 -38.0883 0 endloop @@ -17075,13 +17075,13 @@ solid OpenSCAD_Model facet normal -0.0732736 0.997312 0 outer loop vertex -9.15585 -38.1249 0 - vertex -8.657 -38.0883 -0.1 - vertex -9.15585 -38.1249 -0.1 + vertex -8.657 -38.0883 -0.2 + vertex -9.15585 -38.1249 -0.2 endloop endfacet facet normal -0.0291211 0.999576 0 outer loop - vertex -9.15585 -38.1249 -0.1 + vertex -9.15585 -38.1249 -0.2 vertex -9.84865 -38.1451 0 vertex -9.15585 -38.1249 0 endloop @@ -17089,13 +17089,13 @@ solid OpenSCAD_Model facet normal -0.0291211 0.999576 0 outer loop vertex -9.84865 -38.1451 0 - vertex -9.15585 -38.1249 -0.1 - vertex -9.84865 -38.1451 -0.1 + vertex -9.15585 -38.1249 -0.2 + vertex -9.84865 -38.1451 -0.2 endloop endfacet facet normal -0.00482502 0.999988 0 outer loop - vertex -9.84865 -38.1451 -0.1 + vertex -9.84865 -38.1451 -0.2 vertex -11.9896 -38.1555 0 vertex -9.84865 -38.1451 0 endloop @@ -17103,13 +17103,13 @@ solid OpenSCAD_Model facet normal -0.00482502 0.999988 0 outer loop vertex -11.9896 -38.1555 0 - vertex -9.84865 -38.1451 -0.1 - vertex -11.9896 -38.1555 -0.1 + vertex -9.84865 -38.1451 -0.2 + vertex -11.9896 -38.1555 -0.2 endloop endfacet facet normal 0.0039213 0.999992 -0 outer loop - vertex -11.9896 -38.1555 -0.1 + vertex -11.9896 -38.1555 -0.2 vertex -14.1677 -38.1469 0 vertex -11.9896 -38.1555 0 endloop @@ -17117,13 +17117,13 @@ solid OpenSCAD_Model facet normal 0.0039213 0.999992 0 outer loop vertex -14.1677 -38.1469 0 - vertex -11.9896 -38.1555 -0.1 - vertex -14.1677 -38.1469 -0.1 + vertex -11.9896 -38.1555 -0.2 + vertex -14.1677 -38.1469 -0.2 endloop endfacet facet normal 0.0274602 0.999623 -0 outer loop - vertex -14.1677 -38.1469 -0.1 + vertex -14.1677 -38.1469 -0.2 vertex -14.8486 -38.1282 0 vertex -14.1677 -38.1469 0 endloop @@ -17131,13 +17131,13 @@ solid OpenSCAD_Model facet normal 0.0274602 0.999623 0 outer loop vertex -14.8486 -38.1282 0 - vertex -14.1677 -38.1469 -0.1 - vertex -14.8486 -38.1282 -0.1 + vertex -14.1677 -38.1469 -0.2 + vertex -14.8486 -38.1282 -0.2 endloop endfacet facet normal 0.0756421 0.997135 -0 outer loop - vertex -14.8486 -38.1282 -0.1 + vertex -14.8486 -38.1282 -0.2 vertex -15.316 -38.0928 0 vertex -14.8486 -38.1282 0 endloop @@ -17145,13 +17145,13 @@ solid OpenSCAD_Model facet normal 0.0756421 0.997135 0 outer loop vertex -15.316 -38.0928 0 - vertex -14.8486 -38.1282 -0.1 - vertex -15.316 -38.0928 -0.1 + vertex -14.8486 -38.1282 -0.2 + vertex -15.316 -38.0928 -0.2 endloop endfacet facet normal 0.189644 0.981853 -0 outer loop - vertex -15.316 -38.0928 -0.1 + vertex -15.316 -38.0928 -0.2 vertex -15.614 -38.0352 0 vertex -15.316 -38.0928 0 endloop @@ -17159,13 +17159,13 @@ solid OpenSCAD_Model facet normal 0.189644 0.981853 0 outer loop vertex -15.614 -38.0352 0 - vertex -15.316 -38.0928 -0.1 - vertex -15.614 -38.0352 -0.1 + vertex -15.316 -38.0928 -0.2 + vertex -15.614 -38.0352 -0.2 endloop endfacet facet normal 0.363705 0.931514 -0 outer loop - vertex -15.614 -38.0352 -0.1 + vertex -15.614 -38.0352 -0.2 vertex -15.7132 -37.9965 0 vertex -15.614 -38.0352 0 endloop @@ -17173,13 +17173,13 @@ solid OpenSCAD_Model facet normal 0.363705 0.931514 0 outer loop vertex -15.7132 -37.9965 0 - vertex -15.614 -38.0352 -0.1 - vertex -15.7132 -37.9965 -0.1 + vertex -15.614 -38.0352 -0.2 + vertex -15.7132 -37.9965 -0.2 endloop endfacet facet normal 0.533432 0.845843 -0 outer loop - vertex -15.7132 -37.9965 -0.1 + vertex -15.7132 -37.9965 -0.2 vertex -15.7865 -37.9502 0 vertex -15.7132 -37.9965 0 endloop @@ -17187,153 +17187,153 @@ solid OpenSCAD_Model facet normal 0.533432 0.845843 0 outer loop vertex -15.7865 -37.9502 0 - vertex -15.7132 -37.9965 -0.1 - vertex -15.7865 -37.9502 -0.1 + vertex -15.7132 -37.9965 -0.2 + vertex -15.7865 -37.9502 -0.2 endloop endfacet facet normal 0.71659 0.697495 0 outer loop vertex -15.7865 -37.9502 0 - vertex -15.8396 -37.8957 -0.1 + vertex -15.8396 -37.8957 -0.2 vertex -15.8396 -37.8957 0 endloop endfacet facet normal 0.71659 0.697495 0 outer loop - vertex -15.8396 -37.8957 -0.1 + vertex -15.8396 -37.8957 -0.2 vertex -15.7865 -37.9502 0 - vertex -15.7865 -37.9502 -0.1 + vertex -15.7865 -37.9502 -0.2 endloop endfacet facet normal 0.856476 0.516186 0 outer loop vertex -15.8396 -37.8957 0 - vertex -15.8777 -37.8324 -0.1 + vertex -15.8777 -37.8324 -0.2 vertex -15.8777 -37.8324 0 endloop endfacet facet normal 0.856476 0.516186 0 outer loop - vertex -15.8777 -37.8324 -0.1 + vertex -15.8777 -37.8324 -0.2 vertex -15.8396 -37.8957 0 - vertex -15.8396 -37.8957 -0.1 + vertex -15.8396 -37.8957 -0.2 endloop endfacet facet normal 0.945292 0.326225 0 outer loop vertex -15.8777 -37.8324 0 - vertex -15.9316 -37.6764 -0.1 + vertex -15.9316 -37.6764 -0.2 vertex -15.9316 -37.6764 0 endloop endfacet facet normal 0.945292 0.326225 0 outer loop - vertex -15.9316 -37.6764 -0.1 + vertex -15.9316 -37.6764 -0.2 vertex -15.8777 -37.8324 0 - vertex -15.8777 -37.8324 -0.1 + vertex -15.8777 -37.8324 -0.2 endloop endfacet facet normal 0.977576 0.210582 0 outer loop vertex -15.9316 -37.6764 0 - vertex -15.9604 -37.5428 -0.1 + vertex -15.9604 -37.5428 -0.2 vertex -15.9604 -37.5428 0 endloop endfacet facet normal 0.977576 0.210582 0 outer loop - vertex -15.9604 -37.5428 -0.1 + vertex -15.9604 -37.5428 -0.2 vertex -15.9316 -37.6764 0 - vertex -15.9316 -37.6764 -0.1 + vertex -15.9316 -37.6764 -0.2 endloop endfacet facet normal 0.998424 0.0561231 0 outer loop vertex -15.9604 -37.5428 0 - vertex -15.9675 -37.4163 -0.1 + vertex -15.9675 -37.4163 -0.2 vertex -15.9675 -37.4163 0 endloop endfacet facet normal 0.998424 0.0561231 0 outer loop - vertex -15.9675 -37.4163 -0.1 + vertex -15.9675 -37.4163 -0.2 vertex -15.9604 -37.5428 0 - vertex -15.9604 -37.5428 -0.1 + vertex -15.9604 -37.5428 -0.2 endloop endfacet facet normal 0.991334 -0.131364 0 outer loop vertex -15.9675 -37.4163 0 - vertex -15.9511 -37.293 -0.1 + vertex -15.9511 -37.293 -0.2 vertex -15.9511 -37.293 0 endloop endfacet facet normal 0.991334 -0.131364 0 outer loop - vertex -15.9511 -37.293 -0.1 + vertex -15.9511 -37.293 -0.2 vertex -15.9675 -37.4163 0 - vertex -15.9675 -37.4163 -0.1 + vertex -15.9675 -37.4163 -0.2 endloop endfacet facet normal 0.94832 -0.317316 0 outer loop vertex -15.9511 -37.293 0 - vertex -15.9096 -37.1689 -0.1 + vertex -15.9096 -37.1689 -0.2 vertex -15.9096 -37.1689 0 endloop endfacet facet normal 0.94832 -0.317316 0 outer loop - vertex -15.9096 -37.1689 -0.1 + vertex -15.9096 -37.1689 -0.2 vertex -15.9511 -37.293 0 - vertex -15.9511 -37.293 -0.1 + vertex -15.9511 -37.293 -0.2 endloop endfacet facet normal 0.883259 -0.468885 0 outer loop vertex -15.9096 -37.1689 0 - vertex -15.8411 -37.0399 -0.1 + vertex -15.8411 -37.0399 -0.2 vertex -15.8411 -37.0399 0 endloop endfacet facet normal 0.883259 -0.468885 0 outer loop - vertex -15.8411 -37.0399 -0.1 + vertex -15.8411 -37.0399 -0.2 vertex -15.9096 -37.1689 0 - vertex -15.9096 -37.1689 -0.1 + vertex -15.9096 -37.1689 -0.2 endloop endfacet facet normal 0.817454 -0.575994 0 outer loop vertex -15.8411 -37.0399 0 - vertex -15.7439 -36.902 -0.1 + vertex -15.7439 -36.902 -0.2 vertex -15.7439 -36.902 0 endloop endfacet facet normal 0.817454 -0.575994 0 outer loop - vertex -15.7439 -36.902 -0.1 + vertex -15.7439 -36.902 -0.2 vertex -15.8411 -37.0399 0 - vertex -15.8411 -37.0399 -0.1 + vertex -15.8411 -37.0399 -0.2 endloop endfacet facet normal 0.742584 -0.669753 0 outer loop vertex -15.7439 -36.902 0 - vertex -15.4564 -36.5832 -0.1 + vertex -15.4564 -36.5832 -0.2 vertex -15.4564 -36.5832 0 endloop endfacet facet normal 0.742584 -0.669753 0 outer loop - vertex -15.4564 -36.5832 -0.1 + vertex -15.4564 -36.5832 -0.2 vertex -15.7439 -36.902 0 - vertex -15.7439 -36.902 -0.1 + vertex -15.7439 -36.902 -0.2 endloop endfacet facet normal 0.654929 -0.755691 0 outer loop - vertex -15.4564 -36.5832 -0.1 + vertex -15.4564 -36.5832 -0.2 vertex -15.1813 -36.3448 0 vertex -15.4564 -36.5832 0 endloop @@ -17341,13 +17341,13 @@ solid OpenSCAD_Model facet normal 0.654929 -0.755691 0 outer loop vertex -15.1813 -36.3448 0 - vertex -15.4564 -36.5832 -0.1 - vertex -15.1813 -36.3448 -0.1 + vertex -15.4564 -36.5832 -0.2 + vertex -15.1813 -36.3448 -0.2 endloop endfacet facet normal 0.547883 -0.836555 0 outer loop - vertex -15.1813 -36.3448 -0.1 + vertex -15.1813 -36.3448 -0.2 vertex -14.8831 -36.1495 0 vertex -15.1813 -36.3448 0 endloop @@ -17355,13 +17355,13 @@ solid OpenSCAD_Model facet normal 0.547883 -0.836555 0 outer loop vertex -14.8831 -36.1495 0 - vertex -15.1813 -36.3448 -0.1 - vertex -14.8831 -36.1495 -0.1 + vertex -15.1813 -36.3448 -0.2 + vertex -14.8831 -36.1495 -0.2 endloop endfacet facet normal 0.419801 -0.907616 0 outer loop - vertex -14.8831 -36.1495 -0.1 + vertex -14.8831 -36.1495 -0.2 vertex -14.5979 -36.0176 0 vertex -14.8831 -36.1495 0 endloop @@ -17369,13 +17369,13 @@ solid OpenSCAD_Model facet normal 0.419801 -0.907616 0 outer loop vertex -14.5979 -36.0176 0 - vertex -14.8831 -36.1495 -0.1 - vertex -14.5979 -36.0176 -0.1 + vertex -14.8831 -36.1495 -0.2 + vertex -14.5979 -36.0176 -0.2 endloop endfacet facet normal 0.273076 -0.961992 0 outer loop - vertex -14.5979 -36.0176 -0.1 + vertex -14.5979 -36.0176 -0.2 vertex -14.4713 -35.9816 0 vertex -14.5979 -36.0176 0 endloop @@ -17383,13 +17383,13 @@ solid OpenSCAD_Model facet normal 0.273076 -0.961992 0 outer loop vertex -14.4713 -35.9816 0 - vertex -14.5979 -36.0176 -0.1 - vertex -14.4713 -35.9816 -0.1 + vertex -14.5979 -36.0176 -0.2 + vertex -14.4713 -35.9816 -0.2 endloop endfacet facet normal 0.113362 -0.993554 0 outer loop - vertex -14.4713 -35.9816 -0.1 + vertex -14.4713 -35.9816 -0.2 vertex -14.3614 -35.9691 0 vertex -14.4713 -35.9816 0 endloop @@ -17397,13 +17397,13 @@ solid OpenSCAD_Model facet normal 0.113362 -0.993554 0 outer loop vertex -14.3614 -35.9691 0 - vertex -14.4713 -35.9816 -0.1 - vertex -14.3614 -35.9691 -0.1 + vertex -14.4713 -35.9816 -0.2 + vertex -14.3614 -35.9691 -0.2 endloop endfacet facet normal 0.0894161 -0.995994 0 outer loop - vertex -14.3614 -35.9691 -0.1 + vertex -14.3614 -35.9691 -0.2 vertex -14.1999 -35.9546 0 vertex -14.3614 -35.9691 0 endloop @@ -17411,13 +17411,13 @@ solid OpenSCAD_Model facet normal 0.0894161 -0.995994 0 outer loop vertex -14.1999 -35.9546 0 - vertex -14.3614 -35.9691 -0.1 - vertex -14.1999 -35.9546 -0.1 + vertex -14.3614 -35.9691 -0.2 + vertex -14.1999 -35.9546 -0.2 endloop endfacet facet normal 0.259204 -0.965823 0 outer loop - vertex -14.1999 -35.9546 -0.1 + vertex -14.1999 -35.9546 -0.2 vertex -14.0373 -35.911 0 vertex -14.1999 -35.9546 0 endloop @@ -17425,13 +17425,13 @@ solid OpenSCAD_Model facet normal 0.259204 -0.965823 0 outer loop vertex -14.0373 -35.911 0 - vertex -14.1999 -35.9546 -0.1 - vertex -14.0373 -35.911 -0.1 + vertex -14.1999 -35.9546 -0.2 + vertex -14.0373 -35.911 -0.2 endloop endfacet facet normal 0.406893 -0.913476 0 outer loop - vertex -14.0373 -35.911 -0.1 + vertex -14.0373 -35.911 -0.2 vertex -13.8736 -35.838 0 vertex -14.0373 -35.911 0 endloop @@ -17439,13 +17439,13 @@ solid OpenSCAD_Model facet normal 0.406893 -0.913476 0 outer loop vertex -13.8736 -35.838 0 - vertex -14.0373 -35.911 -0.1 - vertex -13.8736 -35.838 -0.1 + vertex -14.0373 -35.911 -0.2 + vertex -13.8736 -35.838 -0.2 endloop endfacet facet normal 0.527319 -0.849667 0 outer loop - vertex -13.8736 -35.838 -0.1 + vertex -13.8736 -35.838 -0.2 vertex -13.7085 -35.7356 0 vertex -13.8736 -35.838 0 endloop @@ -17453,13 +17453,13 @@ solid OpenSCAD_Model facet normal 0.527319 -0.849667 0 outer loop vertex -13.7085 -35.7356 0 - vertex -13.8736 -35.838 -0.1 - vertex -13.7085 -35.7356 -0.1 + vertex -13.8736 -35.838 -0.2 + vertex -13.7085 -35.7356 -0.2 endloop endfacet facet normal 0.621601 -0.783334 0 outer loop - vertex -13.7085 -35.7356 -0.1 + vertex -13.7085 -35.7356 -0.2 vertex -13.5421 -35.6036 0 vertex -13.7085 -35.7356 0 endloop @@ -17467,13 +17467,13 @@ solid OpenSCAD_Model facet normal 0.621601 -0.783334 0 outer loop vertex -13.5421 -35.6036 0 - vertex -13.7085 -35.7356 -0.1 - vertex -13.5421 -35.6036 -0.1 + vertex -13.7085 -35.7356 -0.2 + vertex -13.5421 -35.6036 -0.2 endloop endfacet facet normal 0.693973 -0.720001 0 outer loop - vertex -13.5421 -35.6036 -0.1 + vertex -13.5421 -35.6036 -0.2 vertex -13.3741 -35.4417 0 vertex -13.5421 -35.6036 0 endloop @@ -17481,237 +17481,237 @@ solid OpenSCAD_Model facet normal 0.693973 -0.720001 0 outer loop vertex -13.3741 -35.4417 0 - vertex -13.5421 -35.6036 -0.1 - vertex -13.3741 -35.4417 -0.1 + vertex -13.5421 -35.6036 -0.2 + vertex -13.3741 -35.4417 -0.2 endloop endfacet facet normal 0.74925 -0.662287 0 outer loop vertex -13.3741 -35.4417 0 - vertex -13.2045 -35.2497 -0.1 + vertex -13.2045 -35.2497 -0.2 vertex -13.2045 -35.2497 0 endloop endfacet facet normal 0.74925 -0.662287 0 outer loop - vertex -13.2045 -35.2497 -0.1 + vertex -13.2045 -35.2497 -0.2 vertex -13.3741 -35.4417 0 - vertex -13.3741 -35.4417 -0.1 + vertex -13.3741 -35.4417 -0.2 endloop endfacet facet normal 0.791599 -0.611041 0 outer loop vertex -13.2045 -35.2497 0 - vertex -13.0331 -35.0276 -0.1 + vertex -13.0331 -35.0276 -0.2 vertex -13.0331 -35.0276 0 endloop endfacet facet normal 0.791599 -0.611041 0 outer loop - vertex -13.0331 -35.0276 -0.1 + vertex -13.0331 -35.0276 -0.2 vertex -13.2045 -35.2497 0 - vertex -13.2045 -35.2497 -0.1 + vertex -13.2045 -35.2497 -0.2 endloop endfacet facet normal 0.837921 -0.545792 0 outer loop vertex -13.0331 -35.0276 0 - vertex -12.6843 -34.4922 -0.1 + vertex -12.6843 -34.4922 -0.2 vertex -12.6843 -34.4922 0 endloop endfacet facet normal 0.837921 -0.545792 0 outer loop - vertex -12.6843 -34.4922 -0.1 + vertex -12.6843 -34.4922 -0.2 vertex -13.0331 -35.0276 0 - vertex -13.0331 -35.0276 -0.1 + vertex -13.0331 -35.0276 -0.2 endloop endfacet facet normal 0.878782 -0.477224 0 outer loop vertex -12.6843 -34.4922 0 - vertex -12.3268 -33.8339 -0.1 + vertex -12.3268 -33.8339 -0.2 vertex -12.3268 -33.8339 0 endloop endfacet facet normal 0.878782 -0.477224 0 outer loop - vertex -12.3268 -33.8339 -0.1 + vertex -12.3268 -33.8339 -0.2 vertex -12.6843 -34.4922 0 - vertex -12.6843 -34.4922 -0.1 + vertex -12.6843 -34.4922 -0.2 endloop endfacet facet normal 0.905274 -0.424829 0 outer loop vertex -12.3268 -33.8339 0 - vertex -11.9595 -33.0513 -0.1 + vertex -11.9595 -33.0513 -0.2 vertex -11.9595 -33.0513 0 endloop endfacet facet normal 0.905274 -0.424829 0 outer loop - vertex -11.9595 -33.0513 -0.1 + vertex -11.9595 -33.0513 -0.2 vertex -12.3268 -33.8339 0 - vertex -12.3268 -33.8339 -0.1 + vertex -12.3268 -33.8339 -0.2 endloop endfacet facet normal 0.923227 -0.384256 0 outer loop vertex -11.9595 -33.0513 0 - vertex -11.5815 -32.143 -0.1 + vertex -11.5815 -32.143 -0.2 vertex -11.5815 -32.143 0 endloop endfacet facet normal 0.923227 -0.384256 0 outer loop - vertex -11.5815 -32.143 -0.1 + vertex -11.5815 -32.143 -0.2 vertex -11.9595 -33.0513 0 - vertex -11.9595 -33.0513 -0.1 + vertex -11.9595 -33.0513 -0.2 endloop endfacet facet normal 0.927789 -0.373105 0 outer loop vertex -11.5815 -32.143 0 - vertex -9.5401 -27.0667 -0.1 + vertex -9.5401 -27.0667 -0.2 vertex -9.5401 -27.0667 0 endloop endfacet facet normal 0.927789 -0.373105 0 outer loop - vertex -9.5401 -27.0667 -0.1 + vertex -9.5401 -27.0667 -0.2 vertex -11.5815 -32.143 0 - vertex -11.5815 -32.143 -0.1 + vertex -11.5815 -32.143 -0.2 endloop endfacet facet normal 0.931122 -0.364709 0 outer loop vertex -9.5401 -27.0667 0 - vertex -9.05502 -25.8283 -0.1 + vertex -9.05502 -25.8283 -0.2 vertex -9.05502 -25.8283 0 endloop endfacet facet normal 0.931122 -0.364709 0 outer loop - vertex -9.05502 -25.8283 -0.1 + vertex -9.05502 -25.8283 -0.2 vertex -9.5401 -27.0667 0 - vertex -9.5401 -27.0667 -0.1 + vertex -9.5401 -27.0667 -0.2 endloop endfacet facet normal 0.946626 -0.322334 0 outer loop vertex -9.05502 -25.8283 0 - vertex -8.71232 -24.8218 -0.1 + vertex -8.71232 -24.8218 -0.2 vertex -8.71232 -24.8218 0 endloop endfacet facet normal 0.946626 -0.322334 0 outer loop - vertex -8.71232 -24.8218 -0.1 + vertex -8.71232 -24.8218 -0.2 vertex -9.05502 -25.8283 0 - vertex -9.05502 -25.8283 -0.1 + vertex -9.05502 -25.8283 -0.2 endloop endfacet facet normal 0.963249 -0.26861 0 outer loop vertex -8.71232 -24.8218 0 - vertex -8.59455 -24.3995 -0.1 + vertex -8.59455 -24.3995 -0.2 vertex -8.59455 -24.3995 0 endloop endfacet facet normal 0.963249 -0.26861 0 outer loop - vertex -8.59455 -24.3995 -0.1 + vertex -8.59455 -24.3995 -0.2 vertex -8.71232 -24.8218 0 - vertex -8.71232 -24.8218 -0.1 + vertex -8.71232 -24.8218 -0.2 endloop endfacet facet normal 0.976543 -0.215323 0 outer loop vertex -8.59455 -24.3995 0 - vertex -8.51259 -24.0278 -0.1 + vertex -8.51259 -24.0278 -0.2 vertex -8.51259 -24.0278 0 endloop endfacet facet normal 0.976543 -0.215323 0 outer loop - vertex -8.51259 -24.0278 -0.1 + vertex -8.51259 -24.0278 -0.2 vertex -8.59455 -24.3995 0 - vertex -8.59455 -24.3995 -0.1 + vertex -8.59455 -24.3995 -0.2 endloop endfacet facet normal 0.990015 -0.140965 0 outer loop vertex -8.51259 -24.0278 0 - vertex -8.46654 -23.7044 -0.1 + vertex -8.46654 -23.7044 -0.2 vertex -8.46654 -23.7044 0 endloop endfacet facet normal 0.990015 -0.140965 0 outer loop - vertex -8.46654 -23.7044 -0.1 + vertex -8.46654 -23.7044 -0.2 vertex -8.51259 -24.0278 0 - vertex -8.51259 -24.0278 -0.1 + vertex -8.51259 -24.0278 -0.2 endloop endfacet facet normal 0.999341 -0.0362924 0 outer loop vertex -8.46654 -23.7044 0 - vertex -8.45645 -23.4267 -0.1 + vertex -8.45645 -23.4267 -0.2 vertex -8.45645 -23.4267 0 endloop endfacet facet normal 0.999341 -0.0362924 0 outer loop - vertex -8.45645 -23.4267 -0.1 + vertex -8.45645 -23.4267 -0.2 vertex -8.46654 -23.7044 0 - vertex -8.46654 -23.7044 -0.1 + vertex -8.46654 -23.7044 -0.2 endloop endfacet facet normal 0.993917 0.110127 0 outer loop vertex -8.45645 -23.4267 0 - vertex -8.48242 -23.1923 -0.1 + vertex -8.48242 -23.1923 -0.2 vertex -8.48242 -23.1923 0 endloop endfacet facet normal 0.993917 0.110127 0 outer loop - vertex -8.48242 -23.1923 -0.1 + vertex -8.48242 -23.1923 -0.2 vertex -8.45645 -23.4267 0 - vertex -8.45645 -23.4267 -0.1 + vertex -8.45645 -23.4267 -0.2 endloop endfacet facet normal 0.952162 0.305593 0 outer loop vertex -8.48242 -23.1923 0 - vertex -8.54451 -22.9989 -0.1 + vertex -8.54451 -22.9989 -0.2 vertex -8.54451 -22.9989 0 endloop endfacet facet normal 0.952162 0.305593 0 outer loop - vertex -8.54451 -22.9989 -0.1 + vertex -8.54451 -22.9989 -0.2 vertex -8.48242 -23.1923 0 - vertex -8.48242 -23.1923 -0.1 + vertex -8.48242 -23.1923 -0.2 endloop endfacet facet normal 0.844525 0.535516 0 outer loop vertex -8.54451 -22.9989 0 - vertex -8.64279 -22.8439 -0.1 + vertex -8.64279 -22.8439 -0.2 vertex -8.64279 -22.8439 0 endloop endfacet facet normal 0.844525 0.535516 0 outer loop - vertex -8.64279 -22.8439 -0.1 + vertex -8.64279 -22.8439 -0.2 vertex -8.54451 -22.9989 0 - vertex -8.54451 -22.9989 -0.1 + vertex -8.54451 -22.9989 -0.2 endloop endfacet facet normal 0.662463 0.749095 -0 outer loop - vertex -8.64279 -22.8439 -0.1 + vertex -8.64279 -22.8439 -0.2 vertex -8.77736 -22.7249 0 vertex -8.64279 -22.8439 0 endloop @@ -17719,13 +17719,13 @@ solid OpenSCAD_Model facet normal 0.662463 0.749095 0 outer loop vertex -8.77736 -22.7249 0 - vertex -8.64279 -22.8439 -0.1 - vertex -8.77736 -22.7249 -0.1 + vertex -8.64279 -22.8439 -0.2 + vertex -8.77736 -22.7249 -0.2 endloop endfacet facet normal 0.447148 0.89446 -0 outer loop - vertex -8.77736 -22.7249 -0.1 + vertex -8.77736 -22.7249 -0.2 vertex -8.94827 -22.6394 0 vertex -8.77736 -22.7249 0 endloop @@ -17733,13 +17733,13 @@ solid OpenSCAD_Model facet normal 0.447148 0.89446 0 outer loop vertex -8.94827 -22.6394 0 - vertex -8.77736 -22.7249 -0.1 - vertex -8.94827 -22.6394 -0.1 + vertex -8.77736 -22.7249 -0.2 + vertex -8.94827 -22.6394 -0.2 endloop endfacet facet normal 0.253452 0.967348 -0 outer loop - vertex -8.94827 -22.6394 -0.1 + vertex -8.94827 -22.6394 -0.2 vertex -9.15561 -22.5851 0 vertex -8.94827 -22.6394 0 endloop @@ -17747,13 +17747,13 @@ solid OpenSCAD_Model facet normal 0.253452 0.967348 0 outer loop vertex -9.15561 -22.5851 0 - vertex -8.94827 -22.6394 -0.1 - vertex -9.15561 -22.5851 -0.1 + vertex -8.94827 -22.6394 -0.2 + vertex -9.15561 -22.5851 -0.2 endloop endfacet facet normal 0.104613 0.994513 -0 outer loop - vertex -9.15561 -22.5851 -0.1 + vertex -9.15561 -22.5851 -0.2 vertex -9.39946 -22.5595 0 vertex -9.15561 -22.5851 0 endloop @@ -17761,13 +17761,13 @@ solid OpenSCAD_Model facet normal 0.104613 0.994513 0 outer loop vertex -9.39946 -22.5595 0 - vertex -9.15561 -22.5851 -0.1 - vertex -9.39946 -22.5595 -0.1 + vertex -9.15561 -22.5851 -0.2 + vertex -9.39946 -22.5595 -0.2 endloop endfacet facet normal -0.0020677 0.999998 0 outer loop - vertex -9.39946 -22.5595 -0.1 + vertex -9.39946 -22.5595 -0.2 vertex -9.67988 -22.56 0 vertex -9.39946 -22.5595 0 endloop @@ -17775,13 +17775,13 @@ solid OpenSCAD_Model facet normal -0.0020677 0.999998 0 outer loop vertex -9.67988 -22.56 0 - vertex -9.39946 -22.5595 -0.1 - vertex -9.67988 -22.56 -0.1 + vertex -9.39946 -22.5595 -0.2 + vertex -9.67988 -22.56 -0.2 endloop endfacet facet normal -0.129535 0.991575 0 outer loop - vertex -9.67988 -22.56 -0.1 + vertex -9.67988 -22.56 -0.2 vertex -10.0796 -22.6123 0 vertex -9.67988 -22.56 0 endloop @@ -17789,13 +17789,13 @@ solid OpenSCAD_Model facet normal -0.129535 0.991575 0 outer loop vertex -10.0796 -22.6123 0 - vertex -9.67988 -22.56 -0.1 - vertex -10.0796 -22.6123 -0.1 + vertex -9.67988 -22.56 -0.2 + vertex -10.0796 -22.6123 -0.2 endloop endfacet facet normal -0.24491 0.969546 0 outer loop - vertex -10.0796 -22.6123 -0.1 + vertex -10.0796 -22.6123 -0.2 vertex -10.5344 -22.7271 0 vertex -10.0796 -22.6123 0 endloop @@ -17803,13 +17803,13 @@ solid OpenSCAD_Model facet normal -0.24491 0.969546 0 outer loop vertex -10.5344 -22.7271 0 - vertex -10.0796 -22.6123 -0.1 - vertex -10.5344 -22.7271 -0.1 + vertex -10.0796 -22.6123 -0.2 + vertex -10.5344 -22.7271 -0.2 endloop endfacet facet normal -0.333557 0.94273 0 outer loop - vertex -10.5344 -22.7271 -0.1 + vertex -10.5344 -22.7271 -0.2 vertex -10.9881 -22.8877 0 vertex -10.5344 -22.7271 0 endloop @@ -17817,13 +17817,13 @@ solid OpenSCAD_Model facet normal -0.333557 0.94273 0 outer loop vertex -10.9881 -22.8877 0 - vertex -10.5344 -22.7271 -0.1 - vertex -10.9881 -22.8877 -0.1 + vertex -10.5344 -22.7271 -0.2 + vertex -10.9881 -22.8877 -0.2 endloop endfacet facet normal -0.430494 0.902594 0 outer loop - vertex -10.9881 -22.8877 -0.1 + vertex -10.9881 -22.8877 -0.2 vertex -11.3849 -23.0769 0 vertex -10.9881 -22.8877 0 endloop @@ -17831,13 +17831,13 @@ solid OpenSCAD_Model facet normal -0.430494 0.902594 0 outer loop vertex -11.3849 -23.0769 0 - vertex -10.9881 -22.8877 -0.1 - vertex -11.3849 -23.0769 -0.1 + vertex -10.9881 -22.8877 -0.2 + vertex -11.3849 -23.0769 -0.2 endloop endfacet facet normal -0.511004 0.859578 0 outer loop - vertex -11.3849 -23.0769 -0.1 + vertex -11.3849 -23.0769 -0.2 vertex -11.9359 -23.4045 0 vertex -11.3849 -23.0769 0 endloop @@ -17845,13 +17845,13 @@ solid OpenSCAD_Model facet normal -0.511004 0.859578 0 outer loop vertex -11.9359 -23.4045 0 - vertex -11.3849 -23.0769 -0.1 - vertex -11.9359 -23.4045 -0.1 + vertex -11.3849 -23.0769 -0.2 + vertex -11.9359 -23.4045 -0.2 endloop endfacet facet normal -0.561997 0.827139 0 outer loop - vertex -11.9359 -23.4045 -0.1 + vertex -11.9359 -23.4045 -0.2 vertex -12.4007 -23.7203 0 vertex -11.9359 -23.4045 0 endloop @@ -17859,13 +17859,13 @@ solid OpenSCAD_Model facet normal -0.561997 0.827139 0 outer loop vertex -12.4007 -23.7203 0 - vertex -11.9359 -23.4045 -0.1 - vertex -12.4007 -23.7203 -0.1 + vertex -11.9359 -23.4045 -0.2 + vertex -12.4007 -23.7203 -0.2 endloop endfacet facet normal -0.632295 0.774728 0 outer loop - vertex -12.4007 -23.7203 -0.1 + vertex -12.4007 -23.7203 -0.2 vertex -12.7941 -24.0414 0 vertex -12.4007 -23.7203 0 endloop @@ -17873,237 +17873,237 @@ solid OpenSCAD_Model facet normal -0.632295 0.774728 0 outer loop vertex -12.7941 -24.0414 0 - vertex -12.4007 -23.7203 -0.1 - vertex -12.7941 -24.0414 -0.1 + vertex -12.4007 -23.7203 -0.2 + vertex -12.7941 -24.0414 -0.2 endloop endfacet facet normal -0.713871 0.700277 0 outer loop - vertex -13.131 -24.3848 -0.1 + vertex -13.131 -24.3848 -0.2 vertex -12.7941 -24.0414 0 - vertex -12.7941 -24.0414 -0.1 + vertex -12.7941 -24.0414 -0.2 endloop endfacet facet normal -0.713871 0.700277 0 outer loop vertex -12.7941 -24.0414 0 - vertex -13.131 -24.3848 -0.1 + vertex -13.131 -24.3848 -0.2 vertex -13.131 -24.3848 0 endloop endfacet facet normal -0.791901 0.61065 0 outer loop - vertex -13.4262 -24.7676 -0.1 + vertex -13.4262 -24.7676 -0.2 vertex -13.131 -24.3848 0 - vertex -13.131 -24.3848 -0.1 + vertex -13.131 -24.3848 -0.2 endloop endfacet facet normal -0.791901 0.61065 0 outer loop vertex -13.131 -24.3848 0 - vertex -13.4262 -24.7676 -0.1 + vertex -13.4262 -24.7676 -0.2 vertex -13.4262 -24.7676 0 endloop endfacet facet normal -0.853364 0.521315 0 outer loop - vertex -13.6945 -25.2068 -0.1 + vertex -13.6945 -25.2068 -0.2 vertex -13.4262 -24.7676 0 - vertex -13.4262 -24.7676 -0.1 + vertex -13.4262 -24.7676 -0.2 endloop endfacet facet normal -0.853364 0.521315 0 outer loop vertex -13.4262 -24.7676 0 - vertex -13.6945 -25.2068 -0.1 + vertex -13.6945 -25.2068 -0.2 vertex -13.6945 -25.2068 0 endloop endfacet facet normal -0.894467 0.447134 0 outer loop - vertex -13.9508 -25.7195 -0.1 + vertex -13.9508 -25.7195 -0.2 vertex -13.6945 -25.2068 0 - vertex -13.6945 -25.2068 -0.1 + vertex -13.6945 -25.2068 -0.2 endloop endfacet facet normal -0.894467 0.447134 0 outer loop vertex -13.6945 -25.2068 0 - vertex -13.9508 -25.7195 -0.1 + vertex -13.9508 -25.7195 -0.2 vertex -13.9508 -25.7195 0 endloop endfacet facet normal -0.918824 0.394667 0 outer loop - vertex -14.2098 -26.3227 -0.1 + vertex -14.2098 -26.3227 -0.2 vertex -13.9508 -25.7195 0 - vertex -13.9508 -25.7195 -0.1 + vertex -13.9508 -25.7195 -0.2 endloop endfacet facet normal -0.918824 0.394667 0 outer loop vertex -13.9508 -25.7195 0 - vertex -14.2098 -26.3227 -0.1 + vertex -14.2098 -26.3227 -0.2 vertex -14.2098 -26.3227 0 endloop endfacet facet normal -0.926196 0.377042 0 outer loop - vertex -15.3777 -29.1914 -0.1 + vertex -15.3777 -29.1914 -0.2 vertex -14.2098 -26.3227 0 - vertex -14.2098 -26.3227 -0.1 + vertex -14.2098 -26.3227 -0.2 endloop endfacet facet normal -0.926196 0.377042 0 outer loop vertex -14.2098 -26.3227 0 - vertex -15.3777 -29.1914 -0.1 + vertex -15.3777 -29.1914 -0.2 vertex -15.3777 -29.1914 0 endloop endfacet facet normal -0.925675 0.37832 0 outer loop - vertex -16.8163 -32.7116 -0.1 + vertex -16.8163 -32.7116 -0.2 vertex -15.3777 -29.1914 0 - vertex -15.3777 -29.1914 -0.1 + vertex -15.3777 -29.1914 -0.2 endloop endfacet facet normal -0.925675 0.37832 0 outer loop vertex -15.3777 -29.1914 0 - vertex -16.8163 -32.7116 -0.1 + vertex -16.8163 -32.7116 -0.2 vertex -16.8163 -32.7116 0 endloop endfacet facet normal -0.928735 0.370745 0 outer loop - vertex -17.1674 -33.591 -0.1 + vertex -17.1674 -33.591 -0.2 vertex -16.8163 -32.7116 0 - vertex -16.8163 -32.7116 -0.1 + vertex -16.8163 -32.7116 -0.2 endloop endfacet facet normal -0.928735 0.370745 0 outer loop vertex -16.8163 -32.7116 0 - vertex -17.1674 -33.591 -0.1 + vertex -17.1674 -33.591 -0.2 vertex -17.1674 -33.591 0 endloop endfacet facet normal -0.937631 0.347632 0 outer loop - vertex -17.4329 -34.3072 -0.1 + vertex -17.4329 -34.3072 -0.2 vertex -17.1674 -33.591 0 - vertex -17.1674 -33.591 -0.1 + vertex -17.1674 -33.591 -0.2 endloop endfacet facet normal -0.937631 0.347632 0 outer loop vertex -17.1674 -33.591 0 - vertex -17.4329 -34.3072 -0.1 + vertex -17.4329 -34.3072 -0.2 vertex -17.4329 -34.3072 0 endloop endfacet facet normal -0.951989 0.306132 0 outer loop - vertex -17.6153 -34.8741 -0.1 + vertex -17.6153 -34.8741 -0.2 vertex -17.4329 -34.3072 0 - vertex -17.4329 -34.3072 -0.1 + vertex -17.4329 -34.3072 -0.2 endloop endfacet facet normal -0.951989 0.306132 0 outer loop vertex -17.4329 -34.3072 0 - vertex -17.6153 -34.8741 -0.1 + vertex -17.6153 -34.8741 -0.2 vertex -17.6153 -34.8741 0 endloop endfacet facet normal -0.973485 0.228749 0 outer loop - vertex -17.7168 -35.3062 -0.1 + vertex -17.7168 -35.3062 -0.2 vertex -17.6153 -34.8741 0 - vertex -17.6153 -34.8741 -0.1 + vertex -17.6153 -34.8741 -0.2 endloop endfacet facet normal -0.973485 0.228749 0 outer loop vertex -17.6153 -34.8741 0 - vertex -17.7168 -35.3062 -0.1 + vertex -17.7168 -35.3062 -0.2 vertex -17.7168 -35.3062 0 endloop endfacet facet normal -0.992299 0.123865 0 outer loop - vertex -17.738 -35.4761 -0.1 + vertex -17.738 -35.4761 -0.2 vertex -17.7168 -35.3062 0 - vertex -17.7168 -35.3062 -0.1 + vertex -17.7168 -35.3062 -0.2 endloop endfacet facet normal -0.992299 0.123865 0 outer loop vertex -17.7168 -35.3062 0 - vertex -17.738 -35.4761 -0.1 + vertex -17.738 -35.4761 -0.2 vertex -17.738 -35.4761 0 endloop endfacet facet normal -0.99991 0.0134015 0 outer loop - vertex -17.7399 -35.6175 -0.1 + vertex -17.7399 -35.6175 -0.2 vertex -17.738 -35.4761 0 - vertex -17.738 -35.4761 -0.1 + vertex -17.738 -35.4761 -0.2 endloop endfacet facet normal -0.99991 0.0134015 0 outer loop vertex -17.738 -35.4761 0 - vertex -17.7399 -35.6175 -0.1 + vertex -17.7399 -35.6175 -0.2 vertex -17.7399 -35.6175 0 endloop endfacet facet normal -0.989073 -0.147424 0 outer loop - vertex -17.7228 -35.7323 -0.1 + vertex -17.7228 -35.7323 -0.2 vertex -17.7399 -35.6175 0 - vertex -17.7399 -35.6175 -0.1 + vertex -17.7399 -35.6175 -0.2 endloop endfacet facet normal -0.989073 -0.147424 0 outer loop vertex -17.7399 -35.6175 0 - vertex -17.7228 -35.7323 -0.1 + vertex -17.7228 -35.7323 -0.2 vertex -17.7228 -35.7323 0 endloop endfacet facet normal -0.929053 -0.369947 0 outer loop - vertex -17.6869 -35.8223 -0.1 + vertex -17.6869 -35.8223 -0.2 vertex -17.7228 -35.7323 0 - vertex -17.7228 -35.7323 -0.1 + vertex -17.7228 -35.7323 -0.2 endloop endfacet facet normal -0.929053 -0.369947 0 outer loop vertex -17.7228 -35.7323 0 - vertex -17.6869 -35.8223 -0.1 + vertex -17.6869 -35.8223 -0.2 vertex -17.6869 -35.8223 0 endloop endfacet facet normal -0.776679 -0.629897 0 outer loop - vertex -17.6327 -35.8892 -0.1 + vertex -17.6327 -35.8892 -0.2 vertex -17.6869 -35.8223 0 - vertex -17.6869 -35.8223 -0.1 + vertex -17.6869 -35.8223 -0.2 endloop endfacet facet normal -0.776679 -0.629897 0 outer loop vertex -17.6869 -35.8223 0 - vertex -17.6327 -35.8892 -0.1 + vertex -17.6327 -35.8892 -0.2 vertex -17.6327 -35.8892 0 endloop endfacet facet normal -0.532937 -0.846155 0 outer loop - vertex -17.6327 -35.8892 -0.1 + vertex -17.6327 -35.8892 -0.2 vertex -17.5603 -35.9348 0 vertex -17.6327 -35.8892 0 endloop @@ -18111,13 +18111,13 @@ solid OpenSCAD_Model facet normal -0.532937 -0.846155 -0 outer loop vertex -17.5603 -35.9348 0 - vertex -17.6327 -35.8892 -0.1 - vertex -17.5603 -35.9348 -0.1 + vertex -17.6327 -35.8892 -0.2 + vertex -17.5603 -35.9348 -0.2 endloop endfacet facet normal -0.277484 -0.96073 0 outer loop - vertex -17.5603 -35.9348 -0.1 + vertex -17.5603 -35.9348 -0.2 vertex -17.4702 -35.9608 0 vertex -17.5603 -35.9348 0 endloop @@ -18125,13 +18125,13 @@ solid OpenSCAD_Model facet normal -0.277484 -0.96073 -0 outer loop vertex -17.4702 -35.9608 0 - vertex -17.5603 -35.9348 -0.1 - vertex -17.4702 -35.9608 -0.1 + vertex -17.5603 -35.9348 -0.2 + vertex -17.4702 -35.9608 -0.2 endloop endfacet facet normal -0.0767033 -0.997054 0 outer loop - vertex -17.4702 -35.9608 -0.1 + vertex -17.4702 -35.9608 -0.2 vertex -17.3625 -35.9691 0 vertex -17.4702 -35.9608 0 endloop @@ -18139,13 +18139,13 @@ solid OpenSCAD_Model facet normal -0.0767033 -0.997054 -0 outer loop vertex -17.3625 -35.9691 0 - vertex -17.4702 -35.9608 -0.1 - vertex -17.3625 -35.9691 -0.1 + vertex -17.4702 -35.9608 -0.2 + vertex -17.3625 -35.9691 -0.2 endloop endfacet facet normal -0.0829709 -0.996552 0 outer loop - vertex -17.3625 -35.9691 -0.1 + vertex -17.3625 -35.9691 -0.2 vertex -17.1493 -35.9869 0 vertex -17.3625 -35.9691 0 endloop @@ -18153,13 +18153,13 @@ solid OpenSCAD_Model facet normal -0.0829709 -0.996552 -0 outer loop vertex -17.1493 -35.9869 0 - vertex -17.3625 -35.9691 -0.1 - vertex -17.1493 -35.9869 -0.1 + vertex -17.3625 -35.9691 -0.2 + vertex -17.1493 -35.9869 -0.2 endloop endfacet facet normal -0.234852 -0.972031 0 outer loop - vertex -17.1493 -35.9869 -0.1 + vertex -17.1493 -35.9869 -0.2 vertex -16.942 -36.0369 0 vertex -17.1493 -35.9869 0 endloop @@ -18167,13 +18167,13 @@ solid OpenSCAD_Model facet normal -0.234852 -0.972031 -0 outer loop vertex -16.942 -36.0369 0 - vertex -17.1493 -35.9869 -0.1 - vertex -16.942 -36.0369 -0.1 + vertex -17.1493 -35.9869 -0.2 + vertex -16.942 -36.0369 -0.2 endloop endfacet facet normal -0.371048 -0.928614 0 outer loop - vertex -16.942 -36.0369 -0.1 + vertex -16.942 -36.0369 -0.2 vertex -16.7476 -36.1146 0 vertex -16.942 -36.0369 0 endloop @@ -18181,13 +18181,13 @@ solid OpenSCAD_Model facet normal -0.371048 -0.928614 -0 outer loop vertex -16.7476 -36.1146 0 - vertex -16.942 -36.0369 -0.1 - vertex -16.7476 -36.1146 -0.1 + vertex -16.942 -36.0369 -0.2 + vertex -16.7476 -36.1146 -0.2 endloop endfacet facet normal -0.499006 -0.866599 0 outer loop - vertex -16.7476 -36.1146 -0.1 + vertex -16.7476 -36.1146 -0.2 vertex -16.5729 -36.2152 0 vertex -16.7476 -36.1146 0 endloop @@ -18195,13 +18195,13 @@ solid OpenSCAD_Model facet normal -0.499006 -0.866599 -0 outer loop vertex -16.5729 -36.2152 0 - vertex -16.7476 -36.1146 -0.1 - vertex -16.5729 -36.2152 -0.1 + vertex -16.7476 -36.1146 -0.2 + vertex -16.5729 -36.2152 -0.2 endloop endfacet facet normal -0.625925 -0.779883 0 outer loop - vertex -16.5729 -36.2152 -0.1 + vertex -16.5729 -36.2152 -0.2 vertex -16.4249 -36.334 0 vertex -16.5729 -36.2152 0 endloop @@ -18209,125 +18209,125 @@ solid OpenSCAD_Model facet normal -0.625925 -0.779883 -0 outer loop vertex -16.4249 -36.334 0 - vertex -16.5729 -36.2152 -0.1 - vertex -16.4249 -36.334 -0.1 + vertex -16.5729 -36.2152 -0.2 + vertex -16.4249 -36.334 -0.2 endloop endfacet facet normal -0.756453 -0.654048 0 outer loop - vertex -16.3106 -36.4662 -0.1 + vertex -16.3106 -36.4662 -0.2 vertex -16.4249 -36.334 0 - vertex -16.4249 -36.334 -0.1 + vertex -16.4249 -36.334 -0.2 endloop endfacet facet normal -0.756453 -0.654048 0 outer loop vertex -16.4249 -36.334 0 - vertex -16.3106 -36.4662 -0.1 + vertex -16.3106 -36.4662 -0.2 vertex -16.3106 -36.4662 0 endloop endfacet facet normal -0.886186 -0.46333 0 outer loop - vertex -16.237 -36.6071 -0.1 + vertex -16.237 -36.6071 -0.2 vertex -16.3106 -36.4662 0 - vertex -16.3106 -36.4662 -0.1 + vertex -16.3106 -36.4662 -0.2 endloop endfacet facet normal -0.886186 -0.46333 0 outer loop vertex -16.3106 -36.4662 0 - vertex -16.237 -36.6071 -0.1 + vertex -16.237 -36.6071 -0.2 vertex -16.237 -36.6071 0 endloop endfacet facet normal -0.984159 -0.177288 0 outer loop - vertex -16.2109 -36.752 -0.1 + vertex -16.2109 -36.752 -0.2 vertex -16.237 -36.6071 0 - vertex -16.237 -36.6071 -0.1 + vertex -16.237 -36.6071 -0.2 endloop endfacet facet normal -0.984159 -0.177288 0 outer loop vertex -16.237 -36.6071 0 - vertex -16.2109 -36.752 -0.1 + vertex -16.2109 -36.752 -0.2 vertex -16.2109 -36.752 0 endloop endfacet facet normal -0.97657 0.215201 0 outer loop - vertex -16.2485 -36.9225 -0.1 + vertex -16.2485 -36.9225 -0.2 vertex -16.2109 -36.752 0 - vertex -16.2109 -36.752 -0.1 + vertex -16.2109 -36.752 -0.2 endloop endfacet facet normal -0.97657 0.215201 0 outer loop vertex -16.2109 -36.752 0 - vertex -16.2485 -36.9225 -0.1 + vertex -16.2485 -36.9225 -0.2 vertex -16.2485 -36.9225 0 endloop endfacet facet normal -0.906917 0.42131 0 outer loop - vertex -16.3508 -37.1428 -0.1 + vertex -16.3508 -37.1428 -0.2 vertex -16.2485 -36.9225 0 - vertex -16.2485 -36.9225 -0.1 + vertex -16.2485 -36.9225 -0.2 endloop endfacet facet normal -0.906917 0.42131 0 outer loop vertex -16.2485 -36.9225 0 - vertex -16.3508 -37.1428 -0.1 + vertex -16.3508 -37.1428 -0.2 vertex -16.3508 -37.1428 0 endloop endfacet facet normal -0.847258 0.531182 0 outer loop - vertex -16.5023 -37.3844 -0.1 + vertex -16.5023 -37.3844 -0.2 vertex -16.3508 -37.1428 0 - vertex -16.3508 -37.1428 -0.1 + vertex -16.3508 -37.1428 -0.2 endloop endfacet facet normal -0.847258 0.531182 0 outer loop vertex -16.3508 -37.1428 0 - vertex -16.5023 -37.3844 -0.1 + vertex -16.5023 -37.3844 -0.2 vertex -16.5023 -37.3844 0 endloop endfacet facet normal -0.785088 0.619384 0 outer loop - vertex -16.6872 -37.6188 -0.1 + vertex -16.6872 -37.6188 -0.2 vertex -16.5023 -37.3844 0 - vertex -16.5023 -37.3844 -0.1 + vertex -16.5023 -37.3844 -0.2 endloop endfacet facet normal -0.785088 0.619384 0 outer loop vertex -16.5023 -37.3844 0 - vertex -16.6872 -37.6188 -0.1 + vertex -16.6872 -37.6188 -0.2 vertex -16.6872 -37.6188 0 endloop endfacet facet normal -0.731213 0.68215 0 outer loop - vertex -16.8516 -37.795 -0.1 + vertex -16.8516 -37.795 -0.2 vertex -16.6872 -37.6188 0 - vertex -16.6872 -37.6188 -0.1 + vertex -16.6872 -37.6188 -0.2 endloop endfacet facet normal -0.731213 0.68215 0 outer loop vertex -16.6872 -37.6188 0 - vertex -16.8516 -37.795 -0.1 + vertex -16.8516 -37.795 -0.2 vertex -16.8516 -37.795 0 endloop endfacet facet normal -0.615138 0.78842 0 outer loop - vertex -16.8516 -37.795 -0.1 + vertex -16.8516 -37.795 -0.2 vertex -17.0213 -37.9274 0 vertex -16.8516 -37.795 0 endloop @@ -18335,13 +18335,13 @@ solid OpenSCAD_Model facet normal -0.615138 0.78842 0 outer loop vertex -17.0213 -37.9274 0 - vertex -16.8516 -37.795 -0.1 - vertex -17.0213 -37.9274 -0.1 + vertex -16.8516 -37.795 -0.2 + vertex -17.0213 -37.9274 -0.2 endloop endfacet facet normal -0.390611 0.920556 0 outer loop - vertex -17.0213 -37.9274 -0.1 + vertex -17.0213 -37.9274 -0.2 vertex -17.2437 -38.0218 0 vertex -17.0213 -37.9274 0 endloop @@ -18349,13 +18349,13 @@ solid OpenSCAD_Model facet normal -0.390611 0.920556 0 outer loop vertex -17.2437 -38.0218 0 - vertex -17.0213 -37.9274 -0.1 - vertex -17.2437 -38.0218 -0.1 + vertex -17.0213 -37.9274 -0.2 + vertex -17.2437 -38.0218 -0.2 endloop endfacet facet normal -0.189492 0.981882 0 outer loop - vertex -17.2437 -38.0218 -0.1 + vertex -17.2437 -38.0218 -0.2 vertex -17.5664 -38.0841 0 vertex -17.2437 -38.0218 0 endloop @@ -18363,13 +18363,13 @@ solid OpenSCAD_Model facet normal -0.189492 0.981882 0 outer loop vertex -17.5664 -38.0841 0 - vertex -17.2437 -38.0218 -0.1 - vertex -17.5664 -38.0841 -0.1 + vertex -17.2437 -38.0218 -0.2 + vertex -17.5664 -38.0841 -0.2 endloop endfacet facet normal -0.0764443 0.997074 0 outer loop - vertex -17.5664 -38.0841 -0.1 + vertex -17.5664 -38.0841 -0.2 vertex -18.0369 -38.1201 0 vertex -17.5664 -38.0841 0 endloop @@ -18377,13 +18377,13 @@ solid OpenSCAD_Model facet normal -0.0764443 0.997074 0 outer loop vertex -18.0369 -38.1201 0 - vertex -17.5664 -38.0841 -0.1 - vertex -18.0369 -38.1201 -0.1 + vertex -17.5664 -38.0841 -0.2 + vertex -18.0369 -38.1201 -0.2 endloop endfacet facet normal -0.0236695 0.99972 0 outer loop - vertex -18.0369 -38.1201 -0.1 + vertex -18.0369 -38.1201 -0.2 vertex -18.7028 -38.1359 0 vertex -18.0369 -38.1201 0 endloop @@ -18391,13 +18391,13 @@ solid OpenSCAD_Model facet normal -0.0236695 0.99972 0 outer loop vertex -18.7028 -38.1359 0 - vertex -18.0369 -38.1201 -0.1 - vertex -18.7028 -38.1359 -0.1 + vertex -18.0369 -38.1201 -0.2 + vertex -18.7028 -38.1359 -0.2 endloop endfacet facet normal 0.00275597 0.999996 -0 outer loop - vertex -18.7028 -38.1359 -0.1 + vertex -18.7028 -38.1359 -0.2 vertex -20.8109 -38.1301 0 vertex -18.7028 -38.1359 0 endloop @@ -18405,13 +18405,13 @@ solid OpenSCAD_Model facet normal 0.00275597 0.999996 0 outer loop vertex -20.8109 -38.1301 0 - vertex -18.7028 -38.1359 -0.1 - vertex -20.8109 -38.1301 -0.1 + vertex -18.7028 -38.1359 -0.2 + vertex -20.8109 -38.1301 -0.2 endloop endfacet facet normal 0.0176671 0.999844 -0 outer loop - vertex -20.8109 -38.1301 -0.1 + vertex -20.8109 -38.1301 -0.2 vertex -23.4866 -38.0828 0 vertex -20.8109 -38.1301 0 endloop @@ -18419,13 +18419,13 @@ solid OpenSCAD_Model facet normal 0.0176671 0.999844 0 outer loop vertex -23.4866 -38.0828 0 - vertex -20.8109 -38.1301 -0.1 - vertex -23.4866 -38.0828 -0.1 + vertex -20.8109 -38.1301 -0.2 + vertex -23.4866 -38.0828 -0.2 endloop endfacet facet normal 0.0417305 0.999129 -0 outer loop - vertex -23.4866 -38.0828 -0.1 + vertex -23.4866 -38.0828 -0.2 vertex -24.3782 -38.0456 0 vertex -23.4866 -38.0828 0 endloop @@ -18433,13 +18433,13 @@ solid OpenSCAD_Model facet normal 0.0417305 0.999129 0 outer loop vertex -24.3782 -38.0456 0 - vertex -23.4866 -38.0828 -0.1 - vertex -24.3782 -38.0456 -0.1 + vertex -23.4866 -38.0828 -0.2 + vertex -24.3782 -38.0456 -0.2 endloop endfacet facet normal 0.0968237 0.995302 -0 outer loop - vertex -24.3782 -38.0456 -0.1 + vertex -24.3782 -38.0456 -0.2 vertex -24.7978 -38.0047 0 vertex -24.3782 -38.0456 0 endloop @@ -18447,13 +18447,13 @@ solid OpenSCAD_Model facet normal 0.0968237 0.995302 0 outer loop vertex -24.7978 -38.0047 0 - vertex -24.3782 -38.0456 -0.1 - vertex -24.7978 -38.0047 -0.1 + vertex -24.3782 -38.0456 -0.2 + vertex -24.7978 -38.0047 -0.2 endloop endfacet facet normal 0.412814 0.910815 -0 outer loop - vertex -24.7978 -38.0047 -0.1 + vertex -24.7978 -38.0047 -0.2 vertex -24.9442 -37.9384 0 vertex -24.7978 -38.0047 0 endloop @@ -18461,13 +18461,13 @@ solid OpenSCAD_Model facet normal 0.412814 0.910815 0 outer loop vertex -24.9442 -37.9384 0 - vertex -24.7978 -38.0047 -0.1 - vertex -24.9442 -37.9384 -0.1 + vertex -24.7978 -38.0047 -0.2 + vertex -24.9442 -37.9384 -0.2 endloop endfacet facet normal 0.678412 0.734682 -0 outer loop - vertex -24.9442 -37.9384 -0.1 + vertex -24.9442 -37.9384 -0.2 vertex -25.0491 -37.8416 0 vertex -24.9442 -37.9384 0 endloop @@ -18475,139 +18475,139 @@ solid OpenSCAD_Model facet normal 0.678412 0.734682 0 outer loop vertex -25.0491 -37.8416 0 - vertex -24.9442 -37.9384 -0.1 - vertex -25.0491 -37.8416 -0.1 + vertex -24.9442 -37.9384 -0.2 + vertex -25.0491 -37.8416 -0.2 endloop endfacet facet normal 0.880101 0.474787 0 outer loop vertex -25.0491 -37.8416 0 - vertex -25.1152 -37.719 -0.1 + vertex -25.1152 -37.719 -0.2 vertex -25.1152 -37.719 0 endloop endfacet facet normal 0.880101 0.474787 0 outer loop - vertex -25.1152 -37.719 -0.1 + vertex -25.1152 -37.719 -0.2 vertex -25.0491 -37.8416 0 - vertex -25.0491 -37.8416 -0.1 + vertex -25.0491 -37.8416 -0.2 endloop endfacet facet normal 0.978769 0.204965 0 outer loop vertex -25.1152 -37.719 0 - vertex -25.1453 -37.5754 -0.1 + vertex -25.1453 -37.5754 -0.2 vertex -25.1453 -37.5754 0 endloop endfacet facet normal 0.978769 0.204965 0 outer loop - vertex -25.1453 -37.5754 -0.1 + vertex -25.1453 -37.5754 -0.2 vertex -25.1152 -37.719 0 - vertex -25.1152 -37.719 -0.1 + vertex -25.1152 -37.719 -0.2 endloop endfacet facet normal 0.99978 -0.0209726 0 outer loop vertex -25.1453 -37.5754 0 - vertex -25.1419 -37.4158 -0.1 + vertex -25.1419 -37.4158 -0.2 vertex -25.1419 -37.4158 0 endloop endfacet facet normal 0.99978 -0.0209726 0 outer loop - vertex -25.1419 -37.4158 -0.1 + vertex -25.1419 -37.4158 -0.2 vertex -25.1453 -37.5754 0 - vertex -25.1453 -37.5754 -0.1 + vertex -25.1453 -37.5754 -0.2 endloop endfacet facet normal 0.980708 -0.195479 0 outer loop vertex -25.1419 -37.4158 0 - vertex -25.1078 -37.2448 -0.1 + vertex -25.1078 -37.2448 -0.2 vertex -25.1078 -37.2448 0 endloop endfacet facet normal 0.980708 -0.195479 0 outer loop - vertex -25.1078 -37.2448 -0.1 + vertex -25.1078 -37.2448 -0.2 vertex -25.1419 -37.4158 0 - vertex -25.1419 -37.4158 -0.1 + vertex -25.1419 -37.4158 -0.2 endloop endfacet facet normal 0.94384 -0.330404 0 outer loop vertex -25.1078 -37.2448 0 - vertex -25.0457 -37.0673 -0.1 + vertex -25.0457 -37.0673 -0.2 vertex -25.0457 -37.0673 0 endloop endfacet facet normal 0.94384 -0.330404 0 outer loop - vertex -25.0457 -37.0673 -0.1 + vertex -25.0457 -37.0673 -0.2 vertex -25.1078 -37.2448 0 - vertex -25.1078 -37.2448 -0.1 + vertex -25.1078 -37.2448 -0.2 endloop endfacet facet normal 0.898573 -0.438825 0 outer loop vertex -25.0457 -37.0673 0 - vertex -24.9582 -36.888 -0.1 + vertex -24.9582 -36.888 -0.2 vertex -24.9582 -36.888 0 endloop endfacet facet normal 0.898573 -0.438825 0 outer loop - vertex -24.9582 -36.888 -0.1 + vertex -24.9582 -36.888 -0.2 vertex -25.0457 -37.0673 0 - vertex -25.0457 -37.0673 -0.1 + vertex -25.0457 -37.0673 -0.2 endloop endfacet facet normal 0.847669 -0.530525 0 outer loop vertex -24.9582 -36.888 0 - vertex -24.8479 -36.7119 -0.1 + vertex -24.8479 -36.7119 -0.2 vertex -24.8479 -36.7119 0 endloop endfacet facet normal 0.847669 -0.530525 0 outer loop - vertex -24.8479 -36.7119 -0.1 + vertex -24.8479 -36.7119 -0.2 vertex -24.9582 -36.888 0 - vertex -24.9582 -36.888 -0.1 + vertex -24.9582 -36.888 -0.2 endloop endfacet facet normal 0.790663 -0.612252 0 outer loop vertex -24.8479 -36.7119 0 - vertex -24.7177 -36.5437 -0.1 + vertex -24.7177 -36.5437 -0.2 vertex -24.7177 -36.5437 0 endloop endfacet facet normal 0.790663 -0.612252 0 outer loop - vertex -24.7177 -36.5437 -0.1 + vertex -24.7177 -36.5437 -0.2 vertex -24.8479 -36.7119 0 - vertex -24.8479 -36.7119 -0.1 + vertex -24.8479 -36.7119 -0.2 endloop endfacet facet normal 0.7253 -0.688433 0 outer loop vertex -24.7177 -36.5437 0 - vertex -24.57 -36.3881 -0.1 + vertex -24.57 -36.3881 -0.2 vertex -24.57 -36.3881 0 endloop endfacet facet normal 0.7253 -0.688433 0 outer loop - vertex -24.57 -36.3881 -0.1 + vertex -24.57 -36.3881 -0.2 vertex -24.7177 -36.5437 0 - vertex -24.7177 -36.5437 -0.1 + vertex -24.7177 -36.5437 -0.2 endloop endfacet facet normal 0.647808 -0.761803 0 outer loop - vertex -24.57 -36.3881 -0.1 + vertex -24.57 -36.3881 -0.2 vertex -24.4077 -36.2501 0 vertex -24.57 -36.3881 0 endloop @@ -18615,13 +18615,13 @@ solid OpenSCAD_Model facet normal 0.647808 -0.761803 0 outer loop vertex -24.4077 -36.2501 0 - vertex -24.57 -36.3881 -0.1 - vertex -24.4077 -36.2501 -0.1 + vertex -24.57 -36.3881 -0.2 + vertex -24.4077 -36.2501 -0.2 endloop endfacet facet normal 0.553033 -0.833159 0 outer loop - vertex -24.4077 -36.2501 -0.1 + vertex -24.4077 -36.2501 -0.2 vertex -24.2334 -36.1344 0 vertex -24.4077 -36.2501 0 endloop @@ -18629,13 +18629,13 @@ solid OpenSCAD_Model facet normal 0.553033 -0.833159 0 outer loop vertex -24.2334 -36.1344 0 - vertex -24.4077 -36.2501 -0.1 - vertex -24.2334 -36.1344 -0.1 + vertex -24.4077 -36.2501 -0.2 + vertex -24.2334 -36.1344 -0.2 endloop endfacet facet normal 0.434505 -0.900669 0 outer loop - vertex -24.2334 -36.1344 -0.1 + vertex -24.2334 -36.1344 -0.2 vertex -24.0497 -36.0458 0 vertex -24.2334 -36.1344 0 endloop @@ -18643,13 +18643,13 @@ solid OpenSCAD_Model facet normal 0.434505 -0.900669 0 outer loop vertex -24.0497 -36.0458 0 - vertex -24.2334 -36.1344 -0.1 - vertex -24.0497 -36.0458 -0.1 + vertex -24.2334 -36.1344 -0.2 + vertex -24.0497 -36.0458 -0.2 endloop endfacet facet normal 0.285417 -0.958403 0 outer loop - vertex -24.0497 -36.0458 -0.1 + vertex -24.0497 -36.0458 -0.2 vertex -23.8593 -35.9891 0 vertex -24.0497 -36.0458 0 endloop @@ -18657,13 +18657,13 @@ solid OpenSCAD_Model facet normal 0.285417 -0.958403 0 outer loop vertex -23.8593 -35.9891 0 - vertex -24.0497 -36.0458 -0.1 - vertex -23.8593 -35.9891 -0.1 + vertex -24.0497 -36.0458 -0.2 + vertex -23.8593 -35.9891 -0.2 endloop endfacet facet normal 0.1022 -0.994764 0 outer loop - vertex -23.8593 -35.9891 -0.1 + vertex -23.8593 -35.9891 -0.2 vertex -23.665 -35.9691 0 vertex -23.8593 -35.9891 0 endloop @@ -18671,13 +18671,13 @@ solid OpenSCAD_Model facet normal 0.1022 -0.994764 0 outer loop vertex -23.665 -35.9691 0 - vertex -23.8593 -35.9891 -0.1 - vertex -23.665 -35.9691 -0.1 + vertex -23.8593 -35.9891 -0.2 + vertex -23.665 -35.9691 -0.2 endloop endfacet facet normal 0.0676467 -0.997709 0 outer loop - vertex -23.665 -35.9691 -0.1 + vertex -23.665 -35.9691 -0.2 vertex -23.3082 -35.9449 0 vertex -23.665 -35.9691 0 endloop @@ -18685,13 +18685,13 @@ solid OpenSCAD_Model facet normal 0.0676467 -0.997709 0 outer loop vertex -23.3082 -35.9449 0 - vertex -23.665 -35.9691 -0.1 - vertex -23.3082 -35.9449 -0.1 + vertex -23.665 -35.9691 -0.2 + vertex -23.3082 -35.9449 -0.2 endloop endfacet facet normal 0.201749 -0.979437 0 outer loop - vertex -23.3082 -35.9449 -0.1 + vertex -23.3082 -35.9449 -0.2 vertex -23.1471 -35.9117 0 vertex -23.3082 -35.9449 0 endloop @@ -18699,13 +18699,13 @@ solid OpenSCAD_Model facet normal 0.201749 -0.979437 0 outer loop vertex -23.1471 -35.9117 0 - vertex -23.3082 -35.9449 -0.1 - vertex -23.1471 -35.9117 -0.1 + vertex -23.3082 -35.9449 -0.2 + vertex -23.1471 -35.9117 -0.2 endloop endfacet facet normal 0.311945 -0.9501 0 outer loop - vertex -23.1471 -35.9117 -0.1 + vertex -23.1471 -35.9117 -0.2 vertex -22.9953 -35.8619 0 vertex -23.1471 -35.9117 0 endloop @@ -18713,13 +18713,13 @@ solid OpenSCAD_Model facet normal 0.311945 -0.9501 0 outer loop vertex -22.9953 -35.8619 0 - vertex -23.1471 -35.9117 -0.1 - vertex -22.9953 -35.8619 -0.1 + vertex -23.1471 -35.9117 -0.2 + vertex -22.9953 -35.8619 -0.2 endloop endfacet facet normal 0.428709 -0.903443 0 outer loop - vertex -22.9953 -35.8619 -0.1 + vertex -22.9953 -35.8619 -0.2 vertex -22.8511 -35.7934 0 vertex -22.9953 -35.8619 0 endloop @@ -18727,13 +18727,13 @@ solid OpenSCAD_Model facet normal 0.428709 -0.903443 0 outer loop vertex -22.8511 -35.7934 0 - vertex -22.9953 -35.8619 -0.1 - vertex -22.8511 -35.7934 -0.1 + vertex -22.9953 -35.8619 -0.2 + vertex -22.8511 -35.7934 -0.2 endloop endfacet facet normal 0.540869 -0.841107 0 outer loop - vertex -22.8511 -35.7934 -0.1 + vertex -22.8511 -35.7934 -0.2 vertex -22.7126 -35.7044 0 vertex -22.8511 -35.7934 0 endloop @@ -18741,13 +18741,13 @@ solid OpenSCAD_Model facet normal 0.540869 -0.841107 0 outer loop vertex -22.7126 -35.7044 0 - vertex -22.8511 -35.7934 -0.1 - vertex -22.7126 -35.7044 -0.1 + vertex -22.8511 -35.7934 -0.2 + vertex -22.7126 -35.7044 -0.2 endloop endfacet facet normal 0.638801 -0.769372 0 outer loop - vertex -22.7126 -35.7044 -0.1 + vertex -22.7126 -35.7044 -0.2 vertex -22.5782 -35.5929 0 vertex -22.7126 -35.7044 0 endloop @@ -18755,195 +18755,195 @@ solid OpenSCAD_Model facet normal 0.638801 -0.769372 0 outer loop vertex -22.5782 -35.5929 0 - vertex -22.7126 -35.7044 -0.1 - vertex -22.5782 -35.5929 -0.1 + vertex -22.7126 -35.7044 -0.2 + vertex -22.5782 -35.5929 -0.2 endloop endfacet facet normal 0.717693 -0.69636 0 outer loop vertex -22.5782 -35.5929 0 - vertex -22.4463 -35.4568 -0.1 + vertex -22.4463 -35.4568 -0.2 vertex -22.4463 -35.4568 0 endloop endfacet facet normal 0.717693 -0.69636 0 outer loop - vertex -22.4463 -35.4568 -0.1 + vertex -22.4463 -35.4568 -0.2 vertex -22.5782 -35.5929 0 - vertex -22.5782 -35.5929 -0.1 + vertex -22.5782 -35.5929 -0.2 endloop endfacet facet normal 0.801318 -0.598238 0 outer loop vertex -22.4463 -35.4568 0 - vertex -22.1824 -35.1035 -0.1 + vertex -22.1824 -35.1035 -0.2 vertex -22.1824 -35.1035 0 endloop endfacet facet normal 0.801318 -0.598238 0 outer loop - vertex -22.1824 -35.1035 -0.1 + vertex -22.1824 -35.1035 -0.2 vertex -22.4463 -35.4568 0 - vertex -22.4463 -35.4568 -0.1 + vertex -22.4463 -35.4568 -0.2 endloop endfacet facet normal 0.865265 -0.501314 0 outer loop vertex -22.1824 -35.1035 0 - vertex -21.9074 -34.6287 -0.1 + vertex -21.9074 -34.6287 -0.2 vertex -21.9074 -34.6287 0 endloop endfacet facet normal 0.865265 -0.501314 0 outer loop - vertex -21.9074 -34.6287 -0.1 + vertex -21.9074 -34.6287 -0.2 vertex -22.1824 -35.1035 0 - vertex -22.1824 -35.1035 -0.1 + vertex -22.1824 -35.1035 -0.2 endloop endfacet facet normal 0.897795 -0.440414 0 outer loop vertex -21.9074 -34.6287 0 - vertex -21.6072 -34.0169 -0.1 + vertex -21.6072 -34.0169 -0.2 vertex -21.6072 -34.0169 0 endloop endfacet facet normal 0.897795 -0.440414 0 outer loop - vertex -21.6072 -34.0169 -0.1 + vertex -21.6072 -34.0169 -0.2 vertex -21.9074 -34.6287 0 - vertex -21.9074 -34.6287 -0.1 + vertex -21.9074 -34.6287 -0.2 endloop endfacet facet normal 0.914162 -0.405349 0 outer loop vertex -21.6072 -34.0169 0 - vertex -21.2682 -33.2523 -0.1 + vertex -21.2682 -33.2523 -0.2 vertex -21.2682 -33.2523 0 endloop endfacet facet normal 0.914162 -0.405349 0 outer loop - vertex -21.2682 -33.2523 -0.1 + vertex -21.2682 -33.2523 -0.2 vertex -21.6072 -34.0169 0 - vertex -21.6072 -34.0169 -0.1 + vertex -21.6072 -34.0169 -0.2 endloop endfacet facet normal 0.920953 -0.389675 0 outer loop vertex -21.2682 -33.2523 0 - vertex -19.7699 -29.7113 -0.1 + vertex -19.7699 -29.7113 -0.2 vertex -19.7699 -29.7113 0 endloop endfacet facet normal 0.920953 -0.389675 0 outer loop - vertex -19.7699 -29.7113 -0.1 + vertex -19.7699 -29.7113 -0.2 vertex -21.2682 -33.2523 0 - vertex -21.2682 -33.2523 -0.1 + vertex -21.2682 -33.2523 -0.2 endloop endfacet facet normal 0.925287 -0.379267 0 outer loop vertex -19.7699 -29.7113 0 - vertex -18.5311 -26.6889 -0.1 + vertex -18.5311 -26.6889 -0.2 vertex -18.5311 -26.6889 0 endloop endfacet facet normal 0.925287 -0.379267 0 outer loop - vertex -18.5311 -26.6889 -0.1 + vertex -18.5311 -26.6889 -0.2 vertex -19.7699 -29.7113 0 - vertex -19.7699 -29.7113 -0.1 + vertex -19.7699 -29.7113 -0.2 endloop endfacet facet normal 0.931695 -0.363243 0 outer loop vertex -18.5311 -26.6889 0 - vertex -17.6656 -24.469 -0.1 + vertex -17.6656 -24.469 -0.2 vertex -17.6656 -24.469 0 endloop endfacet facet normal 0.931695 -0.363243 0 outer loop - vertex -17.6656 -24.469 -0.1 + vertex -17.6656 -24.469 -0.2 vertex -18.5311 -26.6889 0 - vertex -18.5311 -26.6889 -0.1 + vertex -18.5311 -26.6889 -0.2 endloop endfacet facet normal 0.941797 -0.336183 0 outer loop vertex -17.6656 -24.469 0 - vertex -17.4084 -23.7485 -0.1 + vertex -17.4084 -23.7485 -0.2 vertex -17.4084 -23.7485 0 endloop endfacet facet normal 0.941797 -0.336183 0 outer loop - vertex -17.4084 -23.7485 -0.1 + vertex -17.4084 -23.7485 -0.2 vertex -17.6656 -24.469 0 - vertex -17.6656 -24.469 -0.1 + vertex -17.6656 -24.469 -0.2 endloop endfacet facet normal 0.959662 -0.281158 0 outer loop vertex -17.4084 -23.7485 0 - vertex -17.2873 -23.335 -0.1 + vertex -17.2873 -23.335 -0.2 vertex -17.2873 -23.335 0 endloop endfacet facet normal 0.959662 -0.281158 0 outer loop - vertex -17.2873 -23.335 -0.1 + vertex -17.2873 -23.335 -0.2 vertex -17.4084 -23.7485 0 - vertex -17.4084 -23.7485 -0.1 + vertex -17.4084 -23.7485 -0.2 endloop endfacet facet normal 0.987024 -0.160575 0 outer loop vertex -17.2873 -23.335 0 - vertex -17.2226 -22.9371 -0.1 + vertex -17.2226 -22.9371 -0.2 vertex -17.2226 -22.9371 0 endloop endfacet facet normal 0.987024 -0.160575 0 outer loop - vertex -17.2226 -22.9371 -0.1 + vertex -17.2226 -22.9371 -0.2 vertex -17.2873 -23.335 0 - vertex -17.2873 -23.335 -0.1 + vertex -17.2873 -23.335 -0.2 endloop endfacet facet normal 0.999826 0.0186517 0 outer loop vertex -17.2226 -22.9371 0 - vertex -17.2249 -22.8126 -0.1 + vertex -17.2249 -22.8126 -0.2 vertex -17.2249 -22.8126 0 endloop endfacet facet normal 0.999826 0.0186517 0 outer loop - vertex -17.2249 -22.8126 -0.1 + vertex -17.2249 -22.8126 -0.2 vertex -17.2226 -22.9371 0 - vertex -17.2226 -22.9371 -0.1 + vertex -17.2226 -22.9371 -0.2 endloop endfacet facet normal 0.932644 0.360799 0 outer loop vertex -17.2249 -22.8126 0 - vertex -17.2578 -22.7276 -0.1 + vertex -17.2578 -22.7276 -0.2 vertex -17.2578 -22.7276 0 endloop endfacet facet normal 0.932644 0.360799 0 outer loop - vertex -17.2578 -22.7276 -0.1 + vertex -17.2578 -22.7276 -0.2 vertex -17.2249 -22.8126 0 - vertex -17.2249 -22.8126 -0.1 + vertex -17.2249 -22.8126 -0.2 endloop endfacet facet normal 0.608972 0.793192 -0 outer loop - vertex -17.2578 -22.7276 -0.1 + vertex -17.2578 -22.7276 -0.2 vertex -17.3267 -22.6747 0 vertex -17.2578 -22.7276 0 endloop @@ -18951,13 +18951,13 @@ solid OpenSCAD_Model facet normal 0.608972 0.793192 0 outer loop vertex -17.3267 -22.6747 0 - vertex -17.2578 -22.7276 -0.1 - vertex -17.3267 -22.6747 -0.1 + vertex -17.2578 -22.7276 -0.2 + vertex -17.3267 -22.6747 -0.2 endloop endfacet facet normal 0.249366 0.968409 -0 outer loop - vertex -17.3267 -22.6747 -0.1 + vertex -17.3267 -22.6747 -0.2 vertex -17.4374 -22.6462 0 vertex -17.3267 -22.6747 0 endloop @@ -18965,13 +18965,13 @@ solid OpenSCAD_Model facet normal 0.249366 0.968409 0 outer loop vertex -17.4374 -22.6462 0 - vertex -17.3267 -22.6747 -0.1 - vertex -17.4374 -22.6462 -0.1 + vertex -17.3267 -22.6747 -0.2 + vertex -17.4374 -22.6462 -0.2 endloop endfacet facet normal 0.0372683 0.999305 -0 outer loop - vertex -17.4374 -22.6462 -0.1 + vertex -17.4374 -22.6462 -0.2 vertex -17.8061 -22.6324 0 vertex -17.4374 -22.6462 0 endloop @@ -18979,13 +18979,13 @@ solid OpenSCAD_Model facet normal 0.0372683 0.999305 0 outer loop vertex -17.8061 -22.6324 0 - vertex -17.4374 -22.6462 -0.1 - vertex -17.8061 -22.6324 -0.1 + vertex -17.4374 -22.6462 -0.2 + vertex -17.8061 -22.6324 -0.2 endloop endfacet facet normal 0.050033 0.998748 -0 outer loop - vertex -17.8061 -22.6324 -0.1 + vertex -17.8061 -22.6324 -0.2 vertex -18.1091 -22.6172 0 vertex -17.8061 -22.6324 0 endloop @@ -18993,13 +18993,13 @@ solid OpenSCAD_Model facet normal 0.050033 0.998748 0 outer loop vertex -18.1091 -22.6172 0 - vertex -17.8061 -22.6324 -0.1 - vertex -18.1091 -22.6172 -0.1 + vertex -17.8061 -22.6324 -0.2 + vertex -18.1091 -22.6172 -0.2 endloop endfacet facet normal 0.187734 0.98222 -0 outer loop - vertex -18.1091 -22.6172 -0.1 + vertex -18.1091 -22.6172 -0.2 vertex -18.3541 -22.5704 0 vertex -18.1091 -22.6172 0 endloop @@ -19007,13 +19007,13 @@ solid OpenSCAD_Model facet normal 0.187734 0.98222 0 outer loop vertex -18.3541 -22.5704 0 - vertex -18.1091 -22.6172 -0.1 - vertex -18.3541 -22.5704 -0.1 + vertex -18.1091 -22.6172 -0.2 + vertex -18.3541 -22.5704 -0.2 endloop endfacet facet normal 0.392235 0.919865 -0 outer loop - vertex -18.3541 -22.5704 -0.1 + vertex -18.3541 -22.5704 -0.2 vertex -18.5429 -22.4899 0 vertex -18.3541 -22.5704 0 endloop @@ -19021,13 +19021,13 @@ solid OpenSCAD_Model facet normal 0.392235 0.919865 0 outer loop vertex -18.5429 -22.4899 0 - vertex -18.3541 -22.5704 -0.1 - vertex -18.5429 -22.4899 -0.1 + vertex -18.3541 -22.5704 -0.2 + vertex -18.5429 -22.4899 -0.2 endloop endfacet facet normal 0.654816 0.755788 -0 outer loop - vertex -18.5429 -22.4899 -0.1 + vertex -18.5429 -22.4899 -0.2 vertex -18.6769 -22.3738 0 vertex -18.5429 -22.4899 0 endloop @@ -19035,111 +19035,111 @@ solid OpenSCAD_Model facet normal 0.654816 0.755788 0 outer loop vertex -18.6769 -22.3738 0 - vertex -18.5429 -22.4899 -0.1 - vertex -18.6769 -22.3738 -0.1 + vertex -18.5429 -22.4899 -0.2 + vertex -18.6769 -22.3738 -0.2 endloop endfacet facet normal 0.885096 0.465409 0 outer loop vertex -18.6769 -22.3738 0 - vertex -18.7577 -22.2202 -0.1 + vertex -18.7577 -22.2202 -0.2 vertex -18.7577 -22.2202 0 endloop endfacet facet normal 0.885096 0.465409 0 outer loop - vertex -18.7577 -22.2202 -0.1 + vertex -18.7577 -22.2202 -0.2 vertex -18.6769 -22.3738 0 - vertex -18.6769 -22.3738 -0.1 + vertex -18.6769 -22.3738 -0.2 endloop endfacet facet normal 0.988779 0.149383 0 outer loop vertex -18.7577 -22.2202 0 - vertex -18.7869 -22.0269 -0.1 + vertex -18.7869 -22.0269 -0.2 vertex -18.7869 -22.0269 0 endloop endfacet facet normal 0.988779 0.149383 0 outer loop - vertex -18.7869 -22.0269 -0.1 + vertex -18.7869 -22.0269 -0.2 vertex -18.7577 -22.2202 0 - vertex -18.7577 -22.2202 -0.1 + vertex -18.7577 -22.2202 -0.2 endloop endfacet facet normal 0.99608 -0.0884566 0 outer loop vertex -18.7869 -22.0269 0 - vertex -18.766 -21.7922 -0.1 + vertex -18.766 -21.7922 -0.2 vertex -18.766 -21.7922 0 endloop endfacet facet normal 0.99608 -0.0884566 0 outer loop - vertex -18.766 -21.7922 -0.1 + vertex -18.766 -21.7922 -0.2 vertex -18.7869 -22.0269 0 - vertex -18.7869 -22.0269 -0.1 + vertex -18.7869 -22.0269 -0.2 endloop endfacet facet normal 0.970344 -0.241728 0 outer loop vertex -18.766 -21.7922 0 - vertex -18.6967 -21.5139 -0.1 + vertex -18.6967 -21.5139 -0.2 vertex -18.6967 -21.5139 0 endloop endfacet facet normal 0.970344 -0.241728 0 outer loop - vertex -18.6967 -21.5139 -0.1 + vertex -18.6967 -21.5139 -0.2 vertex -18.766 -21.7922 0 - vertex -18.766 -21.7922 -0.1 + vertex -18.766 -21.7922 -0.2 endloop endfacet facet normal 0.92433 -0.381593 0 outer loop vertex -18.6967 -21.5139 0 - vertex -18.5788 -21.2283 -0.1 + vertex -18.5788 -21.2283 -0.2 vertex -18.5788 -21.2283 0 endloop endfacet facet normal 0.92433 -0.381593 0 outer loop - vertex -18.5788 -21.2283 -0.1 + vertex -18.5788 -21.2283 -0.2 vertex -18.6967 -21.5139 0 - vertex -18.6967 -21.5139 -0.1 + vertex -18.6967 -21.5139 -0.2 endloop endfacet facet normal 0.848388 -0.529374 0 outer loop vertex -18.5788 -21.2283 0 - vertex -18.5053 -21.1105 -0.1 + vertex -18.5053 -21.1105 -0.2 vertex -18.5053 -21.1105 0 endloop endfacet facet normal 0.848388 -0.529374 0 outer loop - vertex -18.5053 -21.1105 -0.1 + vertex -18.5053 -21.1105 -0.2 vertex -18.5788 -21.2283 0 - vertex -18.5788 -21.2283 -0.1 + vertex -18.5788 -21.2283 -0.2 endloop endfacet facet normal 0.772185 -0.635398 0 outer loop vertex -18.5053 -21.1105 0 - vertex -18.4218 -21.0091 -0.1 + vertex -18.4218 -21.0091 -0.2 vertex -18.4218 -21.0091 0 endloop endfacet facet normal 0.772185 -0.635398 0 outer loop - vertex -18.4218 -21.0091 -0.1 + vertex -18.4218 -21.0091 -0.2 vertex -18.5053 -21.1105 0 - vertex -18.5053 -21.1105 -0.1 + vertex -18.5053 -21.1105 -0.2 endloop endfacet facet normal 0.673134 -0.739521 0 outer loop - vertex -18.4218 -21.0091 -0.1 + vertex -18.4218 -21.0091 -0.2 vertex -18.3284 -20.924 0 vertex -18.4218 -21.0091 0 endloop @@ -19147,13 +19147,13 @@ solid OpenSCAD_Model facet normal 0.673134 -0.739521 0 outer loop vertex -18.3284 -20.924 0 - vertex -18.4218 -21.0091 -0.1 - vertex -18.3284 -20.924 -0.1 + vertex -18.4218 -21.0091 -0.2 + vertex -18.3284 -20.924 -0.2 endloop endfacet facet normal 0.553635 -0.832759 0 outer loop - vertex -18.3284 -20.924 -0.1 + vertex -18.3284 -20.924 -0.2 vertex -18.2248 -20.8552 0 vertex -18.3284 -20.924 0 endloop @@ -19161,13 +19161,13 @@ solid OpenSCAD_Model facet normal 0.553635 -0.832759 0 outer loop vertex -18.2248 -20.8552 0 - vertex -18.3284 -20.924 -0.1 - vertex -18.2248 -20.8552 -0.1 + vertex -18.3284 -20.924 -0.2 + vertex -18.2248 -20.8552 -0.2 endloop endfacet facet normal 0.4209 -0.907107 0 outer loop - vertex -18.2248 -20.8552 -0.1 + vertex -18.2248 -20.8552 -0.2 vertex -18.1109 -20.8023 0 vertex -18.2248 -20.8552 0 endloop @@ -19175,13 +19175,13 @@ solid OpenSCAD_Model facet normal 0.4209 -0.907107 0 outer loop vertex -18.1109 -20.8023 0 - vertex -18.2248 -20.8552 -0.1 - vertex -18.1109 -20.8023 -0.1 + vertex -18.2248 -20.8552 -0.2 + vertex -18.1109 -20.8023 -0.2 endloop endfacet facet normal 0.284987 -0.958531 0 outer loop - vertex -18.1109 -20.8023 -0.1 + vertex -18.1109 -20.8023 -0.2 vertex -17.9865 -20.7653 0 vertex -18.1109 -20.8023 0 endloop @@ -19189,13 +19189,13 @@ solid OpenSCAD_Model facet normal 0.284987 -0.958531 0 outer loop vertex -17.9865 -20.7653 0 - vertex -18.1109 -20.8023 -0.1 - vertex -17.9865 -20.7653 -0.1 + vertex -18.1109 -20.8023 -0.2 + vertex -17.9865 -20.7653 -0.2 endloop endfacet facet normal 0.279088 -0.960266 0 outer loop - vertex -17.9865 -20.7653 -0.1 + vertex -17.9865 -20.7653 -0.2 vertex -16.9393 -20.461 0 vertex -17.9865 -20.7653 0 endloop @@ -19203,13 +19203,13 @@ solid OpenSCAD_Model facet normal 0.279088 -0.960266 0 outer loop vertex -16.9393 -20.461 0 - vertex -17.9865 -20.7653 -0.1 - vertex -16.9393 -20.461 -0.1 + vertex -17.9865 -20.7653 -0.2 + vertex -16.9393 -20.461 -0.2 endloop endfacet facet normal 0.302435 -0.95317 0 outer loop - vertex -16.9393 -20.461 -0.1 + vertex -16.9393 -20.461 -0.2 vertex -15.1436 -19.8912 0 vertex -16.9393 -20.461 0 endloop @@ -19217,13 +19217,13 @@ solid OpenSCAD_Model facet normal 0.302435 -0.95317 0 outer loop vertex -15.1436 -19.8912 0 - vertex -16.9393 -20.461 -0.1 - vertex -15.1436 -19.8912 -0.1 + vertex -16.9393 -20.461 -0.2 + vertex -15.1436 -19.8912 -0.2 endloop endfacet facet normal 0.297661 -0.954672 0 outer loop - vertex -15.1436 -19.8912 -0.1 + vertex -15.1436 -19.8912 -0.2 vertex -14.1989 -19.5967 0 vertex -15.1436 -19.8912 0 endloop @@ -19231,13 +19231,13 @@ solid OpenSCAD_Model facet normal 0.297661 -0.954672 0 outer loop vertex -14.1989 -19.5967 0 - vertex -15.1436 -19.8912 -0.1 - vertex -14.1989 -19.5967 -0.1 + vertex -15.1436 -19.8912 -0.2 + vertex -14.1989 -19.5967 -0.2 endloop endfacet facet normal 0.272658 -0.962111 0 outer loop - vertex -14.1989 -19.5967 -0.1 + vertex -14.1989 -19.5967 -0.2 vertex -13.3483 -19.3556 0 vertex -14.1989 -19.5967 0 endloop @@ -19245,13 +19245,13 @@ solid OpenSCAD_Model facet normal 0.272658 -0.962111 0 outer loop vertex -13.3483 -19.3556 0 - vertex -14.1989 -19.5967 -0.1 - vertex -13.3483 -19.3556 -0.1 + vertex -14.1989 -19.5967 -0.2 + vertex -13.3483 -19.3556 -0.2 endloop endfacet facet normal 0.238231 -0.971209 0 outer loop - vertex -13.3483 -19.3556 -0.1 + vertex -13.3483 -19.3556 -0.2 vertex -12.6849 -19.1929 0 vertex -13.3483 -19.3556 0 endloop @@ -19259,13 +19259,13 @@ solid OpenSCAD_Model facet normal 0.238231 -0.971209 0 outer loop vertex -12.6849 -19.1929 0 - vertex -13.3483 -19.3556 -0.1 - vertex -12.6849 -19.1929 -0.1 + vertex -13.3483 -19.3556 -0.2 + vertex -12.6849 -19.1929 -0.2 endloop endfacet facet normal 0.153595 -0.988134 0 outer loop - vertex -12.6849 -19.1929 -0.1 + vertex -12.6849 -19.1929 -0.2 vertex -12.302 -19.1333 0 vertex -12.6849 -19.1929 0 endloop @@ -19273,13 +19273,13 @@ solid OpenSCAD_Model facet normal 0.153595 -0.988134 0 outer loop vertex -12.302 -19.1333 0 - vertex -12.6849 -19.1929 -0.1 - vertex -12.302 -19.1333 -0.1 + vertex -12.6849 -19.1929 -0.2 + vertex -12.302 -19.1333 -0.2 endloop endfacet facet normal -0.105808 -0.994387 0 outer loop - vertex -12.302 -19.1333 -0.1 + vertex -12.302 -19.1333 -0.2 vertex -12.0792 -19.1571 0 vertex -12.302 -19.1333 0 endloop @@ -19287,1231 +19287,1231 @@ solid OpenSCAD_Model facet normal -0.105808 -0.994387 -0 outer loop vertex -12.0792 -19.1571 0 - vertex -12.302 -19.1333 -0.1 - vertex -12.0792 -19.1571 -0.1 + vertex -12.302 -19.1333 -0.2 + vertex -12.0792 -19.1571 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.6833 -25.6471 -0.1 - vertex 39.342 -26.9688 -0.1 - vertex 35.957 -24.8864 -0.1 + vertex 35.6833 -25.6471 -0.2 + vertex 39.342 -26.9688 -0.2 + vertex 35.957 -24.8864 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.3422 -26.5156 -0.1 - vertex 39.342 -26.9688 -0.1 - vertex 35.6833 -25.6471 -0.1 + vertex 35.3422 -26.5156 -0.2 + vertex 39.342 -26.9688 -0.2 + vertex 35.6833 -25.6471 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 39.342 -26.9688 -0.1 - vertex 35.3422 -26.5156 -0.1 - vertex 38.2305 -29.6614 -0.1 + vertex 39.342 -26.9688 -0.2 + vertex 35.3422 -26.5156 -0.2 + vertex 38.2305 -29.6614 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 33.8561 -30.1753 -0.1 - vertex 38.2305 -29.6614 -0.1 - vertex 35.3422 -26.5156 -0.1 + vertex 33.8561 -30.1753 -0.2 + vertex 38.2305 -29.6614 -0.2 + vertex 35.3422 -26.5156 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.2305 -29.6614 -0.1 - vertex 33.8561 -30.1753 -0.1 - vertex 37.444 -31.6395 -0.1 + vertex 38.2305 -29.6614 -0.2 + vertex 33.8561 -30.1753 -0.2 + vertex 37.444 -31.6395 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.3957 -19.1543 -0.1 - vertex 42.162 -19.859 -0.1 - vertex 42.1595 -19.6516 -0.1 + vertex 41.3957 -19.1543 -0.2 + vertex 42.162 -19.859 -0.2 + vertex 42.1595 -19.6516 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.7426 -19.1572 -0.1 - vertex 42.1595 -19.6516 -0.1 - vertex 42.1149 -19.4743 -0.1 + vertex 41.7426 -19.1572 -0.2 + vertex 42.1595 -19.6516 -0.2 + vertex 42.1149 -19.4743 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.162 -19.859 -0.1 - vertex 41.3957 -19.1543 -0.1 - vertex 42.1212 -20.0931 -0.1 + vertex 42.162 -19.859 -0.2 + vertex 41.3957 -19.1543 -0.2 + vertex 42.1212 -20.0931 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.7426 -19.1572 -0.1 - vertex 42.1149 -19.4743 -0.1 - vertex 42.0297 -19.3306 -0.1 + vertex 41.7426 -19.1572 -0.2 + vertex 42.1149 -19.4743 -0.2 + vertex 42.0297 -19.3306 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 41.156 -19.2119 -0.1 - vertex 42.1212 -20.0931 -0.1 - vertex 41.3957 -19.1543 -0.1 + vertex 41.156 -19.2119 -0.2 + vertex 42.1212 -20.0931 -0.2 + vertex 41.3957 -19.1543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.1212 -20.0931 -0.1 - vertex 41.156 -19.2119 -0.1 - vertex 42.0356 -20.3507 -0.1 + vertex 42.1212 -20.0931 -0.2 + vertex 41.156 -19.2119 -0.2 + vertex 42.0356 -20.3507 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.7426 -19.1572 -0.1 - vertex 42.0297 -19.3306 -0.1 - vertex 41.9051 -19.2238 -0.1 + vertex 41.7426 -19.1572 -0.2 + vertex 42.0297 -19.3306 -0.2 + vertex 41.9051 -19.2238 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.9233 -19.8512 -0.1 - vertex 47.9993 -20.1225 -0.1 - vertex 47.9745 -19.9807 -0.1 + vertex 47.9233 -19.8512 -0.2 + vertex 47.9993 -20.1225 -0.2 + vertex 47.9745 -19.9807 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.9993 -20.1225 -0.1 - vertex 47.9233 -19.8512 -0.1 - vertex 47.9987 -20.2887 -0.1 + vertex 47.9993 -20.1225 -0.2 + vertex 47.9233 -19.8512 -0.2 + vertex 47.9987 -20.2887 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.845 -19.7221 -0.1 - vertex 47.9987 -20.2887 -0.1 - vertex 47.9233 -19.8512 -0.1 + vertex 47.845 -19.7221 -0.2 + vertex 47.9987 -20.2887 -0.2 + vertex 47.9233 -19.8512 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.9987 -20.2887 -0.1 - vertex 47.845 -19.7221 -0.1 - vertex 47.9737 -20.4912 -0.1 + vertex 47.9987 -20.2887 -0.2 + vertex 47.845 -19.7221 -0.2 + vertex 47.9737 -20.4912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.7384 -19.5813 -0.1 - vertex 47.9737 -20.4912 -0.1 - vertex 47.845 -19.7221 -0.1 + vertex 47.7384 -19.5813 -0.2 + vertex 47.9737 -20.4912 -0.2 + vertex 47.845 -19.7221 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.044 -19.1833 -0.1 - vertex 47.9737 -20.4912 -0.1 - vertex 47.7384 -19.5813 -0.1 + vertex 47.044 -19.1833 -0.2 + vertex 47.9737 -20.4912 -0.2 + vertex 47.7384 -19.5813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 46.8289 -19.1548 -0.1 - vertex 47.9737 -20.4912 -0.1 - vertex 47.044 -19.1833 -0.1 + vertex 46.8289 -19.1548 -0.2 + vertex 47.9737 -20.4912 -0.2 + vertex 47.044 -19.1833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.2257 -19.2263 -0.1 - vertex 47.7384 -19.5813 -0.1 - vertex 47.6302 -19.4614 -0.1 + vertex 47.2257 -19.2263 -0.2 + vertex 47.7384 -19.5813 -0.2 + vertex 47.6302 -19.4614 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 46.274 -19.1343 -0.1 - vertex 47.8542 -21.0531 -0.1 - vertex 46.8289 -19.1548 -0.1 + vertex 46.274 -19.1343 -0.2 + vertex 47.8542 -21.0531 -0.2 + vertex 46.8289 -19.1548 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.2257 -19.2263 -0.1 - vertex 47.6302 -19.4614 -0.1 - vertex 47.5127 -19.3635 -0.1 + vertex 47.2257 -19.2263 -0.2 + vertex 47.6302 -19.4614 -0.2 + vertex 47.5127 -19.3635 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.2257 -19.2263 -0.1 - vertex 47.5127 -19.3635 -0.1 - vertex 47.3799 -19.2858 -0.1 + vertex 47.2257 -19.2263 -0.2 + vertex 47.5127 -19.3635 -0.2 + vertex 47.3799 -19.2858 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.9737 -20.4912 -0.1 - vertex 46.8289 -19.1548 -0.1 - vertex 47.8542 -21.0531 -0.1 + vertex 47.9737 -20.4912 -0.2 + vertex 46.8289 -19.1548 -0.2 + vertex 47.8542 -21.0531 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.7384 -19.5813 -0.1 - vertex 47.2257 -19.2263 -0.1 - vertex 47.044 -19.1833 -0.1 + vertex 47.7384 -19.5813 -0.2 + vertex 47.2257 -19.2263 -0.2 + vertex 47.044 -19.1833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.8542 -21.0531 -0.1 - vertex 46.274 -19.1343 -0.1 - vertex 47.7155 -21.5429 -0.1 + vertex 47.8542 -21.0531 -0.2 + vertex 46.274 -19.1343 -0.2 + vertex 47.7155 -21.5429 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 45.8151 -19.1475 -0.1 - vertex 47.7155 -21.5429 -0.1 - vertex 46.274 -19.1343 -0.1 + vertex 45.8151 -19.1475 -0.2 + vertex 47.7155 -21.5429 -0.2 + vertex 46.274 -19.1343 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.7155 -21.5429 -0.1 - vertex 45.8151 -19.1475 -0.1 - vertex 47.5422 -21.9981 -0.1 + vertex 47.7155 -21.5429 -0.2 + vertex 45.8151 -19.1475 -0.2 + vertex 47.5422 -21.9981 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 45.391 -19.1898 -0.1 - vertex 47.5422 -21.9981 -0.1 - vertex 45.8151 -19.1475 -0.1 + vertex 45.391 -19.1898 -0.2 + vertex 47.5422 -21.9981 -0.2 + vertex 45.8151 -19.1475 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.5422 -21.9981 -0.1 - vertex 45.391 -19.1898 -0.1 - vertex 47.3383 -22.4165 -0.1 + vertex 47.5422 -21.9981 -0.2 + vertex 45.391 -19.1898 -0.2 + vertex 47.3383 -22.4165 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 44.9905 -19.265 -0.1 - vertex 47.3383 -22.4165 -0.1 - vertex 45.391 -19.1898 -0.1 + vertex 44.9905 -19.265 -0.2 + vertex 47.3383 -22.4165 -0.2 + vertex 45.391 -19.1898 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 44.6026 -19.3768 -0.1 - vertex 47.3383 -22.4165 -0.1 - vertex 44.9905 -19.265 -0.1 + vertex 44.6026 -19.3768 -0.2 + vertex 47.3383 -22.4165 -0.2 + vertex 44.9905 -19.265 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.3383 -22.4165 -0.1 - vertex 44.6026 -19.3768 -0.1 - vertex 47.1074 -22.796 -0.1 + vertex 47.3383 -22.4165 -0.2 + vertex 44.6026 -19.3768 -0.2 + vertex 47.1074 -22.796 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 44.2162 -19.5289 -0.1 - vertex 47.1074 -22.796 -0.1 - vertex 44.6026 -19.3768 -0.1 + vertex 44.2162 -19.5289 -0.2 + vertex 47.1074 -22.796 -0.2 + vertex 44.6026 -19.3768 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 47.1074 -22.796 -0.1 - vertex 44.2162 -19.5289 -0.1 - vertex 46.8534 -23.1343 -0.1 + vertex 47.1074 -22.796 -0.2 + vertex 44.2162 -19.5289 -0.2 + vertex 46.8534 -23.1343 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 43.3873 -23.2523 -0.1 - vertex 46.8534 -23.1343 -0.1 - vertex 44.2162 -19.5289 -0.1 + vertex 43.3873 -23.2523 -0.2 + vertex 46.8534 -23.1343 -0.2 + vertex 44.2162 -19.5289 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 46.8534 -23.1343 -0.1 - vertex 43.3873 -23.2523 -0.1 - vertex 46.5801 -23.4293 -0.1 + vertex 46.8534 -23.1343 -0.2 + vertex 43.3873 -23.2523 -0.2 + vertex 46.5801 -23.4293 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 46.5801 -23.4293 -0.1 - vertex 43.3873 -23.2523 -0.1 - vertex 46.2914 -23.6786 -0.1 + vertex 46.5801 -23.4293 -0.2 + vertex 43.3873 -23.2523 -0.2 + vertex 46.2914 -23.6786 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 43.6239 -23.5069 -0.1 - vertex 46.2914 -23.6786 -0.1 - vertex 43.3873 -23.2523 -0.1 + vertex 43.6239 -23.5069 -0.2 + vertex 46.2914 -23.6786 -0.2 + vertex 43.3873 -23.2523 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 46.2914 -23.6786 -0.1 - vertex 43.6239 -23.5069 -0.1 - vertex 45.9909 -23.8802 -0.1 + vertex 46.2914 -23.6786 -0.2 + vertex 43.6239 -23.5069 -0.2 + vertex 45.9909 -23.8802 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 43.8807 -23.7673 -0.1 - vertex 45.3703 -24.1311 -0.1 - vertex 43.6239 -23.5069 -0.1 + vertex 43.8807 -23.7673 -0.2 + vertex 45.3703 -24.1311 -0.2 + vertex 43.6239 -23.5069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 45.3703 -24.1311 -0.1 - vertex 43.8807 -23.7673 -0.1 - vertex 45.0576 -24.176 -0.1 + vertex 45.3703 -24.1311 -0.2 + vertex 43.8807 -23.7673 -0.2 + vertex 45.0576 -24.176 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 45.9909 -23.8802 -0.1 - vertex 43.6239 -23.5069 -0.1 - vertex 45.6826 -24.0317 -0.1 + vertex 45.9909 -23.8802 -0.2 + vertex 43.6239 -23.5069 -0.2 + vertex 45.6826 -24.0317 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 45.0576 -24.176 -0.1 - vertex 43.8807 -23.7673 -0.1 - vertex 44.7485 -24.1643 -0.1 + vertex 45.0576 -24.176 -0.2 + vertex 43.8807 -23.7673 -0.2 + vertex 44.7485 -24.1643 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 44.7485 -24.1643 -0.1 - vertex 43.8807 -23.7673 -0.1 - vertex 44.4468 -24.0937 -0.1 + vertex 44.7485 -24.1643 -0.2 + vertex 43.8807 -23.7673 -0.2 + vertex 44.4468 -24.0937 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 43.3873 -23.2523 -0.1 - vertex 44.2162 -19.5289 -0.1 - vertex 43.8201 -19.7253 -0.1 + vertex 43.3873 -23.2523 -0.2 + vertex 44.2162 -19.5289 -0.2 + vertex 43.8201 -19.7253 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 44.4468 -24.0937 -0.1 - vertex 43.8807 -23.7673 -0.1 - vertex 44.1563 -23.9621 -0.1 + vertex 44.4468 -24.0937 -0.2 + vertex 43.8807 -23.7673 -0.2 + vertex 44.1563 -23.9621 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 43.3873 -23.2523 -0.1 - vertex 43.8201 -19.7253 -0.1 - vertex 43.4033 -19.9696 -0.1 + vertex 43.3873 -23.2523 -0.2 + vertex 43.8201 -19.7253 -0.2 + vertex 43.4033 -19.9696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 45.6826 -24.0317 -0.1 - vertex 43.6239 -23.5069 -0.1 - vertex 45.3703 -24.1311 -0.1 + vertex 45.6826 -24.0317 -0.2 + vertex 43.6239 -23.5069 -0.2 + vertex 45.3703 -24.1311 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 43.4033 -19.9696 -0.1 - vertex 43.1493 -23.0437 -0.1 - vertex 43.3873 -23.2523 -0.1 + vertex 43.4033 -19.9696 -0.2 + vertex 43.1493 -23.0437 -0.2 + vertex 43.3873 -23.2523 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 42.9547 -20.2657 -0.1 - vertex 43.1493 -23.0437 -0.1 - vertex 43.4033 -19.9696 -0.1 + vertex 42.9547 -20.2657 -0.2 + vertex 43.1493 -23.0437 -0.2 + vertex 43.4033 -19.9696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.9547 -20.2657 -0.1 - vertex 42.9376 -22.9028 -0.1 - vertex 43.1493 -23.0437 -0.1 + vertex 42.9547 -20.2657 -0.2 + vertex 42.9376 -22.9028 -0.2 + vertex 43.1493 -23.0437 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.9547 -20.2657 -0.1 - vertex 42.8503 -22.8644 -0.1 - vertex 42.9376 -22.9028 -0.1 + vertex 42.9547 -20.2657 -0.2 + vertex 42.8503 -22.8644 -0.2 + vertex 42.9376 -22.9028 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 42.3117 -20.6924 -0.1 - vertex 42.8503 -22.8644 -0.1 - vertex 42.9547 -20.2657 -0.1 + vertex 42.3117 -20.6924 -0.2 + vertex 42.8503 -22.8644 -0.2 + vertex 42.9547 -20.2657 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.8503 -22.8644 -0.1 - vertex 42.3117 -20.6924 -0.1 - vertex 42.7799 -22.851 -0.1 + vertex 42.8503 -22.8644 -0.2 + vertex 42.3117 -20.6924 -0.2 + vertex 42.7799 -22.851 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 42.1116 -20.8028 -0.1 - vertex 42.7799 -22.851 -0.1 - vertex 42.3117 -20.6924 -0.1 + vertex 42.1116 -20.8028 -0.2 + vertex 42.7799 -22.851 -0.2 + vertex 42.3117 -20.6924 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.7799 -22.851 -0.1 - vertex 42.1116 -20.8028 -0.1 - vertex 42.6968 -22.8729 -0.1 + vertex 42.7799 -22.851 -0.2 + vertex 42.1116 -20.8028 -0.2 + vertex 42.6968 -22.8729 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 41.9827 -20.8453 -0.1 - vertex 42.6968 -22.8729 -0.1 - vertex 42.1116 -20.8028 -0.1 + vertex 41.9827 -20.8453 -0.2 + vertex 42.6968 -22.8729 -0.2 + vertex 42.1116 -20.8028 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.6968 -22.8729 -0.1 - vertex 41.9827 -20.8453 -0.1 - vertex 42.5728 -22.9356 -0.1 + vertex 42.6968 -22.8729 -0.2 + vertex 41.9827 -20.8453 -0.2 + vertex 42.5728 -22.9356 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.9427 -20.8413 -0.1 - vertex 42.5728 -22.9356 -0.1 - vertex 41.9827 -20.8453 -0.1 + vertex 41.9427 -20.8413 -0.2 + vertex 42.5728 -22.9356 -0.2 + vertex 41.9827 -20.8453 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.5728 -22.9356 -0.1 - vertex 41.9427 -20.8413 -0.1 - vertex 42.2267 -23.1657 -0.1 + vertex 42.5728 -22.9356 -0.2 + vertex 41.9427 -20.8413 -0.2 + vertex 42.2267 -23.1657 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.7898 -23.5063 -0.1 - vertex 41.9427 -20.8413 -0.1 - vertex 41.9179 -20.8207 -0.1 + vertex 41.7898 -23.5063 -0.2 + vertex 41.9427 -20.8413 -0.2 + vertex 41.9179 -20.8207 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.9427 -20.8413 -0.1 - vertex 41.7898 -23.5063 -0.1 - vertex 42.2267 -23.1657 -0.1 + vertex 41.9427 -20.8413 -0.2 + vertex 41.7898 -23.5063 -0.2 + vertex 42.2267 -23.1657 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 39.5298 -19.7361 -0.1 - vertex 41.9179 -20.8207 -0.1 - vertex 41.9099 -20.7296 -0.1 + vertex 39.5298 -19.7361 -0.2 + vertex 41.9179 -20.8207 -0.2 + vertex 41.9099 -20.7296 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.0356 -20.3507 -0.1 - vertex 41.156 -19.2119 -0.1 - vertex 41.9515 -20.5727 -0.1 + vertex 42.0356 -20.3507 -0.2 + vertex 41.156 -19.2119 -0.2 + vertex 41.9515 -20.5727 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.1595 -19.6516 -0.1 - vertex 41.7426 -19.1572 -0.1 - vertex 41.5436 -19.1343 -0.1 + vertex 42.1595 -19.6516 -0.2 + vertex 41.7426 -19.1572 -0.2 + vertex 41.5436 -19.1343 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 42.1595 -19.6516 -0.1 - vertex 41.5436 -19.1343 -0.1 - vertex 41.3957 -19.1543 -0.1 + vertex 42.1595 -19.6516 -0.2 + vertex 41.5436 -19.1343 -0.2 + vertex 41.3957 -19.1543 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 40.4513 -19.4233 -0.1 - vertex 41.9515 -20.5727 -0.1 - vertex 41.156 -19.2119 -0.1 + vertex 40.4513 -19.4233 -0.2 + vertex 41.9515 -20.5727 -0.2 + vertex 41.156 -19.2119 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.9515 -20.5727 -0.1 - vertex 40.4513 -19.4233 -0.1 - vertex 41.9099 -20.7296 -0.1 + vertex 41.9515 -20.5727 -0.2 + vertex 40.4513 -19.4233 -0.2 + vertex 41.9099 -20.7296 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 39.5298 -19.7361 -0.1 - vertex 41.9099 -20.7296 -0.1 - vertex 40.4513 -19.4233 -0.1 + vertex 39.5298 -19.7361 -0.2 + vertex 41.9099 -20.7296 -0.2 + vertex 40.4513 -19.4233 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.9179 -20.8207 -0.1 - vertex 39.5298 -19.7361 -0.1 - vertex 41.3103 -23.9223 -0.1 + vertex 41.9179 -20.8207 -0.2 + vertex 39.5298 -19.7361 -0.2 + vertex 41.3103 -23.9223 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.9179 -20.8207 -0.1 - vertex 41.3103 -23.9223 -0.1 - vertex 41.7898 -23.5063 -0.1 + vertex 41.9179 -20.8207 -0.2 + vertex 41.3103 -23.9223 -0.2 + vertex 41.7898 -23.5063 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 38.4916 -20.1181 -0.1 - vertex 41.3103 -23.9223 -0.1 - vertex 39.5298 -19.7361 -0.1 + vertex 38.4916 -20.1181 -0.2 + vertex 41.3103 -23.9223 -0.2 + vertex 39.5298 -19.7361 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 41.3103 -23.9223 -0.1 - vertex 38.4916 -20.1181 -0.1 - vertex 40.922 -24.2835 -0.1 + vertex 41.3103 -23.9223 -0.2 + vertex 38.4916 -20.1181 -0.2 + vertex 40.922 -24.2835 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 40.922 -24.2835 -0.1 - vertex 38.4916 -20.1181 -0.1 - vertex 40.604 -24.6171 -0.1 + vertex 40.922 -24.2835 -0.2 + vertex 38.4916 -20.1181 -0.2 + vertex 40.604 -24.6171 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 36.3539 -23.0402 -0.1 - vertex 40.604 -24.6171 -0.1 - vertex 38.4916 -20.1181 -0.1 + vertex 36.3539 -23.0402 -0.2 + vertex 40.604 -24.6171 -0.2 + vertex 38.4916 -20.1181 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 36.3671 -23.1585 -0.1 - vertex 40.604 -24.6171 -0.1 - vertex 36.3539 -23.0402 -0.1 + vertex 36.3671 -23.1585 -0.2 + vertex 40.604 -24.6171 -0.2 + vertex 36.3539 -23.0402 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 40.604 -24.6171 -0.1 - vertex 36.362 -23.3104 -0.1 - vertex 40.3218 -24.9877 -0.1 + vertex 40.604 -24.6171 -0.2 + vertex 36.362 -23.3104 -0.2 + vertex 40.3218 -24.9877 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 36.2977 -23.7121 -0.1 - vertex 40.3218 -24.9877 -0.1 - vertex 36.362 -23.3104 -0.1 + vertex 36.2977 -23.7121 -0.2 + vertex 40.3218 -24.9877 -0.2 + vertex 36.362 -23.3104 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 40.3218 -24.9877 -0.1 - vertex 36.2977 -23.7121 -0.1 - vertex 40.0406 -25.46 -0.1 + vertex 40.3218 -24.9877 -0.2 + vertex 36.2977 -23.7121 -0.2 + vertex 40.0406 -25.46 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3539 -23.0402 -0.1 - vertex 38.4916 -20.1181 -0.1 - vertex 37.4642 -20.5001 -0.1 + vertex 36.3539 -23.0402 -0.2 + vertex 38.4916 -20.1181 -0.2 + vertex 37.4642 -20.5001 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 36.1622 -24.2394 -0.1 - vertex 40.0406 -25.46 -0.1 - vertex 36.2977 -23.7121 -0.1 + vertex 36.1622 -24.2394 -0.2 + vertex 40.0406 -25.46 -0.2 + vertex 36.2977 -23.7121 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 40.0406 -25.46 -0.1 - vertex 36.1622 -24.2394 -0.1 - vertex 39.7256 -26.0988 -0.1 + vertex 40.0406 -25.46 -0.2 + vertex 36.1622 -24.2394 -0.2 + vertex 39.7256 -26.0988 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3224 -22.9562 -0.1 - vertex 37.4642 -20.5001 -0.1 - vertex 36.5724 -20.813 -0.1 + vertex 36.3224 -22.9562 -0.2 + vertex 37.4642 -20.5001 -0.2 + vertex 36.5724 -20.813 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.957 -24.8864 -0.1 - vertex 39.7256 -26.0988 -0.1 - vertex 36.1622 -24.2394 -0.1 + vertex 35.957 -24.8864 -0.2 + vertex 39.7256 -26.0988 -0.2 + vertex 36.1622 -24.2394 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 39.7256 -26.0988 -0.1 - vertex 35.957 -24.8864 -0.1 - vertex 39.342 -26.9688 -0.1 + vertex 39.7256 -26.0988 -0.2 + vertex 35.957 -24.8864 -0.2 + vertex 39.342 -26.9688 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 36.362 -23.3104 -0.1 - vertex 40.604 -24.6171 -0.1 - vertex 36.3671 -23.1585 -0.1 + vertex 36.362 -23.3104 -0.2 + vertex 40.604 -24.6171 -0.2 + vertex 36.3671 -23.1585 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.4642 -20.5001 -0.1 - vertex 36.3224 -22.9562 -0.1 - vertex 36.3539 -23.0402 -0.1 + vertex 37.4642 -20.5001 -0.2 + vertex 36.3224 -22.9562 -0.2 + vertex 36.3539 -23.0402 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.5724 -20.813 -0.1 - vertex 36.2723 -22.9073 -0.1 - vertex 36.3224 -22.9562 -0.1 + vertex 36.5724 -20.813 -0.2 + vertex 36.2723 -22.9073 -0.2 + vertex 36.3224 -22.9562 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.9118 -21.0243 -0.1 - vertex 36.2723 -22.9073 -0.1 - vertex 36.5724 -20.813 -0.1 + vertex 35.9118 -21.0243 -0.2 + vertex 36.2723 -22.9073 -0.2 + vertex 36.5724 -20.813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.2723 -22.9073 -0.1 - vertex 35.9118 -21.0243 -0.1 - vertex 36.2034 -22.8943 -0.1 + vertex 36.2723 -22.9073 -0.2 + vertex 35.9118 -21.0243 -0.2 + vertex 36.2034 -22.8943 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.5778 -21.102 -0.1 - vertex 36.2034 -22.8943 -0.1 - vertex 35.9118 -21.0243 -0.1 + vertex 35.5778 -21.102 -0.2 + vertex 36.2034 -22.8943 -0.2 + vertex 35.9118 -21.0243 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.2034 -22.8943 -0.1 - vertex 35.5778 -21.102 -0.1 - vertex 36.1157 -22.9178 -0.1 + vertex 36.2034 -22.8943 -0.2 + vertex 35.5778 -21.102 -0.2 + vertex 36.1157 -22.9178 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.1157 -22.9178 -0.1 - vertex 35.5778 -21.102 -0.1 - vertex 35.9442 -22.9618 -0.1 + vertex 36.1157 -22.9178 -0.2 + vertex 35.5778 -21.102 -0.2 + vertex 35.9442 -22.9618 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.9442 -22.9618 -0.1 - vertex 35.5778 -21.102 -0.1 - vertex 35.7166 -22.9783 -0.1 + vertex 35.9442 -22.9618 -0.2 + vertex 35.5778 -21.102 -0.2 + vertex 35.7166 -22.9783 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 35.0706 -21.3217 -0.1 - vertex 35.7166 -22.9783 -0.1 - vertex 35.5778 -21.102 -0.1 + vertex 35.0706 -21.3217 -0.2 + vertex 35.7166 -22.9783 -0.2 + vertex 35.5778 -21.102 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.2304 -21.2043 -0.1 - vertex 35.5778 -21.102 -0.1 - vertex 35.4013 -21.1287 -0.1 + vertex 35.2304 -21.2043 -0.2 + vertex 35.5778 -21.102 -0.2 + vertex 35.4013 -21.1287 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.5778 -21.102 -0.1 - vertex 35.2304 -21.2043 -0.1 - vertex 35.0706 -21.3217 -0.1 + vertex 35.5778 -21.102 -0.2 + vertex 35.2304 -21.2043 -0.2 + vertex 35.0706 -21.3217 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 34.9274 -21.474 -0.1 - vertex 35.7166 -22.9783 -0.1 - vertex 35.0706 -21.3217 -0.1 + vertex 34.9274 -21.474 -0.2 + vertex 35.7166 -22.9783 -0.2 + vertex 35.0706 -21.3217 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.7166 -22.9783 -0.1 - vertex 34.9274 -21.474 -0.1 - vertex 35.4626 -22.9668 -0.1 + vertex 35.7166 -22.9783 -0.2 + vertex 34.9274 -21.474 -0.2 + vertex 35.4626 -22.9668 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 34.8063 -21.6543 -0.1 - vertex 35.4626 -22.9668 -0.1 - vertex 34.9274 -21.474 -0.1 + vertex 34.8063 -21.6543 -0.2 + vertex 35.4626 -22.9668 -0.2 + vertex 34.9274 -21.474 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 34.713 -21.8554 -0.1 - vertex 35.4626 -22.9668 -0.1 - vertex 34.8063 -21.6543 -0.1 + vertex 34.713 -21.8554 -0.2 + vertex 35.4626 -22.9668 -0.2 + vertex 34.8063 -21.6543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.4626 -22.9668 -0.1 - vertex 34.713 -21.8554 -0.1 - vertex 35.2118 -22.9271 -0.1 + vertex 35.4626 -22.9668 -0.2 + vertex 34.713 -21.8554 -0.2 + vertex 35.2118 -22.9271 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 34.653 -22.0706 -0.1 - vertex 35.2118 -22.9271 -0.1 - vertex 34.713 -21.8554 -0.1 + vertex 34.653 -22.0706 -0.2 + vertex 35.2118 -22.9271 -0.2 + vertex 34.713 -21.8554 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 34.6318 -22.2927 -0.1 - vertex 35.2118 -22.9271 -0.1 - vertex 34.653 -22.0706 -0.1 + vertex 34.6318 -22.2927 -0.2 + vertex 35.2118 -22.9271 -0.2 + vertex 34.653 -22.0706 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.2118 -22.9271 -0.1 - vertex 34.6318 -22.2927 -0.1 - vertex 34.9345 -22.8399 -0.1 + vertex 35.2118 -22.9271 -0.2 + vertex 34.6318 -22.2927 -0.2 + vertex 34.9345 -22.8399 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 34.6385 -22.4262 -0.1 - vertex 34.9345 -22.8399 -0.1 - vertex 34.6318 -22.2927 -0.1 + vertex 34.6385 -22.4262 -0.2 + vertex 34.9345 -22.8399 -0.2 + vertex 34.6318 -22.2927 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 34.6602 -22.54 -0.1 - vertex 34.9345 -22.8399 -0.1 - vertex 34.6385 -22.4262 -0.1 + vertex 34.6602 -22.54 -0.2 + vertex 34.9345 -22.8399 -0.2 + vertex 34.6385 -22.4262 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.9345 -22.8399 -0.1 - vertex 34.6602 -22.54 -0.1 - vertex 34.8338 -22.7839 -0.1 + vertex 34.9345 -22.8399 -0.2 + vertex 34.6602 -22.54 -0.2 + vertex 34.8338 -22.7839 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.8338 -22.7839 -0.1 - vertex 34.6602 -22.54 -0.1 - vertex 34.7558 -22.7166 -0.1 + vertex 34.8338 -22.7839 -0.2 + vertex 34.6602 -22.54 -0.2 + vertex 34.7558 -22.7166 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.7558 -22.7166 -0.1 - vertex 34.6602 -22.54 -0.1 - vertex 34.6986 -22.636 -0.1 + vertex 34.7558 -22.7166 -0.2 + vertex 34.6602 -22.54 -0.2 + vertex 34.6986 -22.636 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.6954 -36.1853 -0.1 - vertex 38.1248 -36.8464 -0.1 - vertex 38.119 -36.6694 -0.1 + vertex 37.6954 -36.1853 -0.2 + vertex 38.1248 -36.8464 -0.2 + vertex 38.119 -36.6694 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.8576 -36.2498 -0.1 - vertex 38.119 -36.6694 -0.1 - vertex 38.0969 -36.5276 -0.1 + vertex 37.8576 -36.2498 -0.2 + vertex 38.119 -36.6694 -0.2 + vertex 38.0969 -36.5276 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.203 -36.0604 -0.1 - vertex 38.1248 -36.8464 -0.1 - vertex 37.6954 -36.1853 -0.1 + vertex 37.203 -36.0604 -0.2 + vertex 38.1248 -36.8464 -0.2 + vertex 37.6954 -36.1853 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.9736 -36.3241 -0.1 - vertex 38.0969 -36.5276 -0.1 - vertex 38.0509 -36.4146 -0.1 + vertex 37.9736 -36.3241 -0.2 + vertex 38.0969 -36.5276 -0.2 + vertex 38.0509 -36.4146 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.1248 -36.8464 -0.1 - vertex 37.203 -36.0604 -0.1 - vertex 38.103 -37.2562 -0.1 + vertex 38.1248 -36.8464 -0.2 + vertex 37.203 -36.0604 -0.2 + vertex 38.103 -37.2562 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.0969 -36.5276 -0.1 - vertex 37.9736 -36.3241 -0.1 - vertex 37.8576 -36.2498 -0.1 + vertex 38.0969 -36.5276 -0.2 + vertex 37.9736 -36.3241 -0.2 + vertex 37.8576 -36.2498 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.119 -36.6694 -0.1 - vertex 37.8576 -36.2498 -0.1 - vertex 37.6954 -36.1853 -0.1 + vertex 38.119 -36.6694 -0.2 + vertex 37.8576 -36.2498 -0.2 + vertex 37.6954 -36.1853 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 37.3927 -37.9628 -0.1 - vertex 38.103 -37.2562 -0.1 - vertex 37.203 -36.0604 -0.1 + vertex 37.3927 -37.9628 -0.2 + vertex 38.103 -37.2562 -0.2 + vertex 37.203 -36.0604 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 37.7849 -37.8018 -0.1 - vertex 38.0668 -37.4245 -0.1 - vertex 37.6132 -37.8903 -0.1 + vertex 37.7849 -37.8018 -0.2 + vertex 38.0668 -37.4245 -0.2 + vertex 37.6132 -37.8903 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.0668 -37.4245 -0.1 - vertex 37.7849 -37.8018 -0.1 - vertex 38.0057 -37.5705 -0.1 + vertex 38.0668 -37.4245 -0.2 + vertex 37.7849 -37.8018 -0.2 + vertex 38.0057 -37.5705 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.0057 -37.5705 -0.1 - vertex 37.7849 -37.8018 -0.1 - vertex 37.9137 -37.6957 -0.1 + vertex 38.0057 -37.5705 -0.2 + vertex 37.7849 -37.8018 -0.2 + vertex 37.9137 -37.6957 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 37.6132 -37.8903 -0.1 - vertex 38.103 -37.2562 -0.1 - vertex 37.3927 -37.9628 -0.1 + vertex 37.6132 -37.8903 -0.2 + vertex 38.103 -37.2562 -0.2 + vertex 37.3927 -37.9628 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 38.103 -37.2562 -0.1 - vertex 37.6132 -37.8903 -0.1 - vertex 38.0668 -37.4245 -0.1 + vertex 38.103 -37.2562 -0.2 + vertex 37.6132 -37.8903 -0.2 + vertex 38.0668 -37.4245 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.203 -36.0604 -0.1 - vertex 37.1174 -38.0208 -0.1 - vertex 37.3927 -37.9628 -0.1 + vertex 37.203 -36.0604 -0.2 + vertex 37.1174 -38.0208 -0.2 + vertex 37.3927 -37.9628 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.203 -36.0604 -0.1 - vertex 36.7812 -38.066 -0.1 - vertex 37.1174 -38.0208 -0.1 + vertex 37.203 -36.0604 -0.2 + vertex 36.7812 -38.066 -0.2 + vertex 37.1174 -38.0208 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.6812 -35.9318 -0.1 - vertex 36.7812 -38.066 -0.1 - vertex 37.203 -36.0604 -0.1 + vertex 36.6812 -35.9318 -0.2 + vertex 36.7812 -38.066 -0.2 + vertex 37.203 -36.0604 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.9024 -38.1241 -0.1 - vertex 36.6812 -35.9318 -0.1 - vertex 36.5187 -35.8653 -0.1 + vertex 35.9024 -38.1241 -0.2 + vertex 36.6812 -35.9318 -0.2 + vertex 36.5187 -35.8653 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 35.9024 -38.1241 -0.1 - vertex 36.5187 -35.8653 -0.1 - vertex 36.4089 -35.7834 -0.1 + vertex 35.9024 -38.1241 -0.2 + vertex 36.5187 -35.8653 -0.2 + vertex 36.4089 -35.7834 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.7085 -38.1497 -0.1 - vertex 36.4089 -35.7834 -0.1 - vertex 36.3422 -35.6758 -0.1 + vertex 34.7085 -38.1497 -0.2 + vertex 36.4089 -35.7834 -0.2 + vertex 36.3422 -35.6758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.7085 -38.1497 -0.1 - vertex 36.3422 -35.6758 -0.1 - vertex 36.3089 -35.532 -0.1 + vertex 34.7085 -38.1497 -0.2 + vertex 36.3422 -35.6758 -0.2 + vertex 36.3089 -35.532 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 37.444 -31.6395 -0.1 - vertex 33.8561 -30.1753 -0.1 - vertex 36.8389 -33.2656 -0.1 + vertex 37.444 -31.6395 -0.2 + vertex 33.8561 -30.1753 -0.2 + vertex 36.8389 -33.2656 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 33.1139 -32.0001 -0.1 - vertex 36.8389 -33.2656 -0.1 - vertex 33.8561 -30.1753 -0.1 + vertex 33.1139 -32.0001 -0.2 + vertex 36.8389 -33.2656 -0.2 + vertex 33.8561 -30.1753 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.6812 -35.9318 -0.1 - vertex 35.9024 -38.1241 -0.1 - vertex 36.7812 -38.066 -0.1 + vertex 36.6812 -35.9318 -0.2 + vertex 35.9024 -38.1241 -0.2 + vertex 36.7812 -38.066 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 32.0766 -34.3595 -0.1 - vertex 36.3089 -35.532 -0.1 - vertex 36.2992 -35.3418 -0.1 + vertex 32.0766 -34.3595 -0.2 + vertex 36.3089 -35.532 -0.2 + vertex 36.2992 -35.3418 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.8389 -33.2656 -0.1 - vertex 33.1139 -32.0001 -0.1 - vertex 36.4479 -34.448 -0.1 + vertex 36.8389 -33.2656 -0.2 + vertex 33.1139 -32.0001 -0.2 + vertex 36.4479 -34.448 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 32.5373 -33.371 -0.1 - vertex 36.4479 -34.448 -0.1 - vertex 33.1139 -32.0001 -0.1 + vertex 32.5373 -33.371 -0.2 + vertex 36.4479 -34.448 -0.2 + vertex 33.1139 -32.0001 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.4479 -34.448 -0.1 - vertex 32.5373 -33.371 -0.1 - vertex 36.3428 -34.844 -0.1 + vertex 36.4479 -34.448 -0.2 + vertex 32.5373 -33.371 -0.2 + vertex 36.3428 -34.844 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3428 -34.844 -0.1 - vertex 32.5373 -33.371 -0.1 - vertex 36.3035 -35.0946 -0.1 + vertex 36.3428 -34.844 -0.2 + vertex 32.5373 -33.371 -0.2 + vertex 36.3035 -35.0946 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 32.0766 -34.3595 -0.1 - vertex 36.3035 -35.0946 -0.1 - vertex 32.5373 -33.371 -0.1 + vertex 32.0766 -34.3595 -0.2 + vertex 36.3035 -35.0946 -0.2 + vertex 32.5373 -33.371 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3035 -35.0946 -0.1 - vertex 32.0766 -34.3595 -0.1 - vertex 36.2992 -35.3418 -0.1 + vertex 36.3035 -35.0946 -0.2 + vertex 32.0766 -34.3595 -0.2 + vertex 36.2992 -35.3418 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.4089 -35.7834 -0.1 - vertex 34.7085 -38.1497 -0.1 - vertex 35.9024 -38.1241 -0.1 + vertex 36.4089 -35.7834 -0.2 + vertex 34.7085 -38.1497 -0.2 + vertex 35.9024 -38.1241 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3089 -35.532 -0.1 - vertex 32.0766 -34.3595 -0.1 - vertex 31.8743 -34.7329 -0.1 + vertex 36.3089 -35.532 -0.2 + vertex 32.0766 -34.3595 -0.2 + vertex 31.8743 -34.7329 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 36.3089 -35.532 -0.1 - vertex 31.8743 -34.7329 -0.1 - vertex 34.7085 -38.1497 -0.1 + vertex 36.3089 -35.532 -0.2 + vertex 31.8743 -34.7329 -0.2 + vertex 34.7085 -38.1497 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 34.7085 -38.1497 -0.1 - vertex 31.8743 -34.7329 -0.1 - vertex 33.1514 -38.1555 -0.1 + vertex 34.7085 -38.1497 -0.2 + vertex 31.8743 -34.7329 -0.2 + vertex 33.1514 -38.1555 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 31.6824 -35.0376 -0.1 - vertex 33.1514 -38.1555 -0.1 - vertex 31.8743 -34.7329 -0.1 + vertex 31.6824 -35.0376 -0.2 + vertex 33.1514 -38.1555 -0.2 + vertex 31.8743 -34.7329 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 31.4948 -35.2825 -0.1 - vertex 33.1514 -38.1555 -0.1 - vertex 31.6824 -35.0376 -0.1 + vertex 31.4948 -35.2825 -0.2 + vertex 33.1514 -38.1555 -0.2 + vertex 31.6824 -35.0376 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 31.3052 -35.4767 -0.1 - vertex 33.1514 -38.1555 -0.1 - vertex 31.4948 -35.2825 -0.1 + vertex 31.3052 -35.4767 -0.2 + vertex 33.1514 -38.1555 -0.2 + vertex 31.4948 -35.2825 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 31.1075 -35.6291 -0.1 - vertex 33.1514 -38.1555 -0.1 - vertex 31.3052 -35.4767 -0.1 + vertex 31.1075 -35.6291 -0.2 + vertex 33.1514 -38.1555 -0.2 + vertex 31.3052 -35.4767 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 33.1514 -38.1555 -0.1 - vertex 31.1075 -35.6291 -0.1 - vertex 31.1824 -38.1409 -0.1 + vertex 33.1514 -38.1555 -0.2 + vertex 31.1075 -35.6291 -0.2 + vertex 31.1824 -38.1409 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 30.8955 -35.7486 -0.1 - vertex 31.1824 -38.1409 -0.1 - vertex 31.1075 -35.6291 -0.1 + vertex 30.8955 -35.7486 -0.2 + vertex 31.1824 -38.1409 -0.2 + vertex 31.1075 -35.6291 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 30.6629 -35.8443 -0.1 - vertex 31.1824 -38.1409 -0.1 - vertex 30.8955 -35.7486 -0.1 + vertex 30.6629 -35.8443 -0.2 + vertex 31.1824 -38.1409 -0.2 + vertex 30.8955 -35.7486 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 30.4037 -35.9251 -0.1 - vertex 31.1824 -38.1409 -0.1 - vertex 30.6629 -35.8443 -0.1 + vertex 30.4037 -35.9251 -0.2 + vertex 31.1824 -38.1409 -0.2 + vertex 30.6629 -35.8443 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 30.4037 -35.9251 -0.1 - vertex 29.8192 -38.0948 -0.1 - vertex 31.1824 -38.1409 -0.1 + vertex 30.4037 -35.9251 -0.2 + vertex 29.8192 -38.0948 -0.2 + vertex 31.1824 -38.1409 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.7804 -36.0779 -0.1 - vertex 29.8192 -38.0948 -0.1 - vertex 30.4037 -35.9251 -0.1 + vertex 29.7804 -36.0779 -0.2 + vertex 29.8192 -38.0948 -0.2 + vertex 30.4037 -35.9251 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.5705 -36.1356 -0.1 - vertex 29.8192 -38.0948 -0.1 - vertex 29.7804 -36.0779 -0.1 + vertex 29.5705 -36.1356 -0.2 + vertex 29.8192 -38.0948 -0.2 + vertex 29.7804 -36.0779 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.3757 -36.2065 -0.1 - vertex 29.8192 -38.0948 -0.1 - vertex 29.5705 -36.1356 -0.1 + vertex 29.3757 -36.2065 -0.2 + vertex 29.8192 -38.0948 -0.2 + vertex 29.5705 -36.1356 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.1966 -36.2895 -0.1 - vertex 29.8192 -38.0948 -0.1 - vertex 29.3757 -36.2065 -0.1 + vertex 29.1966 -36.2895 -0.2 + vertex 29.8192 -38.0948 -0.2 + vertex 29.3757 -36.2065 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.8192 -38.0948 -0.1 - vertex 29.1966 -36.2895 -0.1 - vertex 29.3448 -38.0588 -0.1 + vertex 29.8192 -38.0948 -0.2 + vertex 29.1966 -36.2895 -0.2 + vertex 29.3448 -38.0588 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 29.034 -36.3831 -0.1 - vertex 29.3448 -38.0588 -0.1 - vertex 29.1966 -36.2895 -0.1 + vertex 29.034 -36.3831 -0.2 + vertex 29.3448 -38.0588 -0.2 + vertex 29.1966 -36.2895 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.8888 -36.4863 -0.1 - vertex 29.3448 -38.0588 -0.1 - vertex 29.034 -36.3831 -0.1 + vertex 28.8888 -36.4863 -0.2 + vertex 29.3448 -38.0588 -0.2 + vertex 29.034 -36.3831 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.7617 -36.5978 -0.1 - vertex 29.3448 -38.0588 -0.1 - vertex 28.8888 -36.4863 -0.1 + vertex 28.7617 -36.5978 -0.2 + vertex 29.3448 -38.0588 -0.2 + vertex 28.8888 -36.4863 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.6534 -36.7163 -0.1 - vertex 29.3448 -38.0588 -0.1 - vertex 28.7617 -36.5978 -0.1 + vertex 28.6534 -36.7163 -0.2 + vertex 29.3448 -38.0588 -0.2 + vertex 28.7617 -36.5978 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 29.3448 -38.0588 -0.1 - vertex 28.6534 -36.7163 -0.1 - vertex 28.9979 -38.0135 -0.1 + vertex 29.3448 -38.0588 -0.2 + vertex 28.6534 -36.7163 -0.2 + vertex 28.9979 -38.0135 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.5648 -36.8405 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.6534 -36.7163 -0.1 + vertex 28.5648 -36.8405 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.6534 -36.7163 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.4965 -36.9693 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.5648 -36.8405 -0.1 + vertex 28.4965 -36.9693 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.5648 -36.8405 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.4495 -37.1014 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.4965 -36.9693 -0.1 + vertex 28.4495 -37.1014 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.4965 -36.9693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.7706 -37.9584 -0.1 - vertex 28.5587 -37.7674 -0.1 - vertex 28.6548 -37.8931 -0.1 + vertex 28.7706 -37.9584 -0.2 + vertex 28.5587 -37.7674 -0.2 + vertex 28.6548 -37.8931 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.4243 -37.2355 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.4495 -37.1014 -0.1 + vertex 28.4243 -37.2355 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.4495 -37.1014 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.9979 -38.0135 -0.1 - vertex 28.5587 -37.7674 -0.1 - vertex 28.7706 -37.9584 -0.1 + vertex 28.9979 -38.0135 -0.2 + vertex 28.5587 -37.7674 -0.2 + vertex 28.7706 -37.9584 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 28.4219 -37.3704 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.4243 -37.2355 -0.1 + vertex 28.4219 -37.3704 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.4243 -37.2355 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 28.5587 -37.7674 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.4883 -37.6376 -0.1 + vertex 28.5587 -37.7674 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.4883 -37.6376 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 28.4883 -37.6376 -0.1 - vertex 28.9979 -38.0135 -0.1 - vertex 28.443 -37.5048 -0.1 + vertex 28.4883 -37.6376 -0.2 + vertex 28.9979 -38.0135 -0.2 + vertex 28.443 -37.5048 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 28.9979 -38.0135 -0.1 - vertex 28.4219 -37.3704 -0.1 - vertex 28.443 -37.5048 -0.1 + vertex 28.9979 -38.0135 -0.2 + vertex 28.4219 -37.3704 -0.2 + vertex 28.443 -37.5048 -0.2 endloop endfacet facet normal -0.131122 -0.991366 0 outer loop - vertex 46.8289 -19.1548 -0.1 + vertex 46.8289 -19.1548 -0.2 vertex 47.044 -19.1833 0 vertex 46.8289 -19.1548 0 endloop @@ -20519,13 +20519,13 @@ solid OpenSCAD_Model facet normal -0.131122 -0.991366 -0 outer loop vertex 47.044 -19.1833 0 - vertex 46.8289 -19.1548 -0.1 - vertex 47.044 -19.1833 -0.1 + vertex 46.8289 -19.1548 -0.2 + vertex 47.044 -19.1833 -0.2 endloop endfacet facet normal -0.230596 -0.97305 0 outer loop - vertex 47.044 -19.1833 -0.1 + vertex 47.044 -19.1833 -0.2 vertex 47.2257 -19.2263 0 vertex 47.044 -19.1833 0 endloop @@ -20533,13 +20533,13 @@ solid OpenSCAD_Model facet normal -0.230596 -0.97305 -0 outer loop vertex 47.2257 -19.2263 0 - vertex 47.044 -19.1833 -0.1 - vertex 47.2257 -19.2263 -0.1 + vertex 47.044 -19.1833 -0.2 + vertex 47.2257 -19.2263 -0.2 endloop endfacet facet normal -0.359881 -0.932998 0 outer loop - vertex 47.2257 -19.2263 -0.1 + vertex 47.2257 -19.2263 -0.2 vertex 47.3799 -19.2858 0 vertex 47.2257 -19.2263 0 endloop @@ -20547,13 +20547,13 @@ solid OpenSCAD_Model facet normal -0.359881 -0.932998 -0 outer loop vertex 47.3799 -19.2858 0 - vertex 47.2257 -19.2263 -0.1 - vertex 47.3799 -19.2858 -0.1 + vertex 47.2257 -19.2263 -0.2 + vertex 47.3799 -19.2858 -0.2 endloop endfacet facet normal -0.505271 -0.862961 0 outer loop - vertex 47.3799 -19.2858 -0.1 + vertex 47.3799 -19.2858 -0.2 vertex 47.5127 -19.3635 0 vertex 47.3799 -19.2858 0 endloop @@ -20561,13 +20561,13 @@ solid OpenSCAD_Model facet normal -0.505271 -0.862961 -0 outer loop vertex 47.5127 -19.3635 0 - vertex 47.3799 -19.2858 -0.1 - vertex 47.5127 -19.3635 -0.1 + vertex 47.3799 -19.2858 -0.2 + vertex 47.5127 -19.3635 -0.2 endloop endfacet facet normal -0.640123 -0.768272 0 outer loop - vertex 47.5127 -19.3635 -0.1 + vertex 47.5127 -19.3635 -0.2 vertex 47.6302 -19.4614 0 vertex 47.5127 -19.3635 0 endloop @@ -20575,209 +20575,209 @@ solid OpenSCAD_Model facet normal -0.640123 -0.768272 -0 outer loop vertex 47.6302 -19.4614 0 - vertex 47.5127 -19.3635 -0.1 - vertex 47.6302 -19.4614 -0.1 + vertex 47.5127 -19.3635 -0.2 + vertex 47.6302 -19.4614 -0.2 endloop endfacet facet normal -0.742266 -0.670106 0 outer loop - vertex 47.7384 -19.5813 -0.1 + vertex 47.7384 -19.5813 -0.2 vertex 47.6302 -19.4614 0 - vertex 47.6302 -19.4614 -0.1 + vertex 47.6302 -19.4614 -0.2 endloop endfacet facet normal -0.742266 -0.670106 0 outer loop vertex 47.6302 -19.4614 0 - vertex 47.7384 -19.5813 -0.1 + vertex 47.7384 -19.5813 -0.2 vertex 47.7384 -19.5813 0 endloop endfacet facet normal -0.797332 -0.60354 0 outer loop - vertex 47.845 -19.7221 -0.1 + vertex 47.845 -19.7221 -0.2 vertex 47.7384 -19.5813 0 - vertex 47.7384 -19.5813 -0.1 + vertex 47.7384 -19.5813 -0.2 endloop endfacet facet normal -0.797332 -0.60354 0 outer loop vertex 47.7384 -19.5813 0 - vertex 47.845 -19.7221 -0.1 + vertex 47.845 -19.7221 -0.2 vertex 47.845 -19.7221 0 endloop endfacet facet normal -0.85488 -0.518827 0 outer loop - vertex 47.9233 -19.8512 -0.1 + vertex 47.9233 -19.8512 -0.2 vertex 47.845 -19.7221 0 - vertex 47.845 -19.7221 -0.1 + vertex 47.845 -19.7221 -0.2 endloop endfacet facet normal -0.85488 -0.518827 0 outer loop vertex 47.845 -19.7221 0 - vertex 47.9233 -19.8512 -0.1 + vertex 47.9233 -19.8512 -0.2 vertex 47.9233 -19.8512 0 endloop endfacet facet normal -0.930142 -0.367201 0 outer loop - vertex 47.9745 -19.9807 -0.1 + vertex 47.9745 -19.9807 -0.2 vertex 47.9233 -19.8512 0 - vertex 47.9233 -19.8512 -0.1 + vertex 47.9233 -19.8512 -0.2 endloop endfacet facet normal -0.930142 -0.367201 0 outer loop vertex 47.9233 -19.8512 0 - vertex 47.9745 -19.9807 -0.1 + vertex 47.9745 -19.9807 -0.2 vertex 47.9745 -19.9807 0 endloop endfacet facet normal -0.985048 -0.172278 0 outer loop - vertex 47.9993 -20.1225 -0.1 + vertex 47.9993 -20.1225 -0.2 vertex 47.9745 -19.9807 0 - vertex 47.9745 -19.9807 -0.1 + vertex 47.9745 -19.9807 -0.2 endloop endfacet facet normal -0.985048 -0.172278 0 outer loop vertex 47.9745 -19.9807 0 - vertex 47.9993 -20.1225 -0.1 + vertex 47.9993 -20.1225 -0.2 vertex 47.9993 -20.1225 0 endloop endfacet facet normal -0.999994 0.0034209 0 outer loop - vertex 47.9987 -20.2887 -0.1 + vertex 47.9987 -20.2887 -0.2 vertex 47.9993 -20.1225 0 - vertex 47.9993 -20.1225 -0.1 + vertex 47.9993 -20.1225 -0.2 endloop endfacet facet normal -0.999994 0.0034209 0 outer loop vertex 47.9993 -20.1225 0 - vertex 47.9987 -20.2887 -0.1 + vertex 47.9987 -20.2887 -0.2 vertex 47.9987 -20.2887 0 endloop endfacet facet normal -0.992465 0.122526 0 outer loop - vertex 47.9737 -20.4912 -0.1 + vertex 47.9737 -20.4912 -0.2 vertex 47.9987 -20.2887 0 - vertex 47.9987 -20.2887 -0.1 + vertex 47.9987 -20.2887 -0.2 endloop endfacet facet normal -0.992465 0.122526 0 outer loop vertex 47.9987 -20.2887 0 - vertex 47.9737 -20.4912 -0.1 + vertex 47.9737 -20.4912 -0.2 vertex 47.9737 -20.4912 0 endloop endfacet facet normal -0.97813 0.207995 0 outer loop - vertex 47.8542 -21.0531 -0.1 + vertex 47.8542 -21.0531 -0.2 vertex 47.9737 -20.4912 0 - vertex 47.9737 -20.4912 -0.1 + vertex 47.9737 -20.4912 -0.2 endloop endfacet facet normal -0.97813 0.207995 0 outer loop vertex 47.9737 -20.4912 0 - vertex 47.8542 -21.0531 -0.1 + vertex 47.8542 -21.0531 -0.2 vertex 47.8542 -21.0531 0 endloop endfacet facet normal -0.962149 0.272524 0 outer loop - vertex 47.7155 -21.5429 -0.1 + vertex 47.7155 -21.5429 -0.2 vertex 47.8542 -21.0531 0 - vertex 47.8542 -21.0531 -0.1 + vertex 47.8542 -21.0531 -0.2 endloop endfacet facet normal -0.962149 0.272524 0 outer loop vertex 47.8542 -21.0531 0 - vertex 47.7155 -21.5429 -0.1 + vertex 47.7155 -21.5429 -0.2 vertex 47.7155 -21.5429 0 endloop endfacet facet normal -0.934598 0.355705 0 outer loop - vertex 47.5422 -21.9981 -0.1 + vertex 47.5422 -21.9981 -0.2 vertex 47.7155 -21.5429 0 - vertex 47.7155 -21.5429 -0.1 + vertex 47.7155 -21.5429 -0.2 endloop endfacet facet normal -0.934598 0.355705 0 outer loop vertex 47.7155 -21.5429 0 - vertex 47.5422 -21.9981 -0.1 + vertex 47.5422 -21.9981 -0.2 vertex 47.5422 -21.9981 0 endloop endfacet facet normal -0.898902 0.438149 0 outer loop - vertex 47.3383 -22.4165 -0.1 + vertex 47.3383 -22.4165 -0.2 vertex 47.5422 -21.9981 0 - vertex 47.5422 -21.9981 -0.1 + vertex 47.5422 -21.9981 -0.2 endloop endfacet facet normal -0.898902 0.438149 0 outer loop vertex 47.5422 -21.9981 0 - vertex 47.3383 -22.4165 -0.1 + vertex 47.3383 -22.4165 -0.2 vertex 47.3383 -22.4165 0 endloop endfacet facet normal -0.854314 0.519757 0 outer loop - vertex 47.1074 -22.796 -0.1 + vertex 47.1074 -22.796 -0.2 vertex 47.3383 -22.4165 0 - vertex 47.3383 -22.4165 -0.1 + vertex 47.3383 -22.4165 -0.2 endloop endfacet facet normal -0.854314 0.519757 0 outer loop vertex 47.3383 -22.4165 0 - vertex 47.1074 -22.796 -0.1 + vertex 47.1074 -22.796 -0.2 vertex 47.1074 -22.796 0 endloop endfacet facet normal -0.79973 0.600359 0 outer loop - vertex 46.8534 -23.1343 -0.1 + vertex 46.8534 -23.1343 -0.2 vertex 47.1074 -22.796 0 - vertex 47.1074 -22.796 -0.1 + vertex 47.1074 -22.796 -0.2 endloop endfacet facet normal -0.79973 0.600359 0 outer loop vertex 47.1074 -22.796 0 - vertex 46.8534 -23.1343 -0.1 + vertex 46.8534 -23.1343 -0.2 vertex 46.8534 -23.1343 0 endloop endfacet facet normal -0.73354 0.679647 0 outer loop - vertex 46.5801 -23.4293 -0.1 + vertex 46.5801 -23.4293 -0.2 vertex 46.8534 -23.1343 0 - vertex 46.8534 -23.1343 -0.1 + vertex 46.8534 -23.1343 -0.2 endloop endfacet facet normal -0.73354 0.679647 0 outer loop vertex 46.8534 -23.1343 0 - vertex 46.5801 -23.4293 -0.1 + vertex 46.5801 -23.4293 -0.2 vertex 46.5801 -23.4293 0 endloop endfacet facet normal -0.653573 0.756863 0 outer loop - vertex 46.5801 -23.4293 -0.1 + vertex 46.5801 -23.4293 -0.2 vertex 46.2914 -23.6786 0 vertex 46.5801 -23.4293 0 endloop @@ -20785,13 +20785,13 @@ solid OpenSCAD_Model facet normal -0.653573 0.756863 0 outer loop vertex 46.2914 -23.6786 0 - vertex 46.5801 -23.4293 -0.1 - vertex 46.2914 -23.6786 -0.1 + vertex 46.5801 -23.4293 -0.2 + vertex 46.2914 -23.6786 -0.2 endloop endfacet facet normal -0.557126 0.830428 0 outer loop - vertex 46.2914 -23.6786 -0.1 + vertex 46.2914 -23.6786 -0.2 vertex 45.9909 -23.8802 0 vertex 46.2914 -23.6786 0 endloop @@ -20799,13 +20799,13 @@ solid OpenSCAD_Model facet normal -0.557126 0.830428 0 outer loop vertex 45.9909 -23.8802 0 - vertex 46.2914 -23.6786 -0.1 - vertex 45.9909 -23.8802 -0.1 + vertex 46.2914 -23.6786 -0.2 + vertex 45.9909 -23.8802 -0.2 endloop endfacet facet normal -0.441145 0.897436 0 outer loop - vertex 45.9909 -23.8802 -0.1 + vertex 45.9909 -23.8802 -0.2 vertex 45.6826 -24.0317 0 vertex 45.9909 -23.8802 0 endloop @@ -20813,13 +20813,13 @@ solid OpenSCAD_Model facet normal -0.441145 0.897436 0 outer loop vertex 45.6826 -24.0317 0 - vertex 45.9909 -23.8802 -0.1 - vertex 45.6826 -24.0317 -0.1 + vertex 45.9909 -23.8802 -0.2 + vertex 45.6826 -24.0317 -0.2 endloop endfacet facet normal -0.303061 0.952971 0 outer loop - vertex 45.6826 -24.0317 -0.1 + vertex 45.6826 -24.0317 -0.2 vertex 45.3703 -24.1311 0 vertex 45.6826 -24.0317 0 endloop @@ -20827,13 +20827,13 @@ solid OpenSCAD_Model facet normal -0.303061 0.952971 0 outer loop vertex 45.3703 -24.1311 0 - vertex 45.6826 -24.0317 -0.1 - vertex 45.3703 -24.1311 -0.1 + vertex 45.6826 -24.0317 -0.2 + vertex 45.3703 -24.1311 -0.2 endloop endfacet facet normal -0.142218 0.989835 0 outer loop - vertex 45.3703 -24.1311 -0.1 + vertex 45.3703 -24.1311 -0.2 vertex 45.0576 -24.176 0 vertex 45.3703 -24.1311 0 endloop @@ -20841,13 +20841,13 @@ solid OpenSCAD_Model facet normal -0.142218 0.989835 0 outer loop vertex 45.0576 -24.176 0 - vertex 45.3703 -24.1311 -0.1 - vertex 45.0576 -24.176 -0.1 + vertex 45.3703 -24.1311 -0.2 + vertex 45.0576 -24.176 -0.2 endloop endfacet facet normal 0.0378695 0.999283 -0 outer loop - vertex 45.0576 -24.176 -0.1 + vertex 45.0576 -24.176 -0.2 vertex 44.7485 -24.1643 0 vertex 45.0576 -24.176 0 endloop @@ -20855,13 +20855,13 @@ solid OpenSCAD_Model facet normal 0.0378695 0.999283 0 outer loop vertex 44.7485 -24.1643 0 - vertex 45.0576 -24.176 -0.1 - vertex 44.7485 -24.1643 -0.1 + vertex 45.0576 -24.176 -0.2 + vertex 44.7485 -24.1643 -0.2 endloop endfacet facet normal 0.227696 0.973732 -0 outer loop - vertex 44.7485 -24.1643 -0.1 + vertex 44.7485 -24.1643 -0.2 vertex 44.4468 -24.0937 0 vertex 44.7485 -24.1643 0 endloop @@ -20869,13 +20869,13 @@ solid OpenSCAD_Model facet normal 0.227696 0.973732 0 outer loop vertex 44.4468 -24.0937 0 - vertex 44.7485 -24.1643 -0.1 - vertex 44.4468 -24.0937 -0.1 + vertex 44.7485 -24.1643 -0.2 + vertex 44.4468 -24.0937 -0.2 endloop endfacet facet normal 0.412594 0.910915 -0 outer loop - vertex 44.4468 -24.0937 -0.1 + vertex 44.4468 -24.0937 -0.2 vertex 44.1563 -23.9621 0 vertex 44.4468 -24.0937 0 endloop @@ -20883,13 +20883,13 @@ solid OpenSCAD_Model facet normal 0.412594 0.910915 0 outer loop vertex 44.1563 -23.9621 0 - vertex 44.4468 -24.0937 -0.1 - vertex 44.1563 -23.9621 -0.1 + vertex 44.4468 -24.0937 -0.2 + vertex 44.1563 -23.9621 -0.2 endloop endfacet facet normal 0.57736 0.81649 -0 outer loop - vertex 44.1563 -23.9621 -0.1 + vertex 44.1563 -23.9621 -0.2 vertex 43.8807 -23.7673 0 vertex 44.1563 -23.9621 0 endloop @@ -20897,41 +20897,41 @@ solid OpenSCAD_Model facet normal 0.57736 0.81649 0 outer loop vertex 43.8807 -23.7673 0 - vertex 44.1563 -23.9621 -0.1 - vertex 43.8807 -23.7673 -0.1 + vertex 44.1563 -23.9621 -0.2 + vertex 43.8807 -23.7673 -0.2 endloop endfacet facet normal 0.711931 0.70225 0 outer loop vertex 43.8807 -23.7673 0 - vertex 43.6239 -23.5069 -0.1 + vertex 43.6239 -23.5069 -0.2 vertex 43.6239 -23.5069 0 endloop endfacet facet normal 0.711931 0.70225 0 outer loop - vertex 43.6239 -23.5069 -0.1 + vertex 43.6239 -23.5069 -0.2 vertex 43.8807 -23.7673 0 - vertex 43.8807 -23.7673 -0.1 + vertex 43.8807 -23.7673 -0.2 endloop endfacet facet normal 0.732645 0.680611 0 outer loop vertex 43.6239 -23.5069 0 - vertex 43.3873 -23.2523 -0.1 + vertex 43.3873 -23.2523 -0.2 vertex 43.3873 -23.2523 0 endloop endfacet facet normal 0.732645 0.680611 0 outer loop - vertex 43.3873 -23.2523 -0.1 + vertex 43.3873 -23.2523 -0.2 vertex 43.6239 -23.5069 0 - vertex 43.6239 -23.5069 -0.1 + vertex 43.6239 -23.5069 -0.2 endloop endfacet facet normal 0.659068 0.752084 -0 outer loop - vertex 43.3873 -23.2523 -0.1 + vertex 43.3873 -23.2523 -0.2 vertex 43.1493 -23.0437 0 vertex 43.3873 -23.2523 0 endloop @@ -20939,13 +20939,13 @@ solid OpenSCAD_Model facet normal 0.659068 0.752084 0 outer loop vertex 43.1493 -23.0437 0 - vertex 43.3873 -23.2523 -0.1 - vertex 43.1493 -23.0437 -0.1 + vertex 43.3873 -23.2523 -0.2 + vertex 43.1493 -23.0437 -0.2 endloop endfacet facet normal 0.55411 0.832444 -0 outer loop - vertex 43.1493 -23.0437 -0.1 + vertex 43.1493 -23.0437 -0.2 vertex 42.9376 -22.9028 0 vertex 43.1493 -23.0437 0 endloop @@ -20953,13 +20953,13 @@ solid OpenSCAD_Model facet normal 0.55411 0.832444 0 outer loop vertex 42.9376 -22.9028 0 - vertex 43.1493 -23.0437 -0.1 - vertex 42.9376 -22.9028 -0.1 + vertex 43.1493 -23.0437 -0.2 + vertex 42.9376 -22.9028 -0.2 endloop endfacet facet normal 0.402192 0.915555 -0 outer loop - vertex 42.9376 -22.9028 -0.1 + vertex 42.9376 -22.9028 -0.2 vertex 42.8503 -22.8644 0 vertex 42.9376 -22.9028 0 endloop @@ -20967,13 +20967,13 @@ solid OpenSCAD_Model facet normal 0.402192 0.915555 0 outer loop vertex 42.8503 -22.8644 0 - vertex 42.9376 -22.9028 -0.1 - vertex 42.8503 -22.8644 -0.1 + vertex 42.9376 -22.9028 -0.2 + vertex 42.8503 -22.8644 -0.2 endloop endfacet facet normal 0.186876 0.982384 -0 outer loop - vertex 42.8503 -22.8644 -0.1 + vertex 42.8503 -22.8644 -0.2 vertex 42.7799 -22.851 0 vertex 42.8503 -22.8644 0 endloop @@ -20981,13 +20981,13 @@ solid OpenSCAD_Model facet normal 0.186876 0.982384 0 outer loop vertex 42.7799 -22.851 0 - vertex 42.8503 -22.8644 -0.1 - vertex 42.7799 -22.851 -0.1 + vertex 42.8503 -22.8644 -0.2 + vertex 42.7799 -22.851 -0.2 endloop endfacet facet normal -0.254315 0.967121 0 outer loop - vertex 42.7799 -22.851 -0.1 + vertex 42.7799 -22.851 -0.2 vertex 42.6968 -22.8729 0 vertex 42.7799 -22.851 0 endloop @@ -20995,13 +20995,13 @@ solid OpenSCAD_Model facet normal -0.254315 0.967121 0 outer loop vertex 42.6968 -22.8729 0 - vertex 42.7799 -22.851 -0.1 - vertex 42.6968 -22.8729 -0.1 + vertex 42.7799 -22.851 -0.2 + vertex 42.6968 -22.8729 -0.2 endloop endfacet facet normal -0.451219 0.892413 0 outer loop - vertex 42.6968 -22.8729 -0.1 + vertex 42.6968 -22.8729 -0.2 vertex 42.5728 -22.9356 0 vertex 42.6968 -22.8729 0 endloop @@ -21009,13 +21009,13 @@ solid OpenSCAD_Model facet normal -0.451219 0.892413 0 outer loop vertex 42.5728 -22.9356 0 - vertex 42.6968 -22.8729 -0.1 - vertex 42.5728 -22.9356 -0.1 + vertex 42.6968 -22.8729 -0.2 + vertex 42.5728 -22.9356 -0.2 endloop endfacet facet normal -0.553713 0.832708 0 outer loop - vertex 42.5728 -22.9356 -0.1 + vertex 42.5728 -22.9356 -0.2 vertex 42.2267 -23.1657 0 vertex 42.5728 -22.9356 0 endloop @@ -21023,13 +21023,13 @@ solid OpenSCAD_Model facet normal -0.553713 0.832708 0 outer loop vertex 42.2267 -23.1657 0 - vertex 42.5728 -22.9356 -0.1 - vertex 42.2267 -23.1657 -0.1 + vertex 42.5728 -22.9356 -0.2 + vertex 42.2267 -23.1657 -0.2 endloop endfacet facet normal -0.614835 0.788656 0 outer loop - vertex 42.2267 -23.1657 -0.1 + vertex 42.2267 -23.1657 -0.2 vertex 41.7898 -23.5063 0 vertex 42.2267 -23.1657 0 endloop @@ -21037,13 +21037,13 @@ solid OpenSCAD_Model facet normal -0.614835 0.788656 0 outer loop vertex 41.7898 -23.5063 0 - vertex 42.2267 -23.1657 -0.1 - vertex 41.7898 -23.5063 -0.1 + vertex 42.2267 -23.1657 -0.2 + vertex 41.7898 -23.5063 -0.2 endloop endfacet facet normal -0.655263 0.755401 0 outer loop - vertex 41.7898 -23.5063 -0.1 + vertex 41.7898 -23.5063 -0.2 vertex 41.3103 -23.9223 0 vertex 41.7898 -23.5063 0 endloop @@ -21051,13 +21051,13 @@ solid OpenSCAD_Model facet normal -0.655263 0.755401 0 outer loop vertex 41.3103 -23.9223 0 - vertex 41.7898 -23.5063 -0.1 - vertex 41.3103 -23.9223 -0.1 + vertex 41.7898 -23.5063 -0.2 + vertex 41.3103 -23.9223 -0.2 endloop endfacet facet normal -0.681106 0.732185 0 outer loop - vertex 41.3103 -23.9223 -0.1 + vertex 41.3103 -23.9223 -0.2 vertex 40.922 -24.2835 0 vertex 41.3103 -23.9223 0 endloop @@ -21065,223 +21065,223 @@ solid OpenSCAD_Model facet normal -0.681106 0.732185 0 outer loop vertex 40.922 -24.2835 0 - vertex 41.3103 -23.9223 -0.1 - vertex 40.922 -24.2835 -0.1 + vertex 41.3103 -23.9223 -0.2 + vertex 40.922 -24.2835 -0.2 endloop endfacet facet normal -0.723872 0.689934 0 outer loop - vertex 40.604 -24.6171 -0.1 + vertex 40.604 -24.6171 -0.2 vertex 40.922 -24.2835 0 - vertex 40.922 -24.2835 -0.1 + vertex 40.922 -24.2835 -0.2 endloop endfacet facet normal -0.723872 0.689934 0 outer loop vertex 40.922 -24.2835 0 - vertex 40.604 -24.6171 -0.1 + vertex 40.604 -24.6171 -0.2 vertex 40.604 -24.6171 0 endloop endfacet facet normal -0.795563 0.60587 0 outer loop - vertex 40.3218 -24.9877 -0.1 + vertex 40.3218 -24.9877 -0.2 vertex 40.604 -24.6171 0 - vertex 40.604 -24.6171 -0.1 + vertex 40.604 -24.6171 -0.2 endloop endfacet facet normal -0.795563 0.60587 0 outer loop vertex 40.604 -24.6171 0 - vertex 40.3218 -24.9877 -0.1 + vertex 40.3218 -24.9877 -0.2 vertex 40.3218 -24.9877 0 endloop endfacet facet normal -0.859211 0.511621 0 outer loop - vertex 40.0406 -25.46 -0.1 + vertex 40.0406 -25.46 -0.2 vertex 40.3218 -24.9877 0 - vertex 40.3218 -24.9877 -0.1 + vertex 40.3218 -24.9877 -0.2 endloop endfacet facet normal -0.859211 0.511621 0 outer loop vertex 40.3218 -24.9877 0 - vertex 40.0406 -25.46 -0.1 + vertex 40.0406 -25.46 -0.2 vertex 40.0406 -25.46 0 endloop endfacet facet normal -0.896877 0.442281 0 outer loop - vertex 39.7256 -26.0988 -0.1 + vertex 39.7256 -26.0988 -0.2 vertex 40.0406 -25.46 0 - vertex 40.0406 -25.46 -0.1 + vertex 40.0406 -25.46 -0.2 endloop endfacet facet normal -0.896877 0.442281 0 outer loop vertex 40.0406 -25.46 0 - vertex 39.7256 -26.0988 -0.1 + vertex 39.7256 -26.0988 -0.2 vertex 39.7256 -26.0988 0 endloop endfacet facet normal -0.915036 0.403372 0 outer loop - vertex 39.342 -26.9688 -0.1 + vertex 39.342 -26.9688 -0.2 vertex 39.7256 -26.0988 0 - vertex 39.7256 -26.0988 -0.1 + vertex 39.7256 -26.0988 -0.2 endloop endfacet facet normal -0.915036 0.403372 0 outer loop vertex 39.7256 -26.0988 0 - vertex 39.342 -26.9688 -0.1 + vertex 39.342 -26.9688 -0.2 vertex 39.342 -26.9688 0 endloop endfacet facet normal -0.924339 0.381572 0 outer loop - vertex 38.2305 -29.6614 -0.1 + vertex 38.2305 -29.6614 -0.2 vertex 39.342 -26.9688 0 - vertex 39.342 -26.9688 -0.1 + vertex 39.342 -26.9688 -0.2 endloop endfacet facet normal -0.924339 0.381572 0 outer loop vertex 39.342 -26.9688 0 - vertex 38.2305 -29.6614 -0.1 + vertex 38.2305 -29.6614 -0.2 vertex 38.2305 -29.6614 0 endloop endfacet facet normal -0.929232 0.369498 0 outer loop - vertex 37.444 -31.6395 -0.1 + vertex 37.444 -31.6395 -0.2 vertex 38.2305 -29.6614 0 - vertex 38.2305 -29.6614 -0.1 + vertex 38.2305 -29.6614 -0.2 endloop endfacet facet normal -0.929232 0.369498 0 outer loop vertex 38.2305 -29.6614 0 - vertex 37.444 -31.6395 -0.1 + vertex 37.444 -31.6395 -0.2 vertex 37.444 -31.6395 0 endloop endfacet facet normal -0.937221 0.348736 0 outer loop - vertex 36.8389 -33.2656 -0.1 + vertex 36.8389 -33.2656 -0.2 vertex 37.444 -31.6395 0 - vertex 37.444 -31.6395 -0.1 + vertex 37.444 -31.6395 -0.2 endloop endfacet facet normal -0.937221 0.348736 0 outer loop vertex 37.444 -31.6395 0 - vertex 36.8389 -33.2656 -0.1 + vertex 36.8389 -33.2656 -0.2 vertex 36.8389 -33.2656 0 endloop endfacet facet normal -0.949427 0.313989 0 outer loop - vertex 36.4479 -34.448 -0.1 + vertex 36.4479 -34.448 -0.2 vertex 36.8389 -33.2656 0 - vertex 36.8389 -33.2656 -0.1 + vertex 36.8389 -33.2656 -0.2 endloop endfacet facet normal -0.949427 0.313989 0 outer loop vertex 36.8389 -33.2656 0 - vertex 36.4479 -34.448 -0.1 + vertex 36.4479 -34.448 -0.2 vertex 36.4479 -34.448 0 endloop endfacet facet normal -0.966574 0.256387 0 outer loop - vertex 36.3428 -34.844 -0.1 + vertex 36.3428 -34.844 -0.2 vertex 36.4479 -34.448 0 - vertex 36.4479 -34.448 -0.1 + vertex 36.4479 -34.448 -0.2 endloop endfacet facet normal -0.966574 0.256387 0 outer loop vertex 36.4479 -34.448 0 - vertex 36.3428 -34.844 -0.1 + vertex 36.3428 -34.844 -0.2 vertex 36.3428 -34.844 0 endloop endfacet facet normal -0.987922 0.154951 0 outer loop - vertex 36.3035 -35.0946 -0.1 + vertex 36.3035 -35.0946 -0.2 vertex 36.3428 -34.844 0 - vertex 36.3428 -34.844 -0.1 + vertex 36.3428 -34.844 -0.2 endloop endfacet facet normal -0.987922 0.154951 0 outer loop vertex 36.3428 -34.844 0 - vertex 36.3035 -35.0946 -0.1 + vertex 36.3035 -35.0946 -0.2 vertex 36.3035 -35.0946 0 endloop endfacet facet normal -0.999846 0.0175753 0 outer loop - vertex 36.2992 -35.3418 -0.1 + vertex 36.2992 -35.3418 -0.2 vertex 36.3035 -35.0946 0 - vertex 36.3035 -35.0946 -0.1 + vertex 36.3035 -35.0946 -0.2 endloop endfacet facet normal -0.999846 0.0175753 0 outer loop vertex 36.3035 -35.0946 0 - vertex 36.2992 -35.3418 -0.1 + vertex 36.2992 -35.3418 -0.2 vertex 36.2992 -35.3418 0 endloop endfacet facet normal -0.99871 -0.0507764 0 outer loop - vertex 36.3089 -35.532 -0.1 + vertex 36.3089 -35.532 -0.2 vertex 36.2992 -35.3418 0 - vertex 36.2992 -35.3418 -0.1 + vertex 36.2992 -35.3418 -0.2 endloop endfacet facet normal -0.99871 -0.0507764 0 outer loop vertex 36.2992 -35.3418 0 - vertex 36.3089 -35.532 -0.1 + vertex 36.3089 -35.532 -0.2 vertex 36.3089 -35.532 0 endloop endfacet facet normal -0.974112 -0.226068 0 outer loop - vertex 36.3422 -35.6758 -0.1 + vertex 36.3422 -35.6758 -0.2 vertex 36.3089 -35.532 0 - vertex 36.3089 -35.532 -0.1 + vertex 36.3089 -35.532 -0.2 endloop endfacet facet normal -0.974112 -0.226068 0 outer loop vertex 36.3089 -35.532 0 - vertex 36.3422 -35.6758 -0.1 + vertex 36.3422 -35.6758 -0.2 vertex 36.3422 -35.6758 0 endloop endfacet facet normal -0.84992 -0.526911 0 outer loop - vertex 36.4089 -35.7834 -0.1 + vertex 36.4089 -35.7834 -0.2 vertex 36.3422 -35.6758 0 - vertex 36.3422 -35.6758 -0.1 + vertex 36.3422 -35.6758 -0.2 endloop endfacet facet normal -0.84992 -0.526911 0 outer loop vertex 36.3422 -35.6758 0 - vertex 36.4089 -35.7834 -0.1 + vertex 36.4089 -35.7834 -0.2 vertex 36.4089 -35.7834 0 endloop endfacet facet normal -0.59793 -0.801548 0 outer loop - vertex 36.4089 -35.7834 -0.1 + vertex 36.4089 -35.7834 -0.2 vertex 36.5187 -35.8653 0 vertex 36.4089 -35.7834 0 endloop @@ -21289,13 +21289,13 @@ solid OpenSCAD_Model facet normal -0.59793 -0.801548 -0 outer loop vertex 36.5187 -35.8653 0 - vertex 36.4089 -35.7834 -0.1 - vertex 36.5187 -35.8653 -0.1 + vertex 36.4089 -35.7834 -0.2 + vertex 36.5187 -35.8653 -0.2 endloop endfacet facet normal -0.37896 -0.925413 0 outer loop - vertex 36.5187 -35.8653 -0.1 + vertex 36.5187 -35.8653 -0.2 vertex 36.6812 -35.9318 0 vertex 36.5187 -35.8653 0 endloop @@ -21303,13 +21303,13 @@ solid OpenSCAD_Model facet normal -0.37896 -0.925413 -0 outer loop vertex 36.6812 -35.9318 0 - vertex 36.5187 -35.8653 -0.1 - vertex 36.6812 -35.9318 -0.1 + vertex 36.5187 -35.8653 -0.2 + vertex 36.6812 -35.9318 -0.2 endloop endfacet facet normal -0.239239 -0.970961 0 outer loop - vertex 36.6812 -35.9318 -0.1 + vertex 36.6812 -35.9318 -0.2 vertex 37.203 -36.0604 0 vertex 36.6812 -35.9318 0 endloop @@ -21317,13 +21317,13 @@ solid OpenSCAD_Model facet normal -0.239239 -0.970961 -0 outer loop vertex 37.203 -36.0604 0 - vertex 36.6812 -35.9318 -0.1 - vertex 37.203 -36.0604 -0.1 + vertex 36.6812 -35.9318 -0.2 + vertex 37.203 -36.0604 -0.2 endloop endfacet facet normal -0.245847 -0.969309 0 outer loop - vertex 37.203 -36.0604 -0.1 + vertex 37.203 -36.0604 -0.2 vertex 37.6954 -36.1853 0 vertex 37.203 -36.0604 0 endloop @@ -21331,13 +21331,13 @@ solid OpenSCAD_Model facet normal -0.245847 -0.969309 -0 outer loop vertex 37.6954 -36.1853 0 - vertex 37.203 -36.0604 -0.1 - vertex 37.6954 -36.1853 -0.1 + vertex 37.203 -36.0604 -0.2 + vertex 37.6954 -36.1853 -0.2 endloop endfacet facet normal -0.369675 -0.929161 0 outer loop - vertex 37.6954 -36.1853 -0.1 + vertex 37.6954 -36.1853 -0.2 vertex 37.8576 -36.2498 0 vertex 37.6954 -36.1853 0 endloop @@ -21345,13 +21345,13 @@ solid OpenSCAD_Model facet normal -0.369675 -0.929161 -0 outer loop vertex 37.8576 -36.2498 0 - vertex 37.6954 -36.1853 -0.1 - vertex 37.8576 -36.2498 -0.1 + vertex 37.6954 -36.1853 -0.2 + vertex 37.8576 -36.2498 -0.2 endloop endfacet facet normal -0.539517 -0.841975 0 outer loop - vertex 37.8576 -36.2498 -0.1 + vertex 37.8576 -36.2498 -0.2 vertex 37.9736 -36.3241 0 vertex 37.8576 -36.2498 0 endloop @@ -21359,125 +21359,125 @@ solid OpenSCAD_Model facet normal -0.539517 -0.841975 -0 outer loop vertex 37.9736 -36.3241 0 - vertex 37.8576 -36.2498 -0.1 - vertex 37.9736 -36.3241 -0.1 + vertex 37.8576 -36.2498 -0.2 + vertex 37.9736 -36.3241 -0.2 endloop endfacet facet normal -0.760366 -0.649494 0 outer loop - vertex 38.0509 -36.4146 -0.1 + vertex 38.0509 -36.4146 -0.2 vertex 37.9736 -36.3241 0 - vertex 37.9736 -36.3241 -0.1 + vertex 37.9736 -36.3241 -0.2 endloop endfacet facet normal -0.760366 -0.649494 0 outer loop vertex 37.9736 -36.3241 0 - vertex 38.0509 -36.4146 -0.1 + vertex 38.0509 -36.4146 -0.2 vertex 38.0509 -36.4146 0 endloop endfacet facet normal -0.926147 -0.377163 0 outer loop - vertex 38.0969 -36.5276 -0.1 + vertex 38.0969 -36.5276 -0.2 vertex 38.0509 -36.4146 0 - vertex 38.0509 -36.4146 -0.1 + vertex 38.0509 -36.4146 -0.2 endloop endfacet facet normal -0.926147 -0.377163 0 outer loop vertex 38.0509 -36.4146 0 - vertex 38.0969 -36.5276 -0.1 + vertex 38.0969 -36.5276 -0.2 vertex 38.0969 -36.5276 0 endloop endfacet facet normal -0.988006 -0.154417 0 outer loop - vertex 38.119 -36.6694 -0.1 + vertex 38.119 -36.6694 -0.2 vertex 38.0969 -36.5276 0 - vertex 38.0969 -36.5276 -0.1 + vertex 38.0969 -36.5276 -0.2 endloop endfacet facet normal -0.988006 -0.154417 0 outer loop vertex 38.0969 -36.5276 0 - vertex 38.119 -36.6694 -0.1 + vertex 38.119 -36.6694 -0.2 vertex 38.119 -36.6694 0 endloop endfacet facet normal -0.999475 -0.0324031 0 outer loop - vertex 38.1248 -36.8464 -0.1 + vertex 38.1248 -36.8464 -0.2 vertex 38.119 -36.6694 0 - vertex 38.119 -36.6694 -0.1 + vertex 38.119 -36.6694 -0.2 endloop endfacet facet normal -0.999475 -0.0324031 0 outer loop vertex 38.119 -36.6694 0 - vertex 38.1248 -36.8464 -0.1 + vertex 38.1248 -36.8464 -0.2 vertex 38.1248 -36.8464 0 endloop endfacet facet normal -0.99859 0.0530808 0 outer loop - vertex 38.103 -37.2562 -0.1 + vertex 38.103 -37.2562 -0.2 vertex 38.1248 -36.8464 0 - vertex 38.1248 -36.8464 -0.1 + vertex 38.1248 -36.8464 -0.2 endloop endfacet facet normal -0.99859 0.0530808 0 outer loop vertex 38.1248 -36.8464 0 - vertex 38.103 -37.2562 -0.1 + vertex 38.103 -37.2562 -0.2 vertex 38.103 -37.2562 0 endloop endfacet facet normal -0.977614 0.210405 0 outer loop - vertex 38.0668 -37.4245 -0.1 + vertex 38.0668 -37.4245 -0.2 vertex 38.103 -37.2562 0 - vertex 38.103 -37.2562 -0.1 + vertex 38.103 -37.2562 -0.2 endloop endfacet facet normal -0.977614 0.210405 0 outer loop vertex 38.103 -37.2562 0 - vertex 38.0668 -37.4245 -0.1 + vertex 38.0668 -37.4245 -0.2 vertex 38.0668 -37.4245 0 endloop endfacet facet normal -0.922461 0.38609 0 outer loop - vertex 38.0057 -37.5705 -0.1 + vertex 38.0057 -37.5705 -0.2 vertex 38.0668 -37.4245 0 - vertex 38.0668 -37.4245 -0.1 + vertex 38.0668 -37.4245 -0.2 endloop endfacet facet normal -0.922461 0.38609 0 outer loop vertex 38.0668 -37.4245 0 - vertex 38.0057 -37.5705 -0.1 + vertex 38.0057 -37.5705 -0.2 vertex 38.0057 -37.5705 0 endloop endfacet facet normal -0.806037 0.591865 0 outer loop - vertex 37.9137 -37.6957 -0.1 + vertex 37.9137 -37.6957 -0.2 vertex 38.0057 -37.5705 0 - vertex 38.0057 -37.5705 -0.1 + vertex 38.0057 -37.5705 -0.2 endloop endfacet facet normal -0.806037 0.591865 0 outer loop vertex 38.0057 -37.5705 0 - vertex 37.9137 -37.6957 -0.1 + vertex 37.9137 -37.6957 -0.2 vertex 37.9137 -37.6957 0 endloop endfacet facet normal -0.635642 0.771984 0 outer loop - vertex 37.9137 -37.6957 -0.1 + vertex 37.9137 -37.6957 -0.2 vertex 37.7849 -37.8018 0 vertex 37.9137 -37.6957 0 endloop @@ -21485,13 +21485,13 @@ solid OpenSCAD_Model facet normal -0.635642 0.771984 0 outer loop vertex 37.7849 -37.8018 0 - vertex 37.9137 -37.6957 -0.1 - vertex 37.7849 -37.8018 -0.1 + vertex 37.9137 -37.6957 -0.2 + vertex 37.7849 -37.8018 -0.2 endloop endfacet facet normal -0.458146 0.888877 0 outer loop - vertex 37.7849 -37.8018 -0.1 + vertex 37.7849 -37.8018 -0.2 vertex 37.6132 -37.8903 0 vertex 37.7849 -37.8018 0 endloop @@ -21499,13 +21499,13 @@ solid OpenSCAD_Model facet normal -0.458146 0.888877 0 outer loop vertex 37.6132 -37.8903 0 - vertex 37.7849 -37.8018 -0.1 - vertex 37.6132 -37.8903 -0.1 + vertex 37.7849 -37.8018 -0.2 + vertex 37.6132 -37.8903 -0.2 endloop endfacet facet normal -0.312246 0.950001 0 outer loop - vertex 37.6132 -37.8903 -0.1 + vertex 37.6132 -37.8903 -0.2 vertex 37.3927 -37.9628 0 vertex 37.6132 -37.8903 0 endloop @@ -21513,13 +21513,13 @@ solid OpenSCAD_Model facet normal -0.312246 0.950001 0 outer loop vertex 37.3927 -37.9628 0 - vertex 37.6132 -37.8903 -0.1 - vertex 37.3927 -37.9628 -0.1 + vertex 37.6132 -37.8903 -0.2 + vertex 37.3927 -37.9628 -0.2 endloop endfacet facet normal -0.206263 0.978497 0 outer loop - vertex 37.3927 -37.9628 -0.1 + vertex 37.3927 -37.9628 -0.2 vertex 37.1174 -38.0208 0 vertex 37.3927 -37.9628 0 endloop @@ -21527,13 +21527,13 @@ solid OpenSCAD_Model facet normal -0.206263 0.978497 0 outer loop vertex 37.1174 -38.0208 0 - vertex 37.3927 -37.9628 -0.1 - vertex 37.1174 -38.0208 -0.1 + vertex 37.3927 -37.9628 -0.2 + vertex 37.1174 -38.0208 -0.2 endloop endfacet facet normal -0.133215 0.991087 0 outer loop - vertex 37.1174 -38.0208 -0.1 + vertex 37.1174 -38.0208 -0.2 vertex 36.7812 -38.066 0 vertex 37.1174 -38.0208 0 endloop @@ -21541,13 +21541,13 @@ solid OpenSCAD_Model facet normal -0.133215 0.991087 0 outer loop vertex 36.7812 -38.066 0 - vertex 37.1174 -38.0208 -0.1 - vertex 36.7812 -38.066 -0.1 + vertex 37.1174 -38.0208 -0.2 + vertex 36.7812 -38.066 -0.2 endloop endfacet facet normal -0.0659814 0.997821 0 outer loop - vertex 36.7812 -38.066 -0.1 + vertex 36.7812 -38.066 -0.2 vertex 35.9024 -38.1241 0 vertex 36.7812 -38.066 0 endloop @@ -21555,13 +21555,13 @@ solid OpenSCAD_Model facet normal -0.0659814 0.997821 0 outer loop vertex 35.9024 -38.1241 0 - vertex 36.7812 -38.066 -0.1 - vertex 35.9024 -38.1241 -0.1 + vertex 36.7812 -38.066 -0.2 + vertex 35.9024 -38.1241 -0.2 endloop endfacet facet normal -0.0214493 0.99977 0 outer loop - vertex 35.9024 -38.1241 -0.1 + vertex 35.9024 -38.1241 -0.2 vertex 34.7085 -38.1497 0 vertex 35.9024 -38.1241 0 endloop @@ -21569,13 +21569,13 @@ solid OpenSCAD_Model facet normal -0.0214493 0.99977 0 outer loop vertex 34.7085 -38.1497 0 - vertex 35.9024 -38.1241 -0.1 - vertex 34.7085 -38.1497 -0.1 + vertex 35.9024 -38.1241 -0.2 + vertex 34.7085 -38.1497 -0.2 endloop endfacet facet normal -0.00368212 0.999993 0 outer loop - vertex 34.7085 -38.1497 -0.1 + vertex 34.7085 -38.1497 -0.2 vertex 33.1514 -38.1555 0 vertex 34.7085 -38.1497 0 endloop @@ -21583,13 +21583,13 @@ solid OpenSCAD_Model facet normal -0.00368212 0.999993 0 outer loop vertex 33.1514 -38.1555 0 - vertex 34.7085 -38.1497 -0.1 - vertex 33.1514 -38.1555 -0.1 + vertex 34.7085 -38.1497 -0.2 + vertex 33.1514 -38.1555 -0.2 endloop endfacet facet normal 0.00738333 0.999973 -0 outer loop - vertex 33.1514 -38.1555 -0.1 + vertex 33.1514 -38.1555 -0.2 vertex 31.1824 -38.1409 0 vertex 33.1514 -38.1555 0 endloop @@ -21597,13 +21597,13 @@ solid OpenSCAD_Model facet normal 0.00738333 0.999973 0 outer loop vertex 31.1824 -38.1409 0 - vertex 33.1514 -38.1555 -0.1 - vertex 31.1824 -38.1409 -0.1 + vertex 33.1514 -38.1555 -0.2 + vertex 31.1824 -38.1409 -0.2 endloop endfacet facet normal 0.0337924 0.999429 -0 outer loop - vertex 31.1824 -38.1409 -0.1 + vertex 31.1824 -38.1409 -0.2 vertex 29.8192 -38.0948 0 vertex 31.1824 -38.1409 0 endloop @@ -21611,13 +21611,13 @@ solid OpenSCAD_Model facet normal 0.0337924 0.999429 0 outer loop vertex 29.8192 -38.0948 0 - vertex 31.1824 -38.1409 -0.1 - vertex 29.8192 -38.0948 -0.1 + vertex 31.1824 -38.1409 -0.2 + vertex 29.8192 -38.0948 -0.2 endloop endfacet facet normal 0.0757553 0.997126 -0 outer loop - vertex 29.8192 -38.0948 -0.1 + vertex 29.8192 -38.0948 -0.2 vertex 29.3448 -38.0588 0 vertex 29.8192 -38.0948 0 endloop @@ -21625,13 +21625,13 @@ solid OpenSCAD_Model facet normal 0.0757553 0.997126 0 outer loop vertex 29.3448 -38.0588 0 - vertex 29.8192 -38.0948 -0.1 - vertex 29.3448 -38.0588 -0.1 + vertex 29.8192 -38.0948 -0.2 + vertex 29.3448 -38.0588 -0.2 endloop endfacet facet normal 0.129569 0.99157 -0 outer loop - vertex 29.3448 -38.0588 -0.1 + vertex 29.3448 -38.0588 -0.2 vertex 28.9979 -38.0135 0 vertex 29.3448 -38.0588 0 endloop @@ -21639,13 +21639,13 @@ solid OpenSCAD_Model facet normal 0.129569 0.99157 0 outer loop vertex 28.9979 -38.0135 0 - vertex 29.3448 -38.0588 -0.1 - vertex 28.9979 -38.0135 -0.1 + vertex 29.3448 -38.0588 -0.2 + vertex 28.9979 -38.0135 -0.2 endloop endfacet facet normal 0.235468 0.971882 -0 outer loop - vertex 28.9979 -38.0135 -0.1 + vertex 28.9979 -38.0135 -0.2 vertex 28.7706 -37.9584 0 vertex 28.9979 -38.0135 0 endloop @@ -21653,13 +21653,13 @@ solid OpenSCAD_Model facet normal 0.235468 0.971882 0 outer loop vertex 28.7706 -37.9584 0 - vertex 28.9979 -38.0135 -0.1 - vertex 28.7706 -37.9584 -0.1 + vertex 28.9979 -38.0135 -0.2 + vertex 28.7706 -37.9584 -0.2 endloop endfacet facet normal 0.491281 0.871001 -0 outer loop - vertex 28.7706 -37.9584 -0.1 + vertex 28.7706 -37.9584 -0.2 vertex 28.6548 -37.8931 0 vertex 28.7706 -37.9584 0 endloop @@ -21667,153 +21667,153 @@ solid OpenSCAD_Model facet normal 0.491281 0.871001 0 outer loop vertex 28.6548 -37.8931 0 - vertex 28.7706 -37.9584 -0.1 - vertex 28.6548 -37.8931 -0.1 + vertex 28.7706 -37.9584 -0.2 + vertex 28.6548 -37.8931 -0.2 endloop endfacet facet normal 0.794168 0.607698 0 outer loop vertex 28.6548 -37.8931 0 - vertex 28.5587 -37.7674 -0.1 + vertex 28.5587 -37.7674 -0.2 vertex 28.5587 -37.7674 0 endloop endfacet facet normal 0.794168 0.607698 0 outer loop - vertex 28.5587 -37.7674 -0.1 + vertex 28.5587 -37.7674 -0.2 vertex 28.6548 -37.8931 0 - vertex 28.6548 -37.8931 -0.1 + vertex 28.6548 -37.8931 -0.2 endloop endfacet facet normal 0.879213 0.47643 0 outer loop vertex 28.5587 -37.7674 0 - vertex 28.4883 -37.6376 -0.1 + vertex 28.4883 -37.6376 -0.2 vertex 28.4883 -37.6376 0 endloop endfacet facet normal 0.879213 0.47643 0 outer loop - vertex 28.4883 -37.6376 -0.1 + vertex 28.4883 -37.6376 -0.2 vertex 28.5587 -37.7674 0 - vertex 28.5587 -37.7674 -0.1 + vertex 28.5587 -37.7674 -0.2 endloop endfacet facet normal 0.946363 0.323104 0 outer loop vertex 28.4883 -37.6376 0 - vertex 28.443 -37.5048 -0.1 + vertex 28.443 -37.5048 -0.2 vertex 28.443 -37.5048 0 endloop endfacet facet normal 0.946363 0.323104 0 outer loop - vertex 28.443 -37.5048 -0.1 + vertex 28.443 -37.5048 -0.2 vertex 28.4883 -37.6376 0 - vertex 28.4883 -37.6376 -0.1 + vertex 28.4883 -37.6376 -0.2 endloop endfacet facet normal 0.987941 0.154833 0 outer loop vertex 28.443 -37.5048 0 - vertex 28.4219 -37.3704 -0.1 + vertex 28.4219 -37.3704 -0.2 vertex 28.4219 -37.3704 0 endloop endfacet facet normal 0.987941 0.154833 0 outer loop - vertex 28.4219 -37.3704 -0.1 + vertex 28.4219 -37.3704 -0.2 vertex 28.443 -37.5048 0 - vertex 28.443 -37.5048 -0.1 + vertex 28.443 -37.5048 -0.2 endloop endfacet facet normal 0.99984 -0.0178826 0 outer loop vertex 28.4219 -37.3704 0 - vertex 28.4243 -37.2355 -0.1 + vertex 28.4243 -37.2355 -0.2 vertex 28.4243 -37.2355 0 endloop endfacet facet normal 0.99984 -0.0178826 0 outer loop - vertex 28.4243 -37.2355 -0.1 + vertex 28.4243 -37.2355 -0.2 vertex 28.4219 -37.3704 0 - vertex 28.4219 -37.3704 -0.1 + vertex 28.4219 -37.3704 -0.2 endloop endfacet facet normal 0.982895 -0.184165 0 outer loop vertex 28.4243 -37.2355 0 - vertex 28.4495 -37.1014 -0.1 + vertex 28.4495 -37.1014 -0.2 vertex 28.4495 -37.1014 0 endloop endfacet facet normal 0.982895 -0.184165 0 outer loop - vertex 28.4495 -37.1014 -0.1 + vertex 28.4495 -37.1014 -0.2 vertex 28.4243 -37.2355 0 - vertex 28.4243 -37.2355 -0.1 + vertex 28.4243 -37.2355 -0.2 endloop endfacet facet normal 0.941957 -0.335735 0 outer loop vertex 28.4495 -37.1014 0 - vertex 28.4965 -36.9693 -0.1 + vertex 28.4965 -36.9693 -0.2 vertex 28.4965 -36.9693 0 endloop endfacet facet normal 0.941957 -0.335735 0 outer loop - vertex 28.4965 -36.9693 -0.1 + vertex 28.4965 -36.9693 -0.2 vertex 28.4495 -37.1014 0 - vertex 28.4495 -37.1014 -0.1 + vertex 28.4495 -37.1014 -0.2 endloop endfacet facet normal 0.883597 -0.468248 0 outer loop vertex 28.4965 -36.9693 0 - vertex 28.5648 -36.8405 -0.1 + vertex 28.5648 -36.8405 -0.2 vertex 28.5648 -36.8405 0 endloop endfacet facet normal 0.883597 -0.468248 0 outer loop - vertex 28.5648 -36.8405 -0.1 + vertex 28.5648 -36.8405 -0.2 vertex 28.4965 -36.9693 0 - vertex 28.4965 -36.9693 -0.1 + vertex 28.4965 -36.9693 -0.2 endloop endfacet facet normal 0.814058 -0.580783 0 outer loop vertex 28.5648 -36.8405 0 - vertex 28.6534 -36.7163 -0.1 + vertex 28.6534 -36.7163 -0.2 vertex 28.6534 -36.7163 0 endloop endfacet facet normal 0.814058 -0.580783 0 outer loop - vertex 28.6534 -36.7163 -0.1 + vertex 28.6534 -36.7163 -0.2 vertex 28.5648 -36.8405 0 - vertex 28.5648 -36.8405 -0.1 + vertex 28.5648 -36.8405 -0.2 endloop endfacet facet normal 0.738176 -0.674608 0 outer loop vertex 28.6534 -36.7163 0 - vertex 28.7617 -36.5978 -0.1 + vertex 28.7617 -36.5978 -0.2 vertex 28.7617 -36.5978 0 endloop endfacet facet normal 0.738176 -0.674608 0 outer loop - vertex 28.7617 -36.5978 -0.1 + vertex 28.7617 -36.5978 -0.2 vertex 28.6534 -36.7163 0 - vertex 28.6534 -36.7163 -0.1 + vertex 28.6534 -36.7163 -0.2 endloop endfacet facet normal 0.659231 -0.75194 0 outer loop - vertex 28.7617 -36.5978 -0.1 + vertex 28.7617 -36.5978 -0.2 vertex 28.8888 -36.4863 0 vertex 28.7617 -36.5978 0 endloop @@ -21821,13 +21821,13 @@ solid OpenSCAD_Model facet normal 0.659231 -0.75194 0 outer loop vertex 28.8888 -36.4863 0 - vertex 28.7617 -36.5978 -0.1 - vertex 28.8888 -36.4863 -0.1 + vertex 28.7617 -36.5978 -0.2 + vertex 28.8888 -36.4863 -0.2 endloop endfacet facet normal 0.57926 -0.815143 0 outer loop - vertex 28.8888 -36.4863 -0.1 + vertex 28.8888 -36.4863 -0.2 vertex 29.034 -36.3831 0 vertex 28.8888 -36.4863 0 endloop @@ -21835,13 +21835,13 @@ solid OpenSCAD_Model facet normal 0.57926 -0.815143 0 outer loop vertex 29.034 -36.3831 0 - vertex 28.8888 -36.4863 -0.1 - vertex 29.034 -36.3831 -0.1 + vertex 28.8888 -36.4863 -0.2 + vertex 29.034 -36.3831 -0.2 endloop endfacet facet normal 0.499403 -0.86637 0 outer loop - vertex 29.034 -36.3831 -0.1 + vertex 29.034 -36.3831 -0.2 vertex 29.1966 -36.2895 0 vertex 29.034 -36.3831 0 endloop @@ -21849,13 +21849,13 @@ solid OpenSCAD_Model facet normal 0.499403 -0.86637 0 outer loop vertex 29.1966 -36.2895 0 - vertex 29.034 -36.3831 -0.1 - vertex 29.1966 -36.2895 -0.1 + vertex 29.034 -36.3831 -0.2 + vertex 29.1966 -36.2895 -0.2 endloop endfacet facet normal 0.420274 -0.907397 0 outer loop - vertex 29.1966 -36.2895 -0.1 + vertex 29.1966 -36.2895 -0.2 vertex 29.3757 -36.2065 0 vertex 29.1966 -36.2895 0 endloop @@ -21863,13 +21863,13 @@ solid OpenSCAD_Model facet normal 0.420274 -0.907397 0 outer loop vertex 29.3757 -36.2065 0 - vertex 29.1966 -36.2895 -0.1 - vertex 29.3757 -36.2065 -0.1 + vertex 29.1966 -36.2895 -0.2 + vertex 29.3757 -36.2065 -0.2 endloop endfacet facet normal 0.34216 -0.939642 0 outer loop - vertex 29.3757 -36.2065 -0.1 + vertex 29.3757 -36.2065 -0.2 vertex 29.5705 -36.1356 0 vertex 29.3757 -36.2065 0 endloop @@ -21877,13 +21877,13 @@ solid OpenSCAD_Model facet normal 0.34216 -0.939642 0 outer loop vertex 29.5705 -36.1356 0 - vertex 29.3757 -36.2065 -0.1 - vertex 29.5705 -36.1356 -0.1 + vertex 29.3757 -36.2065 -0.2 + vertex 29.5705 -36.1356 -0.2 endloop endfacet facet normal 0.265166 -0.964203 0 outer loop - vertex 29.5705 -36.1356 -0.1 + vertex 29.5705 -36.1356 -0.2 vertex 29.7804 -36.0779 0 vertex 29.5705 -36.1356 0 endloop @@ -21891,13 +21891,13 @@ solid OpenSCAD_Model facet normal 0.265166 -0.964203 0 outer loop vertex 29.7804 -36.0779 0 - vertex 29.5705 -36.1356 -0.1 - vertex 29.7804 -36.0779 -0.1 + vertex 29.5705 -36.1356 -0.2 + vertex 29.7804 -36.0779 -0.2 endloop endfacet facet normal 0.237962 -0.971274 0 outer loop - vertex 29.7804 -36.0779 -0.1 + vertex 29.7804 -36.0779 -0.2 vertex 30.4037 -35.9251 0 vertex 29.7804 -36.0779 0 endloop @@ -21905,13 +21905,13 @@ solid OpenSCAD_Model facet normal 0.237962 -0.971274 0 outer loop vertex 30.4037 -35.9251 0 - vertex 29.7804 -36.0779 -0.1 - vertex 30.4037 -35.9251 -0.1 + vertex 29.7804 -36.0779 -0.2 + vertex 30.4037 -35.9251 -0.2 endloop endfacet facet normal 0.297523 -0.954715 0 outer loop - vertex 30.4037 -35.9251 -0.1 + vertex 30.4037 -35.9251 -0.2 vertex 30.6629 -35.8443 0 vertex 30.4037 -35.9251 0 endloop @@ -21919,13 +21919,13 @@ solid OpenSCAD_Model facet normal 0.297523 -0.954715 0 outer loop vertex 30.6629 -35.8443 0 - vertex 30.4037 -35.9251 -0.1 - vertex 30.6629 -35.8443 -0.1 + vertex 30.4037 -35.9251 -0.2 + vertex 30.6629 -35.8443 -0.2 endloop endfacet facet normal 0.380574 -0.92475 0 outer loop - vertex 30.6629 -35.8443 -0.1 + vertex 30.6629 -35.8443 -0.2 vertex 30.8955 -35.7486 0 vertex 30.6629 -35.8443 0 endloop @@ -21933,13 +21933,13 @@ solid OpenSCAD_Model facet normal 0.380574 -0.92475 0 outer loop vertex 30.8955 -35.7486 0 - vertex 30.6629 -35.8443 -0.1 - vertex 30.8955 -35.7486 -0.1 + vertex 30.6629 -35.8443 -0.2 + vertex 30.8955 -35.7486 -0.2 endloop endfacet facet normal 0.491191 -0.871052 0 outer loop - vertex 30.8955 -35.7486 -0.1 + vertex 30.8955 -35.7486 -0.2 vertex 31.1075 -35.6291 0 vertex 30.8955 -35.7486 0 endloop @@ -21947,13 +21947,13 @@ solid OpenSCAD_Model facet normal 0.491191 -0.871052 0 outer loop vertex 31.1075 -35.6291 0 - vertex 30.8955 -35.7486 -0.1 - vertex 31.1075 -35.6291 -0.1 + vertex 30.8955 -35.7486 -0.2 + vertex 31.1075 -35.6291 -0.2 endloop endfacet facet normal 0.610497 -0.792019 0 outer loop - vertex 31.1075 -35.6291 -0.1 + vertex 31.1075 -35.6291 -0.2 vertex 31.3052 -35.4767 0 vertex 31.1075 -35.6291 0 endloop @@ -21961,237 +21961,237 @@ solid OpenSCAD_Model facet normal 0.610497 -0.792019 0 outer loop vertex 31.3052 -35.4767 0 - vertex 31.1075 -35.6291 -0.1 - vertex 31.3052 -35.4767 -0.1 + vertex 31.1075 -35.6291 -0.2 + vertex 31.3052 -35.4767 -0.2 endloop endfacet facet normal 0.71556 -0.698551 0 outer loop vertex 31.3052 -35.4767 0 - vertex 31.4948 -35.2825 -0.1 + vertex 31.4948 -35.2825 -0.2 vertex 31.4948 -35.2825 0 endloop endfacet facet normal 0.71556 -0.698551 0 outer loop - vertex 31.4948 -35.2825 -0.1 + vertex 31.4948 -35.2825 -0.2 vertex 31.3052 -35.4767 0 - vertex 31.3052 -35.4767 -0.1 + vertex 31.3052 -35.4767 -0.2 endloop endfacet facet normal 0.793854 -0.608109 0 outer loop vertex 31.4948 -35.2825 0 - vertex 31.6824 -35.0376 -0.1 + vertex 31.6824 -35.0376 -0.2 vertex 31.6824 -35.0376 0 endloop endfacet facet normal 0.793854 -0.608109 0 outer loop - vertex 31.6824 -35.0376 -0.1 + vertex 31.6824 -35.0376 -0.2 vertex 31.4948 -35.2825 0 - vertex 31.4948 -35.2825 -0.1 + vertex 31.4948 -35.2825 -0.2 endloop endfacet facet normal 0.846168 -0.532916 0 outer loop vertex 31.6824 -35.0376 0 - vertex 31.8743 -34.7329 -0.1 + vertex 31.8743 -34.7329 -0.2 vertex 31.8743 -34.7329 0 endloop endfacet facet normal 0.846168 -0.532916 0 outer loop - vertex 31.8743 -34.7329 -0.1 + vertex 31.8743 -34.7329 -0.2 vertex 31.6824 -35.0376 0 - vertex 31.6824 -35.0376 -0.1 + vertex 31.6824 -35.0376 -0.2 endloop endfacet facet normal 0.879213 -0.47643 0 outer loop vertex 31.8743 -34.7329 0 - vertex 32.0766 -34.3595 -0.1 + vertex 32.0766 -34.3595 -0.2 vertex 32.0766 -34.3595 0 endloop endfacet facet normal 0.879213 -0.47643 0 outer loop - vertex 32.0766 -34.3595 -0.1 + vertex 32.0766 -34.3595 -0.2 vertex 31.8743 -34.7329 0 - vertex 31.8743 -34.7329 -0.1 + vertex 31.8743 -34.7329 -0.2 endloop endfacet facet normal 0.906414 -0.422389 0 outer loop vertex 32.0766 -34.3595 0 - vertex 32.5373 -33.371 -0.1 + vertex 32.5373 -33.371 -0.2 vertex 32.5373 -33.371 0 endloop endfacet facet normal 0.906414 -0.422389 0 outer loop - vertex 32.5373 -33.371 -0.1 + vertex 32.5373 -33.371 -0.2 vertex 32.0766 -34.3595 0 - vertex 32.0766 -34.3595 -0.1 + vertex 32.0766 -34.3595 -0.2 endloop endfacet facet normal 0.921762 -0.387755 0 outer loop vertex 32.5373 -33.371 0 - vertex 33.1139 -32.0001 -0.1 + vertex 33.1139 -32.0001 -0.2 vertex 33.1139 -32.0001 0 endloop endfacet facet normal 0.921762 -0.387755 0 outer loop - vertex 33.1139 -32.0001 -0.1 + vertex 33.1139 -32.0001 -0.2 vertex 32.5373 -33.371 0 - vertex 32.5373 -33.371 -0.1 + vertex 32.5373 -33.371 -0.2 endloop endfacet facet normal 0.926317 -0.376745 0 outer loop vertex 33.1139 -32.0001 0 - vertex 33.8561 -30.1753 -0.1 + vertex 33.8561 -30.1753 -0.2 vertex 33.8561 -30.1753 0 endloop endfacet facet normal 0.926317 -0.376745 0 outer loop - vertex 33.8561 -30.1753 -0.1 + vertex 33.8561 -30.1753 -0.2 vertex 33.1139 -32.0001 0 - vertex 33.1139 -32.0001 -0.1 + vertex 33.1139 -32.0001 -0.2 endloop endfacet facet normal 0.926524 -0.376237 0 outer loop vertex 33.8561 -30.1753 0 - vertex 35.3422 -26.5156 -0.1 + vertex 35.3422 -26.5156 -0.2 vertex 35.3422 -26.5156 0 endloop endfacet facet normal 0.926524 -0.376237 0 outer loop - vertex 35.3422 -26.5156 -0.1 + vertex 35.3422 -26.5156 -0.2 vertex 33.8561 -30.1753 0 - vertex 33.8561 -30.1753 -0.1 + vertex 33.8561 -30.1753 -0.2 endloop endfacet facet normal 0.930815 -0.36549 0 outer loop vertex 35.3422 -26.5156 0 - vertex 35.6833 -25.6471 -0.1 + vertex 35.6833 -25.6471 -0.2 vertex 35.6833 -25.6471 0 endloop endfacet facet normal 0.930815 -0.36549 0 outer loop - vertex 35.6833 -25.6471 -0.1 + vertex 35.6833 -25.6471 -0.2 vertex 35.3422 -26.5156 0 - vertex 35.3422 -26.5156 -0.1 + vertex 35.3422 -26.5156 -0.2 endloop endfacet facet normal 0.940922 -0.338624 0 outer loop vertex 35.6833 -25.6471 0 - vertex 35.957 -24.8864 -0.1 + vertex 35.957 -24.8864 -0.2 vertex 35.957 -24.8864 0 endloop endfacet facet normal 0.940922 -0.338624 0 outer loop - vertex 35.957 -24.8864 -0.1 + vertex 35.957 -24.8864 -0.2 vertex 35.6833 -25.6471 0 - vertex 35.6833 -25.6471 -0.1 + vertex 35.6833 -25.6471 -0.2 endloop endfacet facet normal 0.953192 -0.302366 0 outer loop vertex 35.957 -24.8864 0 - vertex 36.1622 -24.2394 -0.1 + vertex 36.1622 -24.2394 -0.2 vertex 36.1622 -24.2394 0 endloop endfacet facet normal 0.953192 -0.302366 0 outer loop - vertex 36.1622 -24.2394 -0.1 + vertex 36.1622 -24.2394 -0.2 vertex 35.957 -24.8864 0 - vertex 35.957 -24.8864 -0.1 + vertex 35.957 -24.8864 -0.2 endloop endfacet facet normal 0.968572 -0.248734 0 outer loop vertex 36.1622 -24.2394 0 - vertex 36.2977 -23.7121 -0.1 + vertex 36.2977 -23.7121 -0.2 vertex 36.2977 -23.7121 0 endloop endfacet facet normal 0.968572 -0.248734 0 outer loop - vertex 36.2977 -23.7121 -0.1 + vertex 36.2977 -23.7121 -0.2 vertex 36.1622 -24.2394 0 - vertex 36.1622 -24.2394 -0.1 + vertex 36.1622 -24.2394 -0.2 endloop endfacet facet normal 0.987422 -0.158107 0 outer loop vertex 36.2977 -23.7121 0 - vertex 36.362 -23.3104 -0.1 + vertex 36.362 -23.3104 -0.2 vertex 36.362 -23.3104 0 endloop endfacet facet normal 0.987422 -0.158107 0 outer loop - vertex 36.362 -23.3104 -0.1 + vertex 36.362 -23.3104 -0.2 vertex 36.2977 -23.7121 0 - vertex 36.2977 -23.7121 -0.1 + vertex 36.2977 -23.7121 -0.2 endloop endfacet facet normal 0.999436 -0.0335772 0 outer loop vertex 36.362 -23.3104 0 - vertex 36.3671 -23.1585 -0.1 + vertex 36.3671 -23.1585 -0.2 vertex 36.3671 -23.1585 0 endloop endfacet facet normal 0.999436 -0.0335772 0 outer loop - vertex 36.3671 -23.1585 -0.1 + vertex 36.3671 -23.1585 -0.2 vertex 36.362 -23.3104 0 - vertex 36.362 -23.3104 -0.1 + vertex 36.362 -23.3104 -0.2 endloop endfacet facet normal 0.993888 0.110395 0 outer loop vertex 36.3671 -23.1585 0 - vertex 36.3539 -23.0402 -0.1 + vertex 36.3539 -23.0402 -0.2 vertex 36.3539 -23.0402 0 endloop endfacet facet normal 0.993888 0.110395 0 outer loop - vertex 36.3539 -23.0402 -0.1 + vertex 36.3539 -23.0402 -0.2 vertex 36.3671 -23.1585 0 - vertex 36.3671 -23.1585 -0.1 + vertex 36.3671 -23.1585 -0.2 endloop endfacet facet normal 0.93611 0.351708 0 outer loop vertex 36.3539 -23.0402 0 - vertex 36.3224 -22.9562 -0.1 + vertex 36.3224 -22.9562 -0.2 vertex 36.3224 -22.9562 0 endloop endfacet facet normal 0.93611 0.351708 0 outer loop - vertex 36.3224 -22.9562 -0.1 + vertex 36.3224 -22.9562 -0.2 vertex 36.3539 -23.0402 0 - vertex 36.3539 -23.0402 -0.1 + vertex 36.3539 -23.0402 -0.2 endloop endfacet facet normal 0.698293 0.715812 -0 outer loop - vertex 36.3224 -22.9562 -0.1 + vertex 36.3224 -22.9562 -0.2 vertex 36.2723 -22.9073 0 vertex 36.3224 -22.9562 0 endloop @@ -22199,13 +22199,13 @@ solid OpenSCAD_Model facet normal 0.698293 0.715812 0 outer loop vertex 36.2723 -22.9073 0 - vertex 36.3224 -22.9562 -0.1 - vertex 36.2723 -22.9073 -0.1 + vertex 36.3224 -22.9562 -0.2 + vertex 36.2723 -22.9073 -0.2 endloop endfacet facet normal 0.186395 0.982475 -0 outer loop - vertex 36.2723 -22.9073 -0.1 + vertex 36.2723 -22.9073 -0.2 vertex 36.2034 -22.8943 0 vertex 36.2723 -22.9073 0 endloop @@ -22213,13 +22213,13 @@ solid OpenSCAD_Model facet normal 0.186395 0.982475 0 outer loop vertex 36.2034 -22.8943 0 - vertex 36.2723 -22.9073 -0.1 - vertex 36.2034 -22.8943 -0.1 + vertex 36.2723 -22.9073 -0.2 + vertex 36.2034 -22.8943 -0.2 endloop endfacet facet normal -0.258789 0.965934 0 outer loop - vertex 36.2034 -22.8943 -0.1 + vertex 36.2034 -22.8943 -0.2 vertex 36.1157 -22.9178 0 vertex 36.2034 -22.8943 0 endloop @@ -22227,13 +22227,13 @@ solid OpenSCAD_Model facet normal -0.258789 0.965934 0 outer loop vertex 36.1157 -22.9178 0 - vertex 36.2034 -22.8943 -0.1 - vertex 36.1157 -22.9178 -0.1 + vertex 36.2034 -22.8943 -0.2 + vertex 36.1157 -22.9178 -0.2 endloop endfacet facet normal -0.248765 0.968564 0 outer loop - vertex 36.1157 -22.9178 -0.1 + vertex 36.1157 -22.9178 -0.2 vertex 35.9442 -22.9618 0 vertex 36.1157 -22.9178 0 endloop @@ -22241,13 +22241,13 @@ solid OpenSCAD_Model facet normal -0.248765 0.968564 0 outer loop vertex 35.9442 -22.9618 0 - vertex 36.1157 -22.9178 -0.1 - vertex 35.9442 -22.9618 -0.1 + vertex 36.1157 -22.9178 -0.2 + vertex 35.9442 -22.9618 -0.2 endloop endfacet facet normal -0.0720501 0.997401 0 outer loop - vertex 35.9442 -22.9618 -0.1 + vertex 35.9442 -22.9618 -0.2 vertex 35.7166 -22.9783 0 vertex 35.9442 -22.9618 0 endloop @@ -22255,13 +22255,13 @@ solid OpenSCAD_Model facet normal -0.0720501 0.997401 0 outer loop vertex 35.7166 -22.9783 0 - vertex 35.9442 -22.9618 -0.1 - vertex 35.7166 -22.9783 -0.1 + vertex 35.9442 -22.9618 -0.2 + vertex 35.7166 -22.9783 -0.2 endloop endfacet facet normal 0.0451334 0.998981 -0 outer loop - vertex 35.7166 -22.9783 -0.1 + vertex 35.7166 -22.9783 -0.2 vertex 35.4626 -22.9668 0 vertex 35.7166 -22.9783 0 endloop @@ -22269,13 +22269,13 @@ solid OpenSCAD_Model facet normal 0.0451334 0.998981 0 outer loop vertex 35.4626 -22.9668 0 - vertex 35.7166 -22.9783 -0.1 - vertex 35.4626 -22.9668 -0.1 + vertex 35.7166 -22.9783 -0.2 + vertex 35.4626 -22.9668 -0.2 endloop endfacet facet normal 0.156383 0.987697 -0 outer loop - vertex 35.4626 -22.9668 -0.1 + vertex 35.4626 -22.9668 -0.2 vertex 35.2118 -22.9271 0 vertex 35.4626 -22.9668 0 endloop @@ -22283,13 +22283,13 @@ solid OpenSCAD_Model facet normal 0.156383 0.987697 0 outer loop vertex 35.2118 -22.9271 0 - vertex 35.4626 -22.9668 -0.1 - vertex 35.2118 -22.9271 -0.1 + vertex 35.4626 -22.9668 -0.2 + vertex 35.2118 -22.9271 -0.2 endloop endfacet facet normal 0.299759 0.954015 -0 outer loop - vertex 35.2118 -22.9271 -0.1 + vertex 35.2118 -22.9271 -0.2 vertex 34.9345 -22.8399 0 vertex 35.2118 -22.9271 0 endloop @@ -22297,13 +22297,13 @@ solid OpenSCAD_Model facet normal 0.299759 0.954015 0 outer loop vertex 34.9345 -22.8399 0 - vertex 35.2118 -22.9271 -0.1 - vertex 34.9345 -22.8399 -0.1 + vertex 35.2118 -22.9271 -0.2 + vertex 34.9345 -22.8399 -0.2 endloop endfacet facet normal 0.486497 0.873682 -0 outer loop - vertex 34.9345 -22.8399 -0.1 + vertex 34.9345 -22.8399 -0.2 vertex 34.8338 -22.7839 0 vertex 34.9345 -22.8399 0 endloop @@ -22311,13 +22311,13 @@ solid OpenSCAD_Model facet normal 0.486497 0.873682 0 outer loop vertex 34.8338 -22.7839 0 - vertex 34.9345 -22.8399 -0.1 - vertex 34.8338 -22.7839 -0.1 + vertex 34.9345 -22.8399 -0.2 + vertex 34.8338 -22.7839 -0.2 endloop endfacet facet normal 0.653163 0.757217 -0 outer loop - vertex 34.8338 -22.7839 -0.1 + vertex 34.8338 -22.7839 -0.2 vertex 34.7558 -22.7166 0 vertex 34.8338 -22.7839 0 endloop @@ -22325,139 +22325,139 @@ solid OpenSCAD_Model facet normal 0.653163 0.757217 0 outer loop vertex 34.7558 -22.7166 0 - vertex 34.8338 -22.7839 -0.1 - vertex 34.7558 -22.7166 -0.1 + vertex 34.8338 -22.7839 -0.2 + vertex 34.7558 -22.7166 -0.2 endloop endfacet facet normal 0.815361 0.578952 0 outer loop vertex 34.7558 -22.7166 0 - vertex 34.6986 -22.636 -0.1 + vertex 34.6986 -22.636 -0.2 vertex 34.6986 -22.636 0 endloop endfacet facet normal 0.815361 0.578952 0 outer loop - vertex 34.6986 -22.636 -0.1 + vertex 34.6986 -22.636 -0.2 vertex 34.7558 -22.7166 0 - vertex 34.7558 -22.7166 -0.1 + vertex 34.7558 -22.7166 -0.2 endloop endfacet facet normal 0.928456 0.371442 0 outer loop vertex 34.6986 -22.636 0 - vertex 34.6602 -22.54 -0.1 + vertex 34.6602 -22.54 -0.2 vertex 34.6602 -22.54 0 endloop endfacet facet normal 0.928456 0.371442 0 outer loop - vertex 34.6602 -22.54 -0.1 + vertex 34.6602 -22.54 -0.2 vertex 34.6986 -22.636 0 - vertex 34.6986 -22.636 -0.1 + vertex 34.6986 -22.636 -0.2 endloop endfacet facet normal 0.982392 0.186829 0 outer loop vertex 34.6602 -22.54 0 - vertex 34.6385 -22.4262 -0.1 + vertex 34.6385 -22.4262 -0.2 vertex 34.6385 -22.4262 0 endloop endfacet facet normal 0.982392 0.186829 0 outer loop - vertex 34.6385 -22.4262 -0.1 + vertex 34.6385 -22.4262 -0.2 vertex 34.6602 -22.54 0 - vertex 34.6602 -22.54 -0.1 + vertex 34.6602 -22.54 -0.2 endloop endfacet facet normal 0.998716 0.050655 0 outer loop vertex 34.6385 -22.4262 0 - vertex 34.6318 -22.2927 -0.1 + vertex 34.6318 -22.2927 -0.2 vertex 34.6318 -22.2927 0 endloop endfacet facet normal 0.998716 0.050655 0 outer loop - vertex 34.6318 -22.2927 -0.1 + vertex 34.6318 -22.2927 -0.2 vertex 34.6385 -22.4262 0 - vertex 34.6385 -22.4262 -0.1 + vertex 34.6385 -22.4262 -0.2 endloop endfacet facet normal 0.995457 -0.0952108 0 outer loop vertex 34.6318 -22.2927 0 - vertex 34.653 -22.0706 -0.1 + vertex 34.653 -22.0706 -0.2 vertex 34.653 -22.0706 0 endloop endfacet facet normal 0.995457 -0.0952108 0 outer loop - vertex 34.653 -22.0706 -0.1 + vertex 34.653 -22.0706 -0.2 vertex 34.6318 -22.2927 0 - vertex 34.6318 -22.2927 -0.1 + vertex 34.6318 -22.2927 -0.2 endloop endfacet facet normal 0.963199 -0.268788 0 outer loop vertex 34.653 -22.0706 0 - vertex 34.713 -21.8554 -0.1 + vertex 34.713 -21.8554 -0.2 vertex 34.713 -21.8554 0 endloop endfacet facet normal 0.963199 -0.268788 0 outer loop - vertex 34.713 -21.8554 -0.1 + vertex 34.713 -21.8554 -0.2 vertex 34.653 -22.0706 0 - vertex 34.653 -22.0706 -0.1 + vertex 34.653 -22.0706 -0.2 endloop endfacet facet normal 0.90719 -0.420722 0 outer loop vertex 34.713 -21.8554 0 - vertex 34.8063 -21.6543 -0.1 + vertex 34.8063 -21.6543 -0.2 vertex 34.8063 -21.6543 0 endloop endfacet facet normal 0.90719 -0.420722 0 outer loop - vertex 34.8063 -21.6543 -0.1 + vertex 34.8063 -21.6543 -0.2 vertex 34.713 -21.8554 0 - vertex 34.713 -21.8554 -0.1 + vertex 34.713 -21.8554 -0.2 endloop endfacet facet normal 0.830216 -0.557442 0 outer loop vertex 34.8063 -21.6543 0 - vertex 34.9274 -21.474 -0.1 + vertex 34.9274 -21.474 -0.2 vertex 34.9274 -21.474 0 endloop endfacet facet normal 0.830216 -0.557442 0 outer loop - vertex 34.9274 -21.474 -0.1 + vertex 34.9274 -21.474 -0.2 vertex 34.8063 -21.6543 0 - vertex 34.8063 -21.6543 -0.1 + vertex 34.8063 -21.6543 -0.2 endloop endfacet facet normal 0.728585 -0.684956 0 outer loop vertex 34.9274 -21.474 0 - vertex 35.0706 -21.3217 -0.1 + vertex 35.0706 -21.3217 -0.2 vertex 35.0706 -21.3217 0 endloop endfacet facet normal 0.728585 -0.684956 0 outer loop - vertex 35.0706 -21.3217 -0.1 + vertex 35.0706 -21.3217 -0.2 vertex 34.9274 -21.474 0 - vertex 34.9274 -21.474 -0.1 + vertex 34.9274 -21.474 -0.2 endloop endfacet facet normal 0.592071 -0.805886 0 outer loop - vertex 35.0706 -21.3217 -0.1 + vertex 35.0706 -21.3217 -0.2 vertex 35.2304 -21.2043 0 vertex 35.0706 -21.3217 0 endloop @@ -22465,13 +22465,13 @@ solid OpenSCAD_Model facet normal 0.592071 -0.805886 0 outer loop vertex 35.2304 -21.2043 0 - vertex 35.0706 -21.3217 -0.1 - vertex 35.2304 -21.2043 -0.1 + vertex 35.0706 -21.3217 -0.2 + vertex 35.2304 -21.2043 -0.2 endloop endfacet facet normal 0.404331 -0.914613 0 outer loop - vertex 35.2304 -21.2043 -0.1 + vertex 35.2304 -21.2043 -0.2 vertex 35.4013 -21.1287 0 vertex 35.2304 -21.2043 0 endloop @@ -22479,13 +22479,13 @@ solid OpenSCAD_Model facet normal 0.404331 -0.914613 0 outer loop vertex 35.4013 -21.1287 0 - vertex 35.2304 -21.2043 -0.1 - vertex 35.4013 -21.1287 -0.1 + vertex 35.2304 -21.2043 -0.2 + vertex 35.4013 -21.1287 -0.2 endloop endfacet facet normal 0.149785 -0.988719 0 outer loop - vertex 35.4013 -21.1287 -0.1 + vertex 35.4013 -21.1287 -0.2 vertex 35.5778 -21.102 0 vertex 35.4013 -21.1287 0 endloop @@ -22493,13 +22493,13 @@ solid OpenSCAD_Model facet normal 0.149785 -0.988719 0 outer loop vertex 35.5778 -21.102 0 - vertex 35.4013 -21.1287 -0.1 - vertex 35.5778 -21.102 -0.1 + vertex 35.4013 -21.1287 -0.2 + vertex 35.5778 -21.102 -0.2 endloop endfacet facet normal 0.22645 -0.974023 0 outer loop - vertex 35.5778 -21.102 -0.1 + vertex 35.5778 -21.102 -0.2 vertex 35.9118 -21.0243 0 vertex 35.5778 -21.102 0 endloop @@ -22507,13 +22507,13 @@ solid OpenSCAD_Model facet normal 0.22645 -0.974023 0 outer loop vertex 35.9118 -21.0243 0 - vertex 35.5778 -21.102 -0.1 - vertex 35.9118 -21.0243 -0.1 + vertex 35.5778 -21.102 -0.2 + vertex 35.9118 -21.0243 -0.2 endloop endfacet facet normal 0.304725 -0.95244 0 outer loop - vertex 35.9118 -21.0243 -0.1 + vertex 35.9118 -21.0243 -0.2 vertex 36.5724 -20.813 0 vertex 35.9118 -21.0243 0 endloop @@ -22521,13 +22521,13 @@ solid OpenSCAD_Model facet normal 0.304725 -0.95244 0 outer loop vertex 36.5724 -20.813 0 - vertex 35.9118 -21.0243 -0.1 - vertex 36.5724 -20.813 -0.1 + vertex 35.9118 -21.0243 -0.2 + vertex 36.5724 -20.813 -0.2 endloop endfacet facet normal 0.331013 -0.943626 0 outer loop - vertex 36.5724 -20.813 -0.1 + vertex 36.5724 -20.813 -0.2 vertex 37.4642 -20.5001 0 vertex 36.5724 -20.813 0 endloop @@ -22535,13 +22535,13 @@ solid OpenSCAD_Model facet normal 0.331013 -0.943626 0 outer loop vertex 37.4642 -20.5001 0 - vertex 36.5724 -20.813 -0.1 - vertex 37.4642 -20.5001 -0.1 + vertex 36.5724 -20.813 -0.2 + vertex 37.4642 -20.5001 -0.2 endloop endfacet facet normal 0.348531 -0.937297 0 outer loop - vertex 37.4642 -20.5001 -0.1 + vertex 37.4642 -20.5001 -0.2 vertex 38.4916 -20.1181 0 vertex 37.4642 -20.5001 0 endloop @@ -22549,13 +22549,13 @@ solid OpenSCAD_Model facet normal 0.348531 -0.937297 0 outer loop vertex 38.4916 -20.1181 0 - vertex 37.4642 -20.5001 -0.1 - vertex 38.4916 -20.1181 -0.1 + vertex 37.4642 -20.5001 -0.2 + vertex 38.4916 -20.1181 -0.2 endloop endfacet facet normal 0.345306 -0.93849 0 outer loop - vertex 38.4916 -20.1181 -0.1 + vertex 38.4916 -20.1181 -0.2 vertex 39.5298 -19.7361 0 vertex 38.4916 -20.1181 0 endloop @@ -22563,13 +22563,13 @@ solid OpenSCAD_Model facet normal 0.345306 -0.93849 0 outer loop vertex 39.5298 -19.7361 0 - vertex 38.4916 -20.1181 -0.1 - vertex 39.5298 -19.7361 -0.1 + vertex 38.4916 -20.1181 -0.2 + vertex 39.5298 -19.7361 -0.2 endloop endfacet facet normal 0.321461 -0.946923 0 outer loop - vertex 39.5298 -19.7361 -0.1 + vertex 39.5298 -19.7361 -0.2 vertex 40.4513 -19.4233 0 vertex 39.5298 -19.7361 0 endloop @@ -22577,13 +22577,13 @@ solid OpenSCAD_Model facet normal 0.321461 -0.946923 0 outer loop vertex 40.4513 -19.4233 0 - vertex 39.5298 -19.7361 -0.1 - vertex 40.4513 -19.4233 -0.1 + vertex 39.5298 -19.7361 -0.2 + vertex 40.4513 -19.4233 -0.2 endloop endfacet facet normal 0.28733 -0.957832 0 outer loop - vertex 40.4513 -19.4233 -0.1 + vertex 40.4513 -19.4233 -0.2 vertex 41.156 -19.2119 0 vertex 40.4513 -19.4233 0 endloop @@ -22591,13 +22591,13 @@ solid OpenSCAD_Model facet normal 0.28733 -0.957832 0 outer loop vertex 41.156 -19.2119 0 - vertex 40.4513 -19.4233 -0.1 - vertex 41.156 -19.2119 -0.1 + vertex 40.4513 -19.4233 -0.2 + vertex 41.156 -19.2119 -0.2 endloop endfacet facet normal 0.23347 -0.972364 0 outer loop - vertex 41.156 -19.2119 -0.1 + vertex 41.156 -19.2119 -0.2 vertex 41.3957 -19.1543 0 vertex 41.156 -19.2119 0 endloop @@ -22605,13 +22605,13 @@ solid OpenSCAD_Model facet normal 0.23347 -0.972364 0 outer loop vertex 41.3957 -19.1543 0 - vertex 41.156 -19.2119 -0.1 - vertex 41.3957 -19.1543 -0.1 + vertex 41.156 -19.2119 -0.2 + vertex 41.3957 -19.1543 -0.2 endloop endfacet facet normal 0.13452 -0.990911 0 outer loop - vertex 41.3957 -19.1543 -0.1 + vertex 41.3957 -19.1543 -0.2 vertex 41.5436 -19.1343 0 vertex 41.3957 -19.1543 0 endloop @@ -22619,13 +22619,13 @@ solid OpenSCAD_Model facet normal 0.13452 -0.990911 0 outer loop vertex 41.5436 -19.1343 0 - vertex 41.3957 -19.1543 -0.1 - vertex 41.5436 -19.1343 -0.1 + vertex 41.3957 -19.1543 -0.2 + vertex 41.5436 -19.1343 -0.2 endloop endfacet facet normal -0.114485 -0.993425 0 outer loop - vertex 41.5436 -19.1343 -0.1 + vertex 41.5436 -19.1343 -0.2 vertex 41.7426 -19.1572 0 vertex 41.5436 -19.1343 0 endloop @@ -22633,13 +22633,13 @@ solid OpenSCAD_Model facet normal -0.114485 -0.993425 -0 outer loop vertex 41.7426 -19.1572 0 - vertex 41.5436 -19.1343 -0.1 - vertex 41.7426 -19.1572 -0.1 + vertex 41.5436 -19.1343 -0.2 + vertex 41.7426 -19.1572 -0.2 endloop endfacet facet normal -0.379137 -0.925341 0 outer loop - vertex 41.7426 -19.1572 -0.1 + vertex 41.7426 -19.1572 -0.2 vertex 41.9051 -19.2238 0 vertex 41.7426 -19.1572 0 endloop @@ -22647,13 +22647,13 @@ solid OpenSCAD_Model facet normal -0.379137 -0.925341 -0 outer loop vertex 41.9051 -19.2238 0 - vertex 41.7426 -19.1572 -0.1 - vertex 41.9051 -19.2238 -0.1 + vertex 41.7426 -19.1572 -0.2 + vertex 41.9051 -19.2238 -0.2 endloop endfacet facet normal -0.651079 -0.75901 0 outer loop - vertex 41.9051 -19.2238 -0.1 + vertex 41.9051 -19.2238 -0.2 vertex 42.0297 -19.3306 0 vertex 41.9051 -19.2238 0 endloop @@ -22661,125 +22661,125 @@ solid OpenSCAD_Model facet normal -0.651079 -0.75901 -0 outer loop vertex 42.0297 -19.3306 0 - vertex 41.9051 -19.2238 -0.1 - vertex 42.0297 -19.3306 -0.1 + vertex 41.9051 -19.2238 -0.2 + vertex 42.0297 -19.3306 -0.2 endloop endfacet facet normal -0.860116 -0.510098 0 outer loop - vertex 42.1149 -19.4743 -0.1 + vertex 42.1149 -19.4743 -0.2 vertex 42.0297 -19.3306 0 - vertex 42.0297 -19.3306 -0.1 + vertex 42.0297 -19.3306 -0.2 endloop endfacet facet normal -0.860116 -0.510098 0 outer loop vertex 42.0297 -19.3306 0 - vertex 42.1149 -19.4743 -0.1 + vertex 42.1149 -19.4743 -0.2 vertex 42.1149 -19.4743 0 endloop endfacet facet normal -0.969806 -0.243876 0 outer loop - vertex 42.1595 -19.6516 -0.1 + vertex 42.1595 -19.6516 -0.2 vertex 42.1149 -19.4743 0 - vertex 42.1149 -19.4743 -0.1 + vertex 42.1149 -19.4743 -0.2 endloop endfacet facet normal -0.969806 -0.243876 0 outer loop vertex 42.1149 -19.4743 0 - vertex 42.1595 -19.6516 -0.1 + vertex 42.1595 -19.6516 -0.2 vertex 42.1595 -19.6516 0 endloop endfacet facet normal -0.999925 -0.0122495 0 outer loop - vertex 42.162 -19.859 -0.1 + vertex 42.162 -19.859 -0.2 vertex 42.1595 -19.6516 0 - vertex 42.1595 -19.6516 -0.1 + vertex 42.1595 -19.6516 -0.2 endloop endfacet facet normal -0.999925 -0.0122495 0 outer loop vertex 42.1595 -19.6516 0 - vertex 42.162 -19.859 -0.1 + vertex 42.162 -19.859 -0.2 vertex 42.162 -19.859 0 endloop endfacet facet normal -0.985121 0.171861 0 outer loop - vertex 42.1212 -20.0931 -0.1 + vertex 42.1212 -20.0931 -0.2 vertex 42.162 -19.859 0 - vertex 42.162 -19.859 -0.1 + vertex 42.162 -19.859 -0.2 endloop endfacet facet normal -0.985121 0.171861 0 outer loop vertex 42.162 -19.859 0 - vertex 42.1212 -20.0931 -0.1 + vertex 42.1212 -20.0931 -0.2 vertex 42.1212 -20.0931 0 endloop endfacet facet normal -0.948956 0.315408 0 outer loop - vertex 42.0356 -20.3507 -0.1 + vertex 42.0356 -20.3507 -0.2 vertex 42.1212 -20.0931 0 - vertex 42.1212 -20.0931 -0.1 + vertex 42.1212 -20.0931 -0.2 endloop endfacet facet normal -0.948956 0.315408 0 outer loop vertex 42.1212 -20.0931 0 - vertex 42.0356 -20.3507 -0.1 + vertex 42.0356 -20.3507 -0.2 vertex 42.0356 -20.3507 0 endloop endfacet facet normal -0.935213 0.354086 0 outer loop - vertex 41.9515 -20.5727 -0.1 + vertex 41.9515 -20.5727 -0.2 vertex 42.0356 -20.3507 0 - vertex 42.0356 -20.3507 -0.1 + vertex 42.0356 -20.3507 -0.2 endloop endfacet facet normal -0.935213 0.354086 0 outer loop vertex 42.0356 -20.3507 0 - vertex 41.9515 -20.5727 -0.1 + vertex 41.9515 -20.5727 -0.2 vertex 41.9515 -20.5727 0 endloop endfacet facet normal -0.96654 0.256517 0 outer loop - vertex 41.9099 -20.7296 -0.1 + vertex 41.9099 -20.7296 -0.2 vertex 41.9515 -20.5727 0 - vertex 41.9515 -20.5727 -0.1 + vertex 41.9515 -20.5727 -0.2 endloop endfacet facet normal -0.96654 0.256517 0 outer loop vertex 41.9515 -20.5727 0 - vertex 41.9099 -20.7296 -0.1 + vertex 41.9099 -20.7296 -0.2 vertex 41.9099 -20.7296 0 endloop endfacet facet normal -0.996169 -0.0874488 0 outer loop - vertex 41.9179 -20.8207 -0.1 + vertex 41.9179 -20.8207 -0.2 vertex 41.9099 -20.7296 0 - vertex 41.9099 -20.7296 -0.1 + vertex 41.9099 -20.7296 -0.2 endloop endfacet facet normal -0.996169 -0.0874488 0 outer loop vertex 41.9099 -20.7296 0 - vertex 41.9179 -20.8207 -0.1 + vertex 41.9179 -20.8207 -0.2 vertex 41.9179 -20.8207 0 endloop endfacet facet normal -0.639023 -0.769188 0 outer loop - vertex 41.9179 -20.8207 -0.1 + vertex 41.9179 -20.8207 -0.2 vertex 41.9427 -20.8413 0 vertex 41.9179 -20.8207 0 endloop @@ -22787,13 +22787,13 @@ solid OpenSCAD_Model facet normal -0.639023 -0.769188 -0 outer loop vertex 41.9427 -20.8413 0 - vertex 41.9179 -20.8207 -0.1 - vertex 41.9427 -20.8413 -0.1 + vertex 41.9179 -20.8207 -0.2 + vertex 41.9427 -20.8413 -0.2 endloop endfacet facet normal -0.0984788 -0.995139 0 outer loop - vertex 41.9427 -20.8413 -0.1 + vertex 41.9427 -20.8413 -0.2 vertex 41.9827 -20.8453 0 vertex 41.9427 -20.8413 0 endloop @@ -22801,13 +22801,13 @@ solid OpenSCAD_Model facet normal -0.0984788 -0.995139 -0 outer loop vertex 41.9827 -20.8453 0 - vertex 41.9427 -20.8413 -0.1 - vertex 41.9827 -20.8453 -0.1 + vertex 41.9427 -20.8413 -0.2 + vertex 41.9827 -20.8453 -0.2 endloop endfacet facet normal 0.313279 -0.949661 0 outer loop - vertex 41.9827 -20.8453 -0.1 + vertex 41.9827 -20.8453 -0.2 vertex 42.1116 -20.8028 0 vertex 41.9827 -20.8453 0 endloop @@ -22815,13 +22815,13 @@ solid OpenSCAD_Model facet normal 0.313279 -0.949661 0 outer loop vertex 42.1116 -20.8028 0 - vertex 41.9827 -20.8453 -0.1 - vertex 42.1116 -20.8028 -0.1 + vertex 41.9827 -20.8453 -0.2 + vertex 42.1116 -20.8028 -0.2 endloop endfacet facet normal 0.482712 -0.875779 0 outer loop - vertex 42.1116 -20.8028 -0.1 + vertex 42.1116 -20.8028 -0.2 vertex 42.3117 -20.6924 0 vertex 42.1116 -20.8028 0 endloop @@ -22829,13 +22829,13 @@ solid OpenSCAD_Model facet normal 0.482712 -0.875779 0 outer loop vertex 42.3117 -20.6924 0 - vertex 42.1116 -20.8028 -0.1 - vertex 42.3117 -20.6924 -0.1 + vertex 42.1116 -20.8028 -0.2 + vertex 42.3117 -20.6924 -0.2 endloop endfacet facet normal 0.552983 -0.833193 0 outer loop - vertex 42.3117 -20.6924 -0.1 + vertex 42.3117 -20.6924 -0.2 vertex 42.9547 -20.2657 0 vertex 42.3117 -20.6924 0 endloop @@ -22843,13 +22843,13 @@ solid OpenSCAD_Model facet normal 0.552983 -0.833193 0 outer loop vertex 42.9547 -20.2657 0 - vertex 42.3117 -20.6924 -0.1 - vertex 42.9547 -20.2657 -0.1 + vertex 42.3117 -20.6924 -0.2 + vertex 42.9547 -20.2657 -0.2 endloop endfacet facet normal 0.550831 -0.834617 0 outer loop - vertex 42.9547 -20.2657 -0.1 + vertex 42.9547 -20.2657 -0.2 vertex 43.4033 -19.9696 0 vertex 42.9547 -20.2657 0 endloop @@ -22857,13 +22857,13 @@ solid OpenSCAD_Model facet normal 0.550831 -0.834617 0 outer loop vertex 43.4033 -19.9696 0 - vertex 42.9547 -20.2657 -0.1 - vertex 43.4033 -19.9696 -0.1 + vertex 42.9547 -20.2657 -0.2 + vertex 43.4033 -19.9696 -0.2 endloop endfacet facet normal 0.505722 -0.862696 0 outer loop - vertex 43.4033 -19.9696 -0.1 + vertex 43.4033 -19.9696 -0.2 vertex 43.8201 -19.7253 0 vertex 43.4033 -19.9696 0 endloop @@ -22871,13 +22871,13 @@ solid OpenSCAD_Model facet normal 0.505722 -0.862696 0 outer loop vertex 43.8201 -19.7253 0 - vertex 43.4033 -19.9696 -0.1 - vertex 43.8201 -19.7253 -0.1 + vertex 43.4033 -19.9696 -0.2 + vertex 43.8201 -19.7253 -0.2 endloop endfacet facet normal 0.444191 -0.895932 0 outer loop - vertex 43.8201 -19.7253 -0.1 + vertex 43.8201 -19.7253 -0.2 vertex 44.2162 -19.5289 0 vertex 43.8201 -19.7253 0 endloop @@ -22885,13 +22885,13 @@ solid OpenSCAD_Model facet normal 0.444191 -0.895932 0 outer loop vertex 44.2162 -19.5289 0 - vertex 43.8201 -19.7253 -0.1 - vertex 44.2162 -19.5289 -0.1 + vertex 43.8201 -19.7253 -0.2 + vertex 44.2162 -19.5289 -0.2 endloop endfacet facet normal 0.36641 -0.930454 0 outer loop - vertex 44.2162 -19.5289 -0.1 + vertex 44.2162 -19.5289 -0.2 vertex 44.6026 -19.3768 0 vertex 44.2162 -19.5289 0 endloop @@ -22899,13 +22899,13 @@ solid OpenSCAD_Model facet normal 0.36641 -0.930454 0 outer loop vertex 44.6026 -19.3768 0 - vertex 44.2162 -19.5289 -0.1 - vertex 44.6026 -19.3768 -0.1 + vertex 44.2162 -19.5289 -0.2 + vertex 44.6026 -19.3768 -0.2 endloop endfacet facet normal 0.276888 -0.960902 0 outer loop - vertex 44.6026 -19.3768 -0.1 + vertex 44.6026 -19.3768 -0.2 vertex 44.9905 -19.265 0 vertex 44.6026 -19.3768 0 endloop @@ -22913,13 +22913,13 @@ solid OpenSCAD_Model facet normal 0.276888 -0.960902 0 outer loop vertex 44.9905 -19.265 0 - vertex 44.6026 -19.3768 -0.1 - vertex 44.9905 -19.265 -0.1 + vertex 44.6026 -19.3768 -0.2 + vertex 44.9905 -19.265 -0.2 endloop endfacet facet normal 0.184446 -0.982843 0 outer loop - vertex 44.9905 -19.265 -0.1 + vertex 44.9905 -19.265 -0.2 vertex 45.391 -19.1898 0 vertex 44.9905 -19.265 0 endloop @@ -22927,13 +22927,13 @@ solid OpenSCAD_Model facet normal 0.184446 -0.982843 0 outer loop vertex 45.391 -19.1898 0 - vertex 44.9905 -19.265 -0.1 - vertex 45.391 -19.1898 -0.1 + vertex 44.9905 -19.265 -0.2 + vertex 45.391 -19.1898 -0.2 endloop endfacet facet normal 0.0992848 -0.995059 0 outer loop - vertex 45.391 -19.1898 -0.1 + vertex 45.391 -19.1898 -0.2 vertex 45.8151 -19.1475 0 vertex 45.391 -19.1898 0 endloop @@ -22941,13 +22941,13 @@ solid OpenSCAD_Model facet normal 0.0992848 -0.995059 0 outer loop vertex 45.8151 -19.1475 0 - vertex 45.391 -19.1898 -0.1 - vertex 45.8151 -19.1475 -0.1 + vertex 45.391 -19.1898 -0.2 + vertex 45.8151 -19.1475 -0.2 endloop endfacet facet normal 0.028896 -0.999582 0 outer loop - vertex 45.8151 -19.1475 -0.1 + vertex 45.8151 -19.1475 -0.2 vertex 46.274 -19.1343 0 vertex 45.8151 -19.1475 0 endloop @@ -22955,13 +22955,13 @@ solid OpenSCAD_Model facet normal 0.028896 -0.999582 0 outer loop vertex 46.274 -19.1343 0 - vertex 45.8151 -19.1475 -0.1 - vertex 46.274 -19.1343 -0.1 + vertex 45.8151 -19.1475 -0.2 + vertex 46.274 -19.1343 -0.2 endloop endfacet facet normal -0.036999 -0.999315 0 outer loop - vertex 46.274 -19.1343 -0.1 + vertex 46.274 -19.1343 -0.2 vertex 46.8289 -19.1548 0 vertex 46.274 -19.1343 0 endloop @@ -22969,7027 +22969,7027 @@ solid OpenSCAD_Model facet normal -0.036999 -0.999315 -0 outer loop vertex 46.8289 -19.1548 0 - vertex 46.274 -19.1343 -0.1 - vertex 46.8289 -19.1548 -0.1 + vertex 46.274 -19.1343 -0.2 + vertex 46.8289 -19.1548 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1728 30.7024 -0.1 - vertex 12.3025 30.5214 -0.1 - vertex 12.291 30.606 -0.1 + vertex 12.1728 30.7024 -0.2 + vertex 12.3025 30.5214 -0.2 + vertex 12.291 30.606 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1728 30.7024 -0.1 - vertex 12.291 30.606 -0.1 - vertex 12.2478 30.6663 -0.1 + vertex 12.1728 30.7024 -0.2 + vertex 12.291 30.606 -0.2 + vertex 12.2478 30.6663 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0661 30.7144 -0.1 - vertex 12.3025 30.5214 -0.1 - vertex 12.1728 30.7024 -0.1 + vertex 12.0661 30.7144 -0.2 + vertex 12.3025 30.5214 -0.2 + vertex 12.1728 30.7024 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.3025 30.5214 -0.1 - vertex 12.0661 30.7144 -0.1 - vertex 12.2821 30.4122 -0.1 + vertex 12.3025 30.5214 -0.2 + vertex 12.0661 30.7144 -0.2 + vertex 12.2821 30.4122 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.9476 30.6899 -0.1 - vertex 12.2821 30.4122 -0.1 - vertex 12.0661 30.7144 -0.1 + vertex 11.9476 30.6899 -0.2 + vertex 12.2821 30.4122 -0.2 + vertex 12.0661 30.7144 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2821 30.4122 -0.1 - vertex 11.9476 30.6899 -0.1 - vertex 12.23 30.2784 -0.1 + vertex 12.2821 30.4122 -0.2 + vertex 11.9476 30.6899 -0.2 + vertex 12.23 30.2784 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.7177 30.5077 -0.1 - vertex 12.23 30.2784 -0.1 - vertex 11.8311 30.6195 -0.1 + vertex 11.7177 30.5077 -0.2 + vertex 12.23 30.2784 -0.2 + vertex 11.8311 30.6195 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.23 30.2784 -0.1 - vertex 11.9476 30.6899 -0.1 - vertex 11.8311 30.6195 -0.1 + vertex 12.23 30.2784 -0.2 + vertex 11.9476 30.6899 -0.2 + vertex 11.8311 30.6195 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.6088 30.3591 -0.1 - vertex 12.23 30.2784 -0.1 - vertex 11.7177 30.5077 -0.1 + vertex 11.6088 30.3591 -0.2 + vertex 12.23 30.2784 -0.2 + vertex 11.7177 30.5077 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.23 30.2784 -0.1 - vertex 11.6088 30.3591 -0.1 - vertex 12.0304 29.9363 -0.1 + vertex 12.23 30.2784 -0.2 + vertex 11.6088 30.3591 -0.2 + vertex 12.0304 29.9363 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.5057 30.1782 -0.1 - vertex 12.0304 29.9363 -0.1 - vertex 11.6088 30.3591 -0.1 + vertex 11.5057 30.1782 -0.2 + vertex 12.0304 29.9363 -0.2 + vertex 11.6088 30.3591 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0304 29.9363 -0.1 - vertex 11.5057 30.1782 -0.1 - vertex 11.965 29.8184 -0.1 + vertex 12.0304 29.9363 -0.2 + vertex 11.5057 30.1782 -0.2 + vertex 11.965 29.8184 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.965 29.8184 -0.1 - vertex 11.4096 29.9696 -0.1 - vertex 11.9082 29.6745 -0.1 + vertex 11.965 29.8184 -0.2 + vertex 11.4096 29.9696 -0.2 + vertex 11.9082 29.6745 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.4096 29.9696 -0.1 - vertex 11.965 29.8184 -0.1 - vertex 11.5057 30.1782 -0.1 + vertex 11.4096 29.9696 -0.2 + vertex 11.965 29.8184 -0.2 + vertex 11.5057 30.1782 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.6784 17.7808 -0.1 - vertex 26.0696 17.9605 -0.1 - vertex 26.0933 17.5963 -0.1 + vertex 26.6784 17.7808 -0.2 + vertex 26.0696 17.9605 -0.2 + vertex 26.0933 17.5963 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.2605 19.0904 -0.1 - vertex 26.0009 18.2942 -0.1 - vertex 26.0696 17.9605 -0.1 + vertex 26.2605 19.0904 -0.2 + vertex 26.0009 18.2942 -0.2 + vertex 26.0696 17.9605 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.5652 19.0574 -0.1 - vertex 26.1176 19.296 -0.1 - vertex 25.9541 19.4837 -0.1 + vertex 25.5652 19.0574 -0.2 + vertex 26.1176 19.296 -0.2 + vertex 25.9541 19.4837 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.2605 19.0904 -0.1 - vertex 25.8914 18.5921 -0.1 - vertex 26.0009 18.2942 -0.1 + vertex 26.2605 19.0904 -0.2 + vertex 25.8914 18.5921 -0.2 + vertex 26.0009 18.2942 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.5652 19.0574 -0.1 - vertex 25.9541 19.4837 -0.1 - vertex 25.7697 19.6539 -0.1 + vertex 25.5652 19.0574 -0.2 + vertex 25.9541 19.4837 -0.2 + vertex 25.7697 19.6539 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.2605 19.0904 -0.1 - vertex 25.7448 18.8483 -0.1 - vertex 25.8914 18.5921 -0.1 + vertex 26.2605 19.0904 -0.2 + vertex 25.7448 18.8483 -0.2 + vertex 25.8914 18.5921 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.1176 19.296 -0.1 - vertex 25.5652 19.0574 -0.1 - vertex 25.7448 18.8483 -0.1 + vertex 26.1176 19.296 -0.2 + vertex 25.5652 19.0574 -0.2 + vertex 25.7448 18.8483 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.3564 19.2137 -0.1 - vertex 25.7697 19.6539 -0.1 - vertex 25.5639 19.8069 -0.1 + vertex 25.3564 19.2137 -0.2 + vertex 25.7697 19.6539 -0.2 + vertex 25.5639 19.8069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.7697 19.6539 -0.1 - vertex 25.3564 19.2137 -0.1 - vertex 25.5652 19.0574 -0.1 + vertex 25.7697 19.6539 -0.2 + vertex 25.3564 19.2137 -0.2 + vertex 25.5652 19.0574 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.1224 19.3115 -0.1 - vertex 25.5639 19.8069 -0.1 - vertex 25.3364 19.943 -0.1 + vertex 25.1224 19.3115 -0.2 + vertex 25.5639 19.8069 -0.2 + vertex 25.3364 19.943 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.5639 19.8069 -0.1 - vertex 25.1224 19.3115 -0.1 - vertex 25.3564 19.2137 -0.1 + vertex 25.5639 19.8069 -0.2 + vertex 25.1224 19.3115 -0.2 + vertex 25.3564 19.2137 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.9972 19.3368 -0.1 - vertex 25.3364 19.943 -0.1 - vertex 25.087 20.0627 -0.1 + vertex 24.9972 19.3368 -0.2 + vertex 25.3364 19.943 -0.2 + vertex 25.087 20.0627 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.3364 19.943 -0.1 - vertex 24.9972 19.3368 -0.1 - vertex 25.1224 19.3115 -0.1 + vertex 25.3364 19.943 -0.2 + vertex 24.9972 19.3368 -0.2 + vertex 25.1224 19.3115 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.087 20.0627 -0.1 - vertex 24.8672 19.3454 -0.1 - vertex 24.9972 19.3368 -0.1 + vertex 25.087 20.0627 -0.2 + vertex 24.8672 19.3454 -0.2 + vertex 24.9972 19.3368 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.8151 20.1664 -0.1 - vertex 24.8672 19.3454 -0.1 - vertex 25.087 20.0627 -0.1 + vertex 24.8151 20.1664 -0.2 + vertex 24.8672 19.3454 -0.2 + vertex 25.087 20.0627 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.8151 20.1664 -0.1 - vertex 24.6124 19.3722 -0.1 - vertex 24.8672 19.3454 -0.1 + vertex 24.8151 20.1664 -0.2 + vertex 24.6124 19.3722 -0.2 + vertex 24.8672 19.3454 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.5205 20.2543 -0.1 - vertex 24.6124 19.3722 -0.1 - vertex 24.8151 20.1664 -0.1 + vertex 24.5205 20.2543 -0.2 + vertex 24.6124 19.3722 -0.2 + vertex 24.8151 20.1664 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.5205 20.2543 -0.1 - vertex 24.2514 19.4451 -0.1 - vertex 24.6124 19.3722 -0.1 + vertex 24.5205 20.2543 -0.2 + vertex 24.2514 19.4451 -0.2 + vertex 24.6124 19.3722 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.2028 20.3268 -0.1 - vertex 24.2514 19.4451 -0.1 - vertex 24.5205 20.2543 -0.1 + vertex 24.2028 20.3268 -0.2 + vertex 24.2514 19.4451 -0.2 + vertex 24.5205 20.2543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.8321 19.5531 -0.1 - vertex 24.2028 20.3268 -0.1 - vertex 23.8617 20.3844 -0.1 + vertex 23.8321 19.5531 -0.2 + vertex 24.2028 20.3268 -0.2 + vertex 23.8617 20.3844 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.2028 20.3268 -0.1 - vertex 23.8321 19.5531 -0.1 - vertex 24.2514 19.4451 -0.1 + vertex 24.2028 20.3268 -0.2 + vertex 23.8321 19.5531 -0.2 + vertex 24.2514 19.4451 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.4027 19.6849 -0.1 - vertex 23.8617 20.3844 -0.1 - vertex 23.4814 20.4643 -0.1 + vertex 23.4027 19.6849 -0.2 + vertex 23.8617 20.3844 -0.2 + vertex 23.4814 20.4643 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.8617 20.3844 -0.1 - vertex 23.4027 19.6849 -0.1 - vertex 23.8321 19.5531 -0.1 + vertex 23.8617 20.3844 -0.2 + vertex 23.4027 19.6849 -0.2 + vertex 23.8321 19.5531 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.9977 19.8472 -0.1 - vertex 23.4814 20.4643 -0.1 - vertex 23.1504 20.59 -0.1 + vertex 22.9977 19.8472 -0.2 + vertex 23.4814 20.4643 -0.2 + vertex 23.1504 20.59 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.4814 20.4643 -0.1 - vertex 22.9977 19.8472 -0.1 - vertex 23.4027 19.6849 -0.1 + vertex 23.4814 20.4643 -0.2 + vertex 22.9977 19.8472 -0.2 + vertex 23.4027 19.6849 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.6486 20.047 -0.1 - vertex 23.1504 20.59 -0.1 - vertex 22.8668 20.7638 -0.1 + vertex 22.6486 20.047 -0.2 + vertex 23.1504 20.59 -0.2 + vertex 22.8668 20.7638 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.3515 20.2895 -0.1 - vertex 22.8668 20.7638 -0.1 - vertex 22.7421 20.8693 -0.1 + vertex 22.3515 20.2895 -0.2 + vertex 22.8668 20.7638 -0.2 + vertex 22.7421 20.8693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.1504 20.59 -0.1 - vertex 22.6486 20.047 -0.1 - vertex 22.9977 19.8472 -0.1 + vertex 23.1504 20.59 -0.2 + vertex 22.6486 20.047 -0.2 + vertex 22.9977 19.8472 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.2213 20.4283 -0.1 - vertex 22.7421 20.8693 -0.1 - vertex 22.6286 20.9877 -0.1 + vertex 22.2213 20.4283 -0.2 + vertex 22.7421 20.8693 -0.2 + vertex 22.6286 20.9877 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.8989 20.9229 -0.1 - vertex 22.6286 20.9877 -0.1 - vertex 22.4341 21.2638 -0.1 + vertex 21.8989 20.9229 -0.2 + vertex 22.6286 20.9877 -0.2 + vertex 22.4341 21.2638 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.8668 20.7638 -0.1 - vertex 22.3515 20.2895 -0.1 - vertex 22.6486 20.047 -0.1 + vertex 22.8668 20.7638 -0.2 + vertex 22.3515 20.2895 -0.2 + vertex 22.6486 20.047 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 21.7362 21.3239 -0.1 - vertex 22.4341 21.2638 -0.1 - vertex 22.2815 21.5943 -0.1 + vertex 21.7362 21.3239 -0.2 + vertex 22.4341 21.2638 -0.2 + vertex 22.2815 21.5943 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.7421 20.8693 -0.1 - vertex 22.2213 20.4283 -0.1 - vertex 22.3515 20.2895 -0.1 + vertex 22.7421 20.8693 -0.2 + vertex 22.2213 20.4283 -0.2 + vertex 22.3515 20.2895 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 21.6111 21.7881 -0.1 - vertex 22.2815 21.5943 -0.1 - vertex 22.1689 21.9813 -0.1 + vertex 21.6111 21.7881 -0.2 + vertex 22.2815 21.5943 -0.2 + vertex 22.1689 21.9813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.6286 20.9877 -0.1 - vertex 22.1028 20.5797 -0.1 - vertex 22.2213 20.4283 -0.1 + vertex 22.6286 20.9877 -0.2 + vertex 22.1028 20.5797 -0.2 + vertex 22.2213 20.4283 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 21.5197 22.3204 -0.1 - vertex 22.1689 21.9813 -0.1 - vertex 22.0944 22.427 -0.1 + vertex 21.5197 22.3204 -0.2 + vertex 22.1689 21.9813 -0.2 + vertex 22.0944 22.427 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 21.4205 22.8275 -0.1 - vertex 22.0944 22.427 -0.1 - vertex 21.9928 23.1034 -0.1 + vertex 21.4205 22.8275 -0.2 + vertex 22.0944 22.427 -0.2 + vertex 21.9928 23.1034 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.3493 23.064 -0.1 - vertex 21.9928 23.1034 -0.1 - vertex 21.926 23.397 -0.1 + vertex 21.3493 23.064 -0.2 + vertex 21.9928 23.1034 -0.2 + vertex 21.926 23.397 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.6286 20.9877 -0.1 - vertex 21.8989 20.9229 -0.1 - vertex 22.1028 20.5797 -0.1 + vertex 22.6286 20.9877 -0.2 + vertex 21.8989 20.9229 -0.2 + vertex 22.1028 20.5797 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.2635 23.2891 -0.1 - vertex 21.926 23.397 -0.1 - vertex 21.8437 23.6658 -0.1 + vertex 21.2635 23.2891 -0.2 + vertex 21.926 23.397 -0.2 + vertex 21.8437 23.6658 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1632 23.503 -0.1 - vertex 21.8437 23.6658 -0.1 - vertex 21.7423 23.9135 -0.1 + vertex 21.1632 23.503 -0.2 + vertex 21.8437 23.6658 -0.2 + vertex 21.7423 23.9135 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.4341 21.2638 -0.1 - vertex 21.7362 21.3239 -0.1 - vertex 21.8989 20.9229 -0.1 + vertex 22.4341 21.2638 -0.2 + vertex 21.7362 21.3239 -0.2 + vertex 21.8989 20.9229 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0482 23.7058 -0.1 - vertex 21.7423 23.9135 -0.1 - vertex 21.6182 24.144 -0.1 + vertex 21.0482 23.7058 -0.2 + vertex 21.7423 23.9135 -0.2 + vertex 21.6182 24.144 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.2815 21.5943 -0.1 - vertex 21.6111 21.7881 -0.1 - vertex 21.7362 21.3239 -0.1 + vertex 22.2815 21.5943 -0.2 + vertex 21.6111 21.7881 -0.2 + vertex 21.7362 21.3239 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.1689 21.9813 -0.1 - vertex 21.5197 22.3204 -0.1 - vertex 21.6111 21.7881 -0.1 + vertex 22.1689 21.9813 -0.2 + vertex 21.5197 22.3204 -0.2 + vertex 21.6111 21.7881 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9184 23.8976 -0.1 - vertex 21.6182 24.144 -0.1 - vertex 21.4677 24.3609 -0.1 + vertex 20.9184 23.8976 -0.2 + vertex 21.6182 24.144 -0.2 + vertex 21.4677 24.3609 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.0944 22.427 -0.1 - vertex 21.4205 22.8275 -0.1 - vertex 21.5197 22.3204 -0.1 + vertex 22.0944 22.427 -0.2 + vertex 21.4205 22.8275 -0.2 + vertex 21.5197 22.3204 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.9928 23.1034 -0.1 - vertex 21.3493 23.064 -0.1 - vertex 21.4205 22.8275 -0.1 + vertex 21.9928 23.1034 -0.2 + vertex 21.3493 23.064 -0.2 + vertex 21.4205 22.8275 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.7738 24.0784 -0.1 - vertex 21.4677 24.3609 -0.1 - vertex 21.2873 24.568 -0.1 + vertex 20.7738 24.0784 -0.2 + vertex 21.4677 24.3609 -0.2 + vertex 21.2873 24.568 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.926 23.397 -0.1 - vertex 21.2635 23.2891 -0.1 - vertex 21.3493 23.064 -0.1 + vertex 21.926 23.397 -0.2 + vertex 21.2635 23.2891 -0.2 + vertex 21.3493 23.064 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.8437 23.6658 -0.1 - vertex 21.1632 23.503 -0.1 - vertex 21.2635 23.2891 -0.1 + vertex 21.8437 23.6658 -0.2 + vertex 21.1632 23.503 -0.2 + vertex 21.2635 23.2891 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.6143 24.2484 -0.1 - vertex 21.2873 24.568 -0.1 - vertex 21.0733 24.7691 -0.1 + vertex 20.6143 24.2484 -0.2 + vertex 21.2873 24.568 -0.2 + vertex 21.0733 24.7691 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.7423 23.9135 -0.1 - vertex 21.0482 23.7058 -0.1 - vertex 21.1632 23.503 -0.1 + vertex 21.7423 23.9135 -0.2 + vertex 21.0482 23.7058 -0.2 + vertex 21.1632 23.503 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.6182 24.144 -0.1 - vertex 20.9184 23.8976 -0.1 - vertex 21.0482 23.7058 -0.1 + vertex 21.6182 24.144 -0.2 + vertex 20.9184 23.8976 -0.2 + vertex 21.0482 23.7058 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.4398 24.4076 -0.1 - vertex 21.0733 24.7691 -0.1 - vertex 20.8221 24.9679 -0.1 + vertex 20.4398 24.4076 -0.2 + vertex 21.0733 24.7691 -0.2 + vertex 20.8221 24.9679 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.4677 24.3609 -0.1 - vertex 20.7738 24.0784 -0.1 - vertex 20.9184 23.8976 -0.1 + vertex 21.4677 24.3609 -0.2 + vertex 20.7738 24.0784 -0.2 + vertex 20.9184 23.8976 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.2873 24.568 -0.1 - vertex 20.6143 24.2484 -0.1 - vertex 20.7738 24.0784 -0.1 + vertex 21.2873 24.568 -0.2 + vertex 20.6143 24.2484 -0.2 + vertex 20.7738 24.0784 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.2502 24.5562 -0.1 - vertex 20.8221 24.9679 -0.1 - vertex 20.53 25.168 -0.1 + vertex 20.2502 24.5562 -0.2 + vertex 20.8221 24.9679 -0.2 + vertex 20.53 25.168 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0733 24.7691 -0.1 - vertex 20.4398 24.4076 -0.1 - vertex 20.6143 24.2484 -0.1 + vertex 21.0733 24.7691 -0.2 + vertex 20.4398 24.4076 -0.2 + vertex 20.6143 24.2484 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.8221 24.9679 -0.1 - vertex 20.2502 24.5562 -0.1 - vertex 20.4398 24.4076 -0.1 + vertex 20.8221 24.9679 -0.2 + vertex 20.2502 24.5562 -0.2 + vertex 20.4398 24.4076 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0455 24.6942 -0.1 - vertex 20.53 25.168 -0.1 - vertex 20.1936 25.3734 -0.1 + vertex 20.0455 24.6942 -0.2 + vertex 20.53 25.168 -0.2 + vertex 20.1936 25.3734 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.53 25.168 -0.1 - vertex 20.0455 24.6942 -0.1 - vertex 20.2502 24.5562 -0.1 + vertex 20.53 25.168 -0.2 + vertex 20.0455 24.6942 -0.2 + vertex 20.2502 24.5562 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.1936 25.3734 -0.1 - vertex 19.5904 24.9388 -0.1 - vertex 20.0455 24.6942 -0.1 + vertex 20.1936 25.3734 -0.2 + vertex 19.5904 24.9388 -0.2 + vertex 20.0455 24.6942 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3729 25.8147 -0.1 - vertex 19.5904 24.9388 -0.1 - vertex 20.1936 25.3734 -0.1 + vertex 19.3729 25.8147 -0.2 + vertex 19.5904 24.9388 -0.2 + vertex 20.1936 25.3734 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3729 25.8147 -0.1 - vertex 19.0737 25.1422 -0.1 - vertex 19.5904 24.9388 -0.1 + vertex 19.3729 25.8147 -0.2 + vertex 19.0737 25.1422 -0.2 + vertex 19.5904 24.9388 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.3729 25.8147 -0.1 - vertex 18.5685 25.3244 -0.1 - vertex 19.0737 25.1422 -0.1 + vertex 19.3729 25.8147 -0.2 + vertex 18.5685 25.3244 -0.2 + vertex 19.0737 25.1422 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.3311 26.3216 -0.1 - vertex 18.5685 25.3244 -0.1 - vertex 19.3729 25.8147 -0.1 + vertex 18.3311 26.3216 -0.2 + vertex 18.5685 25.3244 -0.2 + vertex 19.3729 25.8147 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.3311 26.3216 -0.1 - vertex 18.1033 25.5216 -0.1 - vertex 18.5685 25.3244 -0.1 + vertex 18.3311 26.3216 -0.2 + vertex 18.1033 25.5216 -0.2 + vertex 18.5685 25.3244 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.3311 26.3216 -0.1 - vertex 17.6707 25.7385 -0.1 - vertex 18.1033 25.5216 -0.1 + vertex 18.3311 26.3216 -0.2 + vertex 17.6707 25.7385 -0.2 + vertex 18.1033 25.5216 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6504 26.6607 -0.1 - vertex 17.6707 25.7385 -0.1 - vertex 18.3311 26.3216 -0.1 + vertex 17.6504 26.6607 -0.2 + vertex 17.6707 25.7385 -0.2 + vertex 18.3311 26.3216 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6504 26.6607 -0.1 - vertex 17.2631 25.98 -0.1 - vertex 17.6707 25.7385 -0.1 + vertex 17.6504 26.6607 -0.2 + vertex 17.2631 25.98 -0.2 + vertex 17.6707 25.7385 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.873 26.2508 -0.1 - vertex 17.6504 26.6607 -0.1 - vertex 17.0889 26.9817 -0.1 + vertex 16.873 26.2508 -0.2 + vertex 17.6504 26.6607 -0.2 + vertex 17.0889 26.9817 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6504 26.6607 -0.1 - vertex 16.873 26.2508 -0.1 - vertex 17.2631 25.98 -0.1 + vertex 17.6504 26.6607 -0.2 + vertex 16.873 26.2508 -0.2 + vertex 17.2631 25.98 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.4932 26.5558 -0.1 - vertex 17.0889 26.9817 -0.1 - vertex 16.6359 27.2959 -0.1 + vertex 16.4932 26.5558 -0.2 + vertex 17.0889 26.9817 -0.2 + vertex 16.6359 27.2959 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.0889 26.9817 -0.1 - vertex 16.4932 26.5558 -0.1 - vertex 16.873 26.2508 -0.1 + vertex 17.0889 26.9817 -0.2 + vertex 16.4932 26.5558 -0.2 + vertex 16.873 26.2508 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.116 26.8997 -0.1 - vertex 16.6359 27.2959 -0.1 - vertex 16.4467 27.454 -0.1 + vertex 16.116 26.8997 -0.2 + vertex 16.6359 27.2959 -0.2 + vertex 16.4467 27.454 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.116 26.8997 -0.1 - vertex 16.4467 27.454 -0.1 - vertex 16.2806 27.6146 -0.1 + vertex 16.116 26.8997 -0.2 + vertex 16.4467 27.454 -0.2 + vertex 16.2806 27.6146 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.734 27.2872 -0.1 - vertex 16.2806 27.6146 -0.1 - vertex 16.1362 27.7792 -0.1 + vertex 15.734 27.2872 -0.2 + vertex 16.2806 27.6146 -0.2 + vertex 16.1362 27.7792 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.6359 27.2959 -0.1 - vertex 16.116 26.8997 -0.1 - vertex 16.4932 26.5558 -0.1 + vertex 16.6359 27.2959 -0.2 + vertex 16.116 26.8997 -0.2 + vertex 16.4932 26.5558 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.734 27.2872 -0.1 - vertex 16.1362 27.7792 -0.1 - vertex 16.0121 27.9491 -0.1 + vertex 15.734 27.2872 -0.2 + vertex 16.1362 27.7792 -0.2 + vertex 16.0121 27.9491 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.344 27.7317 -0.1 - vertex 16.0121 27.9491 -0.1 - vertex 15.9071 28.1258 -0.1 + vertex 15.344 27.7317 -0.2 + vertex 16.0121 27.9491 -0.2 + vertex 15.9071 28.1258 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.2193 27.9155 -0.1 - vertex 15.9071 28.1258 -0.1 - vertex 15.8197 28.3106 -0.1 + vertex 15.2193 27.9155 -0.2 + vertex 15.9071 28.1258 -0.2 + vertex 15.8197 28.3106 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.1337 28.0941 -0.1 - vertex 15.8197 28.3106 -0.1 - vertex 15.7487 28.5051 -0.1 + vertex 15.1337 28.0941 -0.2 + vertex 15.8197 28.3106 -0.2 + vertex 15.7487 28.5051 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.2806 27.6146 -0.1 - vertex 15.734 27.2872 -0.1 - vertex 16.116 26.8997 -0.1 + vertex 16.2806 27.6146 -0.2 + vertex 15.734 27.2872 -0.2 + vertex 16.116 26.8997 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.0574 28.4965 -0.1 - vertex 15.7487 28.5051 -0.1 - vertex 15.6927 28.7106 -0.1 + vertex 15.0574 28.4965 -0.2 + vertex 15.7487 28.5051 -0.2 + vertex 15.6927 28.7106 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.0552 28.7509 -0.1 - vertex 15.6927 28.7106 -0.1 - vertex 15.6202 29.1601 -0.1 + vertex 15.0552 28.7509 -0.2 + vertex 15.6927 28.7106 -0.2 + vertex 15.6202 29.1601 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.1102 29.496 -0.1 - vertex 15.6202 29.1601 -0.1 - vertex 15.5622 29.5773 -0.1 + vertex 15.1102 29.496 -0.2 + vertex 15.6202 29.1601 -0.2 + vertex 15.5622 29.5773 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.1701 29.8123 -0.1 - vertex 15.5622 29.5773 -0.1 - vertex 15.49 29.8698 -0.1 + vertex 15.1701 29.8123 -0.2 + vertex 15.5622 29.5773 -0.2 + vertex 15.49 29.8698 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.2437 30.0088 -0.1 - vertex 15.49 29.8698 -0.1 - vertex 15.4091 30.0386 -0.1 + vertex 15.2437 30.0088 -0.2 + vertex 15.49 29.8698 -0.2 + vertex 15.4091 30.0386 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 15.2838 30.0618 -0.1 - vertex 15.4091 30.0386 -0.1 - vertex 15.3672 30.0768 -0.1 + vertex 15.2838 30.0618 -0.2 + vertex 15.4091 30.0386 -0.2 + vertex 15.3672 30.0768 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.6202 29.1601 -0.1 - vertex 15.0694 29.0611 -0.1 - vertex 15.0552 28.7509 -0.1 + vertex 15.6202 29.1601 -0.2 + vertex 15.0694 29.0611 -0.2 + vertex 15.0552 28.7509 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.2838 30.0618 -0.1 - vertex 15.3672 30.0768 -0.1 - vertex 15.3252 30.0845 -0.1 + vertex 15.2838 30.0618 -0.2 + vertex 15.3672 30.0768 -0.2 + vertex 15.3252 30.0845 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.4091 30.0386 -0.1 - vertex 15.2838 30.0618 -0.1 - vertex 15.2437 30.0088 -0.1 + vertex 15.4091 30.0386 -0.2 + vertex 15.2838 30.0618 -0.2 + vertex 15.2437 30.0088 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.49 29.8698 -0.1 - vertex 15.2437 30.0088 -0.1 - vertex 15.1701 29.8123 -0.1 + vertex 15.49 29.8698 -0.2 + vertex 15.2437 30.0088 -0.2 + vertex 15.1701 29.8123 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.6927 28.7106 -0.1 - vertex 15.0552 28.7509 -0.1 - vertex 15.0574 28.4965 -0.1 + vertex 15.6927 28.7106 -0.2 + vertex 15.0552 28.7509 -0.2 + vertex 15.0574 28.4965 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.5622 29.5773 -0.1 - vertex 15.1701 29.8123 -0.1 - vertex 15.1102 29.496 -0.1 + vertex 15.5622 29.5773 -0.2 + vertex 15.1701 29.8123 -0.2 + vertex 15.1102 29.496 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.6202 29.1601 -0.1 - vertex 15.1102 29.496 -0.1 - vertex 15.0694 29.0611 -0.1 + vertex 15.6202 29.1601 -0.2 + vertex 15.1102 29.496 -0.2 + vertex 15.0694 29.0611 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.0121 27.9491 -0.1 - vertex 15.344 27.7317 -0.1 - vertex 15.734 27.2872 -0.1 + vertex 16.0121 27.9491 -0.2 + vertex 15.344 27.7317 -0.2 + vertex 15.734 27.2872 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.7487 28.5051 -0.1 - vertex 15.0574 28.4965 -0.1 - vertex 15.0817 28.2827 -0.1 + vertex 15.7487 28.5051 -0.2 + vertex 15.0574 28.4965 -0.2 + vertex 15.0817 28.2827 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.9071 28.1258 -0.1 - vertex 15.2193 27.9155 -0.1 - vertex 15.344 27.7317 -0.1 + vertex 15.9071 28.1258 -0.2 + vertex 15.2193 27.9155 -0.2 + vertex 15.344 27.7317 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.7487 28.5051 -0.1 - vertex 15.0817 28.2827 -0.1 - vertex 15.1337 28.0941 -0.1 + vertex 15.7487 28.5051 -0.2 + vertex 15.0817 28.2827 -0.2 + vertex 15.1337 28.0941 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.8197 28.3106 -0.1 - vertex 15.1337 28.0941 -0.1 - vertex 15.2193 27.9155 -0.1 + vertex 15.8197 28.3106 -0.2 + vertex 15.1337 28.0941 -0.2 + vertex 15.2193 27.9155 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.6024 10.7775 -0.1 - vertex 21.7259 8.22365 -0.1 - vertex 27.5775 10.2019 -0.1 + vertex 27.6024 10.7775 -0.2 + vertex 21.7259 8.22365 -0.2 + vertex 27.5775 10.2019 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 23.6083 4.95794 -0.1 - vertex 27.0158 7.30485 -0.1 - vertex 23.5351 5.37146 -0.1 + vertex 23.6083 4.95794 -0.2 + vertex 27.0158 7.30485 -0.2 + vertex 23.5351 5.37146 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 22.0631 7.89267 -0.1 - vertex 27.5775 10.2019 -0.1 - vertex 21.7259 8.22365 -0.1 + vertex 22.0631 7.89267 -0.2 + vertex 27.5775 10.2019 -0.2 + vertex 21.7259 8.22365 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.5397 9.70386 -0.1 - vertex 22.0631 7.89267 -0.1 - vertex 27.4871 9.26334 -0.1 + vertex 27.5397 9.70386 -0.2 + vertex 22.0631 7.89267 -0.2 + vertex 27.4871 9.26334 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 23.6192 4.7586 -0.1 - vertex 27.0158 7.30485 -0.1 - vertex 23.6083 4.95794 -0.1 + vertex 23.6192 4.7586 -0.2 + vertex 27.0158 7.30485 -0.2 + vertex 23.6083 4.95794 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0158 7.30485 -0.1 - vertex 23.6192 4.7586 -0.1 - vertex 24.9074 2.59483 -0.1 + vertex 27.0158 7.30485 -0.2 + vertex 23.6192 4.7586 -0.2 + vertex 24.9074 2.59483 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 22.3621 7.54907 -0.1 - vertex 27.4871 9.26334 -0.1 - vertex 22.0631 7.89267 -0.1 + vertex 22.3621 7.54907 -0.2 + vertex 27.4871 9.26334 -0.2 + vertex 22.0631 7.89267 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.6129 4.5634 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 23.6192 4.7586 -0.1 + vertex 23.6129 4.5634 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 23.6192 4.7586 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.5494 4.18291 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 23.5897 4.3717 -0.1 + vertex 23.5494 4.18291 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 23.5897 4.3717 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.4176 8.86037 -0.1 - vertex 22.3621 7.54907 -0.1 - vertex 27.3295 8.47496 -0.1 + vertex 27.4176 8.86037 -0.2 + vertex 22.3621 7.54907 -0.2 + vertex 27.3295 8.47496 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.4183 3.81156 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 23.5494 4.18291 -0.1 + vertex 23.4183 3.81156 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 23.5494 4.18291 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.22 3.44442 -0.1 - vertex 24.764 2.4559 -0.1 - vertex 23.4183 3.81156 -0.1 + vertex 23.22 3.44442 -0.2 + vertex 24.764 2.4559 -0.2 + vertex 23.4183 3.81156 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.9074 2.59483 -0.1 - vertex 23.4183 3.81156 -0.1 - vertex 24.764 2.4559 -0.1 + vertex 24.9074 2.59483 -0.2 + vertex 23.4183 3.81156 -0.2 + vertex 24.764 2.4559 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.5897 4.3717 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 23.6129 4.5634 -0.1 + vertex 23.5897 4.3717 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 23.6129 4.5634 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0158 7.30485 -0.1 - vertex 23.3929 5.8089 -0.1 - vertex 23.5351 5.37146 -0.1 + vertex 27.0158 7.30485 -0.2 + vertex 23.3929 5.8089 -0.2 + vertex 23.5351 5.37146 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3295 8.47496 -0.1 - vertex 22.3621 7.54907 -0.1 - vertex 27.2208 8.08714 -0.1 + vertex 27.3295 8.47496 -0.2 + vertex 22.3621 7.54907 -0.2 + vertex 27.2208 8.08714 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0158 7.30485 -0.1 - vertex 23.1811 6.27516 -0.1 - vertex 23.3929 5.8089 -0.1 + vertex 27.0158 7.30485 -0.2 + vertex 23.1811 6.27516 -0.2 + vertex 23.3929 5.8089 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0158 7.30485 -0.1 - vertex 22.8992 6.77518 -0.1 - vertex 23.1811 6.27516 -0.1 + vertex 27.0158 7.30485 -0.2 + vertex 22.8992 6.77518 -0.2 + vertex 23.1811 6.27516 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.1048 7.68143 -0.1 - vertex 22.8992 6.77518 -0.1 - vertex 27.0158 7.30485 -0.1 + vertex 27.1048 7.68143 -0.2 + vertex 22.8992 6.77518 -0.2 + vertex 27.0158 7.30485 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 22.8992 6.77518 -0.1 - vertex 27.1048 7.68143 -0.1 - vertex 22.6364 7.18064 -0.1 + vertex 22.8992 6.77518 -0.2 + vertex 27.1048 7.68143 -0.2 + vertex 22.6364 7.18064 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.4871 9.26334 -0.1 - vertex 22.3621 7.54907 -0.1 - vertex 27.4176 8.86037 -0.1 + vertex 27.4871 9.26334 -0.2 + vertex 22.3621 7.54907 -0.2 + vertex 27.4176 8.86037 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.2208 8.08714 -0.1 - vertex 22.6364 7.18064 -0.1 - vertex 27.1048 7.68143 -0.1 + vertex 27.2208 8.08714 -0.2 + vertex 22.6364 7.18064 -0.2 + vertex 27.1048 7.68143 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 22.6364 7.18064 -0.1 - vertex 27.2208 8.08714 -0.1 - vertex 22.3621 7.54907 -0.1 + vertex 22.6364 7.18064 -0.2 + vertex 27.2208 8.08714 -0.2 + vertex 22.3621 7.54907 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.3371 8.55423 -0.1 - vertex 22.2336 15.278 -0.1 - vertex 21.6737 15.039 -0.1 + vertex 21.3371 8.55423 -0.2 + vertex 22.2336 15.278 -0.2 + vertex 21.6737 15.039 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.5775 10.2019 -0.1 - vertex 22.0631 7.89267 -0.1 - vertex 27.5397 9.70386 -0.1 + vertex 27.5775 10.2019 -0.2 + vertex 22.0631 7.89267 -0.2 + vertex 27.5397 9.70386 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.8834 8.89663 -0.1 - vertex 21.6737 15.039 -0.1 - vertex 21.1771 14.8489 -0.1 + vertex 20.8834 8.89663 -0.2 + vertex 21.6737 15.039 -0.2 + vertex 21.1771 14.8489 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.6737 15.039 -0.1 - vertex 20.8834 8.89663 -0.1 - vertex 21.3371 8.55423 -0.1 + vertex 21.6737 15.039 -0.2 + vertex 20.8834 8.89663 -0.2 + vertex 21.3371 8.55423 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3513 9.26304 -0.1 - vertex 21.1771 14.8489 -0.1 - vertex 20.8452 14.735 -0.1 + vertex 20.3513 9.26304 -0.2 + vertex 21.1771 14.8489 -0.2 + vertex 20.8452 14.735 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7274 9.66569 -0.1 - vertex 20.8452 14.735 -0.1 - vertex 20.5722 14.6577 -0.1 + vertex 19.7274 9.66569 -0.2 + vertex 20.8452 14.735 -0.2 + vertex 20.5722 14.6577 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1771 14.8489 -0.1 - vertex 20.3513 9.26304 -0.1 - vertex 20.8834 8.89663 -0.1 + vertex 21.1771 14.8489 -0.2 + vertex 20.3513 9.26304 -0.2 + vertex 20.8834 8.89663 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4723 9.81661 -0.1 - vertex 20.5722 14.6577 -0.1 - vertex 20.327 14.6203 -0.1 + vertex 19.4723 9.81661 -0.2 + vertex 20.5722 14.6577 -0.2 + vertex 20.327 14.6203 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.2206 9.94402 -0.1 - vertex 20.327 14.6203 -0.1 - vertex 20.0785 14.6265 -0.1 + vertex 19.2206 9.94402 -0.2 + vertex 20.327 14.6203 -0.2 + vertex 20.0785 14.6265 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.6964 10.137 -0.1 - vertex 20.0785 14.6265 -0.1 - vertex 19.7955 14.6797 -0.1 + vertex 18.6964 10.137 -0.2 + vertex 20.0785 14.6265 -0.2 + vertex 19.7955 14.6797 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.8452 14.735 -0.1 - vertex 19.7274 9.66569 -0.1 - vertex 20.3513 9.26304 -0.1 + vertex 20.8452 14.735 -0.2 + vertex 19.7274 9.66569 -0.2 + vertex 20.3513 9.26304 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.5722 14.6577 -0.1 - vertex 19.4723 9.81661 -0.1 - vertex 19.7274 9.66569 -0.1 + vertex 20.5722 14.6577 -0.2 + vertex 19.4723 9.81661 -0.2 + vertex 19.7274 9.66569 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.4085 10.2069 -0.1 - vertex 19.7955 14.6797 -0.1 - vertex 19.4469 14.7833 -0.1 + vertex 18.4085 10.2069 -0.2 + vertex 19.7955 14.6797 -0.2 + vertex 19.4469 14.7833 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.327 14.6203 -0.1 - vertex 19.2206 9.94402 -0.1 - vertex 19.4723 9.81661 -0.1 + vertex 20.327 14.6203 -0.2 + vertex 19.2206 9.94402 -0.2 + vertex 19.4723 9.81661 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0785 14.6265 -0.1 - vertex 18.9645 10.0501 -0.1 - vertex 19.2206 9.94402 -0.1 + vertex 20.0785 14.6265 -0.2 + vertex 18.9645 10.0501 -0.2 + vertex 19.2206 9.94402 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0785 14.6265 -0.1 - vertex 18.6964 10.137 -0.1 - vertex 18.9645 10.0501 -0.1 + vertex 20.0785 14.6265 -0.2 + vertex 18.6964 10.137 -0.2 + vertex 18.9645 10.0501 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.093 10.2619 -0.1 - vertex 19.4469 14.7833 -0.1 - vertex 18.4281 15.1559 -0.1 + vertex 18.093 10.2619 -0.2 + vertex 19.4469 14.7833 -0.2 + vertex 18.4281 15.1559 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.7955 14.6797 -0.1 - vertex 18.4085 10.2069 -0.1 - vertex 18.6964 10.137 -0.1 + vertex 19.7955 14.6797 -0.2 + vertex 18.4085 10.2069 -0.2 + vertex 18.6964 10.137 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4469 14.7833 -0.1 - vertex 18.093 10.2619 -0.1 - vertex 18.4085 10.2069 -0.1 + vertex 19.4469 14.7833 -0.2 + vertex 18.093 10.2619 -0.2 + vertex 18.4085 10.2069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.499 10.3797 -0.1 - vertex 18.4281 15.1559 -0.1 - vertex 17.448 15.5385 -0.1 + vertex 16.499 10.3797 -0.2 + vertex 18.4281 15.1559 -0.2 + vertex 17.448 15.5385 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.4281 15.1559 -0.1 - vertex 17.3487 10.3363 -0.1 - vertex 18.093 10.2619 -0.1 + vertex 18.4281 15.1559 -0.2 + vertex 17.3487 10.3363 -0.2 + vertex 18.093 10.2619 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.2187 10.3704 -0.1 - vertex 17.448 15.5385 -0.1 - vertex 16.6072 15.8977 -0.1 + vertex 16.2187 10.3704 -0.2 + vertex 17.448 15.5385 -0.2 + vertex 16.6072 15.8977 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.4281 15.1559 -0.1 - vertex 16.499 10.3797 -0.1 - vertex 17.3487 10.3363 -0.1 + vertex 18.4281 15.1559 -0.2 + vertex 16.499 10.3797 -0.2 + vertex 17.3487 10.3363 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.448 15.5385 -0.1 - vertex 16.2187 10.3704 -0.1 - vertex 16.499 10.3797 -0.1 + vertex 17.448 15.5385 -0.2 + vertex 16.2187 10.3704 -0.2 + vertex 16.499 10.3797 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.6072 15.8977 -0.1 - vertex 16.005 10.3315 -0.1 - vertex 16.2187 10.3704 -0.1 + vertex 16.6072 15.8977 -0.2 + vertex 16.005 10.3315 -0.2 + vertex 16.2187 10.3704 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.8738 16.2527 -0.1 - vertex 16.005 10.3315 -0.1 - vertex 16.6072 15.8977 -0.1 + vertex 15.8738 16.2527 -0.2 + vertex 16.005 10.3315 -0.2 + vertex 16.6072 15.8977 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.8738 16.2527 -0.1 - vertex 15.8355 10.2563 -0.1 - vertex 16.005 10.3315 -0.1 + vertex 15.8738 16.2527 -0.2 + vertex 15.8355 10.2563 -0.2 + vertex 16.005 10.3315 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.2162 16.623 -0.1 - vertex 15.8355 10.2563 -0.1 - vertex 15.8738 16.2527 -0.1 + vertex 15.2162 16.623 -0.2 + vertex 15.8355 10.2563 -0.2 + vertex 15.8738 16.2527 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.8355 10.2563 -0.1 - vertex 15.2162 16.623 -0.1 - vertex 15.6879 10.1383 -0.1 + vertex 15.8355 10.2563 -0.2 + vertex 15.2162 16.623 -0.2 + vertex 15.6879 10.1383 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 15.6879 10.1383 -0.1 - vertex 15.2162 16.623 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 15.6879 10.1383 -0.2 + vertex 15.2162 16.623 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.6879 10.1383 -0.1 - vertex 10.4375 16.5104 -0.1 - vertex 15.5399 9.97068 -0.1 + vertex 15.6879 10.1383 -0.2 + vertex 10.4375 16.5104 -0.2 + vertex 15.5399 9.97068 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.5399 9.97068 -0.1 - vertex 10.4375 16.5104 -0.1 - vertex 15.369 9.74689 -0.1 + vertex 15.5399 9.97068 -0.2 + vertex 10.4375 16.5104 -0.2 + vertex 15.369 9.74689 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 9.73318 16.1788 -0.1 - vertex 15.369 9.74689 -0.1 - vertex 10.4375 16.5104 -0.1 + vertex 9.73318 16.1788 -0.2 + vertex 15.369 9.74689 -0.2 + vertex 10.4375 16.5104 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.369 9.74689 -0.1 - vertex 9.73318 16.1788 -0.1 - vertex 15.213 9.52982 -0.1 + vertex 15.369 9.74689 -0.2 + vertex 9.73318 16.1788 -0.2 + vertex 15.213 9.52982 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.213 9.52982 -0.1 - vertex 9.73318 16.1788 -0.1 - vertex 15.0942 9.33737 -0.1 + vertex 15.213 9.52982 -0.2 + vertex 9.73318 16.1788 -0.2 + vertex 15.0942 9.33737 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 9.19116 15.9452 -0.1 - vertex 15.0942 9.33737 -0.1 - vertex 9.73318 16.1788 -0.1 + vertex 9.19116 15.9452 -0.2 + vertex 15.0942 9.33737 -0.2 + vertex 9.73318 16.1788 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 8.99158 15.8746 -0.1 - vertex 15.0942 9.33737 -0.1 - vertex 9.19116 15.9452 -0.1 + vertex 8.99158 15.8746 -0.2 + vertex 15.0942 9.33737 -0.2 + vertex 9.19116 15.9452 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 15.2162 16.623 -0.1 - vertex 14.6028 17.0277 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 15.2162 16.623 -0.2 + vertex 14.6028 17.0277 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 24.4388 2.25734 -0.1 - vertex 24.764 2.4559 -0.1 - vertex 23.22 3.44442 -0.1 + vertex 24.4388 2.25734 -0.2 + vertex 24.764 2.4559 -0.2 + vertex 23.22 3.44442 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.764 2.4559 -0.1 - vertex 24.4388 2.25734 -0.1 - vertex 24.6285 2.34829 -0.1 + vertex 24.764 2.4559 -0.2 + vertex 24.4388 2.25734 -0.2 + vertex 24.6285 2.34829 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.4388 2.25734 -0.1 - vertex 23.22 3.44442 -0.1 - vertex 24.2201 2.19262 -0.1 + vertex 24.4388 2.25734 -0.2 + vertex 23.22 3.44442 -0.2 + vertex 24.2201 2.19262 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.2201 2.19262 -0.1 - vertex 23.22 3.44442 -0.1 - vertex 23.9975 2.16372 -0.1 + vertex 24.2201 2.19262 -0.2 + vertex 23.22 3.44442 -0.2 + vertex 23.9975 2.16372 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.9975 2.16372 -0.1 - vertex 23.22 3.44442 -0.1 - vertex 23.7673 2.14309 -0.1 + vertex 23.9975 2.16372 -0.2 + vertex 23.22 3.44442 -0.2 + vertex 23.7673 2.14309 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.0427 3.12896 -0.1 - vertex 23.7673 2.14309 -0.1 - vertex 23.22 3.44442 -0.1 + vertex 23.0427 3.12896 -0.2 + vertex 23.7673 2.14309 -0.2 + vertex 23.22 3.44442 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.7673 2.14309 -0.1 - vertex 23.0427 3.12896 -0.1 - vertex 23.5277 2.10089 -0.1 + vertex 23.7673 2.14309 -0.2 + vertex 23.0427 3.12896 -0.2 + vertex 23.5277 2.10089 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.9115 2.82433 -0.1 - vertex 23.5277 2.10089 -0.1 - vertex 23.0427 3.12896 -0.1 + vertex 22.9115 2.82433 -0.2 + vertex 23.5277 2.10089 -0.2 + vertex 23.0427 3.12896 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.827 2.54396 -0.1 - vertex 23.5277 2.10089 -0.1 - vertex 22.9115 2.82433 -0.1 + vertex 22.827 2.54396 -0.2 + vertex 23.5277 2.10089 -0.2 + vertex 22.9115 2.82433 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.5277 2.10089 -0.1 - vertex 22.827 2.54396 -0.1 - vertex 23.3072 2.04326 -0.1 + vertex 23.5277 2.10089 -0.2 + vertex 22.827 2.54396 -0.2 + vertex 23.3072 2.04326 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.7901 2.30129 -0.1 - vertex 23.3072 2.04326 -0.1 - vertex 22.827 2.54396 -0.1 + vertex 22.7901 2.30129 -0.2 + vertex 23.3072 2.04326 -0.2 + vertex 22.827 2.54396 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.3072 2.04326 -0.1 - vertex 22.7901 2.30129 -0.1 - vertex 23.0469 1.94283 -0.1 + vertex 23.3072 2.04326 -0.2 + vertex 22.7901 2.30129 -0.2 + vertex 23.0469 1.94283 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 22.8016 2.10976 -0.1 - vertex 23.0469 1.94283 -0.1 - vertex 22.7901 2.30129 -0.1 + vertex 22.8016 2.10976 -0.2 + vertex 23.0469 1.94283 -0.2 + vertex 22.7901 2.30129 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 22.8257 2.03737 -0.1 - vertex 23.0469 1.94283 -0.1 - vertex 22.8016 2.10976 -0.1 + vertex 22.8257 2.03737 -0.2 + vertex 23.0469 1.94283 -0.2 + vertex 22.8016 2.10976 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.0469 1.94283 -0.1 - vertex 22.8257 2.03737 -0.1 - vertex 22.9727 1.93385 -0.1 + vertex 23.0469 1.94283 -0.2 + vertex 22.8257 2.03737 -0.2 + vertex 22.9727 1.93385 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex 22.8622 1.9828 -0.1 - vertex 22.9727 1.93385 -0.1 - vertex 22.8257 2.03737 -0.1 + vertex 22.8622 1.9828 -0.2 + vertex 22.9727 1.93385 -0.2 + vertex 22.8257 2.03737 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.9727 1.93385 -0.1 - vertex 22.8622 1.9828 -0.1 - vertex 22.9112 1.94773 -0.1 + vertex 22.9727 1.93385 -0.2 + vertex 22.8622 1.9828 -0.2 + vertex 22.9112 1.94773 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.4227 15.3534 -0.1 - vertex 24.3498 16.3417 -0.1 - vertex 27.4995 15.0808 -0.1 + vertex 27.4227 15.3534 -0.2 + vertex 24.3498 16.3417 -0.2 + vertex 27.4995 15.0808 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.3198 15.5987 -0.1 - vertex 24.3498 16.3417 -0.1 - vertex 27.4227 15.3534 -0.1 + vertex 27.3198 15.5987 -0.2 + vertex 24.3498 16.3417 -0.2 + vertex 27.4227 15.3534 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.4995 15.0808 -0.1 - vertex 24.3498 16.3417 -0.1 - vertex 27.5539 14.7505 -0.1 + vertex 27.4995 15.0808 -0.2 + vertex 24.3498 16.3417 -0.2 + vertex 27.5539 14.7505 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.3498 16.3417 -0.1 - vertex 27.3198 15.5987 -0.1 - vertex 24.659 16.5397 -0.1 + vertex 24.3498 16.3417 -0.2 + vertex 27.3198 15.5987 -0.2 + vertex 24.659 16.5397 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.5539 14.7505 -0.1 - vertex 24.3498 16.3417 -0.1 - vertex 27.5896 14.3319 -0.1 + vertex 27.5539 14.7505 -0.2 + vertex 24.3498 16.3417 -0.2 + vertex 27.5896 14.3319 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.1872 15.8473 -0.1 - vertex 24.659 16.5397 -0.1 - vertex 27.3198 15.5987 -0.1 + vertex 27.1872 15.8473 -0.2 + vertex 24.659 16.5397 -0.2 + vertex 27.3198 15.5987 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.9148 16.0975 -0.1 - vertex 27.5896 14.3319 -0.1 - vertex 24.3498 16.3417 -0.1 + vertex 23.9148 16.0975 -0.2 + vertex 27.5896 14.3319 -0.2 + vertex 24.3498 16.3417 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.659 16.5397 -0.1 - vertex 25.8187 16.7495 -0.1 - vertex 24.7548 16.6154 -0.1 + vertex 24.659 16.5397 -0.2 + vertex 25.8187 16.7495 -0.2 + vertex 24.7548 16.6154 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.5896 14.3319 -0.1 - vertex 23.9148 16.0975 -0.1 - vertex 27.6103 13.7945 -0.1 + vertex 27.5896 14.3319 -0.2 + vertex 23.9148 16.0975 -0.2 + vertex 27.6103 13.7945 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 23.3919 15.8262 -0.1 - vertex 27.6103 13.7945 -0.1 - vertex 23.9148 16.0975 -0.1 + vertex 23.3919 15.8262 -0.2 + vertex 27.6103 13.7945 -0.2 + vertex 23.9148 16.0975 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.7548 16.6154 -0.1 - vertex 25.8187 16.7495 -0.1 - vertex 24.8049 16.6725 -0.1 + vertex 24.7548 16.6154 -0.2 + vertex 25.8187 16.7495 -0.2 + vertex 24.8049 16.6725 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.6103 13.7945 -0.1 - vertex 23.3919 15.8262 -0.1 - vertex 27.6211 12.2412 -0.1 + vertex 27.6103 13.7945 -0.2 + vertex 23.3919 15.8262 -0.2 + vertex 27.6211 12.2412 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 24.659 16.5397 -0.1 - vertex 27.1872 15.8473 -0.1 - vertex 25.8187 16.7495 -0.1 + vertex 24.659 16.5397 -0.2 + vertex 27.1872 15.8473 -0.2 + vertex 25.8187 16.7495 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 22.2336 15.278 -0.1 - vertex 27.6211 12.2412 -0.1 - vertex 23.3919 15.8262 -0.1 + vertex 22.2336 15.278 -0.2 + vertex 27.6211 12.2412 -0.2 + vertex 23.3919 15.8262 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.3371 8.55423 -0.1 - vertex 27.6211 12.2412 -0.1 - vertex 22.2336 15.278 -0.1 + vertex 21.3371 8.55423 -0.2 + vertex 27.6211 12.2412 -0.2 + vertex 22.2336 15.278 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.8659 16.7424 -0.1 - vertex 27.1872 15.8473 -0.1 - vertex 27.0139 16.2113 -0.1 + vertex 25.8659 16.7424 -0.2 + vertex 27.1872 15.8473 -0.2 + vertex 27.0139 16.2113 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.6211 12.2412 -0.1 - vertex 21.3371 8.55423 -0.1 - vertex 27.6024 10.7775 -0.1 + vertex 27.6211 12.2412 -0.2 + vertex 21.3371 8.55423 -0.2 + vertex 27.6024 10.7775 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 21.7259 8.22365 -0.1 - vertex 27.6024 10.7775 -0.1 - vertex 21.3371 8.55423 -0.1 + vertex 21.7259 8.22365 -0.2 + vertex 27.6024 10.7775 -0.2 + vertex 21.3371 8.55423 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.0158 7.30485 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 26.9517 6.92758 -0.1 + vertex 27.0158 7.30485 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 26.9517 6.92758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 27.1872 15.8473 -0.1 - vertex 25.8659 16.7424 -0.1 - vertex 25.8187 16.7495 -0.1 + vertex 27.1872 15.8473 -0.2 + vertex 25.8659 16.7424 -0.2 + vertex 25.8187 16.7495 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.8659 16.7424 -0.1 - vertex 27.0139 16.2113 -0.1 - vertex 26.8653 16.6367 -0.1 + vertex 25.8659 16.7424 -0.2 + vertex 27.0139 16.2113 -0.2 + vertex 26.8653 16.6367 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.8138 2.23679 -0.1 - vertex 26.9647 2.16551 -0.1 - vertex 26.9615 2.94949 -0.1 + vertex 25.8138 2.23679 -0.2 + vertex 26.9647 2.16551 -0.2 + vertex 26.9615 2.94949 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.4766 2.59351 -0.1 - vertex 26.9615 2.94949 -0.1 - vertex 26.9294 3.98634 -0.1 + vertex 25.4766 2.59351 -0.2 + vertex 26.9615 2.94949 -0.2 + vertex 26.9294 3.98634 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9647 2.16551 -0.1 - vertex 25.8138 2.23679 -0.1 - vertex 26.0094 1.96397 -0.1 + vertex 26.9647 2.16551 -0.2 + vertex 25.8138 2.23679 -0.2 + vertex 26.0094 1.96397 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.185 2.7087 -0.1 - vertex 26.9294 3.98634 -0.1 - vertex 26.8871 5.49316 -0.1 + vertex 25.185 2.7087 -0.2 + vertex 26.9294 3.98634 -0.2 + vertex 26.8871 5.49316 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 26.3175 1.53367 -0.1 - vertex 26.9647 2.16551 -0.1 - vertex 26.0094 1.96397 -0.1 + vertex 26.3175 1.53367 -0.2 + vertex 26.9647 2.16551 -0.2 + vertex 26.0094 1.96397 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9517 6.92758 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 26.9103 6.51977 -0.1 + vertex 26.9517 6.92758 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 26.9103 6.51977 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9615 2.94949 -0.1 - vertex 25.6376 2.44612 -0.1 - vertex 25.8138 2.23679 -0.1 + vertex 26.9615 2.94949 -0.2 + vertex 25.6376 2.44612 -0.2 + vertex 25.8138 2.23679 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.9855 16.8461 -0.1 - vertex 26.8653 16.6367 -0.1 - vertex 26.7571 17.0706 -0.1 + vertex 25.9855 16.8461 -0.2 + vertex 26.8653 16.6367 -0.2 + vertex 26.7571 17.0706 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 26.4455 1.37999 -0.1 - vertex 26.9324 1.61996 -0.1 - vertex 26.3175 1.53367 -0.1 + vertex 26.4455 1.37999 -0.2 + vertex 26.9324 1.61996 -0.2 + vertex 26.3175 1.53367 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 26.0803 17.2678 -0.1 - vertex 26.7571 17.0706 -0.1 - vertex 26.7051 17.4601 -0.1 + vertex 26.0803 17.2678 -0.2 + vertex 26.7571 17.0706 -0.2 + vertex 26.7051 17.4601 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 26.0933 17.5963 -0.1 - vertex 26.7051 17.4601 -0.1 - vertex 26.6784 17.7808 -0.1 + vertex 26.0933 17.5963 -0.2 + vertex 26.7051 17.4601 -0.2 + vertex 26.6784 17.7808 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8653 16.6367 -0.1 - vertex 25.9855 16.8461 -0.1 - vertex 25.9096 16.7563 -0.1 + vertex 26.8653 16.6367 -0.2 + vertex 25.9855 16.8461 -0.2 + vertex 25.9096 16.7563 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 26.0696 17.9605 -0.1 - vertex 26.6784 17.7808 -0.1 - vertex 26.6332 18.0815 -0.1 + vertex 26.0696 17.9605 -0.2 + vertex 26.6784 17.7808 -0.2 + vertex 26.6332 18.0815 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0696 17.9605 -0.1 - vertex 26.6332 18.0815 -0.1 - vertex 26.5691 18.3624 -0.1 + vertex 26.0696 17.9605 -0.2 + vertex 26.6332 18.0815 -0.2 + vertex 26.5691 18.3624 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.7571 17.0706 -0.1 - vertex 26.0434 17.0172 -0.1 - vertex 25.9855 16.8461 -0.1 + vertex 26.7571 17.0706 -0.2 + vertex 26.0434 17.0172 -0.2 + vertex 25.9855 16.8461 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0696 17.9605 -0.1 - vertex 26.5691 18.3624 -0.1 - vertex 26.4859 18.624 -0.1 + vertex 26.0696 17.9605 -0.2 + vertex 26.5691 18.3624 -0.2 + vertex 26.4859 18.624 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9324 1.61996 -0.1 - vertex 26.4455 1.37999 -0.1 - vertex 26.901 1.43209 -0.1 + vertex 26.9324 1.61996 -0.2 + vertex 26.4455 1.37999 -0.2 + vertex 26.901 1.43209 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0696 17.9605 -0.1 - vertex 26.4859 18.624 -0.1 - vertex 26.3832 18.8665 -0.1 + vertex 26.0696 17.9605 -0.2 + vertex 26.4859 18.624 -0.2 + vertex 26.3832 18.8665 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 26.5572 1.2697 -0.1 - vertex 26.901 1.43209 -0.1 - vertex 26.4455 1.37999 -0.1 + vertex 26.5572 1.2697 -0.2 + vertex 26.901 1.43209 -0.2 + vertex 26.4455 1.37999 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.0696 17.9605 -0.1 - vertex 26.3832 18.8665 -0.1 - vertex 26.2605 19.0904 -0.1 + vertex 26.0696 17.9605 -0.2 + vertex 26.3832 18.8665 -0.2 + vertex 26.2605 19.0904 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.7448 18.8483 -0.1 - vertex 26.2605 19.0904 -0.1 - vertex 26.1176 19.296 -0.1 + vertex 25.7448 18.8483 -0.2 + vertex 26.2605 19.0904 -0.2 + vertex 26.1176 19.296 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.7051 17.4601 -0.1 - vertex 26.0933 17.5963 -0.1 - vertex 26.0803 17.2678 -0.1 + vertex 26.7051 17.4601 -0.2 + vertex 26.0933 17.5963 -0.2 + vertex 26.0803 17.2678 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.7571 17.0706 -0.1 - vertex 26.0803 17.2678 -0.1 - vertex 26.0434 17.0172 -0.1 + vertex 26.7571 17.0706 -0.2 + vertex 26.0803 17.2678 -0.2 + vertex 26.0434 17.0172 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 26.6535 1.20459 -0.1 - vertex 26.8581 1.29842 -0.1 - vertex 26.5572 1.2697 -0.1 + vertex 26.6535 1.20459 -0.2 + vertex 26.8581 1.29842 -0.2 + vertex 26.5572 1.2697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8581 1.29842 -0.1 - vertex 26.6535 1.20459 -0.1 - vertex 26.8032 1.21715 -0.1 + vertex 26.8581 1.29842 -0.2 + vertex 26.6535 1.20459 -0.2 + vertex 26.8032 1.21715 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8032 1.21715 -0.1 - vertex 26.6535 1.20459 -0.1 - vertex 26.7352 1.18648 -0.1 + vertex 26.8032 1.21715 -0.2 + vertex 26.6535 1.20459 -0.2 + vertex 26.7352 1.18648 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 25.8659 16.7424 -0.1 - vertex 26.8653 16.6367 -0.1 - vertex 25.9096 16.7563 -0.1 + vertex 25.8659 16.7424 -0.2 + vertex 26.8653 16.6367 -0.2 + vertex 25.9096 16.7563 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9103 6.51977 -0.1 - vertex 24.9074 2.59483 -0.1 - vertex 26.8894 6.05157 -0.1 + vertex 26.9103 6.51977 -0.2 + vertex 24.9074 2.59483 -0.2 + vertex 26.8894 6.05157 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.7157 16.8274 -0.1 - vertex 24.8049 16.6725 -0.1 - vertex 25.8187 16.7495 -0.1 + vertex 25.7157 16.8274 -0.2 + vertex 24.8049 16.6725 -0.2 + vertex 25.8187 16.7495 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.901 1.43209 -0.1 - vertex 26.5572 1.2697 -0.1 - vertex 26.8581 1.29842 -0.1 + vertex 26.901 1.43209 -0.2 + vertex 26.5572 1.2697 -0.2 + vertex 26.8581 1.29842 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.8049 16.6725 -0.1 - vertex 25.7157 16.8274 -0.1 - vertex 24.8294 16.7672 -0.1 + vertex 24.8049 16.6725 -0.2 + vertex 25.7157 16.8274 -0.2 + vertex 24.8294 16.7672 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9647 2.16551 -0.1 - vertex 26.3175 1.53367 -0.1 - vertex 26.9324 1.61996 -0.1 + vertex 26.9647 2.16551 -0.2 + vertex 26.3175 1.53367 -0.2 + vertex 26.9324 1.61996 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.8294 16.7672 -0.1 - vertex 25.7157 16.8274 -0.1 - vertex 25.6037 16.9917 -0.1 + vertex 24.8294 16.7672 -0.2 + vertex 25.7157 16.8274 -0.2 + vertex 25.6037 16.9917 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.8232 16.8925 -0.1 - vertex 25.6037 16.9917 -0.1 - vertex 25.4856 17.2443 -0.1 + vertex 24.8232 16.8925 -0.2 + vertex 25.6037 16.9917 -0.2 + vertex 25.4856 17.2443 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9615 2.94949 -0.1 - vertex 25.4766 2.59351 -0.1 - vertex 25.6376 2.44612 -0.1 + vertex 26.9615 2.94949 -0.2 + vertex 25.4766 2.59351 -0.2 + vertex 25.6376 2.44612 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.789 17.0321 -0.1 - vertex 25.4856 17.2443 -0.1 - vertex 25.3467 17.5167 -0.1 + vertex 24.789 17.0321 -0.2 + vertex 25.4856 17.2443 -0.2 + vertex 25.3467 17.5167 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 25.0464 2.67962 -0.1 - vertex 26.8894 6.05157 -0.1 - vertex 24.9074 2.59483 -0.1 + vertex 25.0464 2.67962 -0.2 + vertex 26.8894 6.05157 -0.2 + vertex 24.9074 2.59483 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.7291 17.1695 -0.1 - vertex 25.3467 17.5167 -0.1 - vertex 25.2614 17.6336 -0.1 + vertex 24.7291 17.1695 -0.2 + vertex 25.3467 17.5167 -0.2 + vertex 25.2614 17.6336 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9294 3.98634 -0.1 - vertex 25.3271 2.68052 -0.1 - vertex 25.4766 2.59351 -0.1 + vertex 26.9294 3.98634 -0.2 + vertex 25.3271 2.68052 -0.2 + vertex 25.4766 2.59351 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6602 17.253 -0.1 - vertex 25.2614 17.6336 -0.1 - vertex 25.163 17.7384 -0.1 + vertex 24.6602 17.253 -0.2 + vertex 25.2614 17.6336 -0.2 + vertex 25.163 17.7384 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6602 17.253 -0.1 - vertex 25.163 17.7384 -0.1 - vertex 25.0501 17.8316 -0.1 + vertex 24.6602 17.253 -0.2 + vertex 25.163 17.7384 -0.2 + vertex 25.0501 17.8316 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.9294 3.98634 -0.1 - vertex 25.185 2.7087 -0.1 - vertex 25.3271 2.68052 -0.1 + vertex 26.9294 3.98634 -0.2 + vertex 25.185 2.7087 -0.2 + vertex 25.3271 2.68052 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6602 17.253 -0.1 - vertex 25.0501 17.8316 -0.1 - vertex 24.9207 17.9138 -0.1 + vertex 24.6602 17.253 -0.2 + vertex 25.0501 17.8316 -0.2 + vertex 24.9207 17.9138 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8871 5.49316 -0.1 - vertex 25.0464 2.67962 -0.1 - vertex 25.185 2.7087 -0.1 + vertex 26.8871 5.49316 -0.2 + vertex 25.0464 2.67962 -0.2 + vertex 25.185 2.7087 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 26.8894 6.05157 -0.1 - vertex 25.0464 2.67962 -0.1 - vertex 26.8871 5.49316 -0.1 + vertex 26.8894 6.05157 -0.2 + vertex 25.0464 2.67962 -0.2 + vertex 26.8871 5.49316 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.6037 16.9917 -0.1 - vertex 24.8232 16.8925 -0.1 - vertex 24.8294 16.7672 -0.1 + vertex 25.6037 16.9917 -0.2 + vertex 24.8232 16.8925 -0.2 + vertex 24.8294 16.7672 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.4856 17.2443 -0.1 - vertex 24.789 17.0321 -0.1 - vertex 24.8232 16.8925 -0.1 + vertex 25.4856 17.2443 -0.2 + vertex 24.789 17.0321 -0.2 + vertex 24.8232 16.8925 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.3467 17.5167 -0.1 - vertex 24.7291 17.1695 -0.1 - vertex 24.789 17.0321 -0.1 + vertex 25.3467 17.5167 -0.2 + vertex 24.7291 17.1695 -0.2 + vertex 24.789 17.0321 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 25.2614 17.6336 -0.1 - vertex 24.6602 17.253 -0.1 - vertex 24.7291 17.1695 -0.1 + vertex 25.2614 17.6336 -0.2 + vertex 24.6602 17.253 -0.2 + vertex 24.7291 17.1695 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.5483 17.3222 -0.1 - vertex 24.9207 17.9138 -0.1 - vertex 24.6059 18.0475 -0.1 + vertex 24.5483 17.3222 -0.2 + vertex 24.9207 17.9138 -0.2 + vertex 24.6059 18.0475 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.9207 17.9138 -0.1 - vertex 24.5483 17.3222 -0.1 - vertex 24.6602 17.253 -0.1 + vertex 24.9207 17.9138 -0.2 + vertex 24.5483 17.3222 -0.2 + vertex 24.6602 17.253 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6059 18.0475 -0.1 - vertex 24.386 17.3783 -0.1 - vertex 24.5483 17.3222 -0.1 + vertex 24.6059 18.0475 -0.2 + vertex 24.386 17.3783 -0.2 + vertex 24.5483 17.3222 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.166 17.4223 -0.1 - vertex 24.6059 18.0475 -0.1 - vertex 24.2049 18.1437 -0.1 + vertex 24.166 17.4223 -0.2 + vertex 24.6059 18.0475 -0.2 + vertex 24.2049 18.1437 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 24.6059 18.0475 -0.1 - vertex 24.166 17.4223 -0.1 - vertex 24.386 17.3783 -0.1 + vertex 24.6059 18.0475 -0.2 + vertex 24.166 17.4223 -0.2 + vertex 24.386 17.3783 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.7039 18.207 -0.1 - vertex 24.166 17.4223 -0.1 - vertex 24.2049 18.1437 -0.1 + vertex 23.7039 18.207 -0.2 + vertex 24.166 17.4223 -0.2 + vertex 24.2049 18.1437 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.7039 18.207 -0.1 - vertex 23.5226 17.4791 -0.1 - vertex 24.166 17.4223 -0.1 + vertex 23.7039 18.207 -0.2 + vertex 23.5226 17.4791 -0.2 + vertex 24.166 17.4223 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.0891 18.2417 -0.1 - vertex 23.5226 17.4791 -0.1 - vertex 23.7039 18.207 -0.1 + vertex 23.0891 18.2417 -0.2 + vertex 23.5226 17.4791 -0.2 + vertex 23.7039 18.207 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 23.0891 18.2417 -0.1 - vertex 22.5588 17.5015 -0.1 - vertex 23.5226 17.4791 -0.1 + vertex 23.0891 18.2417 -0.2 + vertex 22.5588 17.5015 -0.2 + vertex 23.5226 17.4791 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 22.3468 18.2522 -0.1 - vertex 22.5588 17.5015 -0.1 - vertex 23.0891 18.2417 -0.1 + vertex 22.3468 18.2522 -0.2 + vertex 22.5588 17.5015 -0.2 + vertex 23.0891 18.2417 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.5679 18.2611 -0.1 - vertex 22.5588 17.5015 -0.1 - vertex 22.3468 18.2522 -0.1 + vertex 21.5679 18.2611 -0.2 + vertex 22.5588 17.5015 -0.2 + vertex 22.3468 18.2522 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.5679 18.2611 -0.1 - vertex 21.0506 17.5236 -0.1 - vertex 22.5588 17.5015 -0.1 + vertex 21.5679 18.2611 -0.2 + vertex 21.0506 17.5236 -0.2 + vertex 22.5588 17.5015 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9709 18.304 -0.1 - vertex 21.0506 17.5236 -0.1 - vertex 21.5679 18.2611 -0.1 + vertex 20.9709 18.304 -0.2 + vertex 21.0506 17.5236 -0.2 + vertex 21.5679 18.2611 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.7319 18.3459 -0.1 - vertex 21.0506 17.5236 -0.1 - vertex 20.9709 18.304 -0.1 + vertex 20.7319 18.3459 -0.2 + vertex 21.0506 17.5236 -0.2 + vertex 20.9709 18.304 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.2276 17.5562 -0.1 - vertex 20.7319 18.3459 -0.1 - vertex 20.5281 18.4055 -0.1 + vertex 20.2276 17.5562 -0.2 + vertex 20.7319 18.3459 -0.2 + vertex 20.5281 18.4055 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0333 17.6179 -0.1 - vertex 20.5281 18.4055 -0.1 - vertex 20.3561 18.486 -0.1 + vertex 20.0333 17.6179 -0.2 + vertex 20.5281 18.4055 -0.2 + vertex 20.3561 18.486 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.7319 18.3459 -0.1 - vertex 20.2276 17.5562 -0.1 - vertex 21.0506 17.5236 -0.1 + vertex 20.7319 18.3459 -0.2 + vertex 20.2276 17.5562 -0.2 + vertex 21.0506 17.5236 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6934 17.9694 -0.1 - vertex 20.3561 18.486 -0.1 - vertex 20.2124 18.5903 -0.1 + vertex 19.6934 17.9694 -0.2 + vertex 20.3561 18.486 -0.2 + vertex 20.2124 18.5903 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.5281 18.4055 -0.1 - vertex 20.1284 17.5777 -0.1 - vertex 20.2276 17.5562 -0.1 + vertex 20.5281 18.4055 -0.2 + vertex 20.1284 17.5777 -0.2 + vertex 20.2276 17.5562 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.5469 18.2611 -0.1 - vertex 20.2124 18.5903 -0.1 - vertex 20.0935 18.7216 -0.1 + vertex 19.5469 18.2611 -0.2 + vertex 20.2124 18.5903 -0.2 + vertex 20.0935 18.7216 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.5281 18.4055 -0.1 - vertex 20.0333 17.6179 -0.1 - vertex 20.1284 17.5777 -0.1 + vertex 20.5281 18.4055 -0.2 + vertex 20.0333 17.6179 -0.2 + vertex 20.1284 17.5777 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4153 18.6317 -0.1 - vertex 20.0935 18.7216 -0.1 - vertex 19.9962 18.8829 -0.1 + vertex 19.4153 18.6317 -0.2 + vertex 20.0935 18.7216 -0.2 + vertex 19.9962 18.8829 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3561 18.486 -0.1 - vertex 19.9424 17.6771 -0.1 - vertex 20.0333 17.6179 -0.1 + vertex 20.3561 18.486 -0.2 + vertex 19.9424 17.6771 -0.2 + vertex 20.0333 17.6179 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4153 18.6317 -0.1 - vertex 19.9962 18.8829 -0.1 - vertex 19.9169 19.0772 -0.1 + vertex 19.4153 18.6317 -0.2 + vertex 19.9962 18.8829 -0.2 + vertex 19.9169 19.0772 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3561 18.486 -0.1 - vertex 19.8554 17.7553 -0.1 - vertex 19.9424 17.6771 -0.1 + vertex 20.3561 18.486 -0.2 + vertex 19.8554 17.7553 -0.2 + vertex 19.9424 17.6771 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.2984 19.082 -0.1 - vertex 19.9169 19.0772 -0.1 - vertex 19.8522 19.3078 -0.1 + vertex 19.2984 19.082 -0.2 + vertex 19.9169 19.0772 -0.2 + vertex 19.8522 19.3078 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.1956 19.6132 -0.1 - vertex 19.8522 19.3078 -0.1 - vertex 19.753 19.8896 -0.1 + vertex 19.1956 19.6132 -0.2 + vertex 19.8522 19.3078 -0.2 + vertex 19.753 19.8896 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.3561 18.486 -0.1 - vertex 19.6934 17.9694 -0.1 - vertex 19.8554 17.7553 -0.1 + vertex 20.3561 18.486 -0.2 + vertex 19.6934 17.9694 -0.2 + vertex 19.8554 17.7553 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.1065 20.2262 -0.1 - vertex 19.753 19.8896 -0.1 - vertex 19.6713 20.6529 -0.1 + vertex 19.1065 20.2262 -0.2 + vertex 19.753 19.8896 -0.2 + vertex 19.6713 20.6529 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.0081 20.8787 -0.1 - vertex 19.6713 20.6529 -0.1 - vertex 19.58 21.4118 -0.1 + vertex 19.0081 20.8787 -0.2 + vertex 19.6713 20.6529 -0.2 + vertex 19.58 21.4118 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0935 18.7216 -0.1 - vertex 19.4153 18.6317 -0.1 - vertex 19.5469 18.2611 -0.1 + vertex 20.0935 18.7216 -0.2 + vertex 19.4153 18.6317 -0.2 + vertex 19.5469 18.2611 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.892 21.4494 -0.1 - vertex 19.58 21.4118 -0.1 - vertex 19.5238 21.6908 -0.1 + vertex 18.892 21.4494 -0.2 + vertex 19.58 21.4118 -0.2 + vertex 19.5238 21.6908 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.892 21.4494 -0.1 - vertex 19.5238 21.6908 -0.1 - vertex 19.4538 21.9215 -0.1 + vertex 18.892 21.4494 -0.2 + vertex 19.5238 21.6908 -0.2 + vertex 19.4538 21.9215 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.2124 18.5903 -0.1 - vertex 19.5469 18.2611 -0.1 - vertex 19.6934 17.9694 -0.1 + vertex 20.2124 18.5903 -0.2 + vertex 19.5469 18.2611 -0.2 + vertex 19.6934 17.9694 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.7726 21.8767 -0.1 - vertex 19.4538 21.9215 -0.1 - vertex 19.3646 22.1178 -0.1 + vertex 18.7726 21.8767 -0.2 + vertex 19.4538 21.9215 -0.2 + vertex 19.3646 22.1178 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.9169 19.0772 -0.1 - vertex 19.2984 19.082 -0.1 - vertex 19.4153 18.6317 -0.1 + vertex 19.9169 19.0772 -0.2 + vertex 19.2984 19.082 -0.2 + vertex 19.4153 18.6317 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.7726 21.8767 -0.1 - vertex 19.3646 22.1178 -0.1 - vertex 19.2511 22.2936 -0.1 + vertex 18.7726 21.8767 -0.2 + vertex 19.3646 22.1178 -0.2 + vertex 19.2511 22.2936 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.8522 19.3078 -0.1 - vertex 19.1956 19.6132 -0.1 - vertex 19.2984 19.082 -0.1 + vertex 19.8522 19.3078 -0.2 + vertex 19.1956 19.6132 -0.2 + vertex 19.2984 19.082 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.7163 22.0174 -0.1 - vertex 19.2511 22.2936 -0.1 - vertex 19.108 22.463 -0.1 + vertex 18.7163 22.0174 -0.2 + vertex 19.2511 22.2936 -0.2 + vertex 19.108 22.463 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.753 19.8896 -0.1 - vertex 19.1065 20.2262 -0.1 - vertex 19.1956 19.6132 -0.1 + vertex 19.753 19.8896 -0.2 + vertex 19.1065 20.2262 -0.2 + vertex 19.1956 19.6132 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.6713 20.6529 -0.1 - vertex 19.0081 20.8787 -0.1 - vertex 19.1065 20.2262 -0.1 + vertex 19.6713 20.6529 -0.2 + vertex 19.0081 20.8787 -0.2 + vertex 19.1065 20.2262 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.6646 22.0992 -0.1 - vertex 19.108 22.463 -0.1 - vertex 18.9302 22.6398 -0.1 + vertex 18.6646 22.0992 -0.2 + vertex 19.108 22.463 -0.2 + vertex 18.9302 22.6398 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.58 21.4118 -0.1 - vertex 18.892 21.4494 -0.1 - vertex 19.0081 20.8787 -0.1 + vertex 19.58 21.4118 -0.2 + vertex 18.892 21.4494 -0.2 + vertex 19.0081 20.8787 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4538 21.9215 -0.1 - vertex 18.7726 21.8767 -0.1 - vertex 18.892 21.4494 -0.1 + vertex 19.4538 21.9215 -0.2 + vertex 18.7726 21.8767 -0.2 + vertex 18.892 21.4494 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.2511 22.2936 -0.1 - vertex 18.7163 22.0174 -0.1 - vertex 18.7726 21.8767 -0.1 + vertex 19.2511 22.2936 -0.2 + vertex 18.7163 22.0174 -0.2 + vertex 18.7726 21.8767 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.108 22.463 -0.1 - vertex 18.6646 22.0992 -0.1 - vertex 18.7163 22.0174 -0.1 + vertex 19.108 22.463 -0.2 + vertex 18.6646 22.0992 -0.2 + vertex 18.7163 22.0174 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.4732 22.2317 -0.1 - vertex 18.9302 22.6398 -0.1 - vertex 18.6454 22.8797 -0.1 + vertex 18.4732 22.2317 -0.2 + vertex 18.9302 22.6398 -0.2 + vertex 18.6454 22.8797 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.9302 22.6398 -0.1 - vertex 18.4732 22.2317 -0.1 - vertex 18.6646 22.0992 -0.1 + vertex 18.9302 22.6398 -0.2 + vertex 18.4732 22.2317 -0.2 + vertex 18.6646 22.0992 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.127 22.4141 -0.1 - vertex 18.6454 22.8797 -0.1 - vertex 18.318 23.1114 -0.1 + vertex 18.127 22.4141 -0.2 + vertex 18.6454 22.8797 -0.2 + vertex 18.318 23.1114 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.6454 22.8797 -0.1 - vertex 18.127 22.4141 -0.1 - vertex 18.4732 22.2317 -0.1 + vertex 18.6454 22.8797 -0.2 + vertex 18.127 22.4141 -0.2 + vertex 18.4732 22.2317 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6752 22.6222 -0.1 - vertex 18.318 23.1114 -0.1 - vertex 17.9883 23.3086 -0.1 + vertex 17.6752 22.6222 -0.2 + vertex 18.318 23.1114 -0.2 + vertex 17.9883 23.3086 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6752 22.6222 -0.1 - vertex 17.9883 23.3086 -0.1 - vertex 17.6969 23.4449 -0.1 + vertex 17.6752 22.6222 -0.2 + vertex 17.9883 23.3086 -0.2 + vertex 17.6969 23.4449 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.318 23.1114 -0.1 - vertex 17.6752 22.6222 -0.1 - vertex 18.127 22.4141 -0.1 + vertex 18.318 23.1114 -0.2 + vertex 17.6752 22.6222 -0.2 + vertex 18.127 22.4141 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6969 23.4449 -0.1 - vertex 17.1667 22.8321 -0.1 - vertex 17.6752 22.6222 -0.1 + vertex 17.6969 23.4449 -0.2 + vertex 17.1667 22.8321 -0.2 + vertex 17.6752 22.6222 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.2809 23.9862 -0.1 - vertex 17.1667 22.8321 -0.1 - vertex 17.6969 23.4449 -0.1 + vertex 16.2809 23.9862 -0.2 + vertex 17.1667 22.8321 -0.2 + vertex 17.6969 23.4449 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.2809 23.9862 -0.1 - vertex 15.5173 23.4995 -0.1 - vertex 17.1667 22.8321 -0.1 + vertex 16.2809 23.9862 -0.2 + vertex 15.5173 23.4995 -0.2 + vertex 17.1667 22.8321 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.1328 24.4531 -0.1 - vertex 15.5173 23.4995 -0.1 - vertex 16.2809 23.9862 -0.1 + vertex 15.1328 24.4531 -0.2 + vertex 15.5173 23.4995 -0.2 + vertex 16.2809 23.9862 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.0281 24.1527 -0.1 - vertex 15.1328 24.4531 -0.1 - vertex 14.2197 24.8651 -0.1 + vertex 14.0281 24.1527 -0.2 + vertex 15.1328 24.4531 -0.2 + vertex 14.2197 24.8651 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.1328 24.4531 -0.1 - vertex 14.0281 24.1527 -0.1 - vertex 15.5173 23.4995 -0.1 + vertex 15.1328 24.4531 -0.2 + vertex 14.0281 24.1527 -0.2 + vertex 15.5173 23.4995 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.2197 24.8651 -0.1 - vertex 13.7923 24.2655 -0.1 - vertex 14.0281 24.1527 -0.1 + vertex 14.2197 24.8651 -0.2 + vertex 13.7923 24.2655 -0.2 + vertex 14.0281 24.1527 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.2197 24.8651 -0.1 - vertex 13.5553 24.3991 -0.1 - vertex 13.7923 24.2655 -0.1 + vertex 14.2197 24.8651 -0.2 + vertex 13.5553 24.3991 -0.2 + vertex 13.7923 24.2655 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.5086 25.2416 -0.1 - vertex 13.5553 24.3991 -0.1 - vertex 14.2197 24.8651 -0.1 + vertex 13.5086 25.2416 -0.2 + vertex 13.5553 24.3991 -0.2 + vertex 14.2197 24.8651 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.085 24.7212 -0.1 - vertex 13.5086 25.2416 -0.1 - vertex 13.2184 25.4225 -0.1 + vertex 13.085 24.7212 -0.2 + vertex 13.5086 25.2416 -0.2 + vertex 13.2184 25.4225 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.5086 25.2416 -0.1 - vertex 13.085 24.7212 -0.1 - vertex 13.5553 24.3991 -0.1 + vertex 13.5086 25.2416 -0.2 + vertex 13.085 24.7212 -0.2 + vertex 13.5553 24.3991 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.6316 25.1032 -0.1 - vertex 13.2184 25.4225 -0.1 - vertex 12.9664 25.6018 -0.1 + vertex 12.6316 25.1032 -0.2 + vertex 13.2184 25.4225 -0.2 + vertex 12.9664 25.6018 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.6316 25.1032 -0.1 - vertex 12.9664 25.6018 -0.1 - vertex 12.7484 25.782 -0.1 + vertex 12.6316 25.1032 -0.2 + vertex 12.9664 25.6018 -0.2 + vertex 12.7484 25.782 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.2184 25.4225 -0.1 - vertex 12.6316 25.1032 -0.1 - vertex 13.085 24.7212 -0.1 + vertex 13.2184 25.4225 -0.2 + vertex 12.6316 25.1032 -0.2 + vertex 13.085 24.7212 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2092 25.5292 -0.1 - vertex 12.7484 25.782 -0.1 - vertex 12.5603 25.9653 -0.1 + vertex 12.2092 25.5292 -0.2 + vertex 12.7484 25.782 -0.2 + vertex 12.5603 25.9653 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.2092 25.5292 -0.1 - vertex 12.5603 25.9653 -0.1 - vertex 12.3979 26.1543 -0.1 + vertex 12.2092 25.5292 -0.2 + vertex 12.5603 25.9653 -0.2 + vertex 12.3979 26.1543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8324 25.9834 -0.1 - vertex 12.3979 26.1543 -0.1 - vertex 12.2572 26.3514 -0.1 + vertex 11.8324 25.9834 -0.2 + vertex 12.3979 26.1543 -0.2 + vertex 12.2572 26.3514 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.7484 25.782 -0.1 - vertex 12.2092 25.5292 -0.1 - vertex 12.6316 25.1032 -0.1 + vertex 12.7484 25.782 -0.2 + vertex 12.2092 25.5292 -0.2 + vertex 12.6316 25.1032 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8324 25.9834 -0.1 - vertex 12.2572 26.3514 -0.1 - vertex 12.1339 26.5589 -0.1 + vertex 11.8324 25.9834 -0.2 + vertex 12.2572 26.3514 -0.2 + vertex 12.1339 26.5589 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5154 26.4501 -0.1 - vertex 12.1339 26.5589 -0.1 - vertex 12.0241 26.7794 -0.1 + vertex 11.5154 26.4501 -0.2 + vertex 12.1339 26.5589 -0.2 + vertex 12.0241 26.7794 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.3839 26.6832 -0.1 - vertex 12.0241 26.7794 -0.1 - vertex 11.903 27.1234 -0.1 + vertex 11.3839 26.6832 -0.2 + vertex 12.0241 26.7794 -0.2 + vertex 11.903 27.1234 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.3979 26.1543 -0.1 - vertex 11.8324 25.9834 -0.1 - vertex 12.2092 25.5292 -0.1 + vertex 12.3979 26.1543 -0.2 + vertex 11.8324 25.9834 -0.2 + vertex 12.2092 25.5292 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.1835 27.139 -0.1 - vertex 11.903 27.1234 -0.1 - vertex 11.8169 27.5343 -0.1 + vertex 11.1835 27.139 -0.2 + vertex 11.903 27.1234 -0.2 + vertex 11.8169 27.5343 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.0734 27.5937 -0.1 - vertex 11.8169 27.5343 -0.1 - vertex 11.7656 27.9858 -0.1 + vertex 11.0734 27.5937 -0.2 + vertex 11.8169 27.5343 -0.2 + vertex 11.7656 27.9858 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.0419 28.1143 -0.1 - vertex 11.7656 27.9858 -0.1 - vertex 11.7492 28.4518 -0.1 + vertex 11.0419 28.1143 -0.2 + vertex 11.7656 27.9858 -0.2 + vertex 11.7492 28.4518 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.2437 29.4873 -0.1 - vertex 11.9082 29.6745 -0.1 - vertex 11.4096 29.9696 -0.1 + vertex 11.2437 29.4873 -0.2 + vertex 11.9082 29.6745 -0.2 + vertex 11.4096 29.9696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.9082 29.6745 -0.1 - vertex 11.2437 29.4873 -0.1 - vertex 11.8205 29.3224 -0.1 + vertex 11.9082 29.6745 -0.2 + vertex 11.2437 29.4873 -0.2 + vertex 11.8205 29.3224 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.7675 28.9061 -0.1 - vertex 11.1213 28.9486 -0.1 - vertex 11.7492 28.4518 -0.1 + vertex 11.7675 28.9061 -0.2 + vertex 11.1213 28.9486 -0.2 + vertex 11.7492 28.4518 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8205 29.3224 -0.1 - vertex 11.2437 29.4873 -0.1 - vertex 11.7675 28.9061 -0.1 + vertex 11.8205 29.3224 -0.2 + vertex 11.2437 29.4873 -0.2 + vertex 11.7675 28.9061 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.1213 28.9486 -0.1 - vertex 11.7675 28.9061 -0.1 - vertex 11.2437 29.4873 -0.1 + vertex 11.1213 28.9486 -0.2 + vertex 11.7675 28.9061 -0.2 + vertex 11.2437 29.4873 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.0528 28.3898 -0.1 - vertex 11.7492 28.4518 -0.1 - vertex 11.1213 28.9486 -0.1 + vertex 11.0528 28.3898 -0.2 + vertex 11.7492 28.4518 -0.2 + vertex 11.1213 28.9486 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1339 26.5589 -0.1 - vertex 11.5154 26.4501 -0.1 - vertex 11.8324 25.9834 -0.1 + vertex 12.1339 26.5589 -0.2 + vertex 11.5154 26.4501 -0.2 + vertex 11.8324 25.9834 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.0419 28.1143 -0.1 - vertex 11.7492 28.4518 -0.1 - vertex 11.0528 28.3898 -0.1 + vertex 11.0419 28.1143 -0.2 + vertex 11.7492 28.4518 -0.2 + vertex 11.0528 28.3898 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.0241 26.7794 -0.1 - vertex 11.3839 26.6832 -0.1 - vertex 11.5154 26.4501 -0.1 + vertex 12.0241 26.7794 -0.2 + vertex 11.3839 26.6832 -0.2 + vertex 11.5154 26.4501 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.7656 27.9858 -0.1 - vertex 11.0419 28.1143 -0.1 - vertex 11.0484 27.8474 -0.1 + vertex 11.7656 27.9858 -0.2 + vertex 11.0419 28.1143 -0.2 + vertex 11.0484 27.8474 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.903 27.1234 -0.1 - vertex 11.2726 26.9135 -0.1 - vertex 11.3839 26.6832 -0.1 + vertex 11.903 27.1234 -0.2 + vertex 11.2726 26.9135 -0.2 + vertex 11.3839 26.6832 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.7656 27.9858 -0.1 - vertex 11.0484 27.8474 -0.1 - vertex 11.0734 27.5937 -0.1 + vertex 11.7656 27.9858 -0.2 + vertex 11.0484 27.8474 -0.2 + vertex 11.0734 27.5937 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.903 27.1234 -0.1 - vertex 11.1835 27.139 -0.1 - vertex 11.2726 26.9135 -0.1 + vertex 11.903 27.1234 -0.2 + vertex 11.1835 27.139 -0.2 + vertex 11.2726 26.9135 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8169 27.5343 -0.1 - vertex 11.1184 27.3577 -0.1 - vertex 11.1835 27.139 -0.1 + vertex 11.8169 27.5343 -0.2 + vertex 11.1184 27.3577 -0.2 + vertex 11.1835 27.139 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.8169 27.5343 -0.1 - vertex 11.0734 27.5937 -0.1 - vertex 11.1184 27.3577 -0.1 + vertex 11.8169 27.5343 -0.2 + vertex 11.0734 27.5937 -0.2 + vertex 11.1184 27.3577 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.5155 0.168137 -0.1 - vertex 21.1355 -0.658014 -0.1 - vertex 21.1316 -0.233279 -0.1 + vertex 20.5155 0.168137 -0.2 + vertex 21.1355 -0.658014 -0.2 + vertex 21.1316 -0.233279 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.8646 0.230347 -0.1 - vertex 21.1316 -0.233279 -0.1 - vertex 21.099 0.0745682 -0.1 + vertex 20.8646 0.230347 -0.2 + vertex 21.1316 -0.233279 -0.2 + vertex 21.099 0.0745682 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9772 0.235111 -0.1 - vertex 21.099 0.0745682 -0.1 - vertex 21.0726 0.170561 -0.1 + vertex 20.9772 0.235111 -0.2 + vertex 21.099 0.0745682 -0.2 + vertex 21.0726 0.170561 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9772 0.235111 -0.1 - vertex 21.0726 0.170561 -0.1 - vertex 21.0399 0.220413 -0.1 + vertex 20.9772 0.235111 -0.2 + vertex 21.0726 0.170561 -0.2 + vertex 21.0399 0.220413 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1316 -0.233279 -0.1 - vertex 20.8646 0.230347 -0.1 - vertex 20.5155 0.168137 -0.1 + vertex 21.1316 -0.233279 -0.2 + vertex 20.8646 0.230347 -0.2 + vertex 20.5155 0.168137 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1355 -0.658014 -0.1 - vertex 20.5155 0.168137 -0.1 - vertex 20.0432 0.0451876 -0.1 + vertex 21.1355 -0.658014 -0.2 + vertex 20.5155 0.168137 -0.2 + vertex 20.0432 0.0451876 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.099 0.0745682 -0.1 - vertex 20.9772 0.235111 -0.1 - vertex 20.8646 0.230347 -0.1 + vertex 21.099 0.0745682 -0.2 + vertex 20.9772 0.235111 -0.2 + vertex 20.8646 0.230347 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1355 -0.658014 -0.1 - vertex 20.0432 0.0451876 -0.1 - vertex 21.1085 -1.15452 -0.1 + vertex 21.1355 -0.658014 -0.2 + vertex 20.0432 0.0451876 -0.2 + vertex 21.1085 -1.15452 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 19.4982 -0.127099 -0.1 - vertex 21.1085 -1.15452 -0.1 - vertex 20.0432 0.0451876 -0.1 + vertex 19.4982 -0.127099 -0.2 + vertex 21.1085 -1.15452 -0.2 + vertex 20.0432 0.0451876 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.1085 -1.15452 -0.1 - vertex 19.4982 -0.127099 -0.1 - vertex 21.0399 -1.71534 -0.1 + vertex 21.1085 -1.15452 -0.2 + vertex 19.4982 -0.127099 -0.2 + vertex 21.0399 -1.71534 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 21.0399 -1.71534 -0.1 - vertex 19.4982 -0.127099 -0.1 - vertex 20.9878 -1.96317 -0.1 + vertex 21.0399 -1.71534 -0.2 + vertex 19.4982 -0.127099 -0.2 + vertex 20.9878 -1.96317 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.7502 -0.369046 -0.1 - vertex 20.9878 -1.96317 -0.1 - vertex 19.4982 -0.127099 -0.1 + vertex 18.7502 -0.369046 -0.2 + vertex 20.9878 -1.96317 -0.2 + vertex 19.4982 -0.127099 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9878 -1.96317 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.9199 -2.19366 -0.1 + vertex 20.9878 -1.96317 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.9199 -2.19366 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.9199 -2.19366 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.8331 -2.41014 -0.1 + vertex 20.9199 -2.19366 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.8331 -2.41014 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.8331 -2.41014 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.7245 -2.61588 -0.1 + vertex 20.8331 -2.41014 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.7245 -2.61588 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.7245 -2.61588 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.591 -2.8142 -0.1 + vertex 20.7245 -2.61588 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.591 -2.8142 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.591 -2.8142 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.4297 -3.0084 -0.1 + vertex 20.591 -2.8142 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.4297 -3.0084 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.4297 -3.0084 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.2374 -3.20177 -0.1 + vertex 20.4297 -3.0084 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.2374 -3.20177 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.2374 -3.20177 -0.1 - vertex 18.7502 -0.369046 -0.1 - vertex 20.0112 -3.39762 -0.1 + vertex 20.2374 -3.20177 -0.2 + vertex 18.7502 -0.369046 -0.2 + vertex 20.0112 -3.39762 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.4876 -0.435405 -0.1 - vertex 20.0112 -3.39762 -0.1 - vertex 18.7502 -0.369046 -0.1 + vertex 18.4876 -0.435405 -0.2 + vertex 20.0112 -3.39762 -0.2 + vertex 18.7502 -0.369046 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 20.0112 -3.39762 -0.1 - vertex 18.4876 -0.435405 -0.1 - vertex 19.4451 -3.80993 -0.1 + vertex 20.0112 -3.39762 -0.2 + vertex 18.4876 -0.435405 -0.2 + vertex 19.4451 -3.80993 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 18.2791 -0.466914 -0.1 - vertex 19.4451 -3.80993 -0.1 - vertex 18.4876 -0.435405 -0.1 + vertex 18.2791 -0.466914 -0.2 + vertex 19.4451 -3.80993 -0.2 + vertex 18.4876 -0.435405 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 18.1098 -0.464739 -0.1 - vertex 19.4451 -3.80993 -0.1 - vertex 18.2791 -0.466914 -0.1 + vertex 18.1098 -0.464739 -0.2 + vertex 19.4451 -3.80993 -0.2 + vertex 18.2791 -0.466914 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 19.4451 -3.80993 -0.1 - vertex 18.1098 -0.464739 -0.1 - vertex 18.7073 -4.27174 -0.1 + vertex 19.4451 -3.80993 -0.2 + vertex 18.1098 -0.464739 -0.2 + vertex 18.7073 -4.27174 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.9646 -0.430052 -0.1 - vertex 18.7073 -4.27174 -0.1 - vertex 18.1098 -0.464739 -0.1 + vertex 17.9646 -0.430052 -0.2 + vertex 18.7073 -4.27174 -0.2 + vertex 18.1098 -0.464739 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.7736 -4.80944 -0.1 - vertex 17.9646 -0.430052 -0.1 - vertex 17.8284 -0.36402 -0.1 + vertex 17.7736 -4.80944 -0.2 + vertex 17.9646 -0.430052 -0.2 + vertex 17.8284 -0.36402 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.9646 -0.430052 -0.1 - vertex 17.7736 -4.80944 -0.1 - vertex 18.7073 -4.27174 -0.1 + vertex 17.9646 -0.430052 -0.2 + vertex 17.7736 -4.80944 -0.2 + vertex 18.7073 -4.27174 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.3217 -2.5049 -0.1 - vertex 17.8284 -0.36402 -0.1 - vertex 17.6862 -0.267812 -0.1 + vertex 14.3217 -2.5049 -0.2 + vertex 17.8284 -0.36402 -0.2 + vertex 17.6862 -0.267812 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.2572 -2.23644 -0.1 - vertex 17.6862 -0.267812 -0.1 - vertex 17.4918 -0.0873203 -0.1 + vertex 14.2572 -2.23644 -0.2 + vertex 17.6862 -0.267812 -0.2 + vertex 17.4918 -0.0873203 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.1524 -1.94488 -0.1 - vertex 17.4918 -0.0873203 -0.1 - vertex 17.2889 0.169637 -0.1 + vertex 14.1524 -1.94488 -0.2 + vertex 17.4918 -0.0873203 -0.2 + vertex 17.2889 0.169637 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.008 -1.63155 -0.1 - vertex 17.2889 0.169637 -0.1 - vertex 17.0802 0.495742 -0.1 + vertex 14.008 -1.63155 -0.2 + vertex 17.2889 0.169637 -0.2 + vertex 17.0802 0.495742 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.8249 -1.29782 -0.1 - vertex 17.0802 0.495742 -0.1 - vertex 16.8681 0.883681 -0.1 + vertex 13.8249 -1.29782 -0.2 + vertex 17.0802 0.495742 -0.2 + vertex 16.8681 0.883681 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.604 -0.945011 -0.1 - vertex 16.8681 0.883681 -0.1 - vertex 16.6551 1.32614 -0.1 + vertex 13.604 -0.945011 -0.2 + vertex 16.8681 0.883681 -0.2 + vertex 16.6551 1.32614 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.3463 -0.574481 -0.1 - vertex 16.6551 1.32614 -0.1 - vertex 16.4437 1.81579 -0.1 + vertex 13.3463 -0.574481 -0.2 + vertex 16.6551 1.32614 -0.2 + vertex 16.4437 1.81579 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.6862 -0.267812 -0.1 - vertex 14.2572 -2.23644 -0.1 - vertex 14.3217 -2.5049 -0.1 + vertex 17.6862 -0.267812 -0.2 + vertex 14.2572 -2.23644 -0.2 + vertex 14.3217 -2.5049 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.7237 0.214368 -0.1 - vertex 16.4437 1.81579 -0.1 - vertex 16.2363 2.34533 -0.1 + vertex 12.7237 0.214368 -0.2 + vertex 16.4437 1.81579 -0.2 + vertex 16.2363 2.34533 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.3607 0.629996 -0.1 - vertex 16.2363 2.34533 -0.1 - vertex 16.0356 2.90743 -0.1 + vertex 12.3607 0.629996 -0.2 + vertex 16.2363 2.34533 -0.2 + vertex 16.0356 2.90743 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5355 1.49693 -0.1 - vertex 16.0356 2.90743 -0.1 - vertex 15.6639 4.10009 -0.1 + vertex 11.5355 1.49693 -0.2 + vertex 16.0356 2.90743 -0.2 + vertex 15.6639 4.10009 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.8284 -0.36402 -0.1 - vertex 14.3217 -2.5049 -0.1 - vertex 14.3448 -2.7489 -0.1 + vertex 17.8284 -0.36402 -0.2 + vertex 14.3217 -2.5049 -0.2 + vertex 14.3448 -2.7489 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5355 1.49693 -0.1 - vertex 15.6639 4.10009 -0.1 - vertex 15.498 4.716 -0.1 + vertex 11.5355 1.49693 -0.2 + vertex 15.6639 4.10009 -0.2 + vertex 15.498 4.716 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.5842 2.40247 -0.1 - vertex 15.498 4.716 -0.1 - vertex 15.3486 5.33522 -0.1 + vertex 10.5842 2.40247 -0.2 + vertex 15.498 4.716 -0.2 + vertex 15.3486 5.33522 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.5842 2.40247 -0.1 - vertex 15.3486 5.33522 -0.1 - vertex 15.2183 5.95043 -0.1 + vertex 10.5842 2.40247 -0.2 + vertex 15.3486 5.33522 -0.2 + vertex 15.2183 5.95043 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.61741 3.25086 -0.1 - vertex 15.2183 5.95043 -0.1 - vertex 15.1095 6.5543 -0.1 + vertex 9.61741 3.25086 -0.2 + vertex 15.2183 5.95043 -0.2 + vertex 15.1095 6.5543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.29624 3.50894 -0.1 - vertex 15.1095 6.5543 -0.1 - vertex 15.0249 7.13954 -0.1 + vertex 9.29624 3.50894 -0.2 + vertex 15.1095 6.5543 -0.2 + vertex 15.0249 7.13954 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.3256 -2.96711 -0.1 - vertex 17.7736 -4.80944 -0.1 - vertex 14.3448 -2.7489 -0.1 + vertex 14.3256 -2.96711 -0.2 + vertex 17.7736 -4.80944 -0.2 + vertex 14.3448 -2.7489 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.14614 3.60373 -0.1 - vertex 15.0249 7.13954 -0.1 - vertex 14.9668 7.69881 -0.1 + vertex 9.14614 3.60373 -0.2 + vertex 15.0249 7.13954 -0.2 + vertex 14.9668 7.69881 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.19732 4.25764 -0.1 - vertex 14.9668 7.69881 -0.1 - vertex 14.9212 8.45633 -0.1 + vertex 8.19732 4.25764 -0.2 + vertex 14.9668 7.69881 -0.2 + vertex 14.9212 8.45633 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.0942 9.33737 -0.1 - vertex 8.99158 15.8746 -0.1 - vertex 15.0092 9.15168 -0.1 + vertex 15.0942 9.33737 -0.2 + vertex 8.99158 15.8746 -0.2 + vertex 15.0092 9.15168 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.7736 -4.80944 -0.1 - vertex 14.3256 -2.96711 -0.1 - vertex 16.3254 -5.59514 -0.1 + vertex 17.7736 -4.80944 -0.2 + vertex 14.3256 -2.96711 -0.2 + vertex 16.3254 -5.59514 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.1768 -3.32005 -0.1 - vertex 16.3254 -5.59514 -0.1 - vertex 14.2634 -3.15818 -0.1 + vertex 14.1768 -3.32005 -0.2 + vertex 16.3254 -5.59514 -0.2 + vertex 14.2634 -3.15818 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.2634 -3.15818 -0.1 - vertex 16.3254 -5.59514 -0.1 - vertex 14.3256 -2.96711 -0.1 + vertex 14.2634 -3.15818 -0.2 + vertex 16.3254 -5.59514 -0.2 + vertex 14.3256 -2.96711 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.8284 -0.36402 -0.1 - vertex 14.3448 -2.7489 -0.1 - vertex 17.7736 -4.80944 -0.1 + vertex 17.8284 -0.36402 -0.2 + vertex 14.3448 -2.7489 -0.2 + vertex 17.7736 -4.80944 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.4918 -0.0873203 -0.1 - vertex 14.1524 -1.94488 -0.1 - vertex 14.2572 -2.23644 -0.1 + vertex 17.4918 -0.0873203 -0.2 + vertex 14.1524 -1.94488 -0.2 + vertex 14.2572 -2.23644 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.2889 0.169637 -0.1 - vertex 14.008 -1.63155 -0.1 - vertex 14.1524 -1.94488 -0.1 + vertex 17.2889 0.169637 -0.2 + vertex 14.008 -1.63155 -0.2 + vertex 14.1524 -1.94488 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 14.6028 17.0277 -0.1 - vertex 14.0017 17.4864 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 14.6028 17.0277 -0.2 + vertex 14.0017 17.4864 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 17.0802 0.495742 -0.1 - vertex 13.8249 -1.29782 -0.1 - vertex 14.008 -1.63155 -0.1 + vertex 17.0802 0.495742 -0.2 + vertex 13.8249 -1.29782 -0.2 + vertex 14.008 -1.63155 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.8681 0.883681 -0.1 - vertex 13.604 -0.945011 -0.1 - vertex 13.8249 -1.29782 -0.1 + vertex 16.8681 0.883681 -0.2 + vertex 13.604 -0.945011 -0.2 + vertex 13.8249 -1.29782 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 14.0017 17.4864 -0.1 - vertex 13.3813 18.0182 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 14.0017 17.4864 -0.2 + vertex 13.3813 18.0182 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.6551 1.32614 -0.1 - vertex 13.3463 -0.574481 -0.1 - vertex 13.604 -0.945011 -0.1 + vertex 16.6551 1.32614 -0.2 + vertex 13.3463 -0.574481 -0.2 + vertex 13.604 -0.945011 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.4437 1.81579 -0.1 - vertex 13.0525 -0.187573 -0.1 - vertex 13.3463 -0.574481 -0.1 + vertex 16.4437 1.81579 -0.2 + vertex 13.0525 -0.187573 -0.2 + vertex 13.3463 -0.574481 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.4437 1.81579 -0.1 - vertex 12.7237 0.214368 -0.1 - vertex 13.0525 -0.187573 -0.1 + vertex 16.4437 1.81579 -0.2 + vertex 12.7237 0.214368 -0.2 + vertex 13.0525 -0.187573 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 13.3813 18.0182 -0.1 - vertex 12.71 18.6425 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 13.3813 18.0182 -0.2 + vertex 12.71 18.6425 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.2363 2.34533 -0.1 - vertex 12.3607 0.629996 -0.1 - vertex 12.7237 0.214368 -0.1 + vertex 16.2363 2.34533 -0.2 + vertex 12.3607 0.629996 -0.2 + vertex 12.7237 0.214368 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.4375 16.5104 -0.1 - vertex 12.71 18.6425 -0.1 - vertex 12.1494 19.1886 -0.1 + vertex 10.4375 16.5104 -0.2 + vertex 12.71 18.6425 -0.2 + vertex 12.1494 19.1886 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.77546 17.1908 -0.1 - vertex 12.1494 19.1886 -0.1 - vertex 11.6914 19.6646 -0.1 + vertex 9.77546 17.1908 -0.2 + vertex 12.1494 19.1886 -0.2 + vertex 11.6914 19.6646 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 8.87708 15.8492 -0.1 - vertex 15.0092 9.15168 -0.1 - vertex 8.99158 15.8746 -0.1 + vertex 8.87708 15.8492 -0.2 + vertex 15.0092 9.15168 -0.2 + vertex 8.99158 15.8746 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.09841 17.8163 -0.1 - vertex 11.6914 19.6646 -0.1 - vertex 11.3113 20.1069 -0.1 + vertex 9.09841 17.8163 -0.2 + vertex 11.6914 19.6646 -0.2 + vertex 11.3113 20.1069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.09841 17.8163 -0.1 - vertex 11.3113 20.1069 -0.1 - vertex 10.9846 20.5521 -0.1 + vertex 9.09841 17.8163 -0.2 + vertex 11.3113 20.1069 -0.2 + vertex 10.9846 20.5521 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.31493 18.4459 -0.1 - vertex 10.9846 20.5521 -0.1 - vertex 10.6869 21.0368 -0.1 + vertex 8.31493 18.4459 -0.2 + vertex 10.9846 20.5521 -0.2 + vertex 10.6869 21.0368 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.0356 2.90743 -0.1 - vertex 11.5355 1.49693 -0.1 - vertex 12.3607 0.629996 -0.1 + vertex 16.0356 2.90743 -0.2 + vertex 11.5355 1.49693 -0.2 + vertex 12.3607 0.629996 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.498 4.716 -0.1 - vertex 10.5842 2.40247 -0.1 - vertex 11.5355 1.49693 -0.1 + vertex 15.498 4.716 -0.2 + vertex 10.5842 2.40247 -0.2 + vertex 11.5355 1.49693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.9444 18.7161 -0.1 - vertex 10.6869 21.0368 -0.1 - vertex 10.3935 21.5973 -0.1 + vertex 7.9444 18.7161 -0.2 + vertex 10.6869 21.0368 -0.2 + vertex 10.3935 21.5973 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.36805 19.075 -0.1 - vertex 10.3935 21.5973 -0.1 - vertex 10.0801 22.2703 -0.1 + vertex 7.36805 19.075 -0.2 + vertex 10.3935 21.5973 -0.2 + vertex 10.0801 22.2703 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.1494 19.1886 -0.1 - vertex 9.77546 17.1908 -0.1 - vertex 10.4375 16.5104 -0.1 + vertex 12.1494 19.1886 -0.2 + vertex 9.77546 17.1908 -0.2 + vertex 10.4375 16.5104 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.21113 19.1268 -0.1 - vertex 10.0801 22.2703 -0.1 - vertex 9.72206 23.0922 -0.1 + vertex 7.21113 19.1268 -0.2 + vertex 10.0801 22.2703 -0.2 + vertex 9.72206 23.0922 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.6914 19.6646 -0.1 - vertex 9.46246 17.4938 -0.1 - vertex 9.77546 17.1908 -0.1 + vertex 11.6914 19.6646 -0.2 + vertex 9.46246 17.4938 -0.2 + vertex 9.77546 17.1908 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.21113 19.1268 -0.1 - vertex 9.72206 23.0922 -0.1 - vertex 9.38213 23.8626 -0.1 + vertex 7.21113 19.1268 -0.2 + vertex 9.72206 23.0922 -0.2 + vertex 9.38213 23.8626 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.6914 19.6646 -0.1 - vertex 9.09841 17.8163 -0.1 - vertex 9.46246 17.4938 -0.1 + vertex 11.6914 19.6646 -0.2 + vertex 9.09841 17.8163 -0.2 + vertex 9.46246 17.4938 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.76329 26.0408 -0.1 - vertex 9.38213 23.8626 -0.1 - vertex 9.08206 24.476 -0.1 + vertex 6.76329 26.0408 -0.2 + vertex 9.38213 23.8626 -0.2 + vertex 9.08206 24.476 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.12606 25.9588 -0.1 - vertex 9.08206 24.476 -0.1 - vertex 8.80411 24.9522 -0.1 + vertex 7.12606 25.9588 -0.2 + vertex 9.08206 24.476 -0.2 + vertex 8.80411 24.9522 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.55919 25.8755 -0.1 - vertex 8.80411 24.9522 -0.1 - vertex 8.6679 25.145 -0.1 + vertex 7.55919 25.8755 -0.2 + vertex 8.80411 24.9522 -0.2 + vertex 8.6679 25.145 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.55919 25.8755 -0.1 - vertex 8.6679 25.145 -0.1 - vertex 8.53058 25.3107 -0.1 + vertex 7.55919 25.8755 -0.2 + vertex 8.6679 25.145 -0.2 + vertex 8.53058 25.3107 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.55919 25.8755 -0.1 - vertex 8.53058 25.3107 -0.1 - vertex 8.38993 25.4519 -0.1 + vertex 7.55919 25.8755 -0.2 + vertex 8.53058 25.3107 -0.2 + vertex 8.38993 25.4519 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9846 20.5521 -0.1 - vertex 8.31493 18.4459 -0.1 - vertex 9.09841 17.8163 -0.1 + vertex 10.9846 20.5521 -0.2 + vertex 8.31493 18.4459 -0.2 + vertex 9.09841 17.8163 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.92584 25.7528 -0.1 - vertex 8.38993 25.4519 -0.1 - vertex 8.24373 25.571 -0.1 + vertex 7.92584 25.7528 -0.2 + vertex 8.38993 25.4519 -0.2 + vertex 8.24373 25.571 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.92584 25.7528 -0.1 - vertex 8.24373 25.571 -0.1 - vertex 8.08977 25.6705 -0.1 + vertex 7.92584 25.7528 -0.2 + vertex 8.24373 25.571 -0.2 + vertex 8.08977 25.6705 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.6869 21.0368 -0.1 - vertex 7.9444 18.7161 -0.1 - vertex 8.31493 18.4459 -0.1 + vertex 10.6869 21.0368 -0.2 + vertex 7.9444 18.7161 -0.2 + vertex 8.31493 18.4459 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.38993 25.4519 -0.1 - vertex 7.92584 25.7528 -0.1 - vertex 7.55919 25.8755 -0.1 + vertex 8.38993 25.4519 -0.2 + vertex 7.92584 25.7528 -0.2 + vertex 7.55919 25.8755 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.3935 21.5973 -0.1 - vertex 7.62063 18.9319 -0.1 - vertex 7.9444 18.7161 -0.1 + vertex 10.3935 21.5973 -0.2 + vertex 7.62063 18.9319 -0.2 + vertex 7.9444 18.7161 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.80411 24.9522 -0.1 - vertex 7.55919 25.8755 -0.1 - vertex 7.12606 25.9588 -0.1 + vertex 8.80411 24.9522 -0.2 + vertex 7.55919 25.8755 -0.2 + vertex 7.12606 25.9588 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.3935 21.5973 -0.1 - vertex 7.36805 19.075 -0.1 - vertex 7.62063 18.9319 -0.1 + vertex 10.3935 21.5973 -0.2 + vertex 7.36805 19.075 -0.2 + vertex 7.62063 18.9319 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.0801 22.2703 -0.1 - vertex 7.21113 19.1268 -0.1 - vertex 7.36805 19.075 -0.1 + vertex 10.0801 22.2703 -0.2 + vertex 7.21113 19.1268 -0.2 + vertex 7.36805 19.075 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.76329 26.0408 -0.1 - vertex 9.08206 24.476 -0.1 - vertex 7.12606 25.9588 -0.1 + vertex 6.76329 26.0408 -0.2 + vertex 9.08206 24.476 -0.2 + vertex 7.12606 25.9588 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.38213 23.8626 -0.1 - vertex 6.76329 26.0408 -0.1 - vertex 7.21113 19.1268 -0.1 + vertex 9.38213 23.8626 -0.2 + vertex 6.76329 26.0408 -0.2 + vertex 7.21113 19.1268 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.21113 19.1268 -0.1 - vertex 6.76329 26.0408 -0.1 - vertex 7.15267 19.0966 -0.1 + vertex 7.21113 19.1268 -0.2 + vertex 6.76329 26.0408 -0.2 + vertex 7.15267 19.0966 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.41393 26.1795 -0.1 - vertex 7.15267 19.0966 -0.1 - vertex 6.76329 26.0408 -0.1 + vertex 6.41393 26.1795 -0.2 + vertex 7.15267 19.0966 -0.2 + vertex 6.76329 26.0408 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.07308 26.3793 -0.1 - vertex 7.15267 19.0966 -0.1 - vertex 6.41393 26.1795 -0.1 + vertex 6.07308 26.3793 -0.2 + vertex 7.15267 19.0966 -0.2 + vertex 6.41393 26.1795 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.816408 27.0884 -0.1 - vertex 7.15267 19.0966 -0.1 - vertex 6.07308 26.3793 -0.1 + vertex 0.816408 27.0884 -0.2 + vertex 7.15267 19.0966 -0.2 + vertex 6.07308 26.3793 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 1.92323 12.5289 -0.1 - vertex 7.1242 19.0144 -0.1 - vertex 1.90284 12.6291 -0.1 + vertex 1.92323 12.5289 -0.2 + vertex 7.1242 19.0144 -0.2 + vertex 1.90284 12.6291 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.734953 27.0776 -0.1 - vertex 7.15267 19.0966 -0.1 - vertex 0.816408 27.0884 -0.1 + vertex 0.734953 27.0776 -0.2 + vertex 7.15267 19.0966 -0.2 + vertex 0.816408 27.0884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.870515 27.1101 -0.1 - vertex 6.07308 26.3793 -0.1 - vertex 5.73586 26.6445 -0.1 + vertex 0.870515 27.1101 -0.2 + vertex 6.07308 26.3793 -0.2 + vertex 5.73586 26.6445 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.870515 27.1101 -0.1 - vertex 5.73586 26.6445 -0.1 - vertex 5.39739 26.9794 -0.1 + vertex 0.870515 27.1101 -0.2 + vertex 5.73586 26.6445 -0.2 + vertex 5.39739 26.9794 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 6.22936 5.32709 -0.1 - vertex 7.1242 19.0144 -0.1 - vertex 1.92323 12.5289 -0.1 + vertex 6.22936 5.32709 -0.2 + vertex 7.1242 19.0144 -0.2 + vertex 1.92323 12.5289 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.870515 27.1101 -0.1 - vertex 5.39739 26.9794 -0.1 - vertex 5.05276 27.3884 -0.1 + vertex 0.870515 27.1101 -0.2 + vertex 5.39739 26.9794 -0.2 + vertex 5.05276 27.3884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.908598 27.1645 -0.1 - vertex 5.05276 27.3884 -0.1 - vertex 4.69711 27.8759 -0.1 + vertex 0.908598 27.1645 -0.2 + vertex 5.05276 27.3884 -0.2 + vertex 4.69711 27.8759 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.944126 27.2693 -0.1 - vertex 4.69711 27.8759 -0.1 - vertex 4.32553 28.4461 -0.1 + vertex 0.944126 27.2693 -0.2 + vertex 4.69711 27.8759 -0.2 + vertex 4.32553 28.4461 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 6.22936 5.32709 -0.1 - vertex 7.07462 4.9138 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 6.22936 5.32709 -0.2 + vertex 7.07462 4.9138 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.04514 28.0688 -0.1 - vertex 4.32553 28.4461 -0.1 - vertex 4.09087 28.8303 -0.1 + vertex 1.04514 28.0688 -0.2 + vertex 4.32553 28.4461 -0.2 + vertex 4.09087 28.8303 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.04514 28.0688 -0.1 - vertex 4.09087 28.8303 -0.1 - vertex 3.91157 29.1502 -0.1 + vertex 1.04514 28.0688 -0.2 + vertex 4.09087 28.8303 -0.2 + vertex 3.91157 29.1502 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.0601 28.6106 -0.1 - vertex 3.91157 29.1502 -0.1 - vertex 3.78021 29.4348 -0.1 + vertex 1.0601 28.6106 -0.2 + vertex 3.91157 29.1502 -0.2 + vertex 3.78021 29.4348 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.07949 29.2543 -0.1 - vertex 3.78021 29.4348 -0.1 - vertex 3.68937 29.7129 -0.1 + vertex 1.07949 29.2543 -0.2 + vertex 3.78021 29.4348 -0.2 + vertex 3.68937 29.7129 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.13903 29.8907 -0.1 - vertex 3.68937 29.7129 -0.1 - vertex 3.63162 30.0135 -0.1 + vertex 1.13903 29.8907 -0.2 + vertex 3.68937 29.7129 -0.2 + vertex 3.63162 30.0135 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.24074 30.5277 -0.1 - vertex 3.63162 30.0135 -0.1 - vertex 3.59957 30.3654 -0.1 + vertex 1.24074 30.5277 -0.2 + vertex 3.63162 30.0135 -0.2 + vertex 3.59957 30.3654 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.91748 12.4352 -0.1 - vertex 6.22936 5.32709 -0.1 - vertex 1.92323 12.5289 -0.1 + vertex 1.91748 12.4352 -0.2 + vertex 6.22936 5.32709 -0.2 + vertex 1.92323 12.5289 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.38662 31.173 -0.1 - vertex 3.59957 30.3654 -0.1 - vertex 3.58282 31.3388 -0.1 + vertex 1.38662 31.173 -0.2 + vertex 3.59957 30.3654 -0.2 + vertex 3.58282 31.3388 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 14.0741 -3.47638 -0.1 - vertex 16.3254 -5.59514 -0.1 - vertex 14.1768 -3.32005 -0.1 + vertex 14.0741 -3.47638 -0.2 + vertex 16.3254 -5.59514 -0.2 + vertex 14.1768 -3.32005 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 16.3254 -5.59514 -0.1 - vertex 14.0741 -3.47638 -0.1 - vertex 15.6549 -5.93433 -0.1 + vertex 16.3254 -5.59514 -0.2 + vertex 14.0741 -3.47638 -0.2 + vertex 15.6549 -5.93433 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.8248 -3.7697 -0.1 - vertex 15.6549 -5.93433 -0.1 - vertex 14.0741 -3.47638 -0.1 + vertex 13.8248 -3.7697 -0.2 + vertex 15.6549 -5.93433 -0.2 + vertex 14.0741 -3.47638 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.6549 -5.93433 -0.1 - vertex 13.8248 -3.7697 -0.1 - vertex 15.0129 -6.23993 -0.1 + vertex 15.6549 -5.93433 -0.2 + vertex 13.8248 -3.7697 -0.2 + vertex 15.0129 -6.23993 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.5249 -4.03275 -0.1 - vertex 15.0129 -6.23993 -0.1 - vertex 13.8248 -3.7697 -0.1 + vertex 13.5249 -4.03275 -0.2 + vertex 15.0129 -6.23993 -0.2 + vertex 13.8248 -3.7697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.0129 -6.23993 -0.1 - vertex 13.5249 -4.03275 -0.1 - vertex 14.3941 -6.51356 -0.1 + vertex 15.0129 -6.23993 -0.2 + vertex 13.5249 -4.03275 -0.2 + vertex 14.3941 -6.51356 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 13.1837 -4.26011 -0.1 - vertex 14.3941 -6.51356 -0.1 - vertex 13.5249 -4.03275 -0.1 + vertex 13.1837 -4.26011 -0.2 + vertex 14.3941 -6.51356 -0.2 + vertex 13.5249 -4.03275 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.3941 -6.51356 -0.1 - vertex 13.1837 -4.26011 -0.1 - vertex 13.793 -6.75686 -0.1 + vertex 14.3941 -6.51356 -0.2 + vertex 13.1837 -4.26011 -0.2 + vertex 13.793 -6.75686 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.8106 -4.44636 -0.1 - vertex 13.793 -6.75686 -0.1 - vertex 13.1837 -4.26011 -0.1 + vertex 12.8106 -4.44636 -0.2 + vertex 13.793 -6.75686 -0.2 + vertex 13.1837 -4.26011 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.793 -6.75686 -0.1 - vertex 12.8106 -4.44636 -0.1 - vertex 13.2041 -6.97145 -0.1 + vertex 13.793 -6.75686 -0.2 + vertex 12.8106 -4.44636 -0.2 + vertex 13.2041 -6.97145 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.4149 -4.5861 -0.1 - vertex 13.2041 -6.97145 -0.1 - vertex 12.8106 -4.44636 -0.1 + vertex 12.4149 -4.5861 -0.2 + vertex 13.2041 -6.97145 -0.2 + vertex 12.8106 -4.44636 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 13.2041 -6.97145 -0.1 - vertex 12.4149 -4.5861 -0.1 - vertex 12.6221 -7.15898 -0.1 + vertex 13.2041 -6.97145 -0.2 + vertex 12.4149 -4.5861 -0.2 + vertex 12.6221 -7.15898 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 12.006 -4.67391 -0.1 - vertex 12.6221 -7.15898 -0.1 - vertex 12.4149 -4.5861 -0.1 + vertex 12.006 -4.67391 -0.2 + vertex 12.6221 -7.15898 -0.2 + vertex 12.4149 -4.5861 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 12.6221 -7.15898 -0.1 - vertex 12.006 -4.67391 -0.1 - vertex 12.0414 -7.32107 -0.1 + vertex 12.6221 -7.15898 -0.2 + vertex 12.006 -4.67391 -0.2 + vertex 12.0414 -7.32107 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 11.5931 -4.70438 -0.1 - vertex 12.0414 -7.32107 -0.1 - vertex 12.006 -4.67391 -0.1 + vertex 11.5931 -4.70438 -0.2 + vertex 12.0414 -7.32107 -0.2 + vertex 12.006 -4.67391 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.5931 -4.70438 -0.1 - vertex 11.4568 -7.45935 -0.1 - vertex 12.0414 -7.32107 -0.1 + vertex 11.5931 -4.70438 -0.2 + vertex 11.4568 -7.45935 -0.2 + vertex 12.0414 -7.32107 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 11.26 -4.69402 -0.1 - vertex 11.4568 -7.45935 -0.1 - vertex 11.5931 -4.70438 -0.1 + vertex 11.26 -4.69402 -0.2 + vertex 11.4568 -7.45935 -0.2 + vertex 11.5931 -4.70438 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9319 -4.66264 -0.1 - vertex 11.4568 -7.45935 -0.1 - vertex 11.26 -4.69402 -0.1 + vertex 10.9319 -4.66264 -0.2 + vertex 11.4568 -7.45935 -0.2 + vertex 11.26 -4.69402 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.9319 -4.66264 -0.1 - vertex 10.8627 -7.57545 -0.1 - vertex 11.4568 -7.45935 -0.1 + vertex 10.9319 -4.66264 -0.2 + vertex 10.8627 -7.57545 -0.2 + vertex 11.4568 -7.45935 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.608 -4.6098 -0.1 - vertex 10.8627 -7.57545 -0.1 - vertex 10.9319 -4.66264 -0.1 + vertex 10.608 -4.6098 -0.2 + vertex 10.8627 -7.57545 -0.2 + vertex 10.9319 -4.66264 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.2538 -7.67101 -0.1 - vertex 10.608 -4.6098 -0.1 - vertex 10.2875 -4.53506 -0.1 + vertex 10.2538 -7.67101 -0.2 + vertex 10.608 -4.6098 -0.2 + vertex 10.2875 -4.53506 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.608 -4.6098 -0.1 - vertex 10.2538 -7.67101 -0.1 - vertex 10.8627 -7.57545 -0.1 + vertex 10.608 -4.6098 -0.2 + vertex 10.2538 -7.67101 -0.2 + vertex 10.8627 -7.57545 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.62459 -7.74765 -0.1 - vertex 10.2875 -4.53506 -0.1 - vertex 9.96977 -4.43796 -0.1 + vertex 9.62459 -7.74765 -0.2 + vertex 10.2875 -4.53506 -0.2 + vertex 9.96977 -4.43796 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.809 -5.75259 -0.1 - vertex 9.96977 -4.43796 -0.1 - vertex 9.65389 -4.31807 -0.1 + vertex 7.809 -5.75259 -0.2 + vertex 9.96977 -4.43796 -0.2 + vertex 9.65389 -4.31807 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 10.2875 -4.53506 -0.1 - vertex 9.62459 -7.74765 -0.1 - vertex 10.2538 -7.67101 -0.1 + vertex 10.2875 -4.53506 -0.2 + vertex 9.62459 -7.74765 -0.2 + vertex 10.2538 -7.67101 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.809 -5.75259 -0.1 - vertex 9.65389 -4.31807 -0.1 - vertex 9.33912 -4.17495 -0.1 + vertex 7.809 -5.75259 -0.2 + vertex 9.65389 -4.31807 -0.2 + vertex 9.33912 -4.17495 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.809 -5.75259 -0.1 - vertex 9.33912 -4.17495 -0.1 - vertex 9.02468 -4.00814 -0.1 + vertex 7.809 -5.75259 -0.2 + vertex 9.33912 -4.17495 -0.2 + vertex 9.02468 -4.00814 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.96977 -4.43796 -0.1 - vertex 7.809 -5.75259 -0.1 - vertex 9.62459 -7.74765 -0.1 + vertex 9.96977 -4.43796 -0.2 + vertex 7.809 -5.75259 -0.2 + vertex 9.62459 -7.74765 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.809 -5.75259 -0.1 - vertex 9.02468 -4.00814 -0.1 - vertex 8.70978 -3.81721 -0.1 + vertex 7.809 -5.75259 -0.2 + vertex 9.02468 -4.00814 -0.2 + vertex 8.70978 -3.81721 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.04277 -4.97268 -0.1 - vertex 8.70978 -3.81721 -0.1 - vertex 8.39365 -3.60171 -0.1 + vertex 7.04277 -4.97268 -0.2 + vertex 8.70978 -3.81721 -0.2 + vertex 8.39365 -3.60171 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.04277 -4.97268 -0.1 - vertex 8.39365 -3.60171 -0.1 - vertex 8.0755 -3.36119 -0.1 + vertex 7.04277 -4.97268 -0.2 + vertex 8.39365 -3.60171 -0.2 + vertex 8.0755 -3.36119 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.62459 -7.74765 -0.1 - vertex 7.809 -5.75259 -0.1 - vertex 8.96966 -7.80701 -0.1 + vertex 9.62459 -7.74765 -0.2 + vertex 7.809 -5.75259 -0.2 + vertex 8.96966 -7.80701 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.809 -5.75259 -0.1 - vertex 7.56097 -7.88041 -0.1 - vertex 8.96966 -7.80701 -0.1 + vertex 7.809 -5.75259 -0.2 + vertex 7.56097 -7.88041 -0.2 + vertex 8.96966 -7.80701 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 7.2241 -5.88439 -0.1 - vertex 7.56097 -7.88041 -0.1 - vertex 7.809 -5.75259 -0.1 + vertex 7.2241 -5.88439 -0.2 + vertex 7.56097 -7.88041 -0.2 + vertex 7.809 -5.75259 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.87672 -5.95074 -0.1 - vertex 7.56097 -7.88041 -0.1 - vertex 7.2241 -5.88439 -0.1 + vertex 6.87672 -5.95074 -0.2 + vertex 7.56097 -7.88041 -0.2 + vertex 7.2241 -5.88439 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 6.53505 -5.98957 -0.1 - vertex 7.56097 -7.88041 -0.1 - vertex 6.87672 -5.95074 -0.1 + vertex 6.53505 -5.98957 -0.2 + vertex 7.56097 -7.88041 -0.2 + vertex 6.87672 -5.95074 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.04455 -7.91255 -0.1 - vertex 6.53505 -5.98957 -0.1 - vertex 6.18777 -5.99984 -0.1 + vertex 6.04455 -7.91255 -0.2 + vertex 6.53505 -5.98957 -0.2 + vertex 6.18777 -5.99984 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.53505 -5.98957 -0.1 - vertex 6.04455 -7.91255 -0.1 - vertex 7.56097 -7.88041 -0.1 + vertex 6.53505 -5.98957 -0.2 + vertex 6.04455 -7.91255 -0.2 + vertex 7.56097 -7.88041 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.82356 -5.98052 -0.1 - vertex 6.04455 -7.91255 -0.1 - vertex 6.18777 -5.99984 -0.1 + vertex 5.82356 -5.98052 -0.2 + vertex 6.04455 -7.91255 -0.2 + vertex 6.18777 -5.99984 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.82356 -5.98052 -0.1 - vertex 5.49083 -7.9071 -0.1 - vertex 6.04455 -7.91255 -0.1 + vertex 5.82356 -5.98052 -0.2 + vertex 5.49083 -7.9071 -0.2 + vertex 6.04455 -7.91255 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.4311 -5.93055 -0.1 - vertex 5.49083 -7.9071 -0.1 - vertex 5.82356 -5.98052 -0.1 + vertex 5.4311 -5.93055 -0.2 + vertex 5.49083 -7.9071 -0.2 + vertex 5.82356 -5.98052 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.4311 -5.93055 -0.1 - vertex 5.0434 -7.88498 -0.1 - vertex 5.49083 -7.9071 -0.1 + vertex 5.4311 -5.93055 -0.2 + vertex 5.0434 -7.88498 -0.2 + vertex 5.49083 -7.9071 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.99906 -5.84891 -0.1 - vertex 5.0434 -7.88498 -0.1 - vertex 5.4311 -5.93055 -0.1 + vertex 4.99906 -5.84891 -0.2 + vertex 5.0434 -7.88498 -0.2 + vertex 5.4311 -5.93055 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.99906 -5.84891 -0.1 - vertex 4.67971 -7.84446 -0.1 - vertex 5.0434 -7.88498 -0.1 + vertex 4.99906 -5.84891 -0.2 + vertex 4.67971 -7.84446 -0.2 + vertex 5.0434 -7.88498 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.11342 -7.70123 -0.1 - vertex 4.99906 -5.84891 -0.1 - vertex 4.51611 -5.73457 -0.1 + vertex 4.11342 -7.70123 -0.2 + vertex 4.99906 -5.84891 -0.2 + vertex 4.51611 -5.73457 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.99906 -5.84891 -0.1 - vertex 4.37723 -7.78379 -0.1 - vertex 4.67971 -7.84446 -0.1 + vertex 4.99906 -5.84891 -0.2 + vertex 4.37723 -7.78379 -0.2 + vertex 4.67971 -7.84446 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.99906 -5.84891 -0.1 - vertex 4.11342 -7.70123 -0.1 - vertex 4.37723 -7.78379 -0.1 + vertex 4.99906 -5.84891 -0.2 + vertex 4.11342 -7.70123 -0.2 + vertex 4.37723 -7.78379 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.40104 -7.34622 -0.1 - vertex 4.51611 -5.73457 -0.1 - vertex 3.97093 -5.58648 -0.1 + vertex 3.40104 -7.34622 -0.2 + vertex 4.51611 -5.73457 -0.2 + vertex 3.97093 -5.58648 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.51611 -5.73457 -0.1 - vertex 3.86574 -7.59505 -0.1 - vertex 4.11342 -7.70123 -0.1 + vertex 4.51611 -5.73457 -0.2 + vertex 3.86574 -7.59505 -0.2 + vertex 4.11342 -7.70123 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.51611 -5.73457 -0.1 - vertex 3.40104 -7.34622 -0.1 - vertex 3.86574 -7.59505 -0.1 + vertex 4.51611 -5.73457 -0.2 + vertex 3.40104 -7.34622 -0.2 + vertex 3.86574 -7.59505 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.71562 -6.94693 -0.1 - vertex 3.97093 -5.58648 -0.1 - vertex 3.25174 -5.37115 -0.1 + vertex 2.71562 -6.94693 -0.2 + vertex 3.97093 -5.58648 -0.2 + vertex 3.25174 -5.37115 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.97093 -5.58648 -0.1 - vertex 2.71562 -6.94693 -0.1 - vertex 3.40104 -7.34622 -0.1 + vertex 3.97093 -5.58648 -0.2 + vertex 2.71562 -6.94693 -0.2 + vertex 3.40104 -7.34622 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.534 -5.13555 -0.1 - vertex 2.71562 -6.94693 -0.1 - vertex 3.25174 -5.37115 -0.1 + vertex 2.534 -5.13555 -0.2 + vertex 2.71562 -6.94693 -0.2 + vertex 3.25174 -5.37115 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.05193 -5.91722 -0.1 - vertex 2.534 -5.13555 -0.1 - vertex 1.81816 -4.87986 -0.1 + vertex 1.05193 -5.91722 -0.2 + vertex 2.534 -5.13555 -0.2 + vertex 1.81816 -4.87986 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.05193 -5.91722 -0.1 - vertex 1.81816 -4.87986 -0.1 - vertex 1.10471 -4.60426 -0.1 + vertex 1.05193 -5.91722 -0.2 + vertex 1.81816 -4.87986 -0.2 + vertex 1.10471 -4.60426 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.534 -5.13555 -0.1 - vertex 1.05193 -5.91722 -0.1 - vertex 2.71562 -6.94693 -0.1 + vertex 2.534 -5.13555 -0.2 + vertex 1.05193 -5.91722 -0.2 + vertex 2.71562 -6.94693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.394112 -4.30895 -0.1 - vertex 1.05193 -5.91722 -0.1 - vertex 1.10471 -4.60426 -0.1 + vertex 0.394112 -4.30895 -0.2 + vertex 1.05193 -5.91722 -0.2 + vertex 1.10471 -4.60426 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.694871 -4.82613 -0.1 - vertex 0.394112 -4.30895 -0.1 - vertex -0.313177 -3.99411 -0.1 + vertex -0.694871 -4.82613 -0.2 + vertex 0.394112 -4.30895 -0.2 + vertex -0.313177 -3.99411 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.394112 -4.30895 -0.1 - vertex -0.694871 -4.82613 -0.1 - vertex 1.05193 -5.91722 -0.1 + vertex 0.394112 -4.30895 -0.2 + vertex -0.694871 -4.82613 -0.2 + vertex 1.05193 -5.91722 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.01669 -3.65993 -0.1 - vertex -0.694871 -4.82613 -0.1 - vertex -0.313177 -3.99411 -0.1 + vertex -1.01669 -3.65993 -0.2 + vertex -0.694871 -4.82613 -0.2 + vertex -0.313177 -3.99411 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.47177 -3.7788 -0.1 - vertex -1.01669 -3.65993 -0.1 - vertex -1.71595 -3.30659 -0.1 + vertex -2.47177 -3.7788 -0.2 + vertex -1.01669 -3.65993 -0.2 + vertex -1.71595 -3.30659 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.47177 -3.7788 -0.1 - vertex -1.71595 -3.30659 -0.1 - vertex -2.32857 -3.00041 -0.1 + vertex -2.47177 -3.7788 -0.2 + vertex -1.71595 -3.30659 -0.2 + vertex -2.32857 -3.00041 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.01669 -3.65993 -0.1 - vertex -2.47177 -3.7788 -0.1 - vertex -0.694871 -4.82613 -0.1 + vertex -1.01669 -3.65993 -0.2 + vertex -2.47177 -3.7788 -0.2 + vertex -0.694871 -4.82613 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.32857 -3.00041 -0.1 - vertex -2.8551 -3.51984 -0.1 - vertex -2.47177 -3.7788 -0.1 + vertex -2.32857 -3.00041 -0.2 + vertex -2.8551 -3.51984 -0.2 + vertex -2.47177 -3.7788 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.87688 -2.74967 -0.1 - vertex -2.8551 -3.51984 -0.1 - vertex -2.32857 -3.00041 -0.1 + vertex -2.87688 -2.74967 -0.2 + vertex -2.8551 -3.51984 -0.2 + vertex -2.32857 -3.00041 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.87688 -2.74967 -0.1 - vertex -3.18232 -3.26618 -0.1 - vertex -2.8551 -3.51984 -0.1 + vertex -2.87688 -2.74967 -0.2 + vertex -3.18232 -3.26618 -0.2 + vertex -2.8551 -3.51984 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.44099 -3.03042 -0.1 - vertex -2.87688 -2.74967 -0.1 - vertex -3.301 -2.58026 -0.1 + vertex -3.44099 -3.03042 -0.2 + vertex -2.87688 -2.74967 -0.2 + vertex -3.301 -2.58026 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.87688 -2.74967 -0.1 - vertex -3.44099 -3.03042 -0.1 - vertex -3.18232 -3.26618 -0.1 + vertex -2.87688 -2.74967 -0.2 + vertex -3.44099 -3.03042 -0.2 + vertex -3.18232 -3.26618 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.61865 -2.82513 -0.1 - vertex -3.301 -2.58026 -0.1 - vertex -3.54104 -2.51804 -0.1 + vertex -3.61865 -2.82513 -0.2 + vertex -3.301 -2.58026 -0.2 + vertex -3.54104 -2.51804 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.301 -2.58026 -0.1 - vertex -3.61865 -2.82513 -0.1 - vertex -3.44099 -3.03042 -0.1 + vertex -3.301 -2.58026 -0.2 + vertex -3.61865 -2.82513 -0.2 + vertex -3.44099 -3.03042 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.70285 -2.66292 -0.1 - vertex -3.54104 -2.51804 -0.1 - vertex -3.62666 -2.52788 -0.1 + vertex -3.70285 -2.66292 -0.2 + vertex -3.54104 -2.51804 -0.2 + vertex -3.62666 -2.52788 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.70601 -2.60189 -0.1 - vertex -3.62666 -2.52788 -0.1 - vertex -3.68113 -2.55635 -0.1 + vertex -3.70601 -2.60189 -0.2 + vertex -3.62666 -2.52788 -0.2 + vertex -3.68113 -2.55635 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.54104 -2.51804 -0.1 - vertex -3.70285 -2.66292 -0.1 - vertex -3.61865 -2.82513 -0.1 + vertex -3.54104 -2.51804 -0.2 + vertex -3.70285 -2.66292 -0.2 + vertex -3.61865 -2.82513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.62666 -2.52788 -0.1 - vertex -3.70601 -2.60189 -0.1 - vertex -3.70285 -2.66292 -0.1 + vertex -3.62666 -2.52788 -0.2 + vertex -3.70601 -2.60189 -0.2 + vertex -3.70285 -2.66292 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.5419 27.5737 -0.1 - vertex -21.2799 26.5937 -0.1 - vertex -21.2563 26.5576 -0.1 + vertex -20.5419 27.5737 -0.2 + vertex -21.2799 26.5937 -0.2 + vertex -21.2563 26.5576 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.7979 27.6578 -0.1 - vertex -21.3473 26.6332 -0.1 - vertex -21.2799 26.5937 -0.1 + vertex -20.7979 27.6578 -0.2 + vertex -21.3473 26.6332 -0.2 + vertex -21.2799 26.5937 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.5951 26.7172 -0.1 - vertex -21.1001 27.7294 -0.1 - vertex -21.4599 27.7917 -0.1 + vertex -21.5951 26.7172 -0.2 + vertex -21.1001 27.7294 -0.2 + vertex -21.4599 27.7917 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.1001 27.7294 -0.1 - vertex -21.5951 26.7172 -0.1 - vertex -21.3473 26.6332 -0.1 + vertex -21.1001 27.7294 -0.2 + vertex -21.5951 26.7172 -0.2 + vertex -21.3473 26.6332 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.4599 27.7917 -0.1 - vertex -21.9618 26.7994 -0.1 - vertex -21.5951 26.7172 -0.1 + vertex -21.4599 27.7917 -0.2 + vertex -21.9618 26.7994 -0.2 + vertex -21.5951 26.7172 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3975 27.9007 -0.1 - vertex -21.9618 26.7994 -0.1 - vertex -21.4599 27.7917 -0.1 + vertex -22.3975 27.9007 -0.2 + vertex -21.9618 26.7994 -0.2 + vertex -21.4599 27.7917 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3975 27.9007 -0.1 - vertex -22.4095 26.8695 -0.1 - vertex -21.9618 26.7994 -0.1 + vertex -22.3975 27.9007 -0.2 + vertex -22.4095 26.8695 -0.2 + vertex -21.9618 26.7994 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3975 27.9007 -0.1 - vertex -22.8078 26.9423 -0.1 - vertex -22.4095 26.8695 -0.1 + vertex -22.3975 27.9007 -0.2 + vertex -22.8078 26.9423 -0.2 + vertex -22.4095 26.8695 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.1232 27.9594 -0.1 - vertex -22.8078 26.9423 -0.1 - vertex -22.3975 27.9007 -0.1 + vertex -23.1232 27.9594 -0.2 + vertex -22.8078 26.9423 -0.2 + vertex -22.3975 27.9007 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.1232 27.9594 -0.1 - vertex -23.1972 27.0531 -0.1 - vertex -22.8078 26.9423 -0.1 + vertex -23.1232 27.9594 -0.2 + vertex -23.1972 27.0531 -0.2 + vertex -22.8078 26.9423 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.1232 27.9594 -0.1 - vertex -23.56 27.1917 -0.1 - vertex -23.1972 27.0531 -0.1 + vertex -23.1232 27.9594 -0.2 + vertex -23.56 27.1917 -0.2 + vertex -23.1972 27.0531 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.7335 27.9892 -0.1 - vertex -23.56 27.1917 -0.1 - vertex -23.1232 27.9594 -0.1 + vertex -23.7335 27.9892 -0.2 + vertex -23.56 27.1917 -0.2 + vertex -23.1232 27.9594 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.7335 27.9892 -0.1 - vertex -23.8785 27.3484 -0.1 - vertex -23.56 27.1917 -0.1 + vertex -23.7335 27.9892 -0.2 + vertex -23.8785 27.3484 -0.2 + vertex -23.56 27.1917 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.7335 27.9892 -0.1 - vertex -24.1346 27.513 -0.1 - vertex -23.8785 27.3484 -0.1 + vertex -23.7335 27.9892 -0.2 + vertex -24.1346 27.513 -0.2 + vertex -23.8785 27.3484 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.1643 27.9885 -0.1 - vertex -24.1346 27.513 -0.1 - vertex -23.7335 27.9892 -0.1 + vertex -24.1643 27.9885 -0.2 + vertex -24.1346 27.513 -0.2 + vertex -23.7335 27.9892 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.3632 27.7532 -0.1 - vertex -24.1643 27.9885 -0.1 - vertex -24.2923 27.9761 -0.1 + vertex -24.3632 27.7532 -0.2 + vertex -24.1643 27.9885 -0.2 + vertex -24.2923 27.9761 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.1643 27.9885 -0.1 - vertex -24.3107 27.6757 -0.1 - vertex -24.1346 27.513 -0.1 + vertex -24.1643 27.9885 -0.2 + vertex -24.3107 27.6757 -0.2 + vertex -24.1346 27.513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.3858 27.8943 -0.1 - vertex -24.2923 27.9761 -0.1 - vertex -24.3515 27.9554 -0.1 + vertex -24.3858 27.8943 -0.2 + vertex -24.2923 27.9761 -0.2 + vertex -24.3515 27.9554 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.1643 27.9885 -0.1 - vertex -24.3632 27.7532 -0.1 - vertex -24.3107 27.6757 -0.1 + vertex -24.1643 27.9885 -0.2 + vertex -24.3632 27.7532 -0.2 + vertex -24.3107 27.6757 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.2923 27.9761 -0.1 - vertex -24.3858 27.8943 -0.1 - vertex -24.3889 27.8265 -0.1 + vertex -24.2923 27.9761 -0.2 + vertex -24.3858 27.8943 -0.2 + vertex -24.3889 27.8265 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.2923 27.9761 -0.1 - vertex -24.3889 27.8265 -0.1 - vertex -24.3632 27.7532 -0.1 + vertex -24.2923 27.9761 -0.2 + vertex -24.3889 27.8265 -0.2 + vertex -24.3632 27.7532 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.89877 27.2865 -0.1 - vertex -10.5394 24.4322 -0.1 - vertex -10.5349 24.4109 -0.1 + vertex -7.89877 27.2865 -0.2 + vertex -10.5394 24.4322 -0.2 + vertex -10.5349 24.4109 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.2816 27.5955 -0.1 - vertex -10.6591 24.5009 -0.1 - vertex -10.5394 24.4322 -0.1 + vertex -10.2816 27.5955 -0.2 + vertex -10.6591 24.5009 -0.2 + vertex -10.5394 24.4322 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.2816 27.5955 -0.1 - vertex -10.9077 24.5958 -0.1 - vertex -10.6591 24.5009 -0.1 + vertex -10.2816 27.5955 -0.2 + vertex -10.9077 24.5958 -0.2 + vertex -10.6591 24.5009 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.2816 27.5955 -0.1 - vertex -11.2625 24.7069 -0.1 - vertex -10.9077 24.5958 -0.1 + vertex -10.2816 27.5955 -0.2 + vertex -11.2625 24.7069 -0.2 + vertex -10.9077 24.5958 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.5342 27.7352 -0.1 - vertex -11.2625 24.7069 -0.1 - vertex -10.2816 27.5955 -0.1 + vertex -11.5342 27.7352 -0.2 + vertex -11.2625 24.7069 -0.2 + vertex -10.2816 27.5955 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.5342 27.7352 -0.1 - vertex -11.7825 24.8213 -0.1 - vertex -11.2625 24.7069 -0.1 + vertex -11.5342 27.7352 -0.2 + vertex -11.7825 24.8213 -0.2 + vertex -11.2625 24.7069 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.5342 27.7352 -0.1 - vertex -12.4277 24.907 -0.1 - vertex -11.7825 24.8213 -0.1 + vertex -11.5342 27.7352 -0.2 + vertex -12.4277 24.907 -0.2 + vertex -11.7825 24.8213 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.6053 27.816 -0.1 - vertex -12.4277 24.907 -0.1 - vertex -11.5342 27.7352 -0.1 + vertex -12.6053 27.816 -0.2 + vertex -12.4277 24.907 -0.2 + vertex -11.5342 27.7352 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.6053 27.816 -0.1 - vertex -13.1566 24.9634 -0.1 - vertex -12.4277 24.907 -0.1 + vertex -12.6053 27.816 -0.2 + vertex -13.1566 24.9634 -0.2 + vertex -12.4277 24.907 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.5445 27.8374 -0.1 - vertex -13.1566 24.9634 -0.1 - vertex -12.6053 27.816 -0.1 + vertex -13.5445 27.8374 -0.2 + vertex -13.1566 24.9634 -0.2 + vertex -12.6053 27.816 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.5445 27.8374 -0.1 - vertex -13.9275 24.99 -0.1 - vertex -13.1566 24.9634 -0.1 + vertex -13.5445 27.8374 -0.2 + vertex -13.9275 24.99 -0.2 + vertex -13.1566 24.9634 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.4014 27.7989 -0.1 - vertex -13.9275 24.99 -0.1 - vertex -13.5445 27.8374 -0.1 + vertex -14.4014 27.7989 -0.2 + vertex -13.9275 24.99 -0.2 + vertex -13.5445 27.8374 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.4014 27.7989 -0.1 - vertex -14.6988 24.986 -0.1 - vertex -13.9275 24.99 -0.1 + vertex -14.4014 27.7989 -0.2 + vertex -14.6988 24.986 -0.2 + vertex -13.9275 24.99 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.2259 27.7001 -0.1 - vertex -14.6988 24.986 -0.1 - vertex -14.4014 27.7989 -0.1 + vertex -15.2259 27.7001 -0.2 + vertex -14.6988 24.986 -0.2 + vertex -14.4014 27.7989 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.2259 27.7001 -0.1 - vertex -15.4289 24.9511 -0.1 - vertex -14.6988 24.986 -0.1 + vertex -15.2259 27.7001 -0.2 + vertex -15.4289 24.9511 -0.2 + vertex -14.6988 24.986 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -16.0674 27.5405 -0.1 - vertex -15.4289 24.9511 -0.1 - vertex -15.2259 27.7001 -0.1 + vertex -16.0674 27.5405 -0.2 + vertex -15.4289 24.9511 -0.2 + vertex -15.2259 27.7001 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.0674 27.5405 -0.1 - vertex -16.0762 24.8844 -0.1 - vertex -15.4289 24.9511 -0.1 + vertex -16.0674 27.5405 -0.2 + vertex -16.0762 24.8844 -0.2 + vertex -15.4289 24.9511 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -16.9758 27.3196 -0.1 - vertex -16.0762 24.8844 -0.1 - vertex -16.0674 27.5405 -0.1 + vertex -16.9758 27.3196 -0.2 + vertex -16.0762 24.8844 -0.2 + vertex -16.0674 27.5405 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.0762 24.8844 -0.1 - vertex -16.9758 27.3196 -0.1 - vertex -16.599 24.7853 -0.1 + vertex -16.0762 24.8844 -0.2 + vertex -16.9758 27.3196 -0.2 + vertex -16.599 24.7853 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.9758 27.3196 -0.1 - vertex -17.1707 24.6702 -0.1 - vertex -16.599 24.7853 -0.1 + vertex -16.9758 27.3196 -0.2 + vertex -17.1707 24.6702 -0.2 + vertex -16.599 24.7853 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.9758 27.3196 -0.1 - vertex -18.0818 24.5233 -0.1 - vertex -17.1707 24.6702 -0.1 + vertex -16.9758 27.3196 -0.2 + vertex -18.0818 24.5233 -0.2 + vertex -17.1707 24.6702 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -19.3233 26.703 -0.1 - vertex -18.0818 24.5233 -0.1 - vertex -16.9758 27.3196 -0.1 + vertex -19.3233 26.703 -0.2 + vertex -18.0818 24.5233 -0.2 + vertex -16.9758 27.3196 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.0818 24.5233 -0.1 - vertex -19.3233 26.703 -0.1 - vertex -19.207 24.3637 -0.1 + vertex -18.0818 24.5233 -0.2 + vertex -19.3233 26.703 -0.2 + vertex -19.207 24.3637 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2669 26.4994 -0.1 - vertex -19.3233 26.703 -0.1 - vertex -19.9368 27.2141 -0.1 + vertex -21.2669 26.4994 -0.2 + vertex -19.3233 26.703 -0.2 + vertex -19.9368 27.2141 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2563 26.5576 -0.1 - vertex -19.9368 27.2141 -0.1 - vertex -20.1227 27.3549 -0.1 + vertex -21.2563 26.5576 -0.2 + vertex -19.9368 27.2141 -0.2 + vertex -20.1227 27.3549 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2563 26.5576 -0.1 - vertex -20.1227 27.3549 -0.1 - vertex -20.3206 27.4738 -0.1 + vertex -21.2563 26.5576 -0.2 + vertex -20.1227 27.3549 -0.2 + vertex -20.3206 27.4738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2997 26.4466 -0.1 - vertex -19.3233 26.703 -0.1 - vertex -21.2669 26.4994 -0.1 + vertex -21.2997 26.4466 -0.2 + vertex -19.3233 26.703 -0.2 + vertex -21.2669 26.4994 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2563 26.5576 -0.1 - vertex -20.3206 27.4738 -0.1 - vertex -20.5419 27.5737 -0.1 + vertex -21.2563 26.5576 -0.2 + vertex -20.3206 27.4738 -0.2 + vertex -20.5419 27.5737 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.2799 26.5937 -0.1 - vertex -20.5419 27.5737 -0.1 - vertex -20.7979 27.6578 -0.1 + vertex -21.2799 26.5937 -0.2 + vertex -20.5419 27.5737 -0.2 + vertex -20.7979 27.6578 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.3473 26.6332 -0.1 - vertex -20.7979 27.6578 -0.1 - vertex -21.1001 27.7294 -0.1 + vertex -21.3473 26.6332 -0.2 + vertex -20.7979 27.6578 -0.2 + vertex -21.1001 27.7294 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.9368 27.2141 -0.1 - vertex -21.2563 26.5576 -0.1 - vertex -21.2669 26.4994 -0.1 + vertex -19.9368 27.2141 -0.2 + vertex -21.2563 26.5576 -0.2 + vertex -21.2669 26.4994 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.3233 26.703 -0.1 - vertex -20.4207 24.2101 -0.1 - vertex -19.207 24.3637 -0.1 + vertex -19.3233 26.703 -0.2 + vertex -20.4207 24.2101 -0.2 + vertex -19.207 24.3637 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.3233 26.703 -0.1 - vertex -21.2997 26.4466 -0.1 - vertex -20.4207 24.2101 -0.1 + vertex -19.3233 26.703 -0.2 + vertex -21.2997 26.4466 -0.2 + vertex -20.4207 24.2101 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.3558 26.3992 -0.1 - vertex -20.4207 24.2101 -0.1 - vertex -21.2997 26.4466 -0.1 + vertex -21.3558 26.3992 -0.2 + vertex -20.4207 24.2101 -0.2 + vertex -21.2997 26.4466 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.4368 26.3569 -0.1 - vertex -20.4207 24.2101 -0.1 - vertex -21.3558 26.3992 -0.1 + vertex -21.4368 26.3569 -0.2 + vertex -20.4207 24.2101 -0.2 + vertex -21.3558 26.3992 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.6785 26.2874 -0.1 - vertex -20.4207 24.2101 -0.1 - vertex -21.4368 26.3569 -0.1 + vertex -21.6785 26.2874 -0.2 + vertex -20.4207 24.2101 -0.2 + vertex -21.4368 26.3569 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.0356 26.2369 -0.1 - vertex -20.4207 24.2101 -0.1 - vertex -21.6785 26.2874 -0.1 + vertex -22.0356 26.2369 -0.2 + vertex -20.4207 24.2101 -0.2 + vertex -21.6785 26.2874 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.3692 23.8604 -0.1 - vertex -22.0356 26.2369 -0.1 - vertex -22.5186 26.2045 -0.1 + vertex -23.3692 23.8604 -0.2 + vertex -22.0356 26.2369 -0.2 + vertex -22.5186 26.2045 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.3692 23.8604 -0.1 - vertex -22.5186 26.2045 -0.1 - vertex -23.1385 26.1891 -0.1 + vertex -23.3692 23.8604 -0.2 + vertex -22.5186 26.2045 -0.2 + vertex -23.1385 26.1891 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.0356 26.2369 -0.1 - vertex -23.3692 23.8604 -0.1 - vertex -20.4207 24.2101 -0.1 + vertex -22.0356 26.2369 -0.2 + vertex -23.3692 23.8604 -0.2 + vertex -20.4207 24.2101 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.6523 24.0122 -0.1 - vertex -23.3692 23.8604 -0.1 - vertex -23.1385 26.1891 -0.1 + vertex -24.6523 24.0122 -0.2 + vertex -23.3692 23.8604 -0.2 + vertex -23.1385 26.1891 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.3692 23.8604 -0.1 - vertex -24.6523 24.0122 -0.1 - vertex -24.1455 19.0472 -0.1 + vertex -23.3692 23.8604 -0.2 + vertex -24.6523 24.0122 -0.2 + vertex -24.1455 19.0472 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.8316 26.205 -0.1 - vertex -24.6523 24.0122 -0.1 - vertex -23.1385 26.1891 -0.1 + vertex -24.8316 26.205 -0.2 + vertex -24.6523 24.0122 -0.2 + vertex -23.1385 26.1891 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.8316 26.205 -0.1 - vertex -26.0107 24.2804 -0.1 - vertex -24.6523 24.0122 -0.1 + vertex -24.8316 26.205 -0.2 + vertex -26.0107 24.2804 -0.2 + vertex -24.6523 24.0122 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.3751 26.2567 -0.1 - vertex -26.0107 24.2804 -0.1 - vertex -24.8316 26.205 -0.1 + vertex -26.3751 26.2567 -0.2 + vertex -26.0107 24.2804 -0.2 + vertex -24.8316 26.205 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.3751 26.2567 -0.1 - vertex -26.5818 24.4056 -0.1 - vertex -26.0107 24.2804 -0.1 + vertex -26.3751 26.2567 -0.2 + vertex -26.5818 24.4056 -0.2 + vertex -26.0107 24.2804 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.1227 24.5501 -0.1 - vertex -26.3751 26.2567 -0.1 - vertex -26.9353 26.3003 -0.1 + vertex -27.1227 24.5501 -0.2 + vertex -26.3751 26.2567 -0.2 + vertex -26.9353 26.3003 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.3751 26.2567 -0.1 - vertex -27.1227 24.5501 -0.1 - vertex -26.5818 24.4056 -0.1 + vertex -26.3751 26.2567 -0.2 + vertex -27.1227 24.5501 -0.2 + vertex -26.5818 24.4056 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.636 24.7152 -0.1 - vertex -26.9353 26.3003 -0.1 - vertex -27.4097 26.3653 -0.1 + vertex -27.636 24.7152 -0.2 + vertex -26.9353 26.3003 -0.2 + vertex -27.4097 26.3653 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.9353 26.3003 -0.1 - vertex -27.636 24.7152 -0.1 - vertex -27.1227 24.5501 -0.1 + vertex -26.9353 26.3003 -0.2 + vertex -27.636 24.7152 -0.2 + vertex -27.1227 24.5501 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.1248 24.9019 -0.1 - vertex -27.4097 26.3653 -0.1 - vertex -27.8395 26.4592 -0.1 + vertex -28.1248 24.9019 -0.2 + vertex -27.4097 26.3653 -0.2 + vertex -27.8395 26.4592 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.4097 26.3653 -0.1 - vertex -28.1248 24.9019 -0.1 - vertex -27.636 24.7152 -0.1 + vertex -27.4097 26.3653 -0.2 + vertex -28.1248 24.9019 -0.2 + vertex -27.636 24.7152 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.5919 25.1115 -0.1 - vertex -27.8395 26.4592 -0.1 - vertex -28.2663 26.5892 -0.1 + vertex -28.5919 25.1115 -0.2 + vertex -27.8395 26.4592 -0.2 + vertex -28.2663 26.5892 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.8395 26.4592 -0.1 - vertex -28.5919 25.1115 -0.1 - vertex -28.1248 24.9019 -0.1 + vertex -27.8395 26.4592 -0.2 + vertex -28.5919 25.1115 -0.2 + vertex -28.1248 24.9019 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.0402 25.3453 -0.1 - vertex -28.2663 26.5892 -0.1 - vertex -28.7314 26.7626 -0.1 + vertex -29.0402 25.3453 -0.2 + vertex -28.2663 26.5892 -0.2 + vertex -28.7314 26.7626 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.2663 26.5892 -0.1 - vertex -29.0402 25.3453 -0.1 - vertex -28.5919 25.1115 -0.1 + vertex -28.2663 26.5892 -0.2 + vertex -29.0402 25.3453 -0.2 + vertex -28.5919 25.1115 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.4725 25.6043 -0.1 - vertex -28.7314 26.7626 -0.1 - vertex -29.2762 26.9865 -0.1 + vertex -29.4725 25.6043 -0.2 + vertex -28.7314 26.7626 -0.2 + vertex -29.2762 26.9865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.7314 26.7626 -0.1 - vertex -29.4725 25.6043 -0.1 - vertex -29.0402 25.3453 -0.1 + vertex -28.7314 26.7626 -0.2 + vertex -29.4725 25.6043 -0.2 + vertex -29.0402 25.3453 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.2762 26.9865 -0.1 - vertex -29.8918 25.8898 -0.1 - vertex -29.4725 25.6043 -0.1 + vertex -29.2762 26.9865 -0.2 + vertex -29.8918 25.8898 -0.2 + vertex -29.4725 25.6043 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0875 27.3102 -0.1 - vertex -29.8918 25.8898 -0.1 - vertex -29.2762 26.9865 -0.1 + vertex -30.0875 27.3102 -0.2 + vertex -29.8918 25.8898 -0.2 + vertex -29.2762 26.9865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0875 27.3102 -0.1 - vertex -30.6514 26.471 -0.1 - vertex -29.8918 25.8898 -0.1 + vertex -30.0875 27.3102 -0.2 + vertex -30.6514 26.471 -0.2 + vertex -29.8918 25.8898 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.9143 26.7038 -0.1 - vertex -30.0875 27.3102 -0.1 - vertex -30.6543 27.4912 -0.1 + vertex -30.9143 26.7038 -0.2 + vertex -30.0875 27.3102 -0.2 + vertex -30.6543 27.4912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.1043 26.9038 -0.1 - vertex -30.6543 27.4912 -0.1 - vertex -30.8579 27.5312 -0.1 + vertex -31.1043 26.9038 -0.2 + vertex -30.6543 27.4912 -0.2 + vertex -30.8579 27.5312 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0875 27.3102 -0.1 - vertex -30.9143 26.7038 -0.1 - vertex -30.6514 26.471 -0.1 + vertex -30.0875 27.3102 -0.2 + vertex -30.9143 26.7038 -0.2 + vertex -30.6514 26.471 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2248 27.0754 -0.1 - vertex -30.8579 27.5312 -0.1 - vertex -31.0145 27.539 -0.1 + vertex -31.2248 27.0754 -0.2 + vertex -30.8579 27.5312 -0.2 + vertex -31.0145 27.539 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.6543 27.4912 -0.1 - vertex -31.1043 26.9038 -0.1 - vertex -30.9143 26.7038 -0.1 + vertex -30.6543 27.4912 -0.2 + vertex -31.1043 26.9038 -0.2 + vertex -30.9143 26.7038 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.272 27.3506 -0.1 - vertex -31.0145 27.539 -0.1 - vertex -31.1289 27.5158 -0.1 + vertex -31.272 27.3506 -0.2 + vertex -31.0145 27.539 -0.2 + vertex -31.1289 27.5158 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.272 27.3506 -0.1 - vertex -31.1289 27.5158 -0.1 - vertex -31.2059 27.4629 -0.1 + vertex -31.272 27.3506 -0.2 + vertex -31.1289 27.5158 -0.2 + vertex -31.2059 27.4629 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.8579 27.5312 -0.1 - vertex -31.2248 27.0754 -0.1 - vertex -31.1043 26.9038 -0.1 + vertex -30.8579 27.5312 -0.2 + vertex -31.2248 27.0754 -0.2 + vertex -31.1043 26.9038 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.0145 27.539 -0.1 - vertex -31.272 27.3506 -0.1 - vertex -31.2795 27.2229 -0.1 + vertex -31.0145 27.539 -0.2 + vertex -31.272 27.3506 -0.2 + vertex -31.2795 27.2229 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.0145 27.539 -0.1 - vertex -31.2795 27.2229 -0.1 - vertex -31.2248 27.0754 -0.1 + vertex -31.0145 27.539 -0.2 + vertex -31.2795 27.2229 -0.2 + vertex -31.2248 27.0754 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.22936 5.32709 -0.1 - vertex 1.91748 12.4352 -0.1 - vertex 5.27855 5.76024 -0.1 + vertex 6.22936 5.32709 -0.2 + vertex 1.91748 12.4352 -0.2 + vertex 5.27855 5.76024 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.32553 28.4461 -0.1 - vertex 1.00441 27.6053 -0.1 - vertex 0.944126 27.2693 -0.1 + vertex 4.32553 28.4461 -0.2 + vertex 1.00441 27.6053 -0.2 + vertex 0.944126 27.2693 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.60924 32.0876 -0.1 - vertex 1.57871 31.8344 -0.1 - vertex 3.58282 31.3388 -0.1 + vertex 3.60924 32.0876 -0.2 + vertex 1.57871 31.8344 -0.2 + vertex 3.58282 31.3388 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.69711 27.8759 -0.1 - vertex 0.944126 27.2693 -0.1 - vertex 0.908598 27.1645 -0.1 + vertex 4.69711 27.8759 -0.2 + vertex 0.944126 27.2693 -0.2 + vertex 0.908598 27.1645 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.38662 31.173 -0.1 - vertex 3.58282 31.3388 -0.1 - vertex 1.57871 31.8344 -0.1 + vertex 1.38662 31.173 -0.2 + vertex 3.58282 31.3388 -0.2 + vertex 1.57871 31.8344 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 1.85843 12.7398 -0.1 - vertex 1.90284 12.6291 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 1.85843 12.7398 -0.2 + vertex 1.90284 12.6291 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.59957 30.3654 -0.1 - vertex 1.38662 31.173 -0.1 - vertex 1.24074 30.5277 -0.1 + vertex 3.59957 30.3654 -0.2 + vertex 1.38662 31.173 -0.2 + vertex 1.24074 30.5277 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.32553 28.4461 -0.1 - vertex 1.04514 28.0688 -0.1 - vertex 1.00441 27.6053 -0.1 + vertex 4.32553 28.4461 -0.2 + vertex 1.04514 28.0688 -0.2 + vertex 1.00441 27.6053 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.63162 30.0135 -0.1 - vertex 1.24074 30.5277 -0.1 - vertex 1.13903 29.8907 -0.1 + vertex 3.63162 30.0135 -0.2 + vertex 1.24074 30.5277 -0.2 + vertex 1.13903 29.8907 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.68937 29.7129 -0.1 - vertex 1.13903 29.8907 -0.1 - vertex 1.07949 29.2543 -0.1 + vertex 3.68937 29.7129 -0.2 + vertex 1.13903 29.8907 -0.2 + vertex 1.07949 29.2543 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.78021 29.4348 -0.1 - vertex 1.07949 29.2543 -0.1 - vertex 1.0601 28.6106 -0.1 + vertex 3.78021 29.4348 -0.2 + vertex 1.07949 29.2543 -0.2 + vertex 1.0601 28.6106 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.91157 29.1502 -0.1 - vertex 1.0601 28.6106 -0.1 - vertex 1.04514 28.0688 -0.1 + vertex 3.91157 29.1502 -0.2 + vertex 1.0601 28.6106 -0.2 + vertex 1.04514 28.0688 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.05276 27.3884 -0.1 - vertex 0.908598 27.1645 -0.1 - vertex 0.870515 27.1101 -0.1 + vertex 5.05276 27.3884 -0.2 + vertex 0.908598 27.1645 -0.2 + vertex 0.870515 27.1101 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 1.7147 12.9716 -0.1 - vertex 1.85843 12.7398 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 1.7147 12.9716 -0.2 + vertex 1.85843 12.7398 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.07308 26.3793 -0.1 - vertex 0.870515 27.1101 -0.1 - vertex 0.816408 27.0884 -0.1 + vertex 6.07308 26.3793 -0.2 + vertex 0.870515 27.1101 -0.2 + vertex 0.816408 27.0884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 1.51175 13.1874 -0.1 - vertex 1.7147 12.9716 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 1.51175 13.1874 -0.2 + vertex 1.7147 12.9716 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 1.25015 13.3869 -0.1 - vertex 1.51175 13.1874 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 1.25015 13.3869 -0.2 + vertex 1.51175 13.1874 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 0.930489 13.5702 -0.1 - vertex 1.25015 13.3869 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 0.930489 13.5702 -0.2 + vertex 1.25015 13.3869 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.15267 19.0966 -0.1 - vertex 0.734953 27.0776 -0.1 - vertex 7.1242 19.0144 -0.1 + vertex 7.15267 19.0966 -0.2 + vertex 0.734953 27.0776 -0.2 + vertex 7.1242 19.0144 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.371032 14.021 -0.1 - vertex 7.1242 19.0144 -0.1 - vertex 0.734953 27.0776 -0.1 + vertex -0.371032 14.021 -0.2 + vertex 7.1242 19.0144 -0.2 + vertex 0.734953 27.0776 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 0.55335 13.737 -0.1 - vertex 0.930489 13.5702 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 0.55335 13.737 -0.2 + vertex 0.930489 13.5702 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.917111 14.138 -0.1 - vertex 0.734953 27.0776 -0.1 - vertex 0.505992 27.0868 -0.1 + vertex -0.917111 14.138 -0.2 + vertex 0.734953 27.0776 -0.2 + vertex 0.505992 27.0868 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.51834 14.2381 -0.1 - vertex 0.505992 27.0868 -0.1 - vertex 0.215611 27.1342 -0.1 + vertex -1.51834 14.2381 -0.2 + vertex 0.505992 27.0868 -0.2 + vertex 0.215611 27.1342 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex 0.119316 13.8873 -0.1 - vertex 0.55335 13.737 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex 0.119316 13.8873 -0.2 + vertex 0.55335 13.737 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.17413 14.3212 -0.1 - vertex 0.215611 27.1342 -0.1 - vertex -0.104203 27.2162 -0.1 + vertex -2.17413 14.3212 -0.2 + vertex 0.215611 27.1342 -0.2 + vertex -0.104203 27.2162 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.1242 19.0144 -0.1 - vertex -0.371032 14.021 -0.1 - vertex 0.119316 13.8873 -0.1 + vertex 7.1242 19.0144 -0.2 + vertex -0.371032 14.021 -0.2 + vertex 0.119316 13.8873 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.8839 14.3873 -0.1 - vertex -0.104203 27.2162 -0.1 - vertex -0.438314 27.347 -0.1 + vertex -2.8839 14.3873 -0.2 + vertex -0.104203 27.2162 -0.2 + vertex -0.438314 27.347 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.54439 27.3597 -0.1 - vertex -0.438314 27.347 -0.1 - vertex -0.7749 27.5359 -0.1 + vertex -6.54439 27.3597 -0.2 + vertex -0.438314 27.347 -0.2 + vertex -0.7749 27.5359 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.734953 27.0776 -0.1 - vertex -0.917111 14.138 -0.1 - vertex -0.371032 14.021 -0.1 + vertex 0.734953 27.0776 -0.2 + vertex -0.917111 14.138 -0.2 + vertex -0.371032 14.021 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.54439 27.3597 -0.1 - vertex -0.7749 27.5359 -0.1 - vertex -1.11256 27.7809 -0.1 + vertex -6.54439 27.3597 -0.2 + vertex -0.7749 27.5359 -0.2 + vertex -1.11256 27.7809 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.44763 27.4571 -0.1 - vertex -1.11256 27.7809 -0.1 - vertex -1.44988 28.0795 -0.1 + vertex -6.44763 27.4571 -0.2 + vertex -1.11256 27.7809 -0.2 + vertex -1.44988 28.0795 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.505992 27.0868 -0.1 - vertex -1.51834 14.2381 -0.1 - vertex -0.917111 14.138 -0.1 + vertex 0.505992 27.0868 -0.2 + vertex -1.51834 14.2381 -0.2 + vertex -0.917111 14.138 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.44763 27.4571 -0.1 - vertex -1.44988 28.0795 -0.1 - vertex -1.78547 28.4297 -0.1 + vertex -6.44763 27.4571 -0.2 + vertex -1.44988 28.0795 -0.2 + vertex -1.78547 28.4297 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.37156 27.6173 -0.1 - vertex -1.78547 28.4297 -0.1 - vertex -2.11792 28.8291 -0.1 + vertex -6.37156 27.6173 -0.2 + vertex -1.78547 28.4297 -0.2 + vertex -2.11792 28.8291 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.215611 27.1342 -0.1 - vertex -2.17413 14.3212 -0.1 - vertex -1.51834 14.2381 -0.1 + vertex 0.215611 27.1342 -0.2 + vertex -2.17413 14.3212 -0.2 + vertex -1.51834 14.2381 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.31368 27.8729 -0.1 - vertex -2.11792 28.8291 -0.1 - vertex -2.44583 29.2754 -0.1 + vertex -6.31368 27.8729 -0.2 + vertex -2.11792 28.8291 -0.2 + vertex -2.44583 29.2754 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.27149 28.2565 -0.1 - vertex -2.44583 29.2754 -0.1 - vertex -2.7678 29.7664 -0.1 + vertex -6.27149 28.2565 -0.2 + vertex -2.44583 29.2754 -0.2 + vertex -2.7678 29.7664 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.11256 27.7809 -0.1 - vertex -6.44763 27.4571 -0.1 - vertex -6.54439 27.3597 -0.1 + vertex -1.11256 27.7809 -0.2 + vertex -6.44763 27.4571 -0.2 + vertex -6.54439 27.3597 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.24249 28.8007 -0.1 - vertex -2.7678 29.7664 -0.1 - vertex -3.08241 30.2998 -0.1 + vertex -6.24249 28.8007 -0.2 + vertex -2.7678 29.7664 -0.2 + vertex -3.08241 30.2998 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.22417 29.538 -0.1 - vertex -3.08241 30.2998 -0.1 - vertex -3.38828 30.8734 -0.1 + vertex -6.22417 29.538 -0.2 + vertex -3.08241 30.2998 -0.2 + vertex -3.38828 30.8734 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.438314 27.347 -0.1 - vertex -6.54439 27.3597 -0.1 - vertex -3.64708 14.4362 -0.1 + vertex -0.438314 27.347 -0.2 + vertex -6.54439 27.3597 -0.2 + vertex -3.64708 14.4362 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.22417 29.538 -0.1 - vertex -3.38828 30.8734 -0.1 - vertex -3.68399 31.485 -0.1 + vertex -6.22417 29.538 -0.2 + vertex -3.38828 30.8734 -0.2 + vertex -3.68399 31.485 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.20957 31.7226 -0.1 - vertex -3.68399 31.485 -0.1 - vertex -3.96814 32.1322 -0.1 + vertex -6.20957 31.7226 -0.2 + vertex -3.68399 31.485 -0.2 + vertex -3.96814 32.1322 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.20957 31.7226 -0.1 - vertex -3.96814 32.1322 -0.1 - vertex -4.23933 32.8128 -0.1 + vertex -6.20957 31.7226 -0.2 + vertex -3.96814 32.1322 -0.2 + vertex -4.23933 32.8128 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.78547 28.4297 -0.1 - vertex -6.37156 27.6173 -0.1 - vertex -6.44763 27.4571 -0.1 + vertex -1.78547 28.4297 -0.2 + vertex -6.37156 27.6173 -0.2 + vertex -6.44763 27.4571 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.19415 33.3563 -0.1 - vertex -4.23933 32.8128 -0.1 - vertex -4.49616 33.5245 -0.1 + vertex -6.19415 33.3563 -0.2 + vertex -4.23933 32.8128 -0.2 + vertex -4.49616 33.5245 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.19415 33.3563 -0.1 - vertex -4.49616 33.5245 -0.1 - vertex -4.73722 34.2652 -0.1 + vertex -6.19415 33.3563 -0.2 + vertex -4.49616 33.5245 -0.2 + vertex -4.73722 34.2652 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.15766 34.7516 -0.1 - vertex -4.73722 34.2652 -0.1 - vertex -4.96111 35.0324 -0.1 + vertex -6.15766 34.7516 -0.2 + vertex -4.73722 34.2652 -0.2 + vertex -4.96111 35.0324 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.15766 34.7516 -0.1 - vertex -4.96111 35.0324 -0.1 - vertex -5.11886 35.5644 -0.1 + vertex -6.15766 34.7516 -0.2 + vertex -4.96111 35.0324 -0.2 + vertex -5.11886 35.5644 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.10555 35.7605 -0.1 - vertex -5.11886 35.5644 -0.1 - vertex -5.26884 35.9859 -0.1 + vertex -6.10555 35.7605 -0.2 + vertex -5.11886 35.5644 -0.2 + vertex -5.26884 35.9859 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.7678 29.7664 -0.1 - vertex -6.24249 28.8007 -0.1 - vertex -6.27149 28.2565 -0.1 + vertex -2.7678 29.7664 -0.2 + vertex -6.24249 28.8007 -0.2 + vertex -6.27149 28.2565 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.07534 36.0738 -0.1 - vertex -5.26884 35.9859 -0.1 - vertex -5.41174 36.2975 -0.1 + vertex -6.07534 36.0738 -0.2 + vertex -5.26884 35.9859 -0.2 + vertex -5.41174 36.2975 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.92579 36.4611 -0.1 - vertex -5.41174 36.2975 -0.1 - vertex -5.54821 36.5001 -0.1 + vertex -5.92579 36.4611 -0.2 + vertex -5.41174 36.2975 -0.2 + vertex -5.54821 36.5001 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.86569 36.5344 -0.1 - vertex -5.54821 36.5001 -0.1 - vertex -5.61425 36.5608 -0.1 + vertex -5.86569 36.5344 -0.2 + vertex -5.54821 36.5001 -0.2 + vertex -5.61425 36.5608 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.80457 36.5812 -0.1 - vertex -5.61425 36.5608 -0.1 - vertex -5.67893 36.5944 -0.1 + vertex -5.80457 36.5812 -0.2 + vertex -5.61425 36.5608 -0.2 + vertex -5.67893 36.5944 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.80457 36.5812 -0.1 - vertex -5.67893 36.5944 -0.1 - vertex -5.74234 36.6012 -0.1 + vertex -5.80457 36.5812 -0.2 + vertex -5.67893 36.5944 -0.2 + vertex -5.74234 36.6012 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.61425 36.5608 -0.1 - vertex -5.80457 36.5812 -0.1 - vertex -5.86569 36.5344 -0.1 + vertex -5.61425 36.5608 -0.2 + vertex -5.80457 36.5812 -0.2 + vertex -5.86569 36.5344 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.54821 36.5001 -0.1 - vertex -5.86569 36.5344 -0.1 - vertex -5.92579 36.4611 -0.1 + vertex -5.54821 36.5001 -0.2 + vertex -5.86569 36.5344 -0.2 + vertex -5.92579 36.4611 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.41174 36.2975 -0.1 - vertex -5.92579 36.4611 -0.1 - vertex -6.04327 36.2349 -0.1 + vertex -5.41174 36.2975 -0.2 + vertex -5.92579 36.4611 -0.2 + vertex -6.04327 36.2349 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.41174 36.2975 -0.1 - vertex -6.04327 36.2349 -0.1 - vertex -6.07534 36.0738 -0.1 + vertex -5.41174 36.2975 -0.2 + vertex -6.04327 36.2349 -0.2 + vertex -6.07534 36.0738 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.26884 35.9859 -0.1 - vertex -6.07534 36.0738 -0.1 - vertex -6.10555 35.7605 -0.1 + vertex -5.26884 35.9859 -0.2 + vertex -6.07534 36.0738 -0.2 + vertex -6.10555 35.7605 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.11886 35.5644 -0.1 - vertex -6.10555 35.7605 -0.1 - vertex -6.15766 34.7516 -0.1 + vertex -5.11886 35.5644 -0.2 + vertex -6.10555 35.7605 -0.2 + vertex -6.15766 34.7516 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.73722 34.2652 -0.1 - vertex -6.15766 34.7516 -0.1 - vertex -6.19415 33.3563 -0.1 + vertex -4.73722 34.2652 -0.2 + vertex -6.15766 34.7516 -0.2 + vertex -6.19415 33.3563 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.23933 32.8128 -0.1 - vertex -6.19415 33.3563 -0.1 - vertex -6.20957 31.7226 -0.1 + vertex -4.23933 32.8128 -0.2 + vertex -6.19415 33.3563 -0.2 + vertex -6.20957 31.7226 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.68399 31.485 -0.1 - vertex -6.20957 31.7226 -0.1 - vertex -6.22417 29.538 -0.1 + vertex -3.68399 31.485 -0.2 + vertex -6.20957 31.7226 -0.2 + vertex -6.22417 29.538 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.08241 30.2998 -0.1 - vertex -6.22417 29.538 -0.1 - vertex -6.24249 28.8007 -0.1 + vertex -3.08241 30.2998 -0.2 + vertex -6.22417 29.538 -0.2 + vertex -6.24249 28.8007 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.44583 29.2754 -0.1 - vertex -6.27149 28.2565 -0.1 - vertex -6.31368 27.8729 -0.1 + vertex -2.44583 29.2754 -0.2 + vertex -6.27149 28.2565 -0.2 + vertex -6.31368 27.8729 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.11792 28.8291 -0.1 - vertex -6.31368 27.8729 -0.1 - vertex -6.37156 27.6173 -0.1 + vertex -2.11792 28.8291 -0.2 + vertex -6.31368 27.8729 -0.2 + vertex -6.37156 27.6173 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.104203 27.2162 -0.1 - vertex -2.8839 14.3873 -0.1 - vertex -2.17413 14.3212 -0.1 + vertex -0.104203 27.2162 -0.2 + vertex -2.8839 14.3873 -0.2 + vertex -2.17413 14.3212 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.438314 27.347 -0.1 - vertex -3.64708 14.4362 -0.1 - vertex -2.8839 14.3873 -0.1 + vertex -0.438314 27.347 -0.2 + vertex -3.64708 14.4362 -0.2 + vertex -2.8839 14.3873 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -6.65192 27.3056 -0.1 - vertex -3.64708 14.4362 -0.1 - vertex -6.54439 27.3597 -0.1 + vertex -6.65192 27.3056 -0.2 + vertex -3.64708 14.4362 -0.2 + vertex -6.54439 27.3597 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.64708 14.4362 -0.1 - vertex -6.65192 27.3056 -0.1 - vertex -4.46307 14.4678 -0.1 + vertex -3.64708 14.4362 -0.2 + vertex -6.65192 27.3056 -0.2 + vertex -4.46307 14.4678 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -10.904 19.9248 -0.1 - vertex -4.46307 14.4678 -0.1 - vertex -6.65192 27.3056 -0.1 + vertex -10.904 19.9248 -0.2 + vertex -4.46307 14.4678 -0.2 + vertex -6.65192 27.3056 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.46307 14.4678 -0.1 - vertex -10.904 19.9248 -0.1 - vertex -5.33129 14.482 -0.1 + vertex -4.46307 14.4678 -0.2 + vertex -10.904 19.9248 -0.2 + vertex -5.33129 14.482 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.904 19.9248 -0.1 - vertex -6.65192 27.3056 -0.1 - vertex -6.80178 27.2682 -0.1 + vertex -10.904 19.9248 -0.2 + vertex -6.65192 27.3056 -0.2 + vertex -6.80178 27.2682 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5349 24.4109 -0.1 - vertex -6.80178 27.2682 -0.1 - vertex -6.99768 27.2475 -0.1 + vertex -10.5349 24.4109 -0.2 + vertex -6.80178 27.2682 -0.2 + vertex -6.99768 27.2475 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.33129 14.482 -0.1 - vertex -10.904 19.9248 -0.1 - vertex -6.25117 14.4787 -0.1 + vertex -5.33129 14.482 -0.2 + vertex -10.904 19.9248 -0.2 + vertex -6.25117 14.4787 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5349 24.4109 -0.1 - vertex -6.99768 27.2475 -0.1 - vertex -7.24334 27.2437 -0.1 + vertex -10.5349 24.4109 -0.2 + vertex -6.99768 27.2475 -0.2 + vertex -7.24334 27.2437 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5349 24.4109 -0.1 - vertex -7.24334 27.2437 -0.1 - vertex -7.89877 27.2865 -0.1 + vertex -10.5349 24.4109 -0.2 + vertex -7.24334 27.2437 -0.2 + vertex -7.89877 27.2865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5394 24.4322 -0.1 - vertex -7.89877 27.2865 -0.1 - vertex -8.79778 27.3973 -0.1 + vertex -10.5394 24.4322 -0.2 + vertex -7.89877 27.2865 -0.2 + vertex -8.79778 27.3973 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.80178 27.2682 -0.1 - vertex -10.5349 24.4109 -0.1 - vertex -10.904 19.9248 -0.1 + vertex -6.80178 27.2682 -0.2 + vertex -10.5349 24.4109 -0.2 + vertex -10.904 19.9248 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -6.25117 14.4787 -0.1 - vertex -10.9261 19.832 -0.1 - vertex -7.22211 14.4578 -0.1 + vertex -6.25117 14.4787 -0.2 + vertex -10.9261 19.832 -0.2 + vertex -7.22211 14.4578 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5394 24.4322 -0.1 - vertex -8.79778 27.3973 -0.1 - vertex -10.2816 27.5955 -0.1 + vertex -10.5394 24.4322 -0.2 + vertex -8.79778 27.3973 -0.2 + vertex -10.2816 27.5955 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -10.9261 19.832 -0.1 - vertex -6.25117 14.4787 -0.1 - vertex -10.904 19.9248 -0.1 + vertex -10.9261 19.832 -0.2 + vertex -6.25117 14.4787 -0.2 + vertex -10.904 19.9248 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.0035 20.0644 -0.1 - vertex -10.5349 24.4109 -0.1 - vertex -10.5711 24.4 -0.1 + vertex -11.0035 20.0644 -0.2 + vertex -10.5349 24.4109 -0.2 + vertex -10.5711 24.4 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -10.9948 19.7221 -0.1 - vertex -7.22211 14.4578 -0.1 - vertex -10.9261 19.832 -0.1 + vertex -10.9948 19.7221 -0.2 + vertex -7.22211 14.4578 -0.2 + vertex -10.9261 19.832 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -7.22211 14.4578 -0.1 - vertex -10.9948 19.7221 -0.1 - vertex -9.25643 14.3812 -0.1 + vertex -7.22211 14.4578 -0.2 + vertex -10.9948 19.7221 -0.2 + vertex -9.25643 14.3812 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5349 24.4109 -0.1 - vertex -10.9294 20.0018 -0.1 - vertex -10.904 19.9248 -0.1 + vertex -10.5349 24.4109 -0.2 + vertex -10.9294 20.0018 -0.2 + vertex -10.904 19.9248 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5349 24.4109 -0.1 - vertex -11.0035 20.0644 -0.1 - vertex -10.9294 20.0018 -0.1 + vertex -10.5349 24.4109 -0.2 + vertex -11.0035 20.0644 -0.2 + vertex -10.9294 20.0018 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5711 24.4 -0.1 - vertex -11.1271 20.114 -0.1 - vertex -11.0035 20.0644 -0.1 + vertex -10.5711 24.4 -0.2 + vertex -11.1271 20.114 -0.2 + vertex -11.0035 20.0644 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5711 24.4 -0.1 - vertex -11.3013 20.1521 -0.1 - vertex -11.1271 20.114 -0.1 + vertex -10.5711 24.4 -0.2 + vertex -11.3013 20.1521 -0.2 + vertex -11.1271 20.114 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5711 24.4 -0.1 - vertex -11.5271 20.1801 -0.1 - vertex -11.3013 20.1521 -0.1 + vertex -10.5711 24.4 -0.2 + vertex -11.5271 20.1801 -0.2 + vertex -11.3013 20.1521 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.5711 24.4 -0.1 - vertex -12.1376 20.2112 -0.1 - vertex -11.5271 20.1801 -0.1 + vertex -10.5711 24.4 -0.2 + vertex -12.1376 20.2112 -0.2 + vertex -11.5271 20.1801 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.1612 23.8467 -0.1 - vertex -12.1376 20.2112 -0.1 - vertex -10.5711 24.4 -0.1 + vertex -14.1612 23.8467 -0.2 + vertex -12.1376 20.2112 -0.2 + vertex -10.5711 24.4 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.1376 20.2112 -0.1 - vertex -14.1612 23.8467 -0.1 - vertex -12.9665 20.2187 -0.1 + vertex -12.1376 20.2112 -0.2 + vertex -14.1612 23.8467 -0.2 + vertex -12.9665 20.2187 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.9665 20.2187 -0.1 - vertex -14.1612 23.8467 -0.1 - vertex -13.9037 20.2008 -0.1 + vertex -12.9665 20.2187 -0.2 + vertex -14.1612 23.8467 -0.2 + vertex -13.9037 20.2008 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.1612 23.8467 -0.1 - vertex -14.8461 20.153 -0.1 - vertex -13.9037 20.2008 -0.1 + vertex -14.1612 23.8467 -0.2 + vertex -14.8461 20.153 -0.2 + vertex -13.9037 20.2008 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.0412 23.3999 -0.1 - vertex -14.8461 20.153 -0.1 - vertex -14.1612 23.8467 -0.1 + vertex -17.0412 23.3999 -0.2 + vertex -14.8461 20.153 -0.2 + vertex -14.1612 23.8467 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.8461 20.153 -0.1 - vertex -17.0412 23.3999 -0.1 - vertex -15.684 20.0825 -0.1 + vertex -14.8461 20.153 -0.2 + vertex -17.0412 23.3999 -0.2 + vertex -15.684 20.0825 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -15.684 20.0825 -0.1 - vertex -17.0412 23.3999 -0.1 - vertex -16.3079 19.9967 -0.1 + vertex -15.684 20.0825 -0.2 + vertex -17.0412 23.3999 -0.2 + vertex -16.3079 19.9967 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.0412 23.3999 -0.1 - vertex -17.2235 19.8332 -0.1 - vertex -16.3079 19.9967 -0.1 + vertex -17.0412 23.3999 -0.2 + vertex -17.2235 19.8332 -0.2 + vertex -16.3079 19.9967 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -19.3158 23.0662 -0.1 - vertex -17.2235 19.8332 -0.1 - vertex -17.0412 23.3999 -0.1 + vertex -19.3158 23.0662 -0.2 + vertex -17.2235 19.8332 -0.2 + vertex -17.0412 23.3999 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.2235 19.8332 -0.1 - vertex -19.3158 23.0662 -0.1 - vertex -18.1791 19.6811 -0.1 + vertex -17.2235 19.8332 -0.2 + vertex -19.3158 23.0662 -0.2 + vertex -18.1791 19.6811 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.3158 23.0662 -0.1 - vertex -20.1671 19.4139 -0.1 - vertex -18.1791 19.6811 -0.1 + vertex -19.3158 23.0662 -0.2 + vertex -20.1671 19.4139 -0.2 + vertex -18.1791 19.6811 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -20.7318 22.8633 -0.1 - vertex -20.1671 19.4139 -0.1 - vertex -19.3158 23.0662 -0.1 + vertex -20.7318 22.8633 -0.2 + vertex -20.1671 19.4139 -0.2 + vertex -19.3158 23.0662 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.5474 22.7309 -0.1 - vertex -20.1671 19.4139 -0.1 - vertex -20.7318 22.8633 -0.1 + vertex -21.5474 22.7309 -0.2 + vertex -20.1671 19.4139 -0.2 + vertex -20.7318 22.8633 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.1849 19.2007 -0.1 - vertex -21.5474 22.7309 -0.1 - vertex -21.6404 22.7266 -0.1 + vertex -22.1849 19.2007 -0.2 + vertex -21.5474 22.7309 -0.2 + vertex -21.6404 22.7266 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.1849 19.2007 -0.1 - vertex -21.6404 22.7266 -0.1 - vertex -21.755 22.7463 -0.1 + vertex -22.1849 19.2007 -0.2 + vertex -21.6404 22.7266 -0.2 + vertex -21.755 22.7463 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.1849 19.2007 -0.1 - vertex -21.755 22.7463 -0.1 - vertex -22.0315 22.8497 -0.1 + vertex -22.1849 19.2007 -0.2 + vertex -21.755 22.7463 -0.2 + vertex -22.0315 22.8497 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.5474 22.7309 -0.1 - vertex -22.1849 19.2007 -0.1 - vertex -20.1671 19.4139 -0.1 + vertex -21.5474 22.7309 -0.2 + vertex -22.1849 19.2007 -0.2 + vertex -20.1671 19.4139 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3422 23.0246 -0.1 - vertex -22.1849 19.2007 -0.1 - vertex -22.0315 22.8497 -0.1 + vertex -22.3422 23.0246 -0.2 + vertex -22.1849 19.2007 -0.2 + vertex -22.0315 22.8497 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.1455 19.0472 -0.1 - vertex -22.3422 23.0246 -0.1 - vertex -22.6524 23.2546 -0.1 + vertex -24.1455 19.0472 -0.2 + vertex -22.3422 23.0246 -0.2 + vertex -22.6524 23.2546 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.1455 19.0472 -0.1 - vertex -22.6524 23.2546 -0.1 - vertex -23.3692 23.8604 -0.1 + vertex -24.1455 19.0472 -0.2 + vertex -22.6524 23.2546 -0.2 + vertex -23.3692 23.8604 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3422 23.0246 -0.1 - vertex -24.1455 19.0472 -0.1 - vertex -22.1849 19.2007 -0.1 + vertex -22.3422 23.0246 -0.2 + vertex -24.1455 19.0472 -0.2 + vertex -22.1849 19.2007 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.10332 38.557 -0.1 - vertex 5.26494 38.4452 -0.1 - vertex 5.23504 38.5484 -0.1 + vertex 5.10332 38.557 -0.2 + vertex 5.26494 38.4452 -0.2 + vertex 5.23504 38.5484 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.26494 38.4452 -0.1 - vertex 5.01738 38.4749 -0.1 - vertex 5.25596 38.2865 -0.1 + vertex 5.26494 38.4452 -0.2 + vertex 5.01738 38.4749 -0.2 + vertex 5.25596 38.2865 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 5.10332 38.557 -0.1 - vertex 5.23504 38.5484 -0.1 - vertex 5.20457 38.5758 -0.1 + vertex 5.10332 38.557 -0.2 + vertex 5.23504 38.5484 -0.2 + vertex 5.20457 38.5758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.10332 38.557 -0.1 - vertex 5.20457 38.5758 -0.1 - vertex 5.16325 38.5852 -0.1 + vertex 5.10332 38.557 -0.2 + vertex 5.20457 38.5758 -0.2 + vertex 5.16325 38.5852 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.26494 38.4452 -0.1 - vertex 5.10332 38.557 -0.1 - vertex 5.01738 38.4749 -0.1 + vertex 5.26494 38.4452 -0.2 + vertex 5.10332 38.557 -0.2 + vertex 5.01738 38.4749 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.25596 38.2865 -0.1 - vertex 5.01738 38.4749 -0.1 - vertex 5.21112 38.083 -0.1 + vertex 5.25596 38.2865 -0.2 + vertex 5.01738 38.4749 -0.2 + vertex 5.21112 38.083 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.77727 38.1658 -0.1 - vertex 5.21112 38.083 -0.1 - vertex 5.01738 38.4749 -0.1 + vertex 4.77727 38.1658 -0.2 + vertex 5.21112 38.083 -0.2 + vertex 5.01738 38.4749 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.21112 38.083 -0.1 - vertex 4.77727 38.1658 -0.1 - vertex 5.13345 37.8458 -0.1 + vertex 5.21112 38.083 -0.2 + vertex 4.77727 38.1658 -0.2 + vertex 5.13345 37.8458 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.13345 37.8458 -0.1 - vertex 4.77727 38.1658 -0.1 - vertex 5.02596 37.5856 -0.1 + vertex 5.13345 37.8458 -0.2 + vertex 4.77727 38.1658 -0.2 + vertex 5.02596 37.5856 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.46246 37.6912 -0.1 - vertex 5.02596 37.5856 -0.1 - vertex 4.77727 38.1658 -0.1 + vertex 4.46246 37.6912 -0.2 + vertex 5.02596 37.5856 -0.2 + vertex 4.77727 38.1658 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.02596 37.5856 -0.1 - vertex 4.46246 37.6912 -0.1 - vertex 4.89167 37.3134 -0.1 + vertex 5.02596 37.5856 -0.2 + vertex 4.46246 37.6912 -0.2 + vertex 4.89167 37.3134 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.89167 37.3134 -0.1 - vertex 4.46246 37.6912 -0.1 - vertex 4.73361 37.0399 -0.1 + vertex 4.89167 37.3134 -0.2 + vertex 4.46246 37.6912 -0.2 + vertex 4.73361 37.0399 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.09252 37.0842 -0.1 - vertex 4.73361 37.0399 -0.1 - vertex 4.46246 37.6912 -0.1 + vertex 4.09252 37.0842 -0.2 + vertex 4.73361 37.0399 -0.2 + vertex 4.46246 37.6912 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.73361 37.0399 -0.1 - vertex 4.09252 37.0842 -0.1 - vertex 4.62814 36.8484 -0.1 + vertex 4.73361 37.0399 -0.2 + vertex 4.09252 37.0842 -0.2 + vertex 4.62814 36.8484 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.62814 36.8484 -0.1 - vertex 4.09252 37.0842 -0.1 - vertex 4.52293 36.6141 -0.1 + vertex 4.62814 36.8484 -0.2 + vertex 4.09252 37.0842 -0.2 + vertex 4.52293 36.6141 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.68699 36.3778 -0.1 - vertex 4.52293 36.6141 -0.1 - vertex 4.09252 37.0842 -0.1 + vertex 3.68699 36.3778 -0.2 + vertex 4.52293 36.6141 -0.2 + vertex 4.09252 37.0842 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.52293 36.6141 -0.1 - vertex 3.68699 36.3778 -0.1 - vertex 4.31688 36.0346 -0.1 + vertex 4.52293 36.6141 -0.2 + vertex 3.68699 36.3778 -0.2 + vertex 4.31688 36.0346 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.26543 35.6052 -0.1 - vertex 4.31688 36.0346 -0.1 - vertex 3.68699 36.3778 -0.1 + vertex 3.26543 35.6052 -0.2 + vertex 4.31688 36.0346 -0.2 + vertex 3.68699 36.3778 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.31688 36.0346 -0.1 - vertex 3.26543 35.6052 -0.1 - vertex 4.1227 35.3375 -0.1 + vertex 4.31688 36.0346 -0.2 + vertex 3.26543 35.6052 -0.2 + vertex 4.1227 35.3375 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.1227 35.3375 -0.1 - vertex 3.26543 35.6052 -0.1 - vertex 3.94762 34.5584 -0.1 + vertex 4.1227 35.3375 -0.2 + vertex 3.26543 35.6052 -0.2 + vertex 3.94762 34.5584 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 2.84738 34.7996 -0.1 - vertex 3.94762 34.5584 -0.1 - vertex 3.26543 35.6052 -0.1 + vertex 2.84738 34.7996 -0.2 + vertex 3.94762 34.5584 -0.2 + vertex 3.26543 35.6052 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.94762 34.5584 -0.1 - vertex 2.84738 34.7996 -0.1 - vertex 3.79886 33.7332 -0.1 + vertex 3.94762 34.5584 -0.2 + vertex 2.84738 34.7996 -0.2 + vertex 3.79886 33.7332 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 2.4524 33.9939 -0.1 - vertex 3.79886 33.7332 -0.1 - vertex 2.84738 34.7996 -0.1 + vertex 2.4524 33.9939 -0.2 + vertex 3.79886 33.7332 -0.2 + vertex 2.84738 34.7996 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.79886 33.7332 -0.1 - vertex 2.4524 33.9939 -0.1 - vertex 3.68366 32.8976 -0.1 + vertex 3.79886 33.7332 -0.2 + vertex 2.4524 33.9939 -0.2 + vertex 3.68366 32.8976 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 2.10958 33.2371 -0.1 - vertex 3.68366 32.8976 -0.1 - vertex 2.4524 33.9939 -0.1 + vertex 2.10958 33.2371 -0.2 + vertex 3.68366 32.8976 -0.2 + vertex 2.4524 33.9939 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.68366 32.8976 -0.1 - vertex 2.10958 33.2371 -0.1 - vertex 3.60924 32.0876 -0.1 + vertex 3.68366 32.8976 -0.2 + vertex 2.10958 33.2371 -0.2 + vertex 3.60924 32.0876 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.81903 32.5199 -0.1 - vertex 3.60924 32.0876 -0.1 - vertex 2.10958 33.2371 -0.1 + vertex 1.81903 32.5199 -0.2 + vertex 3.60924 32.0876 -0.2 + vertex 2.10958 33.2371 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.27855 5.76024 -0.1 - vertex 1.91748 12.4352 -0.1 - vertex 4.285 6.1855 -0.1 + vertex 5.27855 5.76024 -0.2 + vertex 1.91748 12.4352 -0.2 + vertex 4.285 6.1855 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.57871 31.8344 -0.1 - vertex 3.60924 32.0876 -0.1 - vertex 1.81903 32.5199 -0.1 + vertex 1.57871 31.8344 -0.2 + vertex 3.60924 32.0876 -0.2 + vertex 1.81903 32.5199 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.88346 12.344 -0.1 - vertex 4.285 6.1855 -0.1 - vertex 1.91748 12.4352 -0.1 + vertex 1.88346 12.344 -0.2 + vertex 4.285 6.1855 -0.2 + vertex 1.91748 12.4352 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.285 6.1855 -0.1 - vertex 1.88346 12.344 -0.1 - vertex 3.31149 6.57517 -0.1 + vertex 4.285 6.1855 -0.2 + vertex 1.88346 12.344 -0.2 + vertex 3.31149 6.57517 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.81906 12.2515 -0.1 - vertex 3.31149 6.57517 -0.1 - vertex 1.88346 12.344 -0.1 + vertex 1.81906 12.2515 -0.2 + vertex 3.31149 6.57517 -0.2 + vertex 1.88346 12.344 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.72214 12.1537 -0.1 - vertex 3.31149 6.57517 -0.1 - vertex 1.81906 12.2515 -0.1 + vertex 1.72214 12.1537 -0.2 + vertex 3.31149 6.57517 -0.2 + vertex 1.81906 12.2515 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 3.31149 6.57517 -0.1 - vertex 1.72214 12.1537 -0.1 - vertex 2.42084 6.9015 -0.1 + vertex 3.31149 6.57517 -0.2 + vertex 1.72214 12.1537 -0.2 + vertex 2.42084 6.9015 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 1.42228 11.926 -0.1 - vertex 2.42084 6.9015 -0.1 - vertex 1.72214 12.1537 -0.1 + vertex 1.42228 11.926 -0.2 + vertex 2.42084 6.9015 -0.2 + vertex 1.72214 12.1537 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 2.42084 6.9015 -0.1 - vertex 1.42228 11.926 -0.1 - vertex 1.67583 7.13679 -0.1 + vertex 2.42084 6.9015 -0.2 + vertex 1.42228 11.926 -0.2 + vertex 1.67583 7.13679 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.986004 11.656 -0.1 - vertex 1.67583 7.13679 -0.1 - vertex 1.42228 11.926 -0.1 + vertex 0.986004 11.656 -0.2 + vertex 1.67583 7.13679 -0.2 + vertex 1.42228 11.926 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 1.67583 7.13679 -0.1 - vertex 0.986004 11.656 -0.1 - vertex 1.30727 7.25861 -0.1 + vertex 1.67583 7.13679 -0.2 + vertex 0.986004 11.656 -0.2 + vertex 1.30727 7.25861 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.986004 11.656 -0.1 - vertex 0.855811 7.43981 -0.1 - vertex 1.30727 7.25861 -0.1 + vertex 0.986004 11.656 -0.2 + vertex 0.855811 7.43981 -0.2 + vertex 1.30727 7.25861 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 0.546849 11.4454 -0.1 - vertex 0.855811 7.43981 -0.1 - vertex 0.986004 11.656 -0.1 + vertex 0.546849 11.4454 -0.2 + vertex 0.855811 7.43981 -0.2 + vertex 0.986004 11.656 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.23691 7.94665 -0.1 - vertex 0.546849 11.4454 -0.1 - vertex 0.0942225 11.293 -0.1 + vertex -0.23691 7.94665 -0.2 + vertex 0.546849 11.4454 -0.2 + vertex 0.0942225 11.293 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 0.546849 11.4454 -0.1 - vertex -0.23691 7.94665 -0.1 - vertex 0.855811 7.43981 -0.1 + vertex 0.546849 11.4454 -0.2 + vertex -0.23691 7.94665 -0.2 + vertex 0.855811 7.43981 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -0.382462 11.1972 -0.1 - vertex -0.23691 7.94665 -0.1 - vertex 0.0942225 11.293 -0.1 + vertex -0.382462 11.1972 -0.2 + vertex -0.23691 7.94665 -0.2 + vertex 0.0942225 11.293 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.48458 8.58988 -0.1 - vertex -0.382462 11.1972 -0.1 - vertex -0.893798 11.1566 -0.1 + vertex -1.48458 8.58988 -0.2 + vertex -0.382462 11.1972 -0.2 + vertex -0.893798 11.1566 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.48458 8.58988 -0.1 - vertex -0.893798 11.1566 -0.1 - vertex -1.45038 11.1697 -0.1 + vertex -1.48458 8.58988 -0.2 + vertex -0.893798 11.1566 -0.2 + vertex -1.45038 11.1697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -0.382462 11.1972 -0.1 - vertex -1.48458 8.58988 -0.1 - vertex -0.23691 7.94665 -0.1 + vertex -0.382462 11.1972 -0.2 + vertex -1.48458 8.58988 -0.2 + vertex -0.23691 7.94665 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.76946 9.30203 -0.1 - vertex -1.45038 11.1697 -0.1 - vertex -2.06279 11.235 -0.1 + vertex -2.76946 9.30203 -0.2 + vertex -1.45038 11.1697 -0.2 + vertex -2.06279 11.235 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.76946 9.30203 -0.1 - vertex -2.06279 11.235 -0.1 - vertex -2.74162 11.3511 -0.1 + vertex -2.76946 9.30203 -0.2 + vertex -2.06279 11.235 -0.2 + vertex -2.74162 11.3511 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -1.45038 11.1697 -0.1 - vertex -2.76946 9.30203 -0.1 - vertex -1.48458 8.58988 -0.1 + vertex -1.45038 11.1697 -0.2 + vertex -2.76946 9.30203 -0.2 + vertex -1.48458 8.58988 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -3.97378 10.0157 -0.1 - vertex -2.74162 11.3511 -0.1 - vertex -3.43924 11.4799 -0.1 + vertex -3.97378 10.0157 -0.2 + vertex -2.74162 11.3511 -0.2 + vertex -3.43924 11.4799 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -2.74162 11.3511 -0.1 - vertex -3.97378 10.0157 -0.1 - vertex -2.76946 9.30203 -0.1 + vertex -2.74162 11.3511 -0.2 + vertex -3.97378 10.0157 -0.2 + vertex -2.76946 9.30203 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.06319 11.5774 -0.1 - vertex -3.97378 10.0157 -0.1 - vertex -3.43924 11.4799 -0.1 + vertex -4.06319 11.5774 -0.2 + vertex -3.97378 10.0157 -0.2 + vertex -3.43924 11.4799 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.9798 10.6633 -0.1 - vertex -4.06319 11.5774 -0.1 - vertex -4.60751 11.6434 -0.1 + vertex -4.9798 10.6633 -0.2 + vertex -4.06319 11.5774 -0.2 + vertex -4.60751 11.6434 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -4.06319 11.5774 -0.1 - vertex -4.9798 10.6633 -0.1 - vertex -3.97378 10.0157 -0.1 + vertex -4.06319 11.5774 -0.2 + vertex -4.9798 10.6633 -0.2 + vertex -3.97378 10.0157 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.06624 11.6776 -0.1 - vertex -4.9798 10.6633 -0.1 - vertex -4.60751 11.6434 -0.1 + vertex -5.06624 11.6776 -0.2 + vertex -4.9798 10.6633 -0.2 + vertex -4.60751 11.6434 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.06624 11.6776 -0.1 - vertex -5.37165 10.9414 -0.1 - vertex -4.9798 10.6633 -0.1 + vertex -5.06624 11.6776 -0.2 + vertex -5.37165 10.9414 -0.2 + vertex -4.9798 10.6633 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.4334 11.6797 -0.1 - vertex -5.37165 10.9414 -0.1 - vertex -5.06624 11.6776 -0.1 + vertex -5.4334 11.6797 -0.2 + vertex -5.37165 10.9414 -0.2 + vertex -5.06624 11.6776 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.4334 11.6797 -0.1 - vertex -5.66976 11.1776 -0.1 - vertex -5.37165 10.9414 -0.1 + vertex -5.4334 11.6797 -0.2 + vertex -5.66976 11.1776 -0.2 + vertex -5.37165 10.9414 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.70304 11.6495 -0.1 - vertex -5.66976 11.1776 -0.1 - vertex -5.4334 11.6797 -0.1 + vertex -5.70304 11.6495 -0.2 + vertex -5.66976 11.1776 -0.2 + vertex -5.4334 11.6797 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.85942 11.3636 -0.1 - vertex -5.70304 11.6495 -0.1 - vertex -5.79943 11.6221 -0.1 + vertex -5.85942 11.3636 -0.2 + vertex -5.70304 11.6495 -0.2 + vertex -5.79943 11.6221 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.70304 11.6495 -0.1 - vertex -5.85942 11.3636 -0.1 - vertex -5.66976 11.1776 -0.1 + vertex -5.70304 11.6495 -0.2 + vertex -5.85942 11.3636 -0.2 + vertex -5.66976 11.1776 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.8692 11.5867 -0.1 - vertex -5.85942 11.3636 -0.1 - vertex -5.79943 11.6221 -0.1 + vertex -5.8692 11.5867 -0.2 + vertex -5.85942 11.3636 -0.2 + vertex -5.79943 11.6221 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.8692 11.5867 -0.1 - vertex -5.90899 11.4352 -0.1 - vertex -5.85942 11.3636 -0.1 + vertex -5.8692 11.5867 -0.2 + vertex -5.90899 11.4352 -0.2 + vertex -5.85942 11.3636 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -5.91161 11.5429 -0.1 - vertex -5.90899 11.4352 -0.1 - vertex -5.8692 11.5867 -0.1 + vertex -5.91161 11.5429 -0.2 + vertex -5.90899 11.4352 -0.2 + vertex -5.8692 11.5867 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.90899 11.4352 -0.1 - vertex -5.91161 11.5429 -0.1 - vertex -5.92592 11.491 -0.1 + vertex -5.90899 11.4352 -0.2 + vertex -5.91161 11.5429 -0.2 + vertex -5.92592 11.491 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.51759 -4.36865 -0.1 - vertex 8.0755 -3.36119 -0.1 - vertex 7.75455 -3.09522 -0.1 + vertex 6.51759 -4.36865 -0.2 + vertex 8.0755 -3.36119 -0.2 + vertex 7.75455 -3.09522 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.2523 -4.01644 -0.1 - vertex 7.75455 -3.09522 -0.1 - vertex 7.10115 -2.48513 -0.1 + vertex 6.2523 -4.01644 -0.2 + vertex 7.75455 -3.09522 -0.2 + vertex 7.10115 -2.48513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.70978 -3.81721 -0.1 - vertex 7.04277 -4.97268 -0.1 - vertex 7.809 -5.75259 -0.1 + vertex 8.70978 -3.81721 -0.2 + vertex 7.04277 -4.97268 -0.2 + vertex 7.809 -5.75259 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.0755 -3.36119 -0.1 - vertex 6.78219 -4.68956 -0.1 - vertex 7.04277 -4.97268 -0.1 + vertex 8.0755 -3.36119 -0.2 + vertex 6.78219 -4.68956 -0.2 + vertex 7.04277 -4.97268 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 8.0755 -3.36119 -0.1 - vertex 6.51759 -4.36865 -0.1 - vertex 6.78219 -4.68956 -0.1 + vertex 8.0755 -3.36119 -0.2 + vertex 6.51759 -4.36865 -0.2 + vertex 6.78219 -4.68956 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.48552 -2.8367 -0.1 - vertex 7.10115 -2.48513 -0.1 - vertex 6.42718 -1.76788 -0.1 + vertex 5.48552 -2.8367 -0.2 + vertex 7.10115 -2.48513 -0.2 + vertex 6.42718 -1.76788 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.75455 -3.09522 -0.1 - vertex 6.2523 -4.01644 -0.1 - vertex 6.51759 -4.36865 -0.1 + vertex 7.75455 -3.09522 -0.2 + vertex 6.2523 -4.01644 -0.2 + vertex 6.51759 -4.36865 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.10115 -2.48513 -0.1 - vertex 5.98964 -3.63939 -0.1 - vertex 6.2523 -4.01644 -0.1 + vertex 7.10115 -2.48513 -0.2 + vertex 5.98964 -3.63939 -0.2 + vertex 6.2523 -4.01644 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.03179 -2.01239 -0.1 - vertex 6.42718 -1.76788 -0.1 - vertex 5.79491 -1.04264 -0.1 + vertex 5.03179 -2.01239 -0.2 + vertex 6.42718 -1.76788 -0.2 + vertex 5.79491 -1.04264 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.10115 -2.48513 -0.1 - vertex 5.48552 -2.8367 -0.1 - vertex 5.98964 -3.63939 -0.1 + vertex 7.10115 -2.48513 -0.2 + vertex 5.48552 -2.8367 -0.2 + vertex 5.98964 -3.63939 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.65505 -1.21825 -0.1 - vertex 5.79491 -1.04264 -0.1 - vertex 5.24358 -0.384283 -0.1 + vertex 4.65505 -1.21825 -0.2 + vertex 5.79491 -1.04264 -0.2 + vertex 5.24358 -0.384283 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 6.42718 -1.76788 -0.1 - vertex 5.03179 -2.01239 -0.1 - vertex 5.48552 -2.8367 -0.1 + vertex 6.42718 -1.76788 -0.2 + vertex 5.03179 -2.01239 -0.2 + vertex 5.48552 -2.8367 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.38188 -0.506111 -0.1 - vertex 5.24358 -0.384283 -0.1 - vertex 4.83246 0.134689 -0.1 + vertex 4.38188 -0.506111 -0.2 + vertex 5.24358 -0.384283 -0.2 + vertex 4.83246 0.134689 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.79491 -1.04264 -0.1 - vertex 4.65505 -1.21825 -0.1 - vertex 5.03179 -2.01239 -0.1 + vertex 5.79491 -1.04264 -0.2 + vertex 4.65505 -1.21825 -0.2 + vertex 5.03179 -2.01239 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.23886 0.0722368 -0.1 - vertex 4.83246 0.134689 -0.1 - vertex 4.62083 0.441773 -0.1 + vertex 4.23886 0.0722368 -0.2 + vertex 4.83246 0.134689 -0.2 + vertex 4.62083 0.441773 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.24358 -0.384283 -0.1 - vertex 4.50386 -0.848697 -0.1 - vertex 4.65505 -1.21825 -0.1 + vertex 5.24358 -0.384283 -0.2 + vertex 4.50386 -0.848697 -0.2 + vertex 4.65505 -1.21825 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.25257 0.464986 -0.1 - vertex 4.62083 0.441773 -0.1 - vertex 4.49221 0.674515 -0.1 + vertex 4.25257 0.464986 -0.2 + vertex 4.62083 0.441773 -0.2 + vertex 4.49221 0.674515 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.33872 0.684191 -0.1 - vertex 4.49221 0.674515 -0.1 - vertex 4.44662 0.733548 -0.1 + vertex 4.33872 0.684191 -0.2 + vertex 4.49221 0.674515 -0.2 + vertex 4.44662 0.733548 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex 4.3737 0.738144 -0.1 - vertex 4.44662 0.733548 -0.1 - vertex 4.40839 0.754677 -0.1 + vertex 4.3737 0.738144 -0.2 + vertex 4.44662 0.733548 -0.2 + vertex 4.40839 0.754677 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 5.24358 -0.384283 -0.1 - vertex 4.38188 -0.506111 -0.1 - vertex 4.50386 -0.848697 -0.1 + vertex 5.24358 -0.384283 -0.2 + vertex 4.38188 -0.506111 -0.2 + vertex 4.50386 -0.848697 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.44662 0.733548 -0.1 - vertex 4.3737 0.738144 -0.1 - vertex 4.33872 0.684191 -0.1 + vertex 4.44662 0.733548 -0.2 + vertex 4.3737 0.738144 -0.2 + vertex 4.33872 0.684191 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.49221 0.674515 -0.1 - vertex 4.33872 0.684191 -0.1 - vertex 4.25257 0.464986 -0.1 + vertex 4.49221 0.674515 -0.2 + vertex 4.33872 0.684191 -0.2 + vertex 4.25257 0.464986 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.83246 0.134689 -0.1 - vertex 4.29244 -0.196974 -0.1 - vertex 4.38188 -0.506111 -0.1 + vertex 4.83246 0.134689 -0.2 + vertex 4.29244 -0.196974 -0.2 + vertex 4.38188 -0.506111 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.62083 0.441773 -0.1 - vertex 4.25257 0.464986 -0.1 - vertex 4.22446 0.295049 -0.1 + vertex 4.62083 0.441773 -0.2 + vertex 4.25257 0.464986 -0.2 + vertex 4.22446 0.295049 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.83246 0.134689 -0.1 - vertex 4.23886 0.0722368 -0.1 - vertex 4.29244 -0.196974 -0.1 + vertex 4.83246 0.134689 -0.2 + vertex 4.23886 0.0722368 -0.2 + vertex 4.29244 -0.196974 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 4.62083 0.441773 -0.1 - vertex 4.22446 0.295049 -0.1 - vertex 4.23886 0.0722368 -0.1 + vertex 4.62083 0.441773 -0.2 + vertex 4.22446 0.295049 -0.2 + vertex 4.23886 0.0722368 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.0092 9.15168 -0.1 - vertex 8.87708 15.8492 -0.1 - vertex 14.9543 8.95485 -0.1 + vertex 15.0092 9.15168 -0.2 + vertex 8.87708 15.8492 -0.2 + vertex 14.9543 8.95485 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.2183 5.95043 -0.1 - vertex 9.61741 3.25086 -0.1 - vertex 10.5842 2.40247 -0.1 + vertex 15.2183 5.95043 -0.2 + vertex 9.61741 3.25086 -0.2 + vertex 10.5842 2.40247 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.1095 6.5543 -0.1 - vertex 9.29624 3.50894 -0.1 - vertex 9.61741 3.25086 -0.1 + vertex 15.1095 6.5543 -0.2 + vertex 9.29624 3.50894 -0.2 + vertex 9.61741 3.25086 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 14.9543 8.95485 -0.1 - vertex 8.87708 15.8492 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 14.9543 8.95485 -0.2 + vertex 8.87708 15.8492 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 15.0249 7.13954 -0.1 - vertex 9.14614 3.60373 -0.1 - vertex 9.29624 3.50894 -0.1 + vertex 15.0249 7.13954 -0.2 + vertex 9.14614 3.60373 -0.2 + vertex 9.29624 3.50894 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9668 7.69881 -0.1 - vertex 8.19732 4.25764 -0.1 - vertex 8.81858 3.79581 -0.1 + vertex 14.9668 7.69881 -0.2 + vertex 8.19732 4.25764 -0.2 + vertex 8.81858 3.79581 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9543 8.95485 -0.1 - vertex 7.07462 4.9138 -0.1 - vertex 14.9262 8.72903 -0.1 + vertex 14.9543 8.95485 -0.2 + vertex 7.07462 4.9138 -0.2 + vertex 14.9262 8.72903 -0.2 endloop endfacet facet normal 0 -0 1 outer loop - vertex 7.75154 4.54807 -0.1 - vertex 14.9262 8.72903 -0.1 - vertex 7.07462 4.9138 -0.1 + vertex 7.75154 4.54807 -0.2 + vertex 14.9262 8.72903 -0.2 + vertex 7.07462 4.9138 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 8.87708 15.8492 -0.1 - vertex 8.83337 15.875 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 8.87708 15.8492 -0.2 + vertex 8.83337 15.875 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 9.14614 3.60373 -0.1 - vertex 8.81858 3.79581 -0.1 - vertex 9.03464 3.65533 -0.1 + vertex 9.14614 3.60373 -0.2 + vertex 8.81858 3.79581 -0.2 + vertex 9.03464 3.65533 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 8.83337 15.875 -0.1 - vertex 8.76553 15.9481 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 8.83337 15.875 -0.2 + vertex 8.76553 15.9481 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 8.76553 15.9481 -0.1 - vertex 8.57086 16.213 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 8.76553 15.9481 -0.2 + vertex 8.57086 16.213 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9668 7.69881 -0.1 - vertex 8.81858 3.79581 -0.1 - vertex 9.14614 3.60373 -0.1 + vertex 14.9668 7.69881 -0.2 + vertex 8.81858 3.79581 -0.2 + vertex 9.14614 3.60373 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 8.57086 16.213 -0.1 - vertex 8.03973 17.0592 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 8.57086 16.213 -0.2 + vertex 8.03973 17.0592 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9212 8.45633 -0.1 - vertex 8.00725 4.39171 -0.1 - vertex 8.19732 4.25764 -0.1 + vertex 14.9212 8.45633 -0.2 + vertex 8.00725 4.39171 -0.2 + vertex 8.19732 4.25764 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9212 8.45633 -0.1 - vertex 7.75154 4.54807 -0.1 - vertex 8.00725 4.39171 -0.1 + vertex 14.9212 8.45633 -0.2 + vertex 7.75154 4.54807 -0.2 + vertex 8.00725 4.39171 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 8.03973 17.0592 -0.1 - vertex 7.49889 18.0241 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 8.03973 17.0592 -0.2 + vertex 7.49889 18.0241 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 7.49889 18.0241 -0.1 - vertex 7.29207 18.4374 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 7.49889 18.0241 -0.2 + vertex 7.29207 18.4374 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 7.29207 18.4374 -0.1 - vertex 7.16351 18.7442 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 7.29207 18.4374 -0.2 + vertex 7.16351 18.7442 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 7.16351 18.7442 -0.1 - vertex 7.1273 18.8927 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 7.16351 18.7442 -0.2 + vertex 7.1273 18.8927 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 14.9262 8.72903 -0.1 - vertex 7.75154 4.54807 -0.1 - vertex 14.9212 8.45633 -0.1 + vertex 14.9262 8.72903 -0.2 + vertex 7.75154 4.54807 -0.2 + vertex 14.9212 8.45633 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex 7.07462 4.9138 -0.1 - vertex 7.1273 18.8927 -0.1 - vertex 7.1242 19.0144 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 7.1273 18.8927 -0.2 + vertex 7.1242 19.0144 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -11.1091 19.5935 -0.1 - vertex -9.25643 14.3812 -0.1 - vertex -10.9948 19.7221 -0.1 + vertex -11.1091 19.5935 -0.2 + vertex -9.25643 14.3812 -0.2 + vertex -10.9948 19.7221 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -11.4702 19.2748 -0.1 - vertex -9.25643 14.3812 -0.1 - vertex -11.1091 19.5935 -0.1 + vertex -11.4702 19.2748 -0.2 + vertex -9.25643 14.3812 -0.2 + vertex -11.1091 19.5935 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.25643 14.3812 -0.1 - vertex -11.4702 19.2748 -0.1 - vertex -9.98725 14.3241 -0.1 + vertex -9.25643 14.3812 -0.2 + vertex -11.4702 19.2748 -0.2 + vertex -9.98725 14.3241 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -12.0016 18.8648 -0.1 - vertex -9.98725 14.3241 -0.1 - vertex -11.4702 19.2748 -0.1 + vertex -12.0016 18.8648 -0.2 + vertex -9.98725 14.3241 -0.2 + vertex -11.4702 19.2748 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -9.98725 14.3241 -0.1 - vertex -12.0016 18.8648 -0.1 - vertex -10.6249 14.238 -0.1 + vertex -9.98725 14.3241 -0.2 + vertex -12.0016 18.8648 -0.2 + vertex -10.6249 14.238 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -10.6249 14.238 -0.1 - vertex -12.0016 18.8648 -0.1 - vertex -11.2428 14.1101 -0.1 + vertex -10.6249 14.238 -0.2 + vertex -12.0016 18.8648 -0.2 + vertex -11.2428 14.1101 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -13.8225 17.5152 -0.1 - vertex -11.2428 14.1101 -0.1 - vertex -12.0016 18.8648 -0.1 + vertex -13.8225 17.5152 -0.2 + vertex -11.2428 14.1101 -0.2 + vertex -12.0016 18.8648 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.2428 14.1101 -0.1 - vertex -13.8225 17.5152 -0.1 - vertex -11.9142 13.9281 -0.1 + vertex -11.2428 14.1101 -0.2 + vertex -13.8225 17.5152 -0.2 + vertex -11.9142 13.9281 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -11.9142 13.9281 -0.1 - vertex -13.8225 17.5152 -0.1 - vertex -12.7125 13.6795 -0.1 + vertex -11.9142 13.9281 -0.2 + vertex -13.8225 17.5152 -0.2 + vertex -12.7125 13.6795 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.4648 17.0612 -0.1 - vertex -12.7125 13.6795 -0.1 - vertex -13.8225 17.5152 -0.1 + vertex -14.4648 17.0612 -0.2 + vertex -12.7125 13.6795 -0.2 + vertex -13.8225 17.5152 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -14.9972 16.7116 -0.1 - vertex -12.7125 13.6795 -0.1 - vertex -14.4648 17.0612 -0.1 + vertex -14.9972 16.7116 -0.2 + vertex -12.7125 13.6795 -0.2 + vertex -14.4648 17.0612 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -12.7125 13.6795 -0.1 - vertex -14.9972 16.7116 -0.1 - vertex -13.7109 13.3517 -0.1 + vertex -12.7125 13.6795 -0.2 + vertex -14.9972 16.7116 -0.2 + vertex -13.7109 13.3517 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.4716 16.4339 -0.1 - vertex -13.7109 13.3517 -0.1 - vertex -14.9972 16.7116 -0.1 + vertex -15.4716 16.4339 -0.2 + vertex -13.7109 13.3517 -0.2 + vertex -14.9972 16.7116 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.7109 13.3517 -0.1 - vertex -15.4716 16.4339 -0.1 - vertex -14.949 12.9624 -0.1 + vertex -13.7109 13.3517 -0.2 + vertex -15.4716 16.4339 -0.2 + vertex -14.949 12.9624 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -15.9397 16.1961 -0.1 - vertex -14.949 12.9624 -0.1 - vertex -15.4716 16.4339 -0.1 + vertex -15.9397 16.1961 -0.2 + vertex -14.949 12.9624 -0.2 + vertex -15.4716 16.4339 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -16.4531 15.9659 -0.1 - vertex -14.949 12.9624 -0.1 - vertex -15.9397 16.1961 -0.1 + vertex -16.4531 15.9659 -0.2 + vertex -14.949 12.9624 -0.2 + vertex -15.9397 16.1961 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -14.949 12.9624 -0.1 - vertex -16.4531 15.9659 -0.1 - vertex -16.0795 12.6436 -0.1 + vertex -14.949 12.9624 -0.2 + vertex -16.4531 15.9659 -0.2 + vertex -16.0795 12.6436 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -17.0637 15.711 -0.1 - vertex -16.0795 12.6436 -0.1 - vertex -16.4531 15.9659 -0.1 + vertex -17.0637 15.711 -0.2 + vertex -16.0795 12.6436 -0.2 + vertex -16.4531 15.9659 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.0795 12.6436 -0.1 - vertex -17.0637 15.711 -0.1 - vertex -16.9775 12.4282 -0.1 + vertex -16.0795 12.6436 -0.2 + vertex -17.0637 15.711 -0.2 + vertex -16.9775 12.4282 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -18.4061 15.1884 -0.1 - vertex -16.9775 12.4282 -0.1 - vertex -17.0637 15.711 -0.1 + vertex -18.4061 15.1884 -0.2 + vertex -16.9775 12.4282 -0.2 + vertex -17.0637 15.711 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -16.9775 12.4282 -0.1 - vertex -18.4061 15.1884 -0.1 - vertex -17.3003 12.3696 -0.1 + vertex -16.9775 12.4282 -0.2 + vertex -18.4061 15.1884 -0.2 + vertex -17.3003 12.3696 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.3003 12.3696 -0.1 - vertex -18.4061 15.1884 -0.1 - vertex -17.5181 12.3491 -0.1 + vertex -17.3003 12.3696 -0.2 + vertex -18.4061 15.1884 -0.2 + vertex -17.5181 12.3491 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -17.5181 12.3491 -0.1 - vertex -18.4061 15.1884 -0.1 - vertex -17.9556 12.3221 -0.1 + vertex -17.5181 12.3491 -0.2 + vertex -18.4061 15.1884 -0.2 + vertex -17.9556 12.3221 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.4061 15.1884 -0.1 - vertex -18.5728 12.2484 -0.1 - vertex -17.9556 12.3221 -0.1 + vertex -18.4061 15.1884 -0.2 + vertex -18.5728 12.2484 -0.2 + vertex -17.9556 12.3221 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -19.7213 14.7364 -0.1 - vertex -18.5728 12.2484 -0.1 - vertex -18.4061 15.1884 -0.1 + vertex -19.7213 14.7364 -0.2 + vertex -18.5728 12.2484 -0.2 + vertex -18.4061 15.1884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -18.5728 12.2484 -0.1 - vertex -19.7213 14.7364 -0.1 - vertex -19.2876 12.1394 -0.1 + vertex -18.5728 12.2484 -0.2 + vertex -19.7213 14.7364 -0.2 + vertex -19.2876 12.1394 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -19.7213 14.7364 -0.1 - vertex -20.0181 12.0063 -0.1 - vertex -19.2876 12.1394 -0.1 + vertex -19.7213 14.7364 -0.2 + vertex -20.0181 12.0063 -0.2 + vertex -19.2876 12.1394 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -21.0167 14.3533 -0.1 - vertex -20.0181 12.0063 -0.1 - vertex -19.7213 14.7364 -0.1 + vertex -21.0167 14.3533 -0.2 + vertex -20.0181 12.0063 -0.2 + vertex -19.7213 14.7364 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -20.0181 12.0063 -0.1 - vertex -21.0167 14.3533 -0.1 - vertex -20.4772 11.9313 -0.1 + vertex -20.0181 12.0063 -0.2 + vertex -21.0167 14.3533 -0.2 + vertex -20.4772 11.9313 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -21.0167 14.3533 -0.1 - vertex -21.0446 11.8651 -0.1 - vertex -20.4772 11.9313 -0.1 + vertex -21.0167 14.3533 -0.2 + vertex -21.0446 11.8651 -0.2 + vertex -20.4772 11.9313 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -22.3001 14.0374 -0.1 - vertex -21.0446 11.8651 -0.1 - vertex -21.0167 14.3533 -0.1 + vertex -22.3001 14.0374 -0.2 + vertex -21.0446 11.8651 -0.2 + vertex -21.0167 14.3533 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -22.3001 14.0374 -0.1 - vertex -22.4311 11.7593 -0.1 - vertex -21.0446 11.8651 -0.1 + vertex -22.3001 14.0374 -0.2 + vertex -22.4311 11.7593 -0.2 + vertex -21.0446 11.8651 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -23.579 13.787 -0.1 - vertex -22.4311 11.7593 -0.1 - vertex -22.3001 14.0374 -0.1 + vertex -23.579 13.787 -0.2 + vertex -22.4311 11.7593 -0.2 + vertex -22.3001 14.0374 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -23.579 13.787 -0.1 - vertex -24.031 11.6901 -0.1 - vertex -22.4311 11.7593 -0.1 + vertex -23.579 13.787 -0.2 + vertex -24.031 11.6901 -0.2 + vertex -22.4311 11.7593 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -24.8613 13.6003 -0.1 - vertex -24.031 11.6901 -0.1 - vertex -23.579 13.787 -0.1 + vertex -24.8613 13.6003 -0.2 + vertex -24.031 11.6901 -0.2 + vertex -23.579 13.787 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.8613 13.6003 -0.1 - vertex -25.698 11.6586 -0.1 - vertex -24.031 11.6901 -0.1 + vertex -24.8613 13.6003 -0.2 + vertex -25.698 11.6586 -0.2 + vertex -24.031 11.6901 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.1544 13.4758 -0.1 - vertex -25.698 11.6586 -0.1 - vertex -24.8613 13.6003 -0.1 + vertex -26.1544 13.4758 -0.2 + vertex -25.698 11.6586 -0.2 + vertex -24.8613 13.6003 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.1544 13.4758 -0.1 - vertex -27.2855 11.6658 -0.1 - vertex -25.698 11.6586 -0.1 + vertex -26.1544 13.4758 -0.2 + vertex -27.2855 11.6658 -0.2 + vertex -25.698 11.6586 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -27.4661 13.4117 -0.1 - vertex -27.2855 11.6658 -0.1 - vertex -26.1544 13.4758 -0.1 + vertex -27.4661 13.4117 -0.2 + vertex -27.2855 11.6658 -0.2 + vertex -26.1544 13.4758 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.4661 13.4117 -0.1 - vertex -28.647 11.7129 -0.1 - vertex -27.2855 11.6658 -0.1 + vertex -27.4661 13.4117 -0.2 + vertex -28.647 11.7129 -0.2 + vertex -27.2855 11.6658 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.0548 13.353 -0.1 - vertex -28.647 11.7129 -0.1 - vertex -27.4661 13.4117 -0.1 + vertex -29.0548 13.353 -0.2 + vertex -28.647 11.7129 -0.2 + vertex -27.4661 13.4117 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.0548 13.353 -0.1 - vertex -29.1973 11.7518 -0.1 - vertex -28.647 11.7129 -0.1 + vertex -29.0548 13.353 -0.2 + vertex -29.1973 11.7518 -0.2 + vertex -28.647 11.7129 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -29.5683 13.309 -0.1 - vertex -29.1973 11.7518 -0.1 - vertex -29.0548 13.353 -0.1 + vertex -29.5683 13.309 -0.2 + vertex -29.1973 11.7518 -0.2 + vertex -29.0548 13.353 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.5683 13.309 -0.1 - vertex -29.6362 11.801 -0.1 - vertex -29.1973 11.7518 -0.1 + vertex -29.5683 13.309 -0.2 + vertex -29.6362 11.801 -0.2 + vertex -29.1973 11.7518 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3556 12.4664 -0.1 - vertex -29.5683 13.309 -0.1 - vertex -29.9294 13.2465 -0.1 + vertex -30.3556 12.4664 -0.2 + vertex -29.5683 13.309 -0.2 + vertex -29.9294 13.2465 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.5683 13.309 -0.1 - vertex -30.2975 12.2549 -0.1 - vertex -29.6362 11.801 -0.1 + vertex -29.5683 13.309 -0.2 + vertex -30.2975 12.2549 -0.2 + vertex -29.6362 11.801 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.6362 11.801 -0.1 - vertex -30.2975 12.2549 -0.1 - vertex -29.9453 11.8607 -0.1 + vertex -29.6362 11.801 -0.2 + vertex -30.2975 12.2549 -0.2 + vertex -29.9453 11.8607 -0.2 endloop endfacet facet normal -0 -0 1 outer loop - vertex -30.2115 12.0683 -0.1 - vertex -29.9453 11.8607 -0.1 - vertex -30.2975 12.2549 -0.1 + vertex -30.2115 12.0683 -0.2 + vertex -29.9453 11.8607 -0.2 + vertex -30.2975 12.2549 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.377 12.6783 -0.1 - vertex -29.9294 13.2465 -0.1 - vertex -30.1646 13.1588 -0.1 + vertex -30.377 12.6783 -0.2 + vertex -29.9294 13.2465 -0.2 + vertex -30.1646 13.1588 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.9453 11.8607 -0.1 - vertex -30.2115 12.0683 -0.1 - vertex -30.0456 11.8946 -0.1 + vertex -29.9453 11.8607 -0.2 + vertex -30.2115 12.0683 -0.2 + vertex -30.0456 11.8946 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3621 12.8813 -0.1 - vertex -30.1646 13.1588 -0.1 - vertex -30.2432 13.1034 -0.1 + vertex -30.3621 12.8813 -0.2 + vertex -30.1646 13.1588 -0.2 + vertex -30.2432 13.1034 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0456 11.8946 -0.1 - vertex -30.2115 12.0683 -0.1 - vertex -30.1065 11.9311 -0.1 + vertex -30.0456 11.8946 -0.2 + vertex -30.2115 12.0683 -0.2 + vertex -30.1065 11.9311 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3387 12.9655 -0.1 - vertex -30.2432 13.1034 -0.1 - vertex -30.3001 13.0393 -0.1 + vertex -30.3387 12.9655 -0.2 + vertex -30.2432 13.1034 -0.2 + vertex -30.3001 13.0393 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.2432 13.1034 -0.1 - vertex -30.3387 12.9655 -0.1 - vertex -30.3621 12.8813 -0.1 + vertex -30.2432 13.1034 -0.2 + vertex -30.3387 12.9655 -0.2 + vertex -30.3621 12.8813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.5683 13.309 -0.1 - vertex -30.3556 12.4664 -0.1 - vertex -30.2975 12.2549 -0.1 + vertex -29.5683 13.309 -0.2 + vertex -30.3556 12.4664 -0.2 + vertex -30.2975 12.2549 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.1646 13.1588 -0.1 - vertex -30.3621 12.8813 -0.1 - vertex -30.377 12.6783 -0.1 + vertex -30.1646 13.1588 -0.2 + vertex -30.3621 12.8813 -0.2 + vertex -30.377 12.6783 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.9294 13.2465 -0.1 - vertex -30.377 12.6783 -0.1 - vertex -30.3556 12.4664 -0.1 + vertex -29.9294 13.2465 -0.2 + vertex -30.377 12.6783 -0.2 + vertex -30.3556 12.4664 -0.2 endloop endfacet facet normal -0 0 1 outer loop - vertex -26.053 23.8437 -0.1 - vertex -24.1455 19.0472 -0.1 - vertex -24.6523 24.0122 -0.1 + vertex -26.053 23.8437 -0.2 + vertex -24.1455 19.0472 -0.2 + vertex -24.6523 24.0122 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -24.1455 19.0472 -0.1 - vertex -26.053 23.8437 -0.1 - vertex -25.9619 18.9589 -0.1 + vertex -24.1455 19.0472 -0.2 + vertex -26.053 23.8437 -0.2 + vertex -25.9619 18.9589 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -26.053 23.8437 -0.1 - vertex -26.7338 23.7794 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -26.053 23.8437 -0.2 + vertex -26.7338 23.7794 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.053 23.8437 -0.1 - vertex -28.3394 21.9725 -0.1 - vertex -25.9619 18.9589 -0.1 + vertex -26.053 23.8437 -0.2 + vertex -28.3394 21.9725 -0.2 + vertex -25.9619 18.9589 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -26.7338 23.7794 -0.1 - vertex -27.3569 23.7586 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -26.7338 23.7794 -0.2 + vertex -27.3569 23.7586 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -25.9619 18.9589 -0.1 - vertex -28.3394 21.9725 -0.1 - vertex -26.7887 18.9409 -0.1 + vertex -25.9619 18.9589 -0.2 + vertex -28.3394 21.9725 -0.2 + vertex -26.7887 18.9409 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -27.3569 23.7586 -0.1 - vertex -27.9279 23.7822 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -27.3569 23.7586 -0.2 + vertex -27.9279 23.7822 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -26.7887 18.9409 -0.1 - vertex -28.3394 21.9725 -0.1 - vertex -27.5469 18.9414 -0.1 + vertex -26.7887 18.9409 -0.2 + vertex -28.3394 21.9725 -0.2 + vertex -27.5469 18.9414 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.5469 18.9414 -0.1 - vertex -28.3394 21.9725 -0.1 - vertex -28.2256 18.9609 -0.1 + vertex -27.5469 18.9414 -0.2 + vertex -28.3394 21.9725 -0.2 + vertex -28.2256 18.9609 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.0186 22.3563 -0.1 - vertex -27.9279 23.7822 -0.1 - vertex -28.4524 23.8513 -0.1 + vertex -29.0186 22.3563 -0.2 + vertex -27.9279 23.7822 -0.2 + vertex -28.4524 23.8513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.4321 22.5993 -0.1 - vertex -28.4524 23.8513 -0.1 - vertex -28.9359 23.9669 -0.1 + vertex -29.4321 22.5993 -0.2 + vertex -28.4524 23.8513 -0.2 + vertex -28.9359 23.9669 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -27.9279 23.7822 -0.1 - vertex -29.0186 22.3563 -0.1 - vertex -28.3394 21.9725 -0.1 + vertex -27.9279 23.7822 -0.2 + vertex -29.0186 22.3563 -0.2 + vertex -28.3394 21.9725 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.7937 22.8325 -0.1 - vertex -28.9359 23.9669 -0.1 - vertex -29.384 24.13 -0.1 + vertex -29.7937 22.8325 -0.2 + vertex -28.9359 23.9669 -0.2 + vertex -29.384 24.13 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.4524 23.8513 -0.1 - vertex -29.4321 22.5993 -0.1 - vertex -29.0186 22.3563 -0.1 + vertex -28.4524 23.8513 -0.2 + vertex -29.4321 22.5993 -0.2 + vertex -29.0186 22.3563 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.9359 23.9669 -0.1 - vertex -29.7937 22.8325 -0.1 - vertex -29.4321 22.5993 -0.1 + vertex -28.9359 23.9669 -0.2 + vertex -29.7937 22.8325 -0.2 + vertex -29.4321 22.5993 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.3761 23.2826 -0.1 - vertex -29.384 24.13 -0.1 - vertex -29.8023 24.3416 -0.1 + vertex -30.3761 23.2826 -0.2 + vertex -29.384 24.13 -0.2 + vertex -29.8023 24.3416 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.384 24.13 -0.1 - vertex -30.1071 23.0591 -0.1 - vertex -29.7937 22.8325 -0.1 + vertex -29.384 24.13 -0.2 + vertex -30.1071 23.0591 -0.2 + vertex -29.7937 22.8325 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.7957 23.7338 -0.1 - vertex -29.8023 24.3416 -0.1 - vertex -30.1964 24.6027 -0.1 + vertex -30.7957 23.7338 -0.2 + vertex -29.8023 24.3416 -0.2 + vertex -30.1964 24.6027 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.384 24.13 -0.1 - vertex -30.3761 23.2826 -0.1 - vertex -30.1071 23.0591 -0.1 + vertex -29.384 24.13 -0.2 + vertex -30.3761 23.2826 -0.2 + vertex -30.1071 23.0591 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.0826 24.213 -0.1 - vertex -30.1964 24.6027 -0.1 - vertex -30.5308 24.8328 -0.1 + vertex -31.0826 24.213 -0.2 + vertex -30.1964 24.6027 -0.2 + vertex -30.5308 24.8328 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.8023 24.3416 -0.1 - vertex -30.6044 23.5064 -0.1 - vertex -30.3761 23.2826 -0.1 + vertex -29.8023 24.3416 -0.2 + vertex -30.6044 23.5064 -0.2 + vertex -30.3761 23.2826 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -29.8023 24.3416 -0.1 - vertex -30.7957 23.7338 -0.1 - vertex -30.6044 23.5064 -0.1 + vertex -29.8023 24.3416 -0.2 + vertex -30.7957 23.7338 -0.2 + vertex -30.6044 23.5064 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2103 24.5339 -0.1 - vertex -30.5308 24.8328 -0.1 - vertex -30.8055 24.9813 -0.1 + vertex -31.2103 24.5339 -0.2 + vertex -30.5308 24.8328 -0.2 + vertex -30.8055 24.9813 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.1964 24.6027 -0.1 - vertex -30.9539 23.9682 -0.1 - vertex -30.7957 23.7338 -0.1 + vertex -30.1964 24.6027 -0.2 + vertex -30.9539 23.9682 -0.2 + vertex -30.7957 23.7338 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2656 24.779 -0.1 - vertex -30.8055 24.9813 -0.1 - vertex -31.0185 25.0493 -0.1 + vertex -31.2656 24.779 -0.2 + vertex -30.8055 24.9813 -0.2 + vertex -31.0185 25.0493 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.1964 24.6027 -0.1 - vertex -31.0826 24.213 -0.1 - vertex -30.9539 23.9682 -0.1 + vertex -30.1964 24.6027 -0.2 + vertex -31.0826 24.213 -0.2 + vertex -30.9539 23.9682 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2668 24.8727 -0.1 - vertex -31.0185 25.0493 -0.1 - vertex -31.1012 25.0533 -0.1 + vertex -31.2668 24.8727 -0.2 + vertex -31.0185 25.0493 -0.2 + vertex -31.1012 25.0533 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2507 24.9472 -0.1 - vertex -31.1012 25.0533 -0.1 - vertex -31.1676 25.0376 -0.1 + vertex -31.2507 24.9472 -0.2 + vertex -31.1012 25.0533 -0.2 + vertex -31.1676 25.0376 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.5308 24.8328 -0.1 - vertex -31.2103 24.5339 -0.1 - vertex -31.0826 24.213 -0.1 + vertex -30.5308 24.8328 -0.2 + vertex -31.2103 24.5339 -0.2 + vertex -31.0826 24.213 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.2507 24.9472 -0.1 - vertex -31.1676 25.0376 -0.1 - vertex -31.2175 25.0021 -0.1 + vertex -31.2507 24.9472 -0.2 + vertex -31.1676 25.0376 -0.2 + vertex -31.2175 25.0021 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.1012 25.0533 -0.1 - vertex -31.2507 24.9472 -0.1 - vertex -31.2668 24.8727 -0.1 + vertex -31.1012 25.0533 -0.2 + vertex -31.2507 24.9472 -0.2 + vertex -31.2668 24.8727 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.8055 24.9813 -0.1 - vertex -31.2656 24.779 -0.1 - vertex -31.2103 24.5339 -0.1 + vertex -30.8055 24.9813 -0.2 + vertex -31.2656 24.779 -0.2 + vertex -31.2103 24.5339 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.0185 25.0493 -0.1 - vertex -31.2668 24.8727 -0.1 - vertex -31.2656 24.779 -0.1 + vertex -31.0185 25.0493 -0.2 + vertex -31.2668 24.8727 -0.2 + vertex -31.2656 24.779 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -28.8137 19.0002 -0.1 - vertex -28.2256 18.9609 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -28.8137 19.0002 -0.2 + vertex -28.2256 18.9609 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -29.3006 19.0599 -0.1 - vertex -28.8137 19.0002 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -29.3006 19.0599 -0.2 + vertex -28.8137 19.0002 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -28.3394 21.9725 -0.1 - vertex -29.6752 19.1409 -0.1 - vertex -29.3006 19.0599 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -29.6752 19.1409 -0.2 + vertex -29.3006 19.0599 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0859 22.0525 -0.1 - vertex -29.6752 19.1409 -0.1 - vertex -28.3394 21.9725 -0.1 + vertex -30.0859 22.0525 -0.2 + vertex -29.6752 19.1409 -0.2 + vertex -28.3394 21.9725 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.5811 19.4165 -0.1 - vertex -30.0859 22.0525 -0.1 - vertex -30.5728 22.0884 -0.1 + vertex -30.5811 19.4165 -0.2 + vertex -30.0859 22.0525 -0.2 + vertex -30.5728 22.0884 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.0859 22.0525 -0.1 - vertex -30.5811 19.4165 -0.1 - vertex -29.6752 19.1409 -0.1 + vertex -30.0859 22.0525 -0.2 + vertex -30.5811 19.4165 -0.2 + vertex -29.6752 19.1409 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.4466 19.7034 -0.1 - vertex -30.5728 22.0884 -0.1 - vertex -31.074 22.1513 -0.1 + vertex -31.4466 19.7034 -0.2 + vertex -30.5728 22.0884 -0.2 + vertex -31.074 22.1513 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -30.5728 22.0884 -0.1 - vertex -31.4466 19.7034 -0.1 - vertex -30.5811 19.4165 -0.1 + vertex -30.5728 22.0884 -0.2 + vertex -31.4466 19.7034 -0.2 + vertex -30.5811 19.4165 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.271 20.0012 -0.1 - vertex -31.074 22.1513 -0.1 - vertex -31.5861 22.2399 -0.1 + vertex -32.271 20.0012 -0.2 + vertex -31.074 22.1513 -0.2 + vertex -31.5861 22.2399 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.271 20.0012 -0.1 - vertex -31.5861 22.2399 -0.1 - vertex -32.1061 22.3529 -0.1 + vertex -32.271 20.0012 -0.2 + vertex -31.5861 22.2399 -0.2 + vertex -32.1061 22.3529 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -31.074 22.1513 -0.1 - vertex -32.271 20.0012 -0.1 - vertex -31.4466 19.7034 -0.1 + vertex -31.074 22.1513 -0.2 + vertex -32.271 20.0012 -0.2 + vertex -31.4466 19.7034 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.0533 20.3093 -0.1 - vertex -32.1061 22.3529 -0.1 - vertex -32.6306 22.489 -0.1 + vertex -33.0533 20.3093 -0.2 + vertex -32.1061 22.3529 -0.2 + vertex -32.6306 22.489 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.1061 22.3529 -0.1 - vertex -33.0533 20.3093 -0.1 - vertex -32.271 20.0012 -0.1 + vertex -32.1061 22.3529 -0.2 + vertex -33.0533 20.3093 -0.2 + vertex -32.271 20.0012 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.7926 20.6272 -0.1 - vertex -32.6306 22.489 -0.1 - vertex -33.1564 22.6469 -0.1 + vertex -33.7926 20.6272 -0.2 + vertex -32.6306 22.489 -0.2 + vertex -33.1564 22.6469 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.4881 20.9542 -0.1 - vertex -33.1564 22.6469 -0.1 - vertex -33.6803 22.8253 -0.1 + vertex -34.4881 20.9542 -0.2 + vertex -33.1564 22.6469 -0.2 + vertex -33.6803 22.8253 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -32.6306 22.489 -0.1 - vertex -33.7926 20.6272 -0.1 - vertex -33.0533 20.3093 -0.1 + vertex -32.6306 22.489 -0.2 + vertex -33.7926 20.6272 -0.2 + vertex -33.0533 20.3093 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.4881 20.9542 -0.1 - vertex -33.6803 22.8253 -0.1 - vertex -34.199 23.023 -0.1 + vertex -34.4881 20.9542 -0.2 + vertex -33.6803 22.8253 -0.2 + vertex -34.199 23.023 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -33.1564 22.6469 -0.1 - vertex -34.4881 20.9542 -0.1 - vertex -33.7926 20.6272 -0.1 + vertex -33.1564 22.6469 -0.2 + vertex -34.4881 20.9542 -0.2 + vertex -33.7926 20.6272 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.1386 21.2899 -0.1 - vertex -34.199 23.023 -0.1 - vertex -34.7094 23.2385 -0.1 + vertex -35.1386 21.2899 -0.2 + vertex -34.199 23.023 -0.2 + vertex -34.7094 23.2385 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.199 23.023 -0.1 - vertex -35.1386 21.2899 -0.1 - vertex -34.4881 20.9542 -0.1 + vertex -34.199 23.023 -0.2 + vertex -35.1386 21.2899 -0.2 + vertex -34.4881 20.9542 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.7435 21.6336 -0.1 - vertex -34.7094 23.2385 -0.1 - vertex -35.2082 23.4707 -0.1 + vertex -35.7435 21.6336 -0.2 + vertex -34.7094 23.2385 -0.2 + vertex -35.2082 23.4707 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.3017 21.985 -0.1 - vertex -35.2082 23.4707 -0.1 - vertex -35.6921 23.7183 -0.1 + vertex -36.3017 21.985 -0.2 + vertex -35.2082 23.4707 -0.2 + vertex -35.6921 23.7183 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -34.7094 23.2385 -0.1 - vertex -35.7435 21.6336 -0.1 - vertex -35.1386 21.2899 -0.1 + vertex -34.7094 23.2385 -0.2 + vertex -35.7435 21.6336 -0.2 + vertex -35.1386 21.2899 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.8124 22.3433 -0.1 - vertex -35.6921 23.7183 -0.1 - vertex -36.1579 23.9798 -0.1 + vertex -36.8124 22.3433 -0.2 + vertex -35.6921 23.7183 -0.2 + vertex -36.1579 23.9798 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.2082 23.4707 -0.1 - vertex -36.3017 21.985 -0.1 - vertex -35.7435 21.6336 -0.1 + vertex -35.2082 23.4707 -0.2 + vertex -36.3017 21.985 -0.2 + vertex -35.7435 21.6336 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.2746 22.7082 -0.1 - vertex -36.1579 23.9798 -0.1 - vertex -36.6025 24.2541 -0.1 + vertex -37.2746 22.7082 -0.2 + vertex -36.1579 23.9798 -0.2 + vertex -36.6025 24.2541 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -35.6921 23.7183 -0.1 - vertex -36.8124 22.3433 -0.1 - vertex -36.3017 21.985 -0.1 + vertex -35.6921 23.7183 -0.2 + vertex -36.8124 22.3433 -0.2 + vertex -36.3017 21.985 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.6874 23.0789 -0.1 - vertex -36.6025 24.2541 -0.1 - vertex -37.0225 24.5398 -0.1 + vertex -37.6874 23.0789 -0.2 + vertex -36.6025 24.2541 -0.2 + vertex -37.0225 24.5398 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.1579 23.9798 -0.1 - vertex -37.2746 22.7082 -0.1 - vertex -36.8124 22.3433 -0.1 + vertex -36.1579 23.9798 -0.2 + vertex -37.2746 22.7082 -0.2 + vertex -36.8124 22.3433 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.3611 23.836 -0.1 - vertex -37.0225 24.5398 -0.1 - vertex -37.4147 24.8357 -0.1 + vertex -38.3611 23.836 -0.2 + vertex -37.0225 24.5398 -0.2 + vertex -37.4147 24.8357 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -36.6025 24.2541 -0.1 - vertex -37.6874 23.0789 -0.1 - vertex -37.2746 22.7082 -0.1 + vertex -36.6025 24.2541 -0.2 + vertex -37.6874 23.0789 -0.2 + vertex -37.2746 22.7082 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.6203 24.2212 -0.1 - vertex -37.4147 24.8357 -0.1 - vertex -37.776 25.1404 -0.1 + vertex -38.6203 24.2212 -0.2 + vertex -37.4147 24.8357 -0.2 + vertex -37.776 25.1404 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.0225 24.5398 -0.1 - vertex -38.0499 23.455 -0.1 - vertex -37.6874 23.0789 -0.1 + vertex -37.0225 24.5398 -0.2 + vertex -38.0499 23.455 -0.2 + vertex -37.6874 23.0789 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.8265 24.6102 -0.1 - vertex -37.776 25.1404 -0.1 - vertex -38.2113 25.5018 -0.1 + vertex -38.8265 24.6102 -0.2 + vertex -37.776 25.1404 -0.2 + vertex -38.2113 25.5018 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.0225 24.5398 -0.1 - vertex -38.3611 23.836 -0.1 - vertex -38.0499 23.455 -0.1 + vertex -37.0225 24.5398 -0.2 + vertex -38.3611 23.836 -0.2 + vertex -38.0499 23.455 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.0227 25.0923 -0.1 - vertex -38.2113 25.5018 -0.1 - vertex -38.5664 25.7376 -0.1 + vertex -39.0227 25.0923 -0.2 + vertex -38.2113 25.5018 -0.2 + vertex -38.5664 25.7376 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.4147 24.8357 -0.1 - vertex -38.6203 24.2212 -0.1 - vertex -38.3611 23.836 -0.1 + vertex -37.4147 24.8357 -0.2 + vertex -38.6203 24.2212 -0.2 + vertex -38.3611 23.836 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.1186 25.4589 -0.1 - vertex -38.5664 25.7376 -0.1 - vertex -38.7129 25.8089 -0.1 + vertex -39.1186 25.4589 -0.2 + vertex -38.5664 25.7376 -0.2 + vertex -38.7129 25.8089 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -37.776 25.1404 -0.1 - vertex -38.8265 24.6102 -0.1 - vertex -38.6203 24.2212 -0.1 + vertex -37.776 25.1404 -0.2 + vertex -38.8265 24.6102 -0.2 + vertex -38.6203 24.2212 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.13 25.5984 -0.1 - vertex -38.7129 25.8089 -0.1 - vertex -38.8381 25.8495 -0.1 + vertex -39.13 25.5984 -0.2 + vertex -38.7129 25.8089 -0.2 + vertex -38.8381 25.8495 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.1175 25.7085 -0.1 - vertex -38.8381 25.8495 -0.1 - vertex -38.9416 25.8595 -0.1 + vertex -39.1175 25.7085 -0.2 + vertex -38.8381 25.8495 -0.2 + vertex -38.9416 25.8595 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.2113 25.5018 -0.1 - vertex -39.0227 25.0923 -0.1 - vertex -38.8265 24.6102 -0.1 + vertex -38.2113 25.5018 -0.2 + vertex -39.0227 25.0923 -0.2 + vertex -38.8265 24.6102 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -39.0817 25.7888 -0.1 - vertex -38.9416 25.8595 -0.1 - vertex -39.0229 25.8392 -0.1 + vertex -39.0817 25.7888 -0.2 + vertex -38.9416 25.8595 -0.2 + vertex -39.0229 25.8392 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.9416 25.8595 -0.1 - vertex -39.0817 25.7888 -0.1 - vertex -39.1175 25.7085 -0.1 + vertex -38.9416 25.8595 -0.2 + vertex -39.0817 25.7888 -0.2 + vertex -39.1175 25.7085 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.8381 25.8495 -0.1 - vertex -39.1175 25.7085 -0.1 - vertex -39.13 25.5984 -0.1 + vertex -38.8381 25.8495 -0.2 + vertex -39.1175 25.7085 -0.2 + vertex -39.13 25.5984 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.5664 25.7376 -0.1 - vertex -39.1186 25.4589 -0.1 - vertex -39.0227 25.0923 -0.1 + vertex -38.5664 25.7376 -0.2 + vertex -39.1186 25.4589 -0.2 + vertex -39.0227 25.0923 -0.2 endloop endfacet facet normal 0 0 1 outer loop - vertex -38.7129 25.8089 -0.1 - vertex -39.13 25.5984 -0.1 - vertex -39.1186 25.4589 -0.1 + vertex -38.7129 25.8089 -0.2 + vertex -39.13 25.5984 -0.2 + vertex -39.1186 25.4589 -0.2 endloop endfacet facet normal -0.668491 -0.74372 0 outer loop - vertex 5.20457 38.5758 -0.1 + vertex 5.20457 38.5758 -0.2 vertex 5.23504 38.5484 0 vertex 5.20457 38.5758 0 endloop @@ -29997,377 +29997,377 @@ solid OpenSCAD_Model facet normal -0.668491 -0.74372 -0 outer loop vertex 5.23504 38.5484 0 - vertex 5.20457 38.5758 -0.1 - vertex 5.23504 38.5484 -0.1 + vertex 5.20457 38.5758 -0.2 + vertex 5.23504 38.5484 -0.2 endloop endfacet facet normal -0.96052 -0.278211 0 outer loop - vertex 5.26494 38.4452 -0.1 + vertex 5.26494 38.4452 -0.2 vertex 5.23504 38.5484 0 - vertex 5.23504 38.5484 -0.1 + vertex 5.23504 38.5484 -0.2 endloop endfacet facet normal -0.96052 -0.278211 0 outer loop vertex 5.23504 38.5484 0 - vertex 5.26494 38.4452 -0.1 + vertex 5.26494 38.4452 -0.2 vertex 5.26494 38.4452 0 endloop endfacet facet normal -0.998404 0.0564745 0 outer loop - vertex 5.25596 38.2865 -0.1 + vertex 5.25596 38.2865 -0.2 vertex 5.26494 38.4452 0 - vertex 5.26494 38.4452 -0.1 + vertex 5.26494 38.4452 -0.2 endloop endfacet facet normal -0.998404 0.0564745 0 outer loop vertex 5.26494 38.4452 0 - vertex 5.25596 38.2865 -0.1 + vertex 5.25596 38.2865 -0.2 vertex 5.25596 38.2865 0 endloop endfacet facet normal -0.976561 0.215243 0 outer loop - vertex 5.21112 38.083 -0.1 + vertex 5.21112 38.083 -0.2 vertex 5.25596 38.2865 0 - vertex 5.25596 38.2865 -0.1 + vertex 5.25596 38.2865 -0.2 endloop endfacet facet normal -0.976561 0.215243 0 outer loop vertex 5.25596 38.2865 0 - vertex 5.21112 38.083 -0.1 + vertex 5.21112 38.083 -0.2 vertex 5.21112 38.083 0 endloop endfacet facet normal -0.950355 0.311168 0 outer loop - vertex 5.13345 37.8458 -0.1 + vertex 5.13345 37.8458 -0.2 vertex 5.21112 38.083 0 - vertex 5.21112 38.083 -0.1 + vertex 5.21112 38.083 -0.2 endloop endfacet facet normal -0.950355 0.311168 0 outer loop vertex 5.21112 38.083 0 - vertex 5.13345 37.8458 -0.1 + vertex 5.13345 37.8458 -0.2 vertex 5.13345 37.8458 0 endloop endfacet facet normal -0.924228 0.381841 0 outer loop - vertex 5.02596 37.5856 -0.1 + vertex 5.02596 37.5856 -0.2 vertex 5.13345 37.8458 0 - vertex 5.13345 37.8458 -0.1 + vertex 5.13345 37.8458 -0.2 endloop endfacet facet normal -0.924228 0.381841 0 outer loop vertex 5.13345 37.8458 0 - vertex 5.02596 37.5856 -0.1 + vertex 5.02596 37.5856 -0.2 vertex 5.02596 37.5856 0 endloop endfacet facet normal -0.896839 0.442358 0 outer loop - vertex 4.89167 37.3134 -0.1 + vertex 4.89167 37.3134 -0.2 vertex 5.02596 37.5856 0 - vertex 5.02596 37.5856 -0.1 + vertex 5.02596 37.5856 -0.2 endloop endfacet facet normal -0.896839 0.442358 0 outer loop vertex 5.02596 37.5856 0 - vertex 4.89167 37.3134 -0.1 + vertex 4.89167 37.3134 -0.2 vertex 4.89167 37.3134 0 endloop endfacet facet normal -0.865785 0.500416 0 outer loop - vertex 4.73361 37.0399 -0.1 + vertex 4.73361 37.0399 -0.2 vertex 4.89167 37.3134 0 - vertex 4.89167 37.3134 -0.1 + vertex 4.89167 37.3134 -0.2 endloop endfacet facet normal -0.865785 0.500416 0 outer loop vertex 4.89167 37.3134 0 - vertex 4.73361 37.0399 -0.1 + vertex 4.73361 37.0399 -0.2 vertex 4.73361 37.0399 0 endloop endfacet facet normal -0.875928 0.482442 0 outer loop - vertex 4.62814 36.8484 -0.1 + vertex 4.62814 36.8484 -0.2 vertex 4.73361 37.0399 0 - vertex 4.73361 37.0399 -0.1 + vertex 4.73361 37.0399 -0.2 endloop endfacet facet normal -0.875928 0.482442 0 outer loop vertex 4.73361 37.0399 0 - vertex 4.62814 36.8484 -0.1 + vertex 4.62814 36.8484 -0.2 vertex 4.62814 36.8484 0 endloop endfacet facet normal -0.912281 0.409566 0 outer loop - vertex 4.52293 36.6141 -0.1 + vertex 4.52293 36.6141 -0.2 vertex 4.62814 36.8484 0 - vertex 4.62814 36.8484 -0.1 + vertex 4.62814 36.8484 -0.2 endloop endfacet facet normal -0.912281 0.409566 0 outer loop vertex 4.62814 36.8484 0 - vertex 4.52293 36.6141 -0.1 + vertex 4.52293 36.6141 -0.2 vertex 4.52293 36.6141 0 endloop endfacet facet normal -0.942197 0.335061 0 outer loop - vertex 4.31688 36.0346 -0.1 + vertex 4.31688 36.0346 -0.2 vertex 4.52293 36.6141 0 - vertex 4.52293 36.6141 -0.1 + vertex 4.52293 36.6141 -0.2 endloop endfacet facet normal -0.942197 0.335061 0 outer loop vertex 4.52293 36.6141 0 - vertex 4.31688 36.0346 -0.1 + vertex 4.31688 36.0346 -0.2 vertex 4.31688 36.0346 0 endloop endfacet facet normal -0.963331 0.268317 0 outer loop - vertex 4.1227 35.3375 -0.1 + vertex 4.1227 35.3375 -0.2 vertex 4.31688 36.0346 0 - vertex 4.31688 36.0346 -0.1 + vertex 4.31688 36.0346 -0.2 endloop endfacet facet normal -0.963331 0.268317 0 outer loop vertex 4.31688 36.0346 0 - vertex 4.1227 35.3375 -0.1 + vertex 4.1227 35.3375 -0.2 vertex 4.1227 35.3375 0 endloop endfacet facet normal -0.975667 0.219257 0 outer loop - vertex 3.94762 34.5584 -0.1 + vertex 3.94762 34.5584 -0.2 vertex 4.1227 35.3375 0 - vertex 4.1227 35.3375 -0.1 + vertex 4.1227 35.3375 -0.2 endloop endfacet facet normal -0.975667 0.219257 0 outer loop vertex 4.1227 35.3375 0 - vertex 3.94762 34.5584 -0.1 + vertex 3.94762 34.5584 -0.2 vertex 3.94762 34.5584 0 endloop endfacet facet normal -0.984138 0.177404 0 outer loop - vertex 3.79886 33.7332 -0.1 + vertex 3.79886 33.7332 -0.2 vertex 3.94762 34.5584 0 - vertex 3.94762 34.5584 -0.1 + vertex 3.94762 34.5584 -0.2 endloop endfacet facet normal -0.984138 0.177404 0 outer loop vertex 3.94762 34.5584 0 - vertex 3.79886 33.7332 -0.1 + vertex 3.79886 33.7332 -0.2 vertex 3.79886 33.7332 0 endloop endfacet facet normal -0.990628 0.136587 0 outer loop - vertex 3.68366 32.8976 -0.1 + vertex 3.68366 32.8976 -0.2 vertex 3.79886 33.7332 0 - vertex 3.79886 33.7332 -0.1 + vertex 3.79886 33.7332 -0.2 endloop endfacet facet normal -0.990628 0.136587 0 outer loop vertex 3.79886 33.7332 0 - vertex 3.68366 32.8976 -0.1 + vertex 3.68366 32.8976 -0.2 vertex 3.68366 32.8976 0 endloop endfacet facet normal -0.995806 0.0914898 0 outer loop - vertex 3.60924 32.0876 -0.1 + vertex 3.60924 32.0876 -0.2 vertex 3.68366 32.8976 0 - vertex 3.68366 32.8976 -0.1 + vertex 3.68366 32.8976 -0.2 endloop endfacet facet normal -0.995806 0.0914898 0 outer loop vertex 3.68366 32.8976 0 - vertex 3.60924 32.0876 -0.1 + vertex 3.60924 32.0876 -0.2 vertex 3.60924 32.0876 0 endloop endfacet facet normal -0.999378 0.0352546 0 outer loop - vertex 3.58282 31.3388 -0.1 + vertex 3.58282 31.3388 -0.2 vertex 3.60924 32.0876 0 - vertex 3.60924 32.0876 -0.1 + vertex 3.60924 32.0876 -0.2 endloop endfacet facet normal -0.999378 0.0352546 0 outer loop vertex 3.60924 32.0876 0 - vertex 3.58282 31.3388 -0.1 + vertex 3.58282 31.3388 -0.2 vertex 3.58282 31.3388 0 endloop endfacet facet normal -0.999852 -0.0171991 0 outer loop - vertex 3.59957 30.3654 -0.1 + vertex 3.59957 30.3654 -0.2 vertex 3.58282 31.3388 0 - vertex 3.58282 31.3388 -0.1 + vertex 3.58282 31.3388 -0.2 endloop endfacet facet normal -0.999852 -0.0171991 0 outer loop vertex 3.58282 31.3388 0 - vertex 3.59957 30.3654 -0.1 + vertex 3.59957 30.3654 -0.2 vertex 3.59957 30.3654 0 endloop endfacet facet normal -0.995876 -0.0907198 0 outer loop - vertex 3.63162 30.0135 -0.1 + vertex 3.63162 30.0135 -0.2 vertex 3.59957 30.3654 0 - vertex 3.59957 30.3654 -0.1 + vertex 3.59957 30.3654 -0.2 endloop endfacet facet normal -0.995876 -0.0907198 0 outer loop vertex 3.59957 30.3654 0 - vertex 3.63162 30.0135 -0.1 + vertex 3.63162 30.0135 -0.2 vertex 3.63162 30.0135 0 endloop endfacet facet normal -0.982044 -0.188652 0 outer loop - vertex 3.68937 29.7129 -0.1 + vertex 3.68937 29.7129 -0.2 vertex 3.63162 30.0135 0 - vertex 3.63162 30.0135 -0.1 + vertex 3.63162 30.0135 -0.2 endloop endfacet facet normal -0.982044 -0.188652 0 outer loop vertex 3.63162 30.0135 0 - vertex 3.68937 29.7129 -0.1 + vertex 3.68937 29.7129 -0.2 vertex 3.68937 29.7129 0 endloop endfacet facet normal -0.950581 -0.310477 0 outer loop - vertex 3.78021 29.4348 -0.1 + vertex 3.78021 29.4348 -0.2 vertex 3.68937 29.7129 0 - vertex 3.68937 29.7129 -0.1 + vertex 3.68937 29.7129 -0.2 endloop endfacet facet normal -0.950581 -0.310477 0 outer loop vertex 3.68937 29.7129 0 - vertex 3.78021 29.4348 -0.1 + vertex 3.78021 29.4348 -0.2 vertex 3.78021 29.4348 0 endloop endfacet facet normal -0.907937 -0.419107 0 outer loop - vertex 3.91157 29.1502 -0.1 + vertex 3.91157 29.1502 -0.2 vertex 3.78021 29.4348 0 - vertex 3.78021 29.4348 -0.1 + vertex 3.78021 29.4348 -0.2 endloop endfacet facet normal -0.907937 -0.419107 0 outer loop vertex 3.78021 29.4348 0 - vertex 3.91157 29.1502 -0.1 + vertex 3.91157 29.1502 -0.2 vertex 3.91157 29.1502 0 endloop endfacet facet normal -0.872337 -0.488905 0 outer loop - vertex 4.09087 28.8303 -0.1 + vertex 4.09087 28.8303 -0.2 vertex 3.91157 29.1502 0 - vertex 3.91157 29.1502 -0.1 + vertex 3.91157 29.1502 -0.2 endloop endfacet facet normal -0.872337 -0.488905 0 outer loop vertex 3.91157 29.1502 0 - vertex 4.09087 28.8303 -0.1 + vertex 4.09087 28.8303 -0.2 vertex 4.09087 28.8303 0 endloop endfacet facet normal -0.853386 -0.52128 0 outer loop - vertex 4.32553 28.4461 -0.1 + vertex 4.32553 28.4461 -0.2 vertex 4.09087 28.8303 0 - vertex 4.09087 28.8303 -0.1 + vertex 4.09087 28.8303 -0.2 endloop endfacet facet normal -0.853386 -0.52128 0 outer loop vertex 4.09087 28.8303 0 - vertex 4.32553 28.4461 -0.1 + vertex 4.32553 28.4461 -0.2 vertex 4.32553 28.4461 0 endloop endfacet facet normal -0.837817 -0.545951 0 outer loop - vertex 4.69711 27.8759 -0.1 + vertex 4.69711 27.8759 -0.2 vertex 4.32553 28.4461 0 - vertex 4.32553 28.4461 -0.1 + vertex 4.32553 28.4461 -0.2 endloop endfacet facet normal -0.837817 -0.545951 0 outer loop vertex 4.32553 28.4461 0 - vertex 4.69711 27.8759 -0.1 + vertex 4.69711 27.8759 -0.2 vertex 4.69711 27.8759 0 endloop endfacet facet normal -0.807831 -0.589415 0 outer loop - vertex 5.05276 27.3884 -0.1 + vertex 5.05276 27.3884 -0.2 vertex 4.69711 27.8759 0 - vertex 4.69711 27.8759 -0.1 + vertex 4.69711 27.8759 -0.2 endloop endfacet facet normal -0.807831 -0.589415 0 outer loop vertex 4.69711 27.8759 0 - vertex 5.05276 27.3884 -0.1 + vertex 5.05276 27.3884 -0.2 vertex 5.05276 27.3884 0 endloop endfacet facet normal -0.764742 -0.644337 0 outer loop - vertex 5.39739 26.9794 -0.1 + vertex 5.39739 26.9794 -0.2 vertex 5.05276 27.3884 0 - vertex 5.05276 27.3884 -0.1 + vertex 5.05276 27.3884 -0.2 endloop endfacet facet normal -0.764742 -0.644337 0 outer loop vertex 5.05276 27.3884 0 - vertex 5.39739 26.9794 -0.1 + vertex 5.39739 26.9794 -0.2 vertex 5.39739 26.9794 0 endloop endfacet facet normal -0.703379 -0.710815 0 outer loop - vertex 5.39739 26.9794 -0.1 + vertex 5.39739 26.9794 -0.2 vertex 5.73586 26.6445 0 vertex 5.39739 26.9794 0 endloop @@ -30375,13 +30375,13 @@ solid OpenSCAD_Model facet normal -0.703379 -0.710815 -0 outer loop vertex 5.73586 26.6445 0 - vertex 5.39739 26.9794 -0.1 - vertex 5.73586 26.6445 -0.1 + vertex 5.39739 26.9794 -0.2 + vertex 5.73586 26.6445 -0.2 endloop endfacet facet normal -0.618154 -0.786057 0 outer loop - vertex 5.73586 26.6445 -0.1 + vertex 5.73586 26.6445 -0.2 vertex 6.07308 26.3793 0 vertex 5.73586 26.6445 0 endloop @@ -30389,13 +30389,13 @@ solid OpenSCAD_Model facet normal -0.618154 -0.786057 -0 outer loop vertex 6.07308 26.3793 0 - vertex 5.73586 26.6445 -0.1 - vertex 6.07308 26.3793 -0.1 + vertex 5.73586 26.6445 -0.2 + vertex 6.07308 26.3793 -0.2 endloop endfacet facet normal -0.505671 -0.862726 0 outer loop - vertex 6.07308 26.3793 -0.1 + vertex 6.07308 26.3793 -0.2 vertex 6.41393 26.1795 0 vertex 6.07308 26.3793 0 endloop @@ -30403,13 +30403,13 @@ solid OpenSCAD_Model facet normal -0.505671 -0.862726 -0 outer loop vertex 6.41393 26.1795 0 - vertex 6.07308 26.3793 -0.1 - vertex 6.41393 26.1795 -0.1 + vertex 6.07308 26.3793 -0.2 + vertex 6.41393 26.1795 -0.2 endloop endfacet facet normal -0.369033 -0.929416 0 outer loop - vertex 6.41393 26.1795 -0.1 + vertex 6.41393 26.1795 -0.2 vertex 6.76329 26.0408 0 vertex 6.41393 26.1795 0 endloop @@ -30417,13 +30417,13 @@ solid OpenSCAD_Model facet normal -0.369033 -0.929416 -0 outer loop vertex 6.76329 26.0408 0 - vertex 6.41393 26.1795 -0.1 - vertex 6.76329 26.0408 -0.1 + vertex 6.41393 26.1795 -0.2 + vertex 6.76329 26.0408 -0.2 endloop endfacet facet normal -0.220456 -0.975397 0 outer loop - vertex 6.76329 26.0408 -0.1 + vertex 6.76329 26.0408 -0.2 vertex 7.12606 25.9588 0 vertex 6.76329 26.0408 0 endloop @@ -30431,13 +30431,13 @@ solid OpenSCAD_Model facet normal -0.220456 -0.975397 -0 outer loop vertex 7.12606 25.9588 0 - vertex 6.76329 26.0408 -0.1 - vertex 7.12606 25.9588 -0.1 + vertex 6.76329 26.0408 -0.2 + vertex 7.12606 25.9588 -0.2 endloop endfacet facet normal -0.188841 -0.982008 0 outer loop - vertex 7.12606 25.9588 -0.1 + vertex 7.12606 25.9588 -0.2 vertex 7.55919 25.8755 0 vertex 7.12606 25.9588 0 endloop @@ -30445,13 +30445,13 @@ solid OpenSCAD_Model facet normal -0.188841 -0.982008 -0 outer loop vertex 7.55919 25.8755 0 - vertex 7.12606 25.9588 -0.1 - vertex 7.55919 25.8755 -0.1 + vertex 7.12606 25.9588 -0.2 + vertex 7.55919 25.8755 -0.2 endloop endfacet facet normal -0.317419 -0.948285 0 outer loop - vertex 7.55919 25.8755 -0.1 + vertex 7.55919 25.8755 -0.2 vertex 7.92584 25.7528 0 vertex 7.55919 25.8755 0 endloop @@ -30459,13 +30459,13 @@ solid OpenSCAD_Model facet normal -0.317419 -0.948285 -0 outer loop vertex 7.92584 25.7528 0 - vertex 7.55919 25.8755 -0.1 - vertex 7.92584 25.7528 -0.1 + vertex 7.55919 25.8755 -0.2 + vertex 7.92584 25.7528 -0.2 endloop endfacet facet normal -0.448547 -0.893759 0 outer loop - vertex 7.92584 25.7528 -0.1 + vertex 7.92584 25.7528 -0.2 vertex 8.08977 25.6705 0 vertex 7.92584 25.7528 0 endloop @@ -30473,13 +30473,13 @@ solid OpenSCAD_Model facet normal -0.448547 -0.893759 -0 outer loop vertex 8.08977 25.6705 0 - vertex 7.92584 25.7528 -0.1 - vertex 8.08977 25.6705 -0.1 + vertex 7.92584 25.7528 -0.2 + vertex 8.08977 25.6705 -0.2 endloop endfacet facet normal -0.542679 -0.83994 0 outer loop - vertex 8.08977 25.6705 -0.1 + vertex 8.08977 25.6705 -0.2 vertex 8.24373 25.571 0 vertex 8.08977 25.6705 0 endloop @@ -30487,13 +30487,13 @@ solid OpenSCAD_Model facet normal -0.542679 -0.83994 -0 outer loop vertex 8.24373 25.571 0 - vertex 8.08977 25.6705 -0.1 - vertex 8.24373 25.571 -0.1 + vertex 8.08977 25.6705 -0.2 + vertex 8.24373 25.571 -0.2 endloop endfacet facet normal -0.63165 -0.775254 0 outer loop - vertex 8.24373 25.571 -0.1 + vertex 8.24373 25.571 -0.2 vertex 8.38993 25.4519 0 vertex 8.24373 25.571 0 endloop @@ -30501,195 +30501,195 @@ solid OpenSCAD_Model facet normal -0.63165 -0.775254 -0 outer loop vertex 8.38993 25.4519 0 - vertex 8.24373 25.571 -0.1 - vertex 8.38993 25.4519 -0.1 + vertex 8.24373 25.571 -0.2 + vertex 8.38993 25.4519 -0.2 endloop endfacet facet normal -0.708493 -0.705718 0 outer loop - vertex 8.53058 25.3107 -0.1 + vertex 8.53058 25.3107 -0.2 vertex 8.38993 25.4519 0 - vertex 8.38993 25.4519 -0.1 + vertex 8.38993 25.4519 -0.2 endloop endfacet facet normal -0.708493 -0.705718 0 outer loop vertex 8.38993 25.4519 0 - vertex 8.53058 25.3107 -0.1 + vertex 8.53058 25.3107 -0.2 vertex 8.53058 25.3107 0 endloop endfacet facet normal -0.770043 -0.637991 0 outer loop - vertex 8.6679 25.145 -0.1 + vertex 8.6679 25.145 -0.2 vertex 8.53058 25.3107 0 - vertex 8.53058 25.3107 -0.1 + vertex 8.53058 25.3107 -0.2 endloop endfacet facet normal -0.770043 -0.637991 0 outer loop vertex 8.53058 25.3107 0 - vertex 8.6679 25.145 -0.1 + vertex 8.6679 25.145 -0.2 vertex 8.6679 25.145 0 endloop endfacet facet normal -0.816637 -0.577152 0 outer loop - vertex 8.80411 24.9522 -0.1 + vertex 8.80411 24.9522 -0.2 vertex 8.6679 25.145 0 - vertex 8.6679 25.145 -0.1 + vertex 8.6679 25.145 -0.2 endloop endfacet facet normal -0.816637 -0.577152 0 outer loop vertex 8.6679 25.145 0 - vertex 8.80411 24.9522 -0.1 + vertex 8.80411 24.9522 -0.2 vertex 8.80411 24.9522 0 endloop endfacet facet normal -0.863652 -0.504088 0 outer loop - vertex 9.08206 24.476 -0.1 + vertex 9.08206 24.476 -0.2 vertex 8.80411 24.9522 0 - vertex 8.80411 24.9522 -0.1 + vertex 8.80411 24.9522 -0.2 endloop endfacet facet normal -0.863652 -0.504088 0 outer loop vertex 8.80411 24.9522 0 - vertex 9.08206 24.476 -0.1 + vertex 9.08206 24.476 -0.2 vertex 9.08206 24.476 0 endloop endfacet facet normal -0.8983 -0.439382 0 outer loop - vertex 9.38213 23.8626 -0.1 + vertex 9.38213 23.8626 -0.2 vertex 9.08206 24.476 0 - vertex 9.08206 24.476 -0.1 + vertex 9.08206 24.476 -0.2 endloop endfacet facet normal -0.8983 -0.439382 0 outer loop vertex 9.08206 24.476 0 - vertex 9.38213 23.8626 -0.1 + vertex 9.38213 23.8626 -0.2 vertex 9.38213 23.8626 0 endloop endfacet facet normal -0.914889 -0.403706 0 outer loop - vertex 9.72206 23.0922 -0.1 + vertex 9.72206 23.0922 -0.2 vertex 9.38213 23.8626 0 - vertex 9.38213 23.8626 -0.1 + vertex 9.38213 23.8626 -0.2 endloop endfacet facet normal -0.914889 -0.403706 0 outer loop vertex 9.38213 23.8626 0 - vertex 9.72206 23.0922 -0.1 + vertex 9.72206 23.0922 -0.2 vertex 9.72206 23.0922 0 endloop endfacet facet normal -0.916786 -0.399379 0 outer loop - vertex 10.0801 22.2703 -0.1 + vertex 10.0801 22.2703 -0.2 vertex 9.72206 23.0922 0 - vertex 9.72206 23.0922 -0.1 + vertex 9.72206 23.0922 -0.2 endloop endfacet facet normal -0.916786 -0.399379 0 outer loop vertex 9.72206 23.0922 0 - vertex 10.0801 22.2703 -0.1 + vertex 10.0801 22.2703 -0.2 vertex 10.0801 22.2703 0 endloop endfacet facet normal -0.906506 -0.422192 0 outer loop - vertex 10.3935 21.5973 -0.1 + vertex 10.3935 21.5973 -0.2 vertex 10.0801 22.2703 0 - vertex 10.0801 22.2703 -0.1 + vertex 10.0801 22.2703 -0.2 endloop endfacet facet normal -0.906506 -0.422192 0 outer loop vertex 10.0801 22.2703 0 - vertex 10.3935 21.5973 -0.1 + vertex 10.3935 21.5973 -0.2 vertex 10.3935 21.5973 0 endloop endfacet facet normal -0.886025 -0.463638 0 outer loop - vertex 10.6869 21.0368 -0.1 + vertex 10.6869 21.0368 -0.2 vertex 10.3935 21.5973 0 - vertex 10.3935 21.5973 -0.1 + vertex 10.3935 21.5973 -0.2 endloop endfacet facet normal -0.886025 -0.463638 0 outer loop vertex 10.3935 21.5973 0 - vertex 10.6869 21.0368 -0.1 + vertex 10.6869 21.0368 -0.2 vertex 10.6869 21.0368 0 endloop endfacet facet normal -0.852053 -0.523456 0 outer loop - vertex 10.9846 20.5521 -0.1 + vertex 10.9846 20.5521 -0.2 vertex 10.6869 21.0368 0 - vertex 10.6869 21.0368 -0.1 + vertex 10.6869 21.0368 -0.2 endloop endfacet facet normal -0.852053 -0.523456 0 outer loop vertex 10.6869 21.0368 0 - vertex 10.9846 20.5521 -0.1 + vertex 10.9846 20.5521 -0.2 vertex 10.9846 20.5521 0 endloop endfacet facet normal -0.806267 -0.591552 0 outer loop - vertex 11.3113 20.1069 -0.1 + vertex 11.3113 20.1069 -0.2 vertex 10.9846 20.5521 0 - vertex 10.9846 20.5521 -0.1 + vertex 10.9846 20.5521 -0.2 endloop endfacet facet normal -0.806267 -0.591552 0 outer loop vertex 10.9846 20.5521 0 - vertex 11.3113 20.1069 -0.1 + vertex 11.3113 20.1069 -0.2 vertex 11.3113 20.1069 0 endloop endfacet facet normal -0.758443 -0.65174 0 outer loop - vertex 11.6914 19.6646 -0.1 + vertex 11.6914 19.6646 -0.2 vertex 11.3113 20.1069 0 - vertex 11.3113 20.1069 -0.1 + vertex 11.3113 20.1069 -0.2 endloop endfacet facet normal -0.758443 -0.65174 0 outer loop vertex 11.3113 20.1069 0 - vertex 11.6914 19.6646 -0.1 + vertex 11.6914 19.6646 -0.2 vertex 11.6914 19.6646 0 endloop endfacet facet normal -0.720518 -0.693437 0 outer loop - vertex 12.1494 19.1886 -0.1 + vertex 12.1494 19.1886 -0.2 vertex 11.6914 19.6646 0 - vertex 11.6914 19.6646 -0.1 + vertex 11.6914 19.6646 -0.2 endloop endfacet facet normal -0.720518 -0.693437 0 outer loop vertex 11.6914 19.6646 0 - vertex 12.1494 19.1886 -0.1 + vertex 12.1494 19.1886 -0.2 vertex 12.1494 19.1886 0 endloop endfacet facet normal -0.697808 -0.716285 0 outer loop - vertex 12.1494 19.1886 -0.1 + vertex 12.1494 19.1886 -0.2 vertex 12.71 18.6425 0 vertex 12.1494 19.1886 0 endloop @@ -30697,13 +30697,13 @@ solid OpenSCAD_Model facet normal -0.697808 -0.716285 -0 outer loop vertex 12.71 18.6425 0 - vertex 12.1494 19.1886 -0.1 - vertex 12.71 18.6425 -0.1 + vertex 12.1494 19.1886 -0.2 + vertex 12.71 18.6425 -0.2 endloop endfacet facet normal -0.680991 -0.732292 0 outer loop - vertex 12.71 18.6425 -0.1 + vertex 12.71 18.6425 -0.2 vertex 13.3813 18.0182 0 vertex 12.71 18.6425 0 endloop @@ -30711,13 +30711,13 @@ solid OpenSCAD_Model facet normal -0.680991 -0.732292 -0 outer loop vertex 13.3813 18.0182 0 - vertex 12.71 18.6425 -0.1 - vertex 13.3813 18.0182 -0.1 + vertex 12.71 18.6425 -0.2 + vertex 13.3813 18.0182 -0.2 endloop endfacet facet normal -0.650845 -0.759211 0 outer loop - vertex 13.3813 18.0182 -0.1 + vertex 13.3813 18.0182 -0.2 vertex 14.0017 17.4864 0 vertex 13.3813 18.0182 0 endloop @@ -30725,13 +30725,13 @@ solid OpenSCAD_Model facet normal -0.650845 -0.759211 -0 outer loop vertex 14.0017 17.4864 0 - vertex 13.3813 18.0182 -0.1 - vertex 14.0017 17.4864 -0.1 + vertex 13.3813 18.0182 -0.2 + vertex 14.0017 17.4864 -0.2 endloop endfacet facet normal -0.606609 -0.795001 0 outer loop - vertex 14.0017 17.4864 -0.1 + vertex 14.0017 17.4864 -0.2 vertex 14.6028 17.0277 0 vertex 14.0017 17.4864 0 endloop @@ -30739,13 +30739,13 @@ solid OpenSCAD_Model facet normal -0.606609 -0.795001 -0 outer loop vertex 14.6028 17.0277 0 - vertex 14.0017 17.4864 -0.1 - vertex 14.6028 17.0277 -0.1 + vertex 14.0017 17.4864 -0.2 + vertex 14.6028 17.0277 -0.2 endloop endfacet facet normal -0.550734 -0.834681 0 outer loop - vertex 14.6028 17.0277 -0.1 + vertex 14.6028 17.0277 -0.2 vertex 15.2162 16.623 0 vertex 14.6028 17.0277 0 endloop @@ -30753,13 +30753,13 @@ solid OpenSCAD_Model facet normal -0.550734 -0.834681 -0 outer loop vertex 15.2162 16.623 0 - vertex 14.6028 17.0277 -0.1 - vertex 15.2162 16.623 -0.1 + vertex 14.6028 17.0277 -0.2 + vertex 15.2162 16.623 -0.2 endloop endfacet facet normal -0.490625 -0.871371 0 outer loop - vertex 15.2162 16.623 -0.1 + vertex 15.2162 16.623 -0.2 vertex 15.8738 16.2527 0 vertex 15.2162 16.623 0 endloop @@ -30767,13 +30767,13 @@ solid OpenSCAD_Model facet normal -0.490625 -0.871371 -0 outer loop vertex 15.8738 16.2527 0 - vertex 15.2162 16.623 -0.1 - vertex 15.8738 16.2527 -0.1 + vertex 15.2162 16.623 -0.2 + vertex 15.8738 16.2527 -0.2 endloop endfacet facet normal -0.435747 -0.900069 0 outer loop - vertex 15.8738 16.2527 -0.1 + vertex 15.8738 16.2527 -0.2 vertex 16.6072 15.8977 0 vertex 15.8738 16.2527 0 endloop @@ -30781,13 +30781,13 @@ solid OpenSCAD_Model facet normal -0.435747 -0.900069 -0 outer loop vertex 16.6072 15.8977 0 - vertex 15.8738 16.2527 -0.1 - vertex 16.6072 15.8977 -0.1 + vertex 15.8738 16.2527 -0.2 + vertex 16.6072 15.8977 -0.2 endloop endfacet facet normal -0.392812 -0.919619 0 outer loop - vertex 16.6072 15.8977 -0.1 + vertex 16.6072 15.8977 -0.2 vertex 17.448 15.5385 0 vertex 16.6072 15.8977 0 endloop @@ -30795,13 +30795,13 @@ solid OpenSCAD_Model facet normal -0.392812 -0.919619 -0 outer loop vertex 17.448 15.5385 0 - vertex 16.6072 15.8977 -0.1 - vertex 17.448 15.5385 -0.1 + vertex 16.6072 15.8977 -0.2 + vertex 17.448 15.5385 -0.2 endloop endfacet facet normal -0.36368 -0.931524 0 outer loop - vertex 17.448 15.5385 -0.1 + vertex 17.448 15.5385 -0.2 vertex 18.4281 15.1559 0 vertex 17.448 15.5385 0 endloop @@ -30809,13 +30809,13 @@ solid OpenSCAD_Model facet normal -0.36368 -0.931524 -0 outer loop vertex 18.4281 15.1559 0 - vertex 17.448 15.5385 -0.1 - vertex 18.4281 15.1559 -0.1 + vertex 17.448 15.5385 -0.2 + vertex 18.4281 15.1559 -0.2 endloop endfacet facet normal -0.343445 -0.939173 0 outer loop - vertex 18.4281 15.1559 -0.1 + vertex 18.4281 15.1559 -0.2 vertex 19.4469 14.7833 0 vertex 18.4281 15.1559 0 endloop @@ -30823,13 +30823,13 @@ solid OpenSCAD_Model facet normal -0.343445 -0.939173 -0 outer loop vertex 19.4469 14.7833 0 - vertex 18.4281 15.1559 -0.1 - vertex 19.4469 14.7833 -0.1 + vertex 18.4281 15.1559 -0.2 + vertex 19.4469 14.7833 -0.2 endloop endfacet facet normal -0.28492 -0.958551 0 outer loop - vertex 19.4469 14.7833 -0.1 + vertex 19.4469 14.7833 -0.2 vertex 19.7955 14.6797 0 vertex 19.4469 14.7833 0 endloop @@ -30837,13 +30837,13 @@ solid OpenSCAD_Model facet normal -0.28492 -0.958551 -0 outer loop vertex 19.7955 14.6797 0 - vertex 19.4469 14.7833 -0.1 - vertex 19.7955 14.6797 -0.1 + vertex 19.4469 14.7833 -0.2 + vertex 19.7955 14.6797 -0.2 endloop endfacet facet normal -0.184649 -0.982804 0 outer loop - vertex 19.7955 14.6797 -0.1 + vertex 19.7955 14.6797 -0.2 vertex 20.0785 14.6265 0 vertex 19.7955 14.6797 0 endloop @@ -30851,13 +30851,13 @@ solid OpenSCAD_Model facet normal -0.184649 -0.982804 -0 outer loop vertex 20.0785 14.6265 0 - vertex 19.7955 14.6797 -0.1 - vertex 20.0785 14.6265 -0.1 + vertex 19.7955 14.6797 -0.2 + vertex 20.0785 14.6265 -0.2 endloop endfacet facet normal -0.024894 -0.99969 0 outer loop - vertex 20.0785 14.6265 -0.1 + vertex 20.0785 14.6265 -0.2 vertex 20.327 14.6203 0 vertex 20.0785 14.6265 0 endloop @@ -30865,13 +30865,13 @@ solid OpenSCAD_Model facet normal -0.024894 -0.99969 -0 outer loop vertex 20.327 14.6203 0 - vertex 20.0785 14.6265 -0.1 - vertex 20.327 14.6203 -0.1 + vertex 20.0785 14.6265 -0.2 + vertex 20.327 14.6203 -0.2 endloop endfacet facet normal 0.150471 -0.988614 0 outer loop - vertex 20.327 14.6203 -0.1 + vertex 20.327 14.6203 -0.2 vertex 20.5722 14.6577 0 vertex 20.327 14.6203 0 endloop @@ -30879,13 +30879,13 @@ solid OpenSCAD_Model facet normal 0.150471 -0.988614 0 outer loop vertex 20.5722 14.6577 0 - vertex 20.327 14.6203 -0.1 - vertex 20.5722 14.6577 -0.1 + vertex 20.327 14.6203 -0.2 + vertex 20.5722 14.6577 -0.2 endloop endfacet facet normal 0.272592 -0.96213 0 outer loop - vertex 20.5722 14.6577 -0.1 + vertex 20.5722 14.6577 -0.2 vertex 20.8452 14.735 0 vertex 20.5722 14.6577 0 endloop @@ -30893,13 +30893,13 @@ solid OpenSCAD_Model facet normal 0.272592 -0.96213 0 outer loop vertex 20.8452 14.735 0 - vertex 20.5722 14.6577 -0.1 - vertex 20.8452 14.735 -0.1 + vertex 20.5722 14.6577 -0.2 + vertex 20.8452 14.735 -0.2 endloop endfacet facet normal 0.32454 -0.945872 0 outer loop - vertex 20.8452 14.735 -0.1 + vertex 20.8452 14.735 -0.2 vertex 21.1771 14.8489 0 vertex 20.8452 14.735 0 endloop @@ -30907,13 +30907,13 @@ solid OpenSCAD_Model facet normal 0.32454 -0.945872 0 outer loop vertex 21.1771 14.8489 0 - vertex 20.8452 14.735 -0.1 - vertex 21.1771 14.8489 -0.1 + vertex 20.8452 14.735 -0.2 + vertex 21.1771 14.8489 -0.2 endloop endfacet facet normal 0.357547 -0.933895 0 outer loop - vertex 21.1771 14.8489 -0.1 + vertex 21.1771 14.8489 -0.2 vertex 21.6737 15.039 0 vertex 21.1771 14.8489 0 endloop @@ -30921,13 +30921,13 @@ solid OpenSCAD_Model facet normal 0.357547 -0.933895 0 outer loop vertex 21.6737 15.039 0 - vertex 21.1771 14.8489 -0.1 - vertex 21.6737 15.039 -0.1 + vertex 21.1771 14.8489 -0.2 + vertex 21.6737 15.039 -0.2 endloop endfacet facet normal 0.392507 -0.919749 0 outer loop - vertex 21.6737 15.039 -0.1 + vertex 21.6737 15.039 -0.2 vertex 22.2336 15.278 0 vertex 21.6737 15.039 0 endloop @@ -30935,13 +30935,13 @@ solid OpenSCAD_Model facet normal 0.392507 -0.919749 0 outer loop vertex 22.2336 15.278 0 - vertex 21.6737 15.039 -0.1 - vertex 22.2336 15.278 -0.1 + vertex 21.6737 15.039 -0.2 + vertex 22.2336 15.278 -0.2 endloop endfacet facet normal 0.427814 -0.903867 0 outer loop - vertex 22.2336 15.278 -0.1 + vertex 22.2336 15.278 -0.2 vertex 23.3919 15.8262 0 vertex 22.2336 15.278 0 endloop @@ -30949,13 +30949,13 @@ solid OpenSCAD_Model facet normal 0.427814 -0.903867 0 outer loop vertex 23.3919 15.8262 0 - vertex 22.2336 15.278 -0.1 - vertex 23.3919 15.8262 -0.1 + vertex 22.2336 15.278 -0.2 + vertex 23.3919 15.8262 -0.2 endloop endfacet facet normal 0.460603 -0.887606 0 outer loop - vertex 23.3919 15.8262 -0.1 + vertex 23.3919 15.8262 -0.2 vertex 23.9148 16.0975 0 vertex 23.3919 15.8262 0 endloop @@ -30963,13 +30963,13 @@ solid OpenSCAD_Model facet normal 0.460603 -0.887606 0 outer loop vertex 23.9148 16.0975 0 - vertex 23.3919 15.8262 -0.1 - vertex 23.9148 16.0975 -0.1 + vertex 23.3919 15.8262 -0.2 + vertex 23.9148 16.0975 -0.2 endloop endfacet facet normal 0.489467 -0.872022 0 outer loop - vertex 23.9148 16.0975 -0.1 + vertex 23.9148 16.0975 -0.2 vertex 24.3498 16.3417 0 vertex 23.9148 16.0975 0 endloop @@ -30977,13 +30977,13 @@ solid OpenSCAD_Model facet normal 0.489467 -0.872022 0 outer loop vertex 24.3498 16.3417 0 - vertex 23.9148 16.0975 -0.1 - vertex 24.3498 16.3417 -0.1 + vertex 23.9148 16.0975 -0.2 + vertex 24.3498 16.3417 -0.2 endloop endfacet facet normal 0.539107 -0.842237 0 outer loop - vertex 24.3498 16.3417 -0.1 + vertex 24.3498 16.3417 -0.2 vertex 24.659 16.5397 0 vertex 24.3498 16.3417 0 endloop @@ -30991,13 +30991,13 @@ solid OpenSCAD_Model facet normal 0.539107 -0.842237 0 outer loop vertex 24.659 16.5397 0 - vertex 24.3498 16.3417 -0.1 - vertex 24.659 16.5397 -0.1 + vertex 24.3498 16.3417 -0.2 + vertex 24.659 16.5397 -0.2 endloop endfacet facet normal 0.620549 -0.784168 0 outer loop - vertex 24.659 16.5397 -0.1 + vertex 24.659 16.5397 -0.2 vertex 24.7548 16.6154 0 vertex 24.659 16.5397 0 endloop @@ -31005,97 +31005,97 @@ solid OpenSCAD_Model facet normal 0.620549 -0.784168 0 outer loop vertex 24.7548 16.6154 0 - vertex 24.659 16.5397 -0.1 - vertex 24.7548 16.6154 -0.1 + vertex 24.659 16.5397 -0.2 + vertex 24.7548 16.6154 -0.2 endloop endfacet facet normal 0.751376 -0.659874 0 outer loop vertex 24.7548 16.6154 0 - vertex 24.8049 16.6725 -0.1 + vertex 24.8049 16.6725 -0.2 vertex 24.8049 16.6725 0 endloop endfacet facet normal 0.751376 -0.659874 0 outer loop - vertex 24.8049 16.6725 -0.1 + vertex 24.8049 16.6725 -0.2 vertex 24.7548 16.6154 0 - vertex 24.7548 16.6154 -0.1 + vertex 24.7548 16.6154 -0.2 endloop endfacet facet normal 0.968195 -0.250195 0 outer loop vertex 24.8049 16.6725 0 - vertex 24.8294 16.7672 -0.1 + vertex 24.8294 16.7672 -0.2 vertex 24.8294 16.7672 0 endloop endfacet facet normal 0.968195 -0.250195 0 outer loop - vertex 24.8294 16.7672 -0.1 + vertex 24.8294 16.7672 -0.2 vertex 24.8049 16.6725 0 - vertex 24.8049 16.6725 -0.1 + vertex 24.8049 16.6725 -0.2 endloop endfacet facet normal 0.998807 0.0488365 0 outer loop vertex 24.8294 16.7672 0 - vertex 24.8232 16.8925 -0.1 + vertex 24.8232 16.8925 -0.2 vertex 24.8232 16.8925 0 endloop endfacet facet normal 0.998807 0.0488365 0 outer loop - vertex 24.8232 16.8925 -0.1 + vertex 24.8232 16.8925 -0.2 vertex 24.8294 16.7672 0 - vertex 24.8294 16.7672 -0.1 + vertex 24.8294 16.7672 -0.2 endloop endfacet facet normal 0.971162 0.23842 0 outer loop vertex 24.8232 16.8925 0 - vertex 24.789 17.0321 -0.1 + vertex 24.789 17.0321 -0.2 vertex 24.789 17.0321 0 endloop endfacet facet normal 0.971162 0.23842 0 outer loop - vertex 24.789 17.0321 -0.1 + vertex 24.789 17.0321 -0.2 vertex 24.8232 16.8925 0 - vertex 24.8232 16.8925 -0.1 + vertex 24.8232 16.8925 -0.2 endloop endfacet facet normal 0.916748 0.399467 0 outer loop vertex 24.789 17.0321 0 - vertex 24.7291 17.1695 -0.1 + vertex 24.7291 17.1695 -0.2 vertex 24.7291 17.1695 0 endloop endfacet facet normal 0.916748 0.399467 0 outer loop - vertex 24.7291 17.1695 -0.1 + vertex 24.7291 17.1695 -0.2 vertex 24.789 17.0321 0 - vertex 24.789 17.0321 -0.1 + vertex 24.789 17.0321 -0.2 endloop endfacet facet normal 0.771083 0.636734 0 outer loop vertex 24.7291 17.1695 0 - vertex 24.6602 17.253 -0.1 + vertex 24.6602 17.253 -0.2 vertex 24.6602 17.253 0 endloop endfacet facet normal 0.771083 0.636734 0 outer loop - vertex 24.6602 17.253 -0.1 + vertex 24.6602 17.253 -0.2 vertex 24.7291 17.1695 0 - vertex 24.7291 17.1695 -0.1 + vertex 24.7291 17.1695 -0.2 endloop endfacet facet normal 0.526106 0.850419 -0 outer loop - vertex 24.6602 17.253 -0.1 + vertex 24.6602 17.253 -0.2 vertex 24.5483 17.3222 0 vertex 24.6602 17.253 0 endloop @@ -31103,13 +31103,13 @@ solid OpenSCAD_Model facet normal 0.526106 0.850419 0 outer loop vertex 24.5483 17.3222 0 - vertex 24.6602 17.253 -0.1 - vertex 24.5483 17.3222 -0.1 + vertex 24.6602 17.253 -0.2 + vertex 24.5483 17.3222 -0.2 endloop endfacet facet normal 0.326655 0.945144 -0 outer loop - vertex 24.5483 17.3222 -0.1 + vertex 24.5483 17.3222 -0.2 vertex 24.386 17.3783 0 vertex 24.5483 17.3222 0 endloop @@ -31117,13 +31117,13 @@ solid OpenSCAD_Model facet normal 0.326655 0.945144 0 outer loop vertex 24.386 17.3783 0 - vertex 24.5483 17.3222 -0.1 - vertex 24.386 17.3783 -0.1 + vertex 24.5483 17.3222 -0.2 + vertex 24.386 17.3783 -0.2 endloop endfacet facet normal 0.19643 0.980518 -0 outer loop - vertex 24.386 17.3783 -0.1 + vertex 24.386 17.3783 -0.2 vertex 24.166 17.4223 0 vertex 24.386 17.3783 0 endloop @@ -31131,13 +31131,13 @@ solid OpenSCAD_Model facet normal 0.19643 0.980518 0 outer loop vertex 24.166 17.4223 0 - vertex 24.386 17.3783 -0.1 - vertex 24.166 17.4223 -0.1 + vertex 24.386 17.3783 -0.2 + vertex 24.166 17.4223 -0.2 endloop endfacet facet normal 0.0878721 0.996132 -0 outer loop - vertex 24.166 17.4223 -0.1 + vertex 24.166 17.4223 -0.2 vertex 23.5226 17.4791 0 vertex 24.166 17.4223 0 endloop @@ -31145,13 +31145,13 @@ solid OpenSCAD_Model facet normal 0.0878721 0.996132 0 outer loop vertex 23.5226 17.4791 0 - vertex 24.166 17.4223 -0.1 - vertex 23.5226 17.4791 -0.1 + vertex 24.166 17.4223 -0.2 + vertex 23.5226 17.4791 -0.2 endloop endfacet facet normal 0.0232768 0.999729 -0 outer loop - vertex 23.5226 17.4791 -0.1 + vertex 23.5226 17.4791 -0.2 vertex 22.5588 17.5015 0 vertex 23.5226 17.4791 0 endloop @@ -31159,13 +31159,13 @@ solid OpenSCAD_Model facet normal 0.0232768 0.999729 0 outer loop vertex 22.5588 17.5015 0 - vertex 23.5226 17.4791 -0.1 - vertex 22.5588 17.5015 -0.1 + vertex 23.5226 17.4791 -0.2 + vertex 22.5588 17.5015 -0.2 endloop endfacet facet normal 0.0146144 0.999893 -0 outer loop - vertex 22.5588 17.5015 -0.1 + vertex 22.5588 17.5015 -0.2 vertex 21.0506 17.5236 0 vertex 22.5588 17.5015 0 endloop @@ -31173,13 +31173,13 @@ solid OpenSCAD_Model facet normal 0.0146144 0.999893 0 outer loop vertex 21.0506 17.5236 0 - vertex 22.5588 17.5015 -0.1 - vertex 21.0506 17.5236 -0.1 + vertex 22.5588 17.5015 -0.2 + vertex 21.0506 17.5236 -0.2 endloop endfacet facet normal 0.0395978 0.999216 -0 outer loop - vertex 21.0506 17.5236 -0.1 + vertex 21.0506 17.5236 -0.2 vertex 20.2276 17.5562 0 vertex 21.0506 17.5236 0 endloop @@ -31187,13 +31187,13 @@ solid OpenSCAD_Model facet normal 0.0395978 0.999216 0 outer loop vertex 20.2276 17.5562 0 - vertex 21.0506 17.5236 -0.1 - vertex 20.2276 17.5562 -0.1 + vertex 21.0506 17.5236 -0.2 + vertex 20.2276 17.5562 -0.2 endloop endfacet facet normal 0.211618 0.977352 -0 outer loop - vertex 20.2276 17.5562 -0.1 + vertex 20.2276 17.5562 -0.2 vertex 20.1284 17.5777 0 vertex 20.2276 17.5562 0 endloop @@ -31201,13 +31201,13 @@ solid OpenSCAD_Model facet normal 0.211618 0.977352 0 outer loop vertex 20.1284 17.5777 0 - vertex 20.2276 17.5562 -0.1 - vertex 20.1284 17.5777 -0.1 + vertex 20.2276 17.5562 -0.2 + vertex 20.1284 17.5777 -0.2 endloop endfacet facet normal 0.390006 0.920812 -0 outer loop - vertex 20.1284 17.5777 -0.1 + vertex 20.1284 17.5777 -0.2 vertex 20.0333 17.6179 0 vertex 20.1284 17.5777 0 endloop @@ -31215,13 +31215,13 @@ solid OpenSCAD_Model facet normal 0.390006 0.920812 0 outer loop vertex 20.0333 17.6179 0 - vertex 20.1284 17.5777 -0.1 - vertex 20.0333 17.6179 -0.1 + vertex 20.1284 17.5777 -0.2 + vertex 20.0333 17.6179 -0.2 endloop endfacet facet normal 0.545234 0.838284 -0 outer loop - vertex 20.0333 17.6179 -0.1 + vertex 20.0333 17.6179 -0.2 vertex 19.9424 17.6771 0 vertex 20.0333 17.6179 0 endloop @@ -31229,13 +31229,13 @@ solid OpenSCAD_Model facet normal 0.545234 0.838284 0 outer loop vertex 19.9424 17.6771 0 - vertex 20.0333 17.6179 -0.1 - vertex 19.9424 17.6771 -0.1 + vertex 20.0333 17.6179 -0.2 + vertex 19.9424 17.6771 -0.2 endloop endfacet facet normal 0.668778 0.743462 -0 outer loop - vertex 19.9424 17.6771 -0.1 + vertex 19.9424 17.6771 -0.2 vertex 19.8554 17.7553 0 vertex 19.9424 17.6771 0 endloop @@ -31243,167 +31243,167 @@ solid OpenSCAD_Model facet normal 0.668778 0.743462 0 outer loop vertex 19.8554 17.7553 0 - vertex 19.9424 17.6771 -0.1 - vertex 19.8554 17.7553 -0.1 + vertex 19.9424 17.6771 -0.2 + vertex 19.8554 17.7553 -0.2 endloop endfacet facet normal 0.797362 0.603501 0 outer loop vertex 19.8554 17.7553 0 - vertex 19.6934 17.9694 -0.1 + vertex 19.6934 17.9694 -0.2 vertex 19.6934 17.9694 0 endloop endfacet facet normal 0.797362 0.603501 0 outer loop - vertex 19.6934 17.9694 -0.1 + vertex 19.6934 17.9694 -0.2 vertex 19.8554 17.7553 0 - vertex 19.8554 17.7553 -0.1 + vertex 19.8554 17.7553 -0.2 endloop endfacet facet normal 0.893603 0.448858 0 outer loop vertex 19.6934 17.9694 0 - vertex 19.5469 18.2611 -0.1 + vertex 19.5469 18.2611 -0.2 vertex 19.5469 18.2611 0 endloop endfacet facet normal 0.893603 0.448858 0 outer loop - vertex 19.5469 18.2611 -0.1 + vertex 19.5469 18.2611 -0.2 vertex 19.6934 17.9694 0 - vertex 19.6934 17.9694 -0.1 + vertex 19.6934 17.9694 -0.2 endloop endfacet facet normal 0.942385 0.33453 0 outer loop vertex 19.5469 18.2611 0 - vertex 19.4153 18.6317 -0.1 + vertex 19.4153 18.6317 -0.2 vertex 19.4153 18.6317 0 endloop endfacet facet normal 0.942385 0.33453 0 outer loop - vertex 19.4153 18.6317 -0.1 + vertex 19.4153 18.6317 -0.2 vertex 19.5469 18.2611 0 - vertex 19.5469 18.2611 -0.1 + vertex 19.5469 18.2611 -0.2 endloop endfacet facet normal 0.967894 0.251357 0 outer loop vertex 19.4153 18.6317 0 - vertex 19.2984 19.082 -0.1 + vertex 19.2984 19.082 -0.2 vertex 19.2984 19.082 0 endloop endfacet facet normal 0.967894 0.251357 0 outer loop - vertex 19.2984 19.082 -0.1 + vertex 19.2984 19.082 -0.2 vertex 19.4153 18.6317 0 - vertex 19.4153 18.6317 -0.1 + vertex 19.4153 18.6317 -0.2 endloop endfacet facet normal 0.981784 0.190002 0 outer loop vertex 19.2984 19.082 0 - vertex 19.1956 19.6132 -0.1 + vertex 19.1956 19.6132 -0.2 vertex 19.1956 19.6132 0 endloop endfacet facet normal 0.981784 0.190002 0 outer loop - vertex 19.1956 19.6132 -0.1 + vertex 19.1956 19.6132 -0.2 vertex 19.2984 19.082 0 - vertex 19.2984 19.082 -0.1 + vertex 19.2984 19.082 -0.2 endloop endfacet facet normal 0.989607 0.143797 0 outer loop vertex 19.1956 19.6132 0 - vertex 19.1065 20.2262 -0.1 + vertex 19.1065 20.2262 -0.2 vertex 19.1065 20.2262 0 endloop endfacet facet normal 0.989607 0.143797 0 outer loop - vertex 19.1065 20.2262 -0.1 + vertex 19.1065 20.2262 -0.2 vertex 19.1956 19.6132 0 - vertex 19.1956 19.6132 -0.1 + vertex 19.1956 19.6132 -0.2 endloop endfacet facet normal 0.988819 0.149121 0 outer loop vertex 19.1065 20.2262 0 - vertex 19.0081 20.8787 -0.1 + vertex 19.0081 20.8787 -0.2 vertex 19.0081 20.8787 0 endloop endfacet facet normal 0.988819 0.149121 0 outer loop - vertex 19.0081 20.8787 -0.1 + vertex 19.0081 20.8787 -0.2 vertex 19.1065 20.2262 0 - vertex 19.1065 20.2262 -0.1 + vertex 19.1065 20.2262 -0.2 endloop endfacet facet normal 0.979919 0.199398 0 outer loop vertex 19.0081 20.8787 0 - vertex 18.892 21.4494 -0.1 + vertex 18.892 21.4494 -0.2 vertex 18.892 21.4494 0 endloop endfacet facet normal 0.979919 0.199398 0 outer loop - vertex 18.892 21.4494 -0.1 + vertex 18.892 21.4494 -0.2 vertex 19.0081 20.8787 0 - vertex 19.0081 20.8787 -0.1 + vertex 19.0081 20.8787 -0.2 endloop endfacet facet normal 0.963148 0.268972 0 outer loop vertex 18.892 21.4494 0 - vertex 18.7726 21.8767 -0.1 + vertex 18.7726 21.8767 -0.2 vertex 18.7726 21.8767 0 endloop endfacet facet normal 0.963148 0.268972 0 outer loop - vertex 18.7726 21.8767 -0.1 + vertex 18.7726 21.8767 -0.2 vertex 18.892 21.4494 0 - vertex 18.892 21.4494 -0.1 + vertex 18.892 21.4494 -0.2 endloop endfacet facet normal 0.928333 0.371749 0 outer loop vertex 18.7726 21.8767 0 - vertex 18.7163 22.0174 -0.1 + vertex 18.7163 22.0174 -0.2 vertex 18.7163 22.0174 0 endloop endfacet facet normal 0.928333 0.371749 0 outer loop - vertex 18.7163 22.0174 -0.1 + vertex 18.7163 22.0174 -0.2 vertex 18.7726 21.8767 0 - vertex 18.7726 21.8767 -0.1 + vertex 18.7726 21.8767 -0.2 endloop endfacet facet normal 0.845312 0.534273 0 outer loop vertex 18.7163 22.0174 0 - vertex 18.6646 22.0992 -0.1 + vertex 18.6646 22.0992 -0.2 vertex 18.6646 22.0992 0 endloop endfacet facet normal 0.845312 0.534273 0 outer loop - vertex 18.6646 22.0992 -0.1 + vertex 18.6646 22.0992 -0.2 vertex 18.7163 22.0174 0 - vertex 18.7163 22.0174 -0.1 + vertex 18.7163 22.0174 -0.2 endloop endfacet facet normal 0.569342 0.822101 -0 outer loop - vertex 18.6646 22.0992 -0.1 + vertex 18.6646 22.0992 -0.2 vertex 18.4732 22.2317 0 vertex 18.6646 22.0992 0 endloop @@ -31411,13 +31411,13 @@ solid OpenSCAD_Model facet normal 0.569342 0.822101 0 outer loop vertex 18.4732 22.2317 0 - vertex 18.6646 22.0992 -0.1 - vertex 18.4732 22.2317 -0.1 + vertex 18.6646 22.0992 -0.2 + vertex 18.4732 22.2317 -0.2 endloop endfacet facet normal 0.466042 0.884763 -0 outer loop - vertex 18.4732 22.2317 -0.1 + vertex 18.4732 22.2317 -0.2 vertex 18.127 22.4141 0 vertex 18.4732 22.2317 0 endloop @@ -31425,13 +31425,13 @@ solid OpenSCAD_Model facet normal 0.466042 0.884763 0 outer loop vertex 18.127 22.4141 0 - vertex 18.4732 22.2317 -0.1 - vertex 18.127 22.4141 -0.1 + vertex 18.4732 22.2317 -0.2 + vertex 18.127 22.4141 -0.2 endloop endfacet facet normal 0.418359 0.908282 -0 outer loop - vertex 18.127 22.4141 -0.1 + vertex 18.127 22.4141 -0.2 vertex 17.6752 22.6222 0 vertex 18.127 22.4141 0 endloop @@ -31439,13 +31439,13 @@ solid OpenSCAD_Model facet normal 0.418359 0.908282 0 outer loop vertex 17.6752 22.6222 0 - vertex 18.127 22.4141 -0.1 - vertex 17.6752 22.6222 -0.1 + vertex 18.127 22.4141 -0.2 + vertex 17.6752 22.6222 -0.2 endloop endfacet facet normal 0.381566 0.924342 -0 outer loop - vertex 17.6752 22.6222 -0.1 + vertex 17.6752 22.6222 -0.2 vertex 17.1667 22.8321 0 vertex 17.6752 22.6222 0 endloop @@ -31453,13 +31453,13 @@ solid OpenSCAD_Model facet normal 0.381566 0.924342 0 outer loop vertex 17.1667 22.8321 0 - vertex 17.6752 22.6222 -0.1 - vertex 17.1667 22.8321 -0.1 + vertex 17.6752 22.6222 -0.2 + vertex 17.1667 22.8321 -0.2 endloop endfacet facet normal 0.375086 0.92699 -0 outer loop - vertex 17.1667 22.8321 -0.1 + vertex 17.1667 22.8321 -0.2 vertex 15.5173 23.4995 0 vertex 17.1667 22.8321 0 endloop @@ -31467,13 +31467,13 @@ solid OpenSCAD_Model facet normal 0.375086 0.92699 0 outer loop vertex 15.5173 23.4995 0 - vertex 17.1667 22.8321 -0.1 - vertex 15.5173 23.4995 -0.1 + vertex 17.1667 22.8321 -0.2 + vertex 15.5173 23.4995 -0.2 endloop endfacet facet normal 0.401684 0.915778 -0 outer loop - vertex 15.5173 23.4995 -0.1 + vertex 15.5173 23.4995 -0.2 vertex 14.0281 24.1527 0 vertex 15.5173 23.4995 0 endloop @@ -31481,13 +31481,13 @@ solid OpenSCAD_Model facet normal 0.401684 0.915778 0 outer loop vertex 14.0281 24.1527 0 - vertex 15.5173 23.4995 -0.1 - vertex 14.0281 24.1527 -0.1 + vertex 15.5173 23.4995 -0.2 + vertex 14.0281 24.1527 -0.2 endloop endfacet facet normal 0.431504 0.902111 -0 outer loop - vertex 14.0281 24.1527 -0.1 + vertex 14.0281 24.1527 -0.2 vertex 13.7923 24.2655 0 vertex 14.0281 24.1527 0 endloop @@ -31495,13 +31495,13 @@ solid OpenSCAD_Model facet normal 0.431504 0.902111 0 outer loop vertex 13.7923 24.2655 0 - vertex 14.0281 24.1527 -0.1 - vertex 13.7923 24.2655 -0.1 + vertex 14.0281 24.1527 -0.2 + vertex 13.7923 24.2655 -0.2 endloop endfacet facet normal 0.491302 0.870989 -0 outer loop - vertex 13.7923 24.2655 -0.1 + vertex 13.7923 24.2655 -0.2 vertex 13.5553 24.3991 0 vertex 13.7923 24.2655 0 endloop @@ -31509,13 +31509,13 @@ solid OpenSCAD_Model facet normal 0.491302 0.870989 0 outer loop vertex 13.5553 24.3991 0 - vertex 13.7923 24.2655 -0.1 - vertex 13.5553 24.3991 -0.1 + vertex 13.7923 24.2655 -0.2 + vertex 13.5553 24.3991 -0.2 endloop endfacet facet normal 0.565064 0.825047 -0 outer loop - vertex 13.5553 24.3991 -0.1 + vertex 13.5553 24.3991 -0.2 vertex 13.085 24.7212 0 vertex 13.5553 24.3991 0 endloop @@ -31523,13 +31523,13 @@ solid OpenSCAD_Model facet normal 0.565064 0.825047 0 outer loop vertex 13.085 24.7212 0 - vertex 13.5553 24.3991 -0.1 - vertex 13.085 24.7212 -0.1 + vertex 13.5553 24.3991 -0.2 + vertex 13.085 24.7212 -0.2 endloop endfacet facet normal 0.644201 0.764857 -0 outer loop - vertex 13.085 24.7212 -0.1 + vertex 13.085 24.7212 -0.2 vertex 12.6316 25.1032 0 vertex 13.085 24.7212 0 endloop @@ -31537,251 +31537,251 @@ solid OpenSCAD_Model facet normal 0.644201 0.764857 0 outer loop vertex 12.6316 25.1032 0 - vertex 13.085 24.7212 -0.1 - vertex 12.6316 25.1032 -0.1 + vertex 13.085 24.7212 -0.2 + vertex 12.6316 25.1032 -0.2 endloop endfacet facet normal 0.710157 0.704043 0 outer loop vertex 12.6316 25.1032 0 - vertex 12.2092 25.5292 -0.1 + vertex 12.2092 25.5292 -0.2 vertex 12.2092 25.5292 0 endloop endfacet facet normal 0.710157 0.704043 0 outer loop - vertex 12.2092 25.5292 -0.1 + vertex 12.2092 25.5292 -0.2 vertex 12.6316 25.1032 0 - vertex 12.6316 25.1032 -0.1 + vertex 12.6316 25.1032 -0.2 endloop endfacet facet normal 0.769647 0.63847 0 outer loop vertex 12.2092 25.5292 0 - vertex 11.8324 25.9834 -0.1 + vertex 11.8324 25.9834 -0.2 vertex 11.8324 25.9834 0 endloop endfacet facet normal 0.769647 0.63847 0 outer loop - vertex 11.8324 25.9834 -0.1 + vertex 11.8324 25.9834 -0.2 vertex 12.2092 25.5292 0 - vertex 12.2092 25.5292 -0.1 + vertex 12.2092 25.5292 -0.2 endloop endfacet facet normal 0.827234 0.561857 0 outer loop vertex 11.8324 25.9834 0 - vertex 11.5154 26.4501 -0.1 + vertex 11.5154 26.4501 -0.2 vertex 11.5154 26.4501 0 endloop endfacet facet normal 0.827234 0.561857 0 outer loop - vertex 11.5154 26.4501 -0.1 + vertex 11.5154 26.4501 -0.2 vertex 11.8324 25.9834 0 - vertex 11.8324 25.9834 -0.1 + vertex 11.8324 25.9834 -0.2 endloop endfacet facet normal 0.870844 0.491559 0 outer loop vertex 11.5154 26.4501 0 - vertex 11.3839 26.6832 -0.1 + vertex 11.3839 26.6832 -0.2 vertex 11.3839 26.6832 0 endloop endfacet facet normal 0.870844 0.491559 0 outer loop - vertex 11.3839 26.6832 -0.1 + vertex 11.3839 26.6832 -0.2 vertex 11.5154 26.4501 0 - vertex 11.5154 26.4501 -0.1 + vertex 11.5154 26.4501 -0.2 endloop endfacet facet normal 0.900452 0.434955 0 outer loop vertex 11.3839 26.6832 0 - vertex 11.2726 26.9135 -0.1 + vertex 11.2726 26.9135 -0.2 vertex 11.2726 26.9135 0 endloop endfacet facet normal 0.900452 0.434955 0 outer loop - vertex 11.2726 26.9135 -0.1 + vertex 11.2726 26.9135 -0.2 vertex 11.3839 26.6832 0 - vertex 11.3839 26.6832 -0.1 + vertex 11.3839 26.6832 -0.2 endloop endfacet facet normal 0.930028 0.367488 0 outer loop vertex 11.2726 26.9135 0 - vertex 11.1835 27.139 -0.1 + vertex 11.1835 27.139 -0.2 vertex 11.1835 27.139 0 endloop endfacet facet normal 0.930028 0.367488 0 outer loop - vertex 11.1835 27.139 -0.1 + vertex 11.1835 27.139 -0.2 vertex 11.2726 26.9135 0 - vertex 11.2726 26.9135 -0.1 + vertex 11.2726 26.9135 -0.2 endloop endfacet facet normal 0.958361 0.28556 0 outer loop vertex 11.1835 27.139 0 - vertex 11.1184 27.3577 -0.1 + vertex 11.1184 27.3577 -0.2 vertex 11.1184 27.3577 0 endloop endfacet facet normal 0.958361 0.28556 0 outer loop - vertex 11.1184 27.3577 -0.1 + vertex 11.1184 27.3577 -0.2 vertex 11.1835 27.139 0 - vertex 11.1835 27.139 -0.1 + vertex 11.1835 27.139 -0.2 endloop endfacet facet normal 0.982358 0.187011 0 outer loop vertex 11.1184 27.3577 0 - vertex 11.0734 27.5937 -0.1 + vertex 11.0734 27.5937 -0.2 vertex 11.0734 27.5937 0 endloop endfacet facet normal 0.982358 0.187011 0 outer loop - vertex 11.0734 27.5937 -0.1 + vertex 11.0734 27.5937 -0.2 vertex 11.1184 27.3577 0 - vertex 11.1184 27.3577 -0.1 + vertex 11.1184 27.3577 -0.2 endloop endfacet facet normal 0.995162 0.0982451 0 outer loop vertex 11.0734 27.5937 0 - vertex 11.0484 27.8474 -0.1 + vertex 11.0484 27.8474 -0.2 vertex 11.0484 27.8474 0 endloop endfacet facet normal 0.995162 0.0982451 0 outer loop - vertex 11.0484 27.8474 -0.1 + vertex 11.0484 27.8474 -0.2 vertex 11.0734 27.5937 0 - vertex 11.0734 27.5937 -0.1 + vertex 11.0734 27.5937 -0.2 endloop endfacet facet normal 0.999708 0.0241697 0 outer loop vertex 11.0484 27.8474 0 - vertex 11.0419 28.1143 -0.1 + vertex 11.0419 28.1143 -0.2 vertex 11.0419 28.1143 0 endloop endfacet facet normal 0.999708 0.0241697 0 outer loop - vertex 11.0419 28.1143 -0.1 + vertex 11.0419 28.1143 -0.2 vertex 11.0484 27.8474 0 - vertex 11.0484 27.8474 -0.1 + vertex 11.0484 27.8474 -0.2 endloop endfacet facet normal 0.999225 -0.0393733 0 outer loop vertex 11.0419 28.1143 0 - vertex 11.0528 28.3898 -0.1 + vertex 11.0528 28.3898 -0.2 vertex 11.0528 28.3898 0 endloop endfacet facet normal 0.999225 -0.0393733 0 outer loop - vertex 11.0528 28.3898 -0.1 + vertex 11.0528 28.3898 -0.2 vertex 11.0419 28.1143 0 - vertex 11.0419 28.1143 -0.1 + vertex 11.0419 28.1143 -0.2 endloop endfacet facet normal 0.992566 -0.121707 0 outer loop vertex 11.0528 28.3898 0 - vertex 11.1213 28.9486 -0.1 + vertex 11.1213 28.9486 -0.2 vertex 11.1213 28.9486 0 endloop endfacet facet normal 0.992566 -0.121707 0 outer loop - vertex 11.1213 28.9486 -0.1 + vertex 11.1213 28.9486 -0.2 vertex 11.0528 28.3898 0 - vertex 11.0528 28.3898 -0.1 + vertex 11.0528 28.3898 -0.2 endloop endfacet facet normal 0.975165 -0.221479 0 outer loop vertex 11.1213 28.9486 0 - vertex 11.2437 29.4873 -0.1 + vertex 11.2437 29.4873 -0.2 vertex 11.2437 29.4873 0 endloop endfacet facet normal 0.975165 -0.221479 0 outer loop - vertex 11.2437 29.4873 -0.1 + vertex 11.2437 29.4873 -0.2 vertex 11.1213 28.9486 0 - vertex 11.1213 28.9486 -0.1 + vertex 11.1213 28.9486 -0.2 endloop endfacet facet normal 0.94561 -0.325304 0 outer loop vertex 11.2437 29.4873 0 - vertex 11.4096 29.9696 -0.1 + vertex 11.4096 29.9696 -0.2 vertex 11.4096 29.9696 0 endloop endfacet facet normal 0.94561 -0.325304 0 outer loop - vertex 11.4096 29.9696 -0.1 + vertex 11.4096 29.9696 -0.2 vertex 11.2437 29.4873 0 - vertex 11.2437 29.4873 -0.1 + vertex 11.2437 29.4873 -0.2 endloop endfacet facet normal 0.908293 -0.418334 0 outer loop vertex 11.4096 29.9696 0 - vertex 11.5057 30.1782 -0.1 + vertex 11.5057 30.1782 -0.2 vertex 11.5057 30.1782 0 endloop endfacet facet normal 0.908293 -0.418334 0 outer loop - vertex 11.5057 30.1782 -0.1 + vertex 11.5057 30.1782 -0.2 vertex 11.4096 29.9696 0 - vertex 11.4096 29.9696 -0.1 + vertex 11.4096 29.9696 -0.2 endloop endfacet facet normal 0.868734 -0.495279 0 outer loop vertex 11.5057 30.1782 0 - vertex 11.6088 30.3591 -0.1 + vertex 11.6088 30.3591 -0.2 vertex 11.6088 30.3591 0 endloop endfacet facet normal 0.868734 -0.495279 0 outer loop - vertex 11.6088 30.3591 -0.1 + vertex 11.6088 30.3591 -0.2 vertex 11.5057 30.1782 0 - vertex 11.5057 30.1782 -0.1 + vertex 11.5057 30.1782 -0.2 endloop endfacet facet normal 0.806643 -0.59104 0 outer loop vertex 11.6088 30.3591 0 - vertex 11.7177 30.5077 -0.1 + vertex 11.7177 30.5077 -0.2 vertex 11.7177 30.5077 0 endloop endfacet facet normal 0.806643 -0.59104 0 outer loop - vertex 11.7177 30.5077 -0.1 + vertex 11.7177 30.5077 -0.2 vertex 11.6088 30.3591 0 - vertex 11.6088 30.3591 -0.1 + vertex 11.6088 30.3591 -0.2 endloop endfacet facet normal 0.702105 -0.712073 0 outer loop - vertex 11.7177 30.5077 -0.1 + vertex 11.7177 30.5077 -0.2 vertex 11.8311 30.6195 0 vertex 11.7177 30.5077 0 endloop @@ -31789,13 +31789,13 @@ solid OpenSCAD_Model facet normal 0.702105 -0.712073 0 outer loop vertex 11.8311 30.6195 0 - vertex 11.7177 30.5077 -0.1 - vertex 11.8311 30.6195 -0.1 + vertex 11.7177 30.5077 -0.2 + vertex 11.8311 30.6195 -0.2 endloop endfacet facet normal 0.51702 -0.855973 0 outer loop - vertex 11.8311 30.6195 -0.1 + vertex 11.8311 30.6195 -0.2 vertex 11.9476 30.6899 0 vertex 11.8311 30.6195 0 endloop @@ -31803,13 +31803,13 @@ solid OpenSCAD_Model facet normal 0.51702 -0.855973 0 outer loop vertex 11.9476 30.6899 0 - vertex 11.8311 30.6195 -0.1 - vertex 11.9476 30.6899 -0.1 + vertex 11.8311 30.6195 -0.2 + vertex 11.9476 30.6899 -0.2 endloop endfacet facet normal 0.202357 -0.979312 0 outer loop - vertex 11.9476 30.6899 -0.1 + vertex 11.9476 30.6899 -0.2 vertex 12.0661 30.7144 0 vertex 11.9476 30.6899 0 endloop @@ -31817,13 +31817,13 @@ solid OpenSCAD_Model facet normal 0.202357 -0.979312 0 outer loop vertex 12.0661 30.7144 0 - vertex 11.9476 30.6899 -0.1 - vertex 12.0661 30.7144 -0.1 + vertex 11.9476 30.6899 -0.2 + vertex 12.0661 30.7144 -0.2 endloop endfacet facet normal -0.111663 -0.993746 0 outer loop - vertex 12.0661 30.7144 -0.1 + vertex 12.0661 30.7144 -0.2 vertex 12.1728 30.7024 0 vertex 12.0661 30.7144 0 endloop @@ -31831,13 +31831,13 @@ solid OpenSCAD_Model facet normal -0.111663 -0.993746 -0 outer loop vertex 12.1728 30.7024 0 - vertex 12.0661 30.7144 -0.1 - vertex 12.1728 30.7024 -0.1 + vertex 12.0661 30.7144 -0.2 + vertex 12.1728 30.7024 -0.2 endloop endfacet facet normal -0.43355 -0.90113 0 outer loop - vertex 12.1728 30.7024 -0.1 + vertex 12.1728 30.7024 -0.2 vertex 12.2478 30.6663 0 vertex 12.1728 30.7024 0 endloop @@ -31845,265 +31845,265 @@ solid OpenSCAD_Model facet normal -0.43355 -0.90113 -0 outer loop vertex 12.2478 30.6663 0 - vertex 12.1728 30.7024 -0.1 - vertex 12.2478 30.6663 -0.1 + vertex 12.1728 30.7024 -0.2 + vertex 12.2478 30.6663 -0.2 endloop endfacet facet normal -0.812799 -0.582545 0 outer loop - vertex 12.291 30.606 -0.1 + vertex 12.291 30.606 -0.2 vertex 12.2478 30.6663 0 - vertex 12.2478 30.6663 -0.1 + vertex 12.2478 30.6663 -0.2 endloop endfacet facet normal -0.812799 -0.582545 0 outer loop vertex 12.2478 30.6663 0 - vertex 12.291 30.606 -0.1 + vertex 12.291 30.606 -0.2 vertex 12.291 30.606 0 endloop endfacet facet normal -0.990983 -0.133984 0 outer loop - vertex 12.3025 30.5214 -0.1 + vertex 12.3025 30.5214 -0.2 vertex 12.291 30.606 0 - vertex 12.291 30.606 -0.1 + vertex 12.291 30.606 -0.2 endloop endfacet facet normal -0.990983 -0.133984 0 outer loop vertex 12.291 30.606 0 - vertex 12.3025 30.5214 -0.1 + vertex 12.3025 30.5214 -0.2 vertex 12.3025 30.5214 0 endloop endfacet facet normal -0.983093 0.183105 0 outer loop - vertex 12.2821 30.4122 -0.1 + vertex 12.2821 30.4122 -0.2 vertex 12.3025 30.5214 0 - vertex 12.3025 30.5214 -0.1 + vertex 12.3025 30.5214 -0.2 endloop endfacet facet normal -0.983093 0.183105 0 outer loop vertex 12.3025 30.5214 0 - vertex 12.2821 30.4122 -0.1 + vertex 12.2821 30.4122 -0.2 vertex 12.2821 30.4122 0 endloop endfacet facet normal -0.931822 0.362917 0 outer loop - vertex 12.23 30.2784 -0.1 + vertex 12.23 30.2784 -0.2 vertex 12.2821 30.4122 0 - vertex 12.2821 30.4122 -0.1 + vertex 12.2821 30.4122 -0.2 endloop endfacet facet normal -0.931822 0.362917 0 outer loop vertex 12.2821 30.4122 0 - vertex 12.23 30.2784 -0.1 + vertex 12.23 30.2784 -0.2 vertex 12.23 30.2784 0 endloop endfacet facet normal -0.863735 0.503946 0 outer loop - vertex 12.0304 29.9363 -0.1 + vertex 12.0304 29.9363 -0.2 vertex 12.23 30.2784 0 - vertex 12.23 30.2784 -0.1 + vertex 12.23 30.2784 -0.2 endloop endfacet facet normal -0.863735 0.503946 0 outer loop vertex 12.23 30.2784 0 - vertex 12.0304 29.9363 -0.1 + vertex 12.0304 29.9363 -0.2 vertex 12.0304 29.9363 0 endloop endfacet facet normal -0.874405 0.485196 0 outer loop - vertex 11.965 29.8184 -0.1 + vertex 11.965 29.8184 -0.2 vertex 12.0304 29.9363 0 - vertex 12.0304 29.9363 -0.1 + vertex 12.0304 29.9363 -0.2 endloop endfacet facet normal -0.874405 0.485196 0 outer loop vertex 12.0304 29.9363 0 - vertex 11.965 29.8184 -0.1 + vertex 11.965 29.8184 -0.2 vertex 11.965 29.8184 0 endloop endfacet facet normal -0.930071 0.367381 0 outer loop - vertex 11.9082 29.6745 -0.1 + vertex 11.9082 29.6745 -0.2 vertex 11.965 29.8184 0 - vertex 11.965 29.8184 -0.1 + vertex 11.965 29.8184 -0.2 endloop endfacet facet normal -0.930071 0.367381 0 outer loop vertex 11.965 29.8184 0 - vertex 11.9082 29.6745 -0.1 + vertex 11.9082 29.6745 -0.2 vertex 11.9082 29.6745 0 endloop endfacet facet normal -0.970384 0.241567 0 outer loop - vertex 11.8205 29.3224 -0.1 + vertex 11.8205 29.3224 -0.2 vertex 11.9082 29.6745 0 - vertex 11.9082 29.6745 -0.1 + vertex 11.9082 29.6745 -0.2 endloop endfacet facet normal -0.970384 0.241567 0 outer loop vertex 11.9082 29.6745 0 - vertex 11.8205 29.3224 -0.1 + vertex 11.8205 29.3224 -0.2 vertex 11.8205 29.3224 0 endloop endfacet facet normal -0.99199 0.126319 0 outer loop - vertex 11.7675 28.9061 -0.1 + vertex 11.7675 28.9061 -0.2 vertex 11.8205 29.3224 0 - vertex 11.8205 29.3224 -0.1 + vertex 11.8205 29.3224 -0.2 endloop endfacet facet normal -0.99199 0.126319 0 outer loop vertex 11.8205 29.3224 0 - vertex 11.7675 28.9061 -0.1 + vertex 11.7675 28.9061 -0.2 vertex 11.7675 28.9061 0 endloop endfacet facet normal -0.999189 0.0402694 0 outer loop - vertex 11.7492 28.4518 -0.1 + vertex 11.7492 28.4518 -0.2 vertex 11.7675 28.9061 0 - vertex 11.7675 28.9061 -0.1 + vertex 11.7675 28.9061 -0.2 endloop endfacet facet normal -0.999189 0.0402694 0 outer loop vertex 11.7675 28.9061 0 - vertex 11.7492 28.4518 -0.1 + vertex 11.7492 28.4518 -0.2 vertex 11.7492 28.4518 0 endloop endfacet facet normal -0.999377 -0.0352801 0 outer loop - vertex 11.7656 27.9858 -0.1 + vertex 11.7656 27.9858 -0.2 vertex 11.7492 28.4518 0 - vertex 11.7492 28.4518 -0.1 + vertex 11.7492 28.4518 -0.2 endloop endfacet facet normal -0.999377 -0.0352801 0 outer loop vertex 11.7492 28.4518 0 - vertex 11.7656 27.9858 -0.1 + vertex 11.7656 27.9858 -0.2 vertex 11.7656 27.9858 0 endloop endfacet facet normal -0.993617 -0.112806 0 outer loop - vertex 11.8169 27.5343 -0.1 + vertex 11.8169 27.5343 -0.2 vertex 11.7656 27.9858 0 - vertex 11.7656 27.9858 -0.1 + vertex 11.7656 27.9858 -0.2 endloop endfacet facet normal -0.993617 -0.112806 0 outer loop vertex 11.7656 27.9858 0 - vertex 11.8169 27.5343 -0.1 + vertex 11.8169 27.5343 -0.2 vertex 11.8169 27.5343 0 endloop endfacet facet normal -0.978727 -0.205168 0 outer loop - vertex 11.903 27.1234 -0.1 + vertex 11.903 27.1234 -0.2 vertex 11.8169 27.5343 0 - vertex 11.8169 27.5343 -0.1 + vertex 11.8169 27.5343 -0.2 endloop endfacet facet normal -0.978727 -0.205168 0 outer loop vertex 11.8169 27.5343 0 - vertex 11.903 27.1234 -0.1 + vertex 11.903 27.1234 -0.2 vertex 11.903 27.1234 0 endloop endfacet facet normal -0.943297 -0.331951 0 outer loop - vertex 12.0241 26.7794 -0.1 + vertex 12.0241 26.7794 -0.2 vertex 11.903 27.1234 0 - vertex 11.903 27.1234 -0.1 + vertex 11.903 27.1234 -0.2 endloop endfacet facet normal -0.943297 -0.331951 0 outer loop vertex 11.903 27.1234 0 - vertex 12.0241 26.7794 -0.1 + vertex 12.0241 26.7794 -0.2 vertex 12.0241 26.7794 0 endloop endfacet facet normal -0.895057 -0.445953 0 outer loop - vertex 12.1339 26.5589 -0.1 + vertex 12.1339 26.5589 -0.2 vertex 12.0241 26.7794 0 - vertex 12.0241 26.7794 -0.1 + vertex 12.0241 26.7794 -0.2 endloop endfacet facet normal -0.895057 -0.445953 0 outer loop vertex 12.0241 26.7794 0 - vertex 12.1339 26.5589 -0.1 + vertex 12.1339 26.5589 -0.2 vertex 12.1339 26.5589 0 endloop endfacet facet normal -0.859859 -0.510531 0 outer loop - vertex 12.2572 26.3514 -0.1 + vertex 12.2572 26.3514 -0.2 vertex 12.1339 26.5589 0 - vertex 12.1339 26.5589 -0.1 + vertex 12.1339 26.5589 -0.2 endloop endfacet facet normal -0.859859 -0.510531 0 outer loop vertex 12.1339 26.5589 0 - vertex 12.2572 26.3514 -0.1 + vertex 12.2572 26.3514 -0.2 vertex 12.2572 26.3514 0 endloop endfacet facet normal -0.813765 -0.581194 0 outer loop - vertex 12.3979 26.1543 -0.1 + vertex 12.3979 26.1543 -0.2 vertex 12.2572 26.3514 0 - vertex 12.2572 26.3514 -0.1 + vertex 12.2572 26.3514 -0.2 endloop endfacet facet normal -0.813765 -0.581194 0 outer loop vertex 12.2572 26.3514 0 - vertex 12.3979 26.1543 -0.1 + vertex 12.3979 26.1543 -0.2 vertex 12.3979 26.1543 0 endloop endfacet facet normal -0.758497 -0.651676 0 outer loop - vertex 12.5603 25.9653 -0.1 + vertex 12.5603 25.9653 -0.2 vertex 12.3979 26.1543 0 - vertex 12.3979 26.1543 -0.1 + vertex 12.3979 26.1543 -0.2 endloop endfacet facet normal -0.758497 -0.651676 0 outer loop vertex 12.3979 26.1543 0 - vertex 12.5603 25.9653 -0.1 + vertex 12.5603 25.9653 -0.2 vertex 12.5603 25.9653 0 endloop endfacet facet normal -0.697934 -0.716162 0 outer loop - vertex 12.5603 25.9653 -0.1 + vertex 12.5603 25.9653 -0.2 vertex 12.7484 25.782 0 vertex 12.5603 25.9653 0 endloop @@ -32111,13 +32111,13 @@ solid OpenSCAD_Model facet normal -0.697934 -0.716162 -0 outer loop vertex 12.7484 25.782 0 - vertex 12.5603 25.9653 -0.1 - vertex 12.7484 25.782 -0.1 + vertex 12.5603 25.9653 -0.2 + vertex 12.7484 25.782 -0.2 endloop endfacet facet normal -0.636928 -0.770923 0 outer loop - vertex 12.7484 25.782 -0.1 + vertex 12.7484 25.782 -0.2 vertex 12.9664 25.6018 0 vertex 12.7484 25.782 0 endloop @@ -32125,13 +32125,13 @@ solid OpenSCAD_Model facet normal -0.636928 -0.770923 -0 outer loop vertex 12.9664 25.6018 0 - vertex 12.7484 25.782 -0.1 - vertex 12.9664 25.6018 -0.1 + vertex 12.7484 25.782 -0.2 + vertex 12.9664 25.6018 -0.2 endloop endfacet facet normal -0.579754 -0.814791 0 outer loop - vertex 12.9664 25.6018 -0.1 + vertex 12.9664 25.6018 -0.2 vertex 13.2184 25.4225 0 vertex 12.9664 25.6018 0 endloop @@ -32139,13 +32139,13 @@ solid OpenSCAD_Model facet normal -0.579754 -0.814791 -0 outer loop vertex 13.2184 25.4225 0 - vertex 12.9664 25.6018 -0.1 - vertex 13.2184 25.4225 -0.1 + vertex 12.9664 25.6018 -0.2 + vertex 13.2184 25.4225 -0.2 endloop endfacet facet normal -0.529164 -0.84852 0 outer loop - vertex 13.2184 25.4225 -0.1 + vertex 13.2184 25.4225 -0.2 vertex 13.5086 25.2416 0 vertex 13.2184 25.4225 0 endloop @@ -32153,13 +32153,13 @@ solid OpenSCAD_Model facet normal -0.529164 -0.84852 -0 outer loop vertex 13.5086 25.2416 0 - vertex 13.2184 25.4225 -0.1 - vertex 13.5086 25.2416 -0.1 + vertex 13.2184 25.4225 -0.2 + vertex 13.5086 25.2416 -0.2 endloop endfacet facet normal -0.467835 -0.883816 0 outer loop - vertex 13.5086 25.2416 -0.1 + vertex 13.5086 25.2416 -0.2 vertex 14.2197 24.8651 0 vertex 13.5086 25.2416 0 endloop @@ -32167,13 +32167,13 @@ solid OpenSCAD_Model facet normal -0.467835 -0.883816 -0 outer loop vertex 14.2197 24.8651 0 - vertex 13.5086 25.2416 -0.1 - vertex 14.2197 24.8651 -0.1 + vertex 13.5086 25.2416 -0.2 + vertex 14.2197 24.8651 -0.2 endloop endfacet facet normal -0.411276 -0.911511 0 outer loop - vertex 14.2197 24.8651 -0.1 + vertex 14.2197 24.8651 -0.2 vertex 15.1328 24.4531 0 vertex 14.2197 24.8651 0 endloop @@ -32181,13 +32181,13 @@ solid OpenSCAD_Model facet normal -0.411276 -0.911511 -0 outer loop vertex 15.1328 24.4531 0 - vertex 14.2197 24.8651 -0.1 - vertex 15.1328 24.4531 -0.1 + vertex 14.2197 24.8651 -0.2 + vertex 15.1328 24.4531 -0.2 endloop endfacet facet normal -0.376758 -0.926312 0 outer loop - vertex 15.1328 24.4531 -0.1 + vertex 15.1328 24.4531 -0.2 vertex 16.2809 23.9862 0 vertex 15.1328 24.4531 0 endloop @@ -32195,13 +32195,13 @@ solid OpenSCAD_Model facet normal -0.376758 -0.926312 -0 outer loop vertex 16.2809 23.9862 0 - vertex 15.1328 24.4531 -0.1 - vertex 16.2809 23.9862 -0.1 + vertex 15.1328 24.4531 -0.2 + vertex 16.2809 23.9862 -0.2 endloop endfacet facet normal -0.357069 -0.934078 0 outer loop - vertex 16.2809 23.9862 -0.1 + vertex 16.2809 23.9862 -0.2 vertex 17.6969 23.4449 0 vertex 16.2809 23.9862 0 endloop @@ -32209,13 +32209,13 @@ solid OpenSCAD_Model facet normal -0.357069 -0.934078 -0 outer loop vertex 17.6969 23.4449 0 - vertex 16.2809 23.9862 -0.1 - vertex 17.6969 23.4449 -0.1 + vertex 16.2809 23.9862 -0.2 + vertex 17.6969 23.4449 -0.2 endloop endfacet facet normal -0.423576 -0.90586 0 outer loop - vertex 17.6969 23.4449 -0.1 + vertex 17.6969 23.4449 -0.2 vertex 17.9883 23.3086 0 vertex 17.6969 23.4449 0 endloop @@ -32223,13 +32223,13 @@ solid OpenSCAD_Model facet normal -0.423576 -0.90586 -0 outer loop vertex 17.9883 23.3086 0 - vertex 17.6969 23.4449 -0.1 - vertex 17.9883 23.3086 -0.1 + vertex 17.6969 23.4449 -0.2 + vertex 17.9883 23.3086 -0.2 endloop endfacet facet normal -0.513377 -0.858163 0 outer loop - vertex 17.9883 23.3086 -0.1 + vertex 17.9883 23.3086 -0.2 vertex 18.318 23.1114 0 vertex 17.9883 23.3086 0 endloop @@ -32237,13 +32237,13 @@ solid OpenSCAD_Model facet normal -0.513377 -0.858163 -0 outer loop vertex 18.318 23.1114 0 - vertex 17.9883 23.3086 -0.1 - vertex 18.318 23.1114 -0.1 + vertex 17.9883 23.3086 -0.2 + vertex 18.318 23.1114 -0.2 endloop endfacet facet normal -0.57768 -0.816263 0 outer loop - vertex 18.318 23.1114 -0.1 + vertex 18.318 23.1114 -0.2 vertex 18.6454 22.8797 0 vertex 18.318 23.1114 0 endloop @@ -32251,13 +32251,13 @@ solid OpenSCAD_Model facet normal -0.57768 -0.816263 -0 outer loop vertex 18.6454 22.8797 0 - vertex 18.318 23.1114 -0.1 - vertex 18.6454 22.8797 -0.1 + vertex 18.318 23.1114 -0.2 + vertex 18.6454 22.8797 -0.2 endloop endfacet facet normal -0.644197 -0.76486 0 outer loop - vertex 18.6454 22.8797 -0.1 + vertex 18.6454 22.8797 -0.2 vertex 18.9302 22.6398 0 vertex 18.6454 22.8797 0 endloop @@ -32265,13 +32265,13 @@ solid OpenSCAD_Model facet normal -0.644197 -0.76486 -0 outer loop vertex 18.9302 22.6398 0 - vertex 18.6454 22.8797 -0.1 - vertex 18.9302 22.6398 -0.1 + vertex 18.6454 22.8797 -0.2 + vertex 18.9302 22.6398 -0.2 endloop endfacet facet normal -0.705164 -0.709044 0 outer loop - vertex 18.9302 22.6398 -0.1 + vertex 18.9302 22.6398 -0.2 vertex 19.108 22.463 0 vertex 18.9302 22.6398 0 endloop @@ -32279,181 +32279,181 @@ solid OpenSCAD_Model facet normal -0.705164 -0.709044 -0 outer loop vertex 19.108 22.463 0 - vertex 18.9302 22.6398 -0.1 - vertex 19.108 22.463 -0.1 + vertex 18.9302 22.6398 -0.2 + vertex 19.108 22.463 -0.2 endloop endfacet facet normal -0.763943 -0.645283 0 outer loop - vertex 19.2511 22.2936 -0.1 + vertex 19.2511 22.2936 -0.2 vertex 19.108 22.463 0 - vertex 19.108 22.463 -0.1 + vertex 19.108 22.463 -0.2 endloop endfacet facet normal -0.763943 -0.645283 0 outer loop vertex 19.108 22.463 0 - vertex 19.2511 22.2936 -0.1 + vertex 19.2511 22.2936 -0.2 vertex 19.2511 22.2936 0 endloop endfacet facet normal -0.840155 -0.542346 0 outer loop - vertex 19.3646 22.1178 -0.1 + vertex 19.3646 22.1178 -0.2 vertex 19.2511 22.2936 0 - vertex 19.2511 22.2936 -0.1 + vertex 19.2511 22.2936 -0.2 endloop endfacet facet normal -0.840155 -0.542346 0 outer loop vertex 19.2511 22.2936 0 - vertex 19.3646 22.1178 -0.1 + vertex 19.3646 22.1178 -0.2 vertex 19.3646 22.1178 0 endloop endfacet facet normal -0.910423 -0.413678 0 outer loop - vertex 19.4538 21.9215 -0.1 + vertex 19.4538 21.9215 -0.2 vertex 19.3646 22.1178 0 - vertex 19.3646 22.1178 -0.1 + vertex 19.3646 22.1178 -0.2 endloop endfacet facet normal -0.910423 -0.413678 0 outer loop vertex 19.3646 22.1178 0 - vertex 19.4538 21.9215 -0.1 + vertex 19.4538 21.9215 -0.2 vertex 19.4538 21.9215 0 endloop endfacet facet normal -0.956843 -0.290607 0 outer loop - vertex 19.5238 21.6908 -0.1 + vertex 19.5238 21.6908 -0.2 vertex 19.4538 21.9215 0 - vertex 19.4538 21.9215 -0.1 + vertex 19.4538 21.9215 -0.2 endloop endfacet facet normal -0.956843 -0.290607 0 outer loop vertex 19.4538 21.9215 0 - vertex 19.5238 21.6908 -0.1 + vertex 19.5238 21.6908 -0.2 vertex 19.5238 21.6908 0 endloop endfacet facet normal -0.980355 -0.19724 0 outer loop - vertex 19.58 21.4118 -0.1 + vertex 19.58 21.4118 -0.2 vertex 19.5238 21.6908 0 - vertex 19.5238 21.6908 -0.1 + vertex 19.5238 21.6908 -0.2 endloop endfacet facet normal -0.980355 -0.19724 0 outer loop vertex 19.5238 21.6908 0 - vertex 19.58 21.4118 -0.1 + vertex 19.58 21.4118 -0.2 vertex 19.58 21.4118 0 endloop endfacet facet normal -0.992839 -0.119457 0 outer loop - vertex 19.6713 20.6529 -0.1 + vertex 19.6713 20.6529 -0.2 vertex 19.58 21.4118 0 - vertex 19.58 21.4118 -0.1 + vertex 19.58 21.4118 -0.2 endloop endfacet facet normal -0.992839 -0.119457 0 outer loop vertex 19.58 21.4118 0 - vertex 19.6713 20.6529 -0.1 + vertex 19.6713 20.6529 -0.2 vertex 19.6713 20.6529 0 endloop endfacet facet normal -0.994314 -0.106485 0 outer loop - vertex 19.753 19.8896 -0.1 + vertex 19.753 19.8896 -0.2 vertex 19.6713 20.6529 0 - vertex 19.6713 20.6529 -0.1 + vertex 19.6713 20.6529 -0.2 endloop endfacet facet normal -0.994314 -0.106485 0 outer loop vertex 19.6713 20.6529 0 - vertex 19.753 19.8896 -0.1 + vertex 19.753 19.8896 -0.2 vertex 19.753 19.8896 0 endloop endfacet facet normal -0.985782 -0.168027 0 outer loop - vertex 19.8522 19.3078 -0.1 + vertex 19.8522 19.3078 -0.2 vertex 19.753 19.8896 0 - vertex 19.753 19.8896 -0.1 + vertex 19.753 19.8896 -0.2 endloop endfacet facet normal -0.985782 -0.168027 0 outer loop vertex 19.753 19.8896 0 - vertex 19.8522 19.3078 -0.1 + vertex 19.8522 19.3078 -0.2 vertex 19.8522 19.3078 0 endloop endfacet facet normal -0.962825 -0.270127 0 outer loop - vertex 19.9169 19.0772 -0.1 + vertex 19.9169 19.0772 -0.2 vertex 19.8522 19.3078 0 - vertex 19.8522 19.3078 -0.1 + vertex 19.8522 19.3078 -0.2 endloop endfacet facet normal -0.962825 -0.270127 0 outer loop vertex 19.8522 19.3078 0 - vertex 19.9169 19.0772 -0.1 + vertex 19.9169 19.0772 -0.2 vertex 19.9169 19.0772 0 endloop endfacet facet normal -0.925898 -0.377775 0 outer loop - vertex 19.9962 18.8829 -0.1 + vertex 19.9962 18.8829 -0.2 vertex 19.9169 19.0772 0 - vertex 19.9169 19.0772 -0.1 + vertex 19.9169 19.0772 -0.2 endloop endfacet facet normal -0.925898 -0.377775 0 outer loop vertex 19.9169 19.0772 0 - vertex 19.9962 18.8829 -0.1 + vertex 19.9962 18.8829 -0.2 vertex 19.9962 18.8829 0 endloop endfacet facet normal -0.85612 -0.516776 0 outer loop - vertex 20.0935 18.7216 -0.1 + vertex 20.0935 18.7216 -0.2 vertex 19.9962 18.8829 0 - vertex 19.9962 18.8829 -0.1 + vertex 19.9962 18.8829 -0.2 endloop endfacet facet normal -0.85612 -0.516776 0 outer loop vertex 19.9962 18.8829 0 - vertex 20.0935 18.7216 -0.1 + vertex 20.0935 18.7216 -0.2 vertex 20.0935 18.7216 0 endloop endfacet facet normal -0.741357 -0.67111 0 outer loop - vertex 20.2124 18.5903 -0.1 + vertex 20.2124 18.5903 -0.2 vertex 20.0935 18.7216 0 - vertex 20.0935 18.7216 -0.1 + vertex 20.0935 18.7216 -0.2 endloop endfacet facet normal -0.741357 -0.67111 0 outer loop vertex 20.0935 18.7216 0 - vertex 20.2124 18.5903 -0.1 + vertex 20.2124 18.5903 -0.2 vertex 20.2124 18.5903 0 endloop endfacet facet normal -0.587422 -0.809281 0 outer loop - vertex 20.2124 18.5903 -0.1 + vertex 20.2124 18.5903 -0.2 vertex 20.3561 18.486 0 vertex 20.2124 18.5903 0 endloop @@ -32461,13 +32461,13 @@ solid OpenSCAD_Model facet normal -0.587422 -0.809281 -0 outer loop vertex 20.3561 18.486 0 - vertex 20.2124 18.5903 -0.1 - vertex 20.3561 18.486 -0.1 + vertex 20.2124 18.5903 -0.2 + vertex 20.3561 18.486 -0.2 endloop endfacet facet normal -0.423563 -0.905867 0 outer loop - vertex 20.3561 18.486 -0.1 + vertex 20.3561 18.486 -0.2 vertex 20.5281 18.4055 0 vertex 20.3561 18.486 0 endloop @@ -32475,13 +32475,13 @@ solid OpenSCAD_Model facet normal -0.423563 -0.905867 -0 outer loop vertex 20.5281 18.4055 0 - vertex 20.3561 18.486 -0.1 - vertex 20.5281 18.4055 -0.1 + vertex 20.3561 18.486 -0.2 + vertex 20.5281 18.4055 -0.2 endloop endfacet facet normal -0.280888 -0.95974 0 outer loop - vertex 20.5281 18.4055 -0.1 + vertex 20.5281 18.4055 -0.2 vertex 20.7319 18.3459 0 vertex 20.5281 18.4055 0 endloop @@ -32489,13 +32489,13 @@ solid OpenSCAD_Model facet normal -0.280888 -0.95974 -0 outer loop vertex 20.7319 18.3459 0 - vertex 20.5281 18.4055 -0.1 - vertex 20.7319 18.3459 -0.1 + vertex 20.5281 18.4055 -0.2 + vertex 20.7319 18.3459 -0.2 endloop endfacet facet normal -0.172751 -0.984966 0 outer loop - vertex 20.7319 18.3459 -0.1 + vertex 20.7319 18.3459 -0.2 vertex 20.9709 18.304 0 vertex 20.7319 18.3459 0 endloop @@ -32503,13 +32503,13 @@ solid OpenSCAD_Model facet normal -0.172751 -0.984966 -0 outer loop vertex 20.9709 18.304 0 - vertex 20.7319 18.3459 -0.1 - vertex 20.9709 18.304 -0.1 + vertex 20.7319 18.3459 -0.2 + vertex 20.9709 18.304 -0.2 endloop endfacet facet normal -0.0716809 -0.997428 0 outer loop - vertex 20.9709 18.304 -0.1 + vertex 20.9709 18.304 -0.2 vertex 21.5679 18.2611 0 vertex 20.9709 18.304 0 endloop @@ -32517,13 +32517,13 @@ solid OpenSCAD_Model facet normal -0.0716809 -0.997428 -0 outer loop vertex 21.5679 18.2611 0 - vertex 20.9709 18.304 -0.1 - vertex 21.5679 18.2611 -0.1 + vertex 20.9709 18.304 -0.2 + vertex 21.5679 18.2611 -0.2 endloop endfacet facet normal -0.0113554 -0.999936 0 outer loop - vertex 21.5679 18.2611 -0.1 + vertex 21.5679 18.2611 -0.2 vertex 22.3468 18.2522 0 vertex 21.5679 18.2611 0 endloop @@ -32531,13 +32531,13 @@ solid OpenSCAD_Model facet normal -0.0113554 -0.999936 -0 outer loop vertex 22.3468 18.2522 0 - vertex 21.5679 18.2611 -0.1 - vertex 22.3468 18.2522 -0.1 + vertex 21.5679 18.2611 -0.2 + vertex 22.3468 18.2522 -0.2 endloop endfacet facet normal -0.0142554 -0.999898 0 outer loop - vertex 22.3468 18.2522 -0.1 + vertex 22.3468 18.2522 -0.2 vertex 23.0891 18.2417 0 vertex 22.3468 18.2522 0 endloop @@ -32545,13 +32545,13 @@ solid OpenSCAD_Model facet normal -0.0142554 -0.999898 -0 outer loop vertex 23.0891 18.2417 0 - vertex 22.3468 18.2522 -0.1 - vertex 23.0891 18.2417 -0.1 + vertex 22.3468 18.2522 -0.2 + vertex 23.0891 18.2417 -0.2 endloop endfacet facet normal -0.0563557 -0.998411 0 outer loop - vertex 23.0891 18.2417 -0.1 + vertex 23.0891 18.2417 -0.2 vertex 23.7039 18.207 0 vertex 23.0891 18.2417 0 endloop @@ -32559,13 +32559,13 @@ solid OpenSCAD_Model facet normal -0.0563557 -0.998411 -0 outer loop vertex 23.7039 18.207 0 - vertex 23.0891 18.2417 -0.1 - vertex 23.7039 18.207 -0.1 + vertex 23.0891 18.2417 -0.2 + vertex 23.7039 18.207 -0.2 endloop endfacet facet normal -0.125256 -0.992124 0 outer loop - vertex 23.7039 18.207 -0.1 + vertex 23.7039 18.207 -0.2 vertex 24.2049 18.1437 0 vertex 23.7039 18.207 0 endloop @@ -32573,13 +32573,13 @@ solid OpenSCAD_Model facet normal -0.125256 -0.992124 -0 outer loop vertex 24.2049 18.1437 0 - vertex 23.7039 18.207 -0.1 - vertex 24.2049 18.1437 -0.1 + vertex 23.7039 18.207 -0.2 + vertex 24.2049 18.1437 -0.2 endloop endfacet facet normal -0.233347 -0.972393 0 outer loop - vertex 24.2049 18.1437 -0.1 + vertex 24.2049 18.1437 -0.2 vertex 24.6059 18.0475 0 vertex 24.2049 18.1437 0 endloop @@ -32587,13 +32587,13 @@ solid OpenSCAD_Model facet normal -0.233347 -0.972393 -0 outer loop vertex 24.6059 18.0475 0 - vertex 24.2049 18.1437 -0.1 - vertex 24.6059 18.0475 -0.1 + vertex 24.2049 18.1437 -0.2 + vertex 24.6059 18.0475 -0.2 endloop endfacet facet normal -0.390765 -0.920491 0 outer loop - vertex 24.6059 18.0475 -0.1 + vertex 24.6059 18.0475 -0.2 vertex 24.9207 17.9138 0 vertex 24.6059 18.0475 0 endloop @@ -32601,13 +32601,13 @@ solid OpenSCAD_Model facet normal -0.390765 -0.920491 -0 outer loop vertex 24.9207 17.9138 0 - vertex 24.6059 18.0475 -0.1 - vertex 24.9207 17.9138 -0.1 + vertex 24.6059 18.0475 -0.2 + vertex 24.9207 17.9138 -0.2 endloop endfacet facet normal -0.536417 -0.843953 0 outer loop - vertex 24.9207 17.9138 -0.1 + vertex 24.9207 17.9138 -0.2 vertex 25.0501 17.8316 0 vertex 24.9207 17.9138 0 endloop @@ -32615,13 +32615,13 @@ solid OpenSCAD_Model facet normal -0.536417 -0.843953 -0 outer loop vertex 25.0501 17.8316 0 - vertex 24.9207 17.9138 -0.1 - vertex 25.0501 17.8316 -0.1 + vertex 24.9207 17.9138 -0.2 + vertex 25.0501 17.8316 -0.2 endloop endfacet facet normal -0.636483 -0.77129 0 outer loop - vertex 25.0501 17.8316 -0.1 + vertex 25.0501 17.8316 -0.2 vertex 25.163 17.7384 0 vertex 25.0501 17.8316 0 endloop @@ -32629,83 +32629,83 @@ solid OpenSCAD_Model facet normal -0.636483 -0.77129 -0 outer loop vertex 25.163 17.7384 0 - vertex 25.0501 17.8316 -0.1 - vertex 25.163 17.7384 -0.1 + vertex 25.0501 17.8316 -0.2 + vertex 25.163 17.7384 -0.2 endloop endfacet facet normal -0.729305 -0.684189 0 outer loop - vertex 25.2614 17.6336 -0.1 + vertex 25.2614 17.6336 -0.2 vertex 25.163 17.7384 0 - vertex 25.163 17.7384 -0.1 + vertex 25.163 17.7384 -0.2 endloop endfacet facet normal -0.729305 -0.684189 0 outer loop vertex 25.163 17.7384 0 - vertex 25.2614 17.6336 -0.1 + vertex 25.2614 17.6336 -0.2 vertex 25.2614 17.6336 0 endloop endfacet facet normal -0.807579 -0.589759 0 outer loop - vertex 25.3467 17.5167 -0.1 + vertex 25.3467 17.5167 -0.2 vertex 25.2614 17.6336 0 - vertex 25.2614 17.6336 -0.1 + vertex 25.2614 17.6336 -0.2 endloop endfacet facet normal -0.807579 -0.589759 0 outer loop vertex 25.2614 17.6336 0 - vertex 25.3467 17.5167 -0.1 + vertex 25.3467 17.5167 -0.2 vertex 25.3467 17.5167 0 endloop endfacet facet normal -0.890947 -0.454107 0 outer loop - vertex 25.4856 17.2443 -0.1 + vertex 25.4856 17.2443 -0.2 vertex 25.3467 17.5167 0 - vertex 25.3467 17.5167 -0.1 + vertex 25.3467 17.5167 -0.2 endloop endfacet facet normal -0.890947 -0.454107 0 outer loop vertex 25.3467 17.5167 0 - vertex 25.4856 17.2443 -0.1 + vertex 25.4856 17.2443 -0.2 vertex 25.4856 17.2443 0 endloop endfacet facet normal -0.905796 -0.423714 0 outer loop - vertex 25.6037 16.9917 -0.1 + vertex 25.6037 16.9917 -0.2 vertex 25.4856 17.2443 0 - vertex 25.4856 17.2443 -0.1 + vertex 25.4856 17.2443 -0.2 endloop endfacet facet normal -0.905796 -0.423714 0 outer loop vertex 25.4856 17.2443 0 - vertex 25.6037 16.9917 -0.1 + vertex 25.6037 16.9917 -0.2 vertex 25.6037 16.9917 0 endloop endfacet facet normal -0.826293 -0.563241 0 outer loop - vertex 25.7157 16.8274 -0.1 + vertex 25.7157 16.8274 -0.2 vertex 25.6037 16.9917 0 - vertex 25.6037 16.9917 -0.1 + vertex 25.6037 16.9917 -0.2 endloop endfacet facet normal -0.826293 -0.563241 0 outer loop vertex 25.6037 16.9917 0 - vertex 25.7157 16.8274 -0.1 + vertex 25.7157 16.8274 -0.2 vertex 25.7157 16.8274 0 endloop endfacet facet normal -0.603414 -0.797428 0 outer loop - vertex 25.7157 16.8274 -0.1 + vertex 25.7157 16.8274 -0.2 vertex 25.8187 16.7495 0 vertex 25.7157 16.8274 0 endloop @@ -32713,13 +32713,13 @@ solid OpenSCAD_Model facet normal -0.603414 -0.797428 -0 outer loop vertex 25.8187 16.7495 0 - vertex 25.7157 16.8274 -0.1 - vertex 25.8187 16.7495 -0.1 + vertex 25.7157 16.8274 -0.2 + vertex 25.8187 16.7495 -0.2 endloop endfacet facet normal -0.148413 -0.988925 0 outer loop - vertex 25.8187 16.7495 -0.1 + vertex 25.8187 16.7495 -0.2 vertex 25.8659 16.7424 0 vertex 25.8187 16.7495 0 endloop @@ -32727,13 +32727,13 @@ solid OpenSCAD_Model facet normal -0.148413 -0.988925 -0 outer loop vertex 25.8659 16.7424 0 - vertex 25.8187 16.7495 -0.1 - vertex 25.8659 16.7424 -0.1 + vertex 25.8187 16.7495 -0.2 + vertex 25.8659 16.7424 -0.2 endloop endfacet facet normal 0.302537 -0.953138 0 outer loop - vertex 25.8659 16.7424 -0.1 + vertex 25.8659 16.7424 -0.2 vertex 25.9096 16.7563 0 vertex 25.8659 16.7424 0 endloop @@ -32741,139 +32741,139 @@ solid OpenSCAD_Model facet normal 0.302537 -0.953138 0 outer loop vertex 25.9096 16.7563 0 - vertex 25.8659 16.7424 -0.1 - vertex 25.9096 16.7563 -0.1 + vertex 25.8659 16.7424 -0.2 + vertex 25.9096 16.7563 -0.2 endloop endfacet facet normal 0.763836 -0.645411 0 outer loop vertex 25.9096 16.7563 0 - vertex 25.9855 16.8461 -0.1 + vertex 25.9855 16.8461 -0.2 vertex 25.9855 16.8461 0 endloop endfacet facet normal 0.763836 -0.645411 0 outer loop - vertex 25.9855 16.8461 -0.1 + vertex 25.9855 16.8461 -0.2 vertex 25.9096 16.7563 0 - vertex 25.9096 16.7563 -0.1 + vertex 25.9096 16.7563 -0.2 endloop endfacet facet normal 0.947245 -0.320511 0 outer loop vertex 25.9855 16.8461 0 - vertex 26.0434 17.0172 -0.1 + vertex 26.0434 17.0172 -0.2 vertex 26.0434 17.0172 0 endloop endfacet facet normal 0.947245 -0.320511 0 outer loop - vertex 26.0434 17.0172 -0.1 + vertex 26.0434 17.0172 -0.2 vertex 25.9855 16.8461 0 - vertex 25.9855 16.8461 -0.1 + vertex 25.9855 16.8461 -0.2 endloop endfacet facet normal 0.989326 -0.145716 0 outer loop vertex 26.0434 17.0172 0 - vertex 26.0803 17.2678 -0.1 + vertex 26.0803 17.2678 -0.2 vertex 26.0803 17.2678 0 endloop endfacet facet normal 0.989326 -0.145716 0 outer loop - vertex 26.0803 17.2678 -0.1 + vertex 26.0803 17.2678 -0.2 vertex 26.0434 17.0172 0 - vertex 26.0434 17.0172 -0.1 + vertex 26.0434 17.0172 -0.2 endloop endfacet facet normal 0.999222 -0.0394472 0 outer loop vertex 26.0803 17.2678 0 - vertex 26.0933 17.5963 -0.1 + vertex 26.0933 17.5963 -0.2 vertex 26.0933 17.5963 0 endloop endfacet facet normal 0.999222 -0.0394472 0 outer loop - vertex 26.0933 17.5963 -0.1 + vertex 26.0933 17.5963 -0.2 vertex 26.0803 17.2678 0 - vertex 26.0803 17.2678 -0.1 + vertex 26.0803 17.2678 -0.2 endloop endfacet facet normal 0.99788 0.0650754 0 outer loop vertex 26.0933 17.5963 0 - vertex 26.0696 17.9605 -0.1 + vertex 26.0696 17.9605 -0.2 vertex 26.0696 17.9605 0 endloop endfacet facet normal 0.99788 0.0650754 0 outer loop - vertex 26.0696 17.9605 -0.1 + vertex 26.0696 17.9605 -0.2 vertex 26.0933 17.5963 0 - vertex 26.0933 17.5963 -0.1 + vertex 26.0933 17.5963 -0.2 endloop endfacet facet normal 0.979516 0.201364 0 outer loop vertex 26.0696 17.9605 0 - vertex 26.0009 18.2942 -0.1 + vertex 26.0009 18.2942 -0.2 vertex 26.0009 18.2942 0 endloop endfacet facet normal 0.979516 0.201364 0 outer loop - vertex 26.0009 18.2942 -0.1 + vertex 26.0009 18.2942 -0.2 vertex 26.0696 17.9605 0 - vertex 26.0696 17.9605 -0.1 + vertex 26.0696 17.9605 -0.2 endloop endfacet facet normal 0.938515 0.345238 0 outer loop vertex 26.0009 18.2942 0 - vertex 25.8914 18.5921 -0.1 + vertex 25.8914 18.5921 -0.2 vertex 25.8914 18.5921 0 endloop endfacet facet normal 0.938515 0.345238 0 outer loop - vertex 25.8914 18.5921 -0.1 + vertex 25.8914 18.5921 -0.2 vertex 26.0009 18.2942 0 - vertex 26.0009 18.2942 -0.1 + vertex 26.0009 18.2942 -0.2 endloop endfacet facet normal 0.86805 0.496476 0 outer loop vertex 25.8914 18.5921 0 - vertex 25.7448 18.8483 -0.1 + vertex 25.7448 18.8483 -0.2 vertex 25.7448 18.8483 0 endloop endfacet facet normal 0.86805 0.496476 0 outer loop - vertex 25.7448 18.8483 -0.1 + vertex 25.7448 18.8483 -0.2 vertex 25.8914 18.5921 0 - vertex 25.8914 18.5921 -0.1 + vertex 25.8914 18.5921 -0.2 endloop endfacet facet normal 0.758477 0.651699 0 outer loop vertex 25.7448 18.8483 0 - vertex 25.5652 19.0574 -0.1 + vertex 25.5652 19.0574 -0.2 vertex 25.5652 19.0574 0 endloop endfacet facet normal 0.758477 0.651699 0 outer loop - vertex 25.5652 19.0574 -0.1 + vertex 25.5652 19.0574 -0.2 vertex 25.7448 18.8483 0 - vertex 25.7448 18.8483 -0.1 + vertex 25.7448 18.8483 -0.2 endloop endfacet facet normal 0.599251 0.800561 -0 outer loop - vertex 25.5652 19.0574 -0.1 + vertex 25.5652 19.0574 -0.2 vertex 25.3564 19.2137 0 vertex 25.5652 19.0574 0 endloop @@ -32881,13 +32881,13 @@ solid OpenSCAD_Model facet normal 0.599251 0.800561 0 outer loop vertex 25.3564 19.2137 0 - vertex 25.5652 19.0574 -0.1 - vertex 25.3564 19.2137 -0.1 + vertex 25.5652 19.0574 -0.2 + vertex 25.3564 19.2137 -0.2 endloop endfacet facet normal 0.385907 0.922538 -0 outer loop - vertex 25.3564 19.2137 -0.1 + vertex 25.3564 19.2137 -0.2 vertex 25.1224 19.3115 0 vertex 25.3564 19.2137 0 endloop @@ -32895,13 +32895,13 @@ solid OpenSCAD_Model facet normal 0.385907 0.922538 0 outer loop vertex 25.1224 19.3115 0 - vertex 25.3564 19.2137 -0.1 - vertex 25.1224 19.3115 -0.1 + vertex 25.3564 19.2137 -0.2 + vertex 25.1224 19.3115 -0.2 endloop endfacet facet normal 0.197951 0.980212 -0 outer loop - vertex 25.1224 19.3115 -0.1 + vertex 25.1224 19.3115 -0.2 vertex 24.9972 19.3368 0 vertex 25.1224 19.3115 0 endloop @@ -32909,13 +32909,13 @@ solid OpenSCAD_Model facet normal 0.197951 0.980212 0 outer loop vertex 24.9972 19.3368 0 - vertex 25.1224 19.3115 -0.1 - vertex 24.9972 19.3368 -0.1 + vertex 25.1224 19.3115 -0.2 + vertex 24.9972 19.3368 -0.2 endloop endfacet facet normal 0.0658711 0.997828 -0 outer loop - vertex 24.9972 19.3368 -0.1 + vertex 24.9972 19.3368 -0.2 vertex 24.8672 19.3454 0 vertex 24.9972 19.3368 0 endloop @@ -32923,13 +32923,13 @@ solid OpenSCAD_Model facet normal 0.0658711 0.997828 0 outer loop vertex 24.8672 19.3454 0 - vertex 24.9972 19.3368 -0.1 - vertex 24.8672 19.3454 -0.1 + vertex 24.9972 19.3368 -0.2 + vertex 24.8672 19.3454 -0.2 endloop endfacet facet normal 0.104566 0.994518 -0 outer loop - vertex 24.8672 19.3454 -0.1 + vertex 24.8672 19.3454 -0.2 vertex 24.6124 19.3722 0 vertex 24.8672 19.3454 0 endloop @@ -32937,13 +32937,13 @@ solid OpenSCAD_Model facet normal 0.104566 0.994518 0 outer loop vertex 24.6124 19.3722 0 - vertex 24.8672 19.3454 -0.1 - vertex 24.6124 19.3722 -0.1 + vertex 24.8672 19.3454 -0.2 + vertex 24.6124 19.3722 -0.2 endloop endfacet facet normal 0.198003 0.980201 -0 outer loop - vertex 24.6124 19.3722 -0.1 + vertex 24.6124 19.3722 -0.2 vertex 24.2514 19.4451 0 vertex 24.6124 19.3722 0 endloop @@ -32951,13 +32951,13 @@ solid OpenSCAD_Model facet normal 0.198003 0.980201 0 outer loop vertex 24.2514 19.4451 0 - vertex 24.6124 19.3722 -0.1 - vertex 24.2514 19.4451 -0.1 + vertex 24.6124 19.3722 -0.2 + vertex 24.2514 19.4451 -0.2 endloop endfacet facet normal 0.249312 0.968423 -0 outer loop - vertex 24.2514 19.4451 -0.1 + vertex 24.2514 19.4451 -0.2 vertex 23.8321 19.5531 0 vertex 24.2514 19.4451 0 endloop @@ -32965,13 +32965,13 @@ solid OpenSCAD_Model facet normal 0.249312 0.968423 0 outer loop vertex 23.8321 19.5531 0 - vertex 24.2514 19.4451 -0.1 - vertex 23.8321 19.5531 -0.1 + vertex 24.2514 19.4451 -0.2 + vertex 23.8321 19.5531 -0.2 endloop endfacet facet normal 0.293412 0.955986 -0 outer loop - vertex 23.8321 19.5531 -0.1 + vertex 23.8321 19.5531 -0.2 vertex 23.4027 19.6849 0 vertex 23.8321 19.5531 0 endloop @@ -32979,13 +32979,13 @@ solid OpenSCAD_Model facet normal 0.293412 0.955986 0 outer loop vertex 23.4027 19.6849 0 - vertex 23.8321 19.5531 -0.1 - vertex 23.4027 19.6849 -0.1 + vertex 23.8321 19.5531 -0.2 + vertex 23.4027 19.6849 -0.2 endloop endfacet facet normal 0.372015 0.928227 -0 outer loop - vertex 23.4027 19.6849 -0.1 + vertex 23.4027 19.6849 -0.2 vertex 22.9977 19.8472 0 vertex 23.4027 19.6849 0 endloop @@ -32993,13 +32993,13 @@ solid OpenSCAD_Model facet normal 0.372015 0.928227 0 outer loop vertex 22.9977 19.8472 0 - vertex 23.4027 19.6849 -0.1 - vertex 22.9977 19.8472 -0.1 + vertex 23.4027 19.6849 -0.2 + vertex 22.9977 19.8472 -0.2 endloop endfacet facet normal 0.496703 0.86792 -0 outer loop - vertex 22.9977 19.8472 -0.1 + vertex 22.9977 19.8472 -0.2 vertex 22.6486 20.047 0 vertex 22.9977 19.8472 0 endloop @@ -33007,13 +33007,13 @@ solid OpenSCAD_Model facet normal 0.496703 0.86792 0 outer loop vertex 22.6486 20.047 0 - vertex 22.9977 19.8472 -0.1 - vertex 22.6486 20.047 -0.1 + vertex 22.9977 19.8472 -0.2 + vertex 22.6486 20.047 -0.2 endloop endfacet facet normal 0.63232 0.774707 -0 outer loop - vertex 22.6486 20.047 -0.1 + vertex 22.6486 20.047 -0.2 vertex 22.3515 20.2895 0 vertex 22.6486 20.047 0 endloop @@ -33021,209 +33021,209 @@ solid OpenSCAD_Model facet normal 0.63232 0.774707 0 outer loop vertex 22.3515 20.2895 0 - vertex 22.6486 20.047 -0.1 - vertex 22.3515 20.2895 -0.1 + vertex 22.6486 20.047 -0.2 + vertex 22.3515 20.2895 -0.2 endloop endfacet facet normal 0.72955 0.683927 0 outer loop vertex 22.3515 20.2895 0 - vertex 22.2213 20.4283 -0.1 + vertex 22.2213 20.4283 -0.2 vertex 22.2213 20.4283 0 endloop endfacet facet normal 0.72955 0.683927 0 outer loop - vertex 22.2213 20.4283 -0.1 + vertex 22.2213 20.4283 -0.2 vertex 22.3515 20.2895 0 - vertex 22.3515 20.2895 -0.1 + vertex 22.3515 20.2895 -0.2 endloop endfacet facet normal 0.787511 0.616301 0 outer loop vertex 22.2213 20.4283 0 - vertex 22.1028 20.5797 -0.1 + vertex 22.1028 20.5797 -0.2 vertex 22.1028 20.5797 0 endloop endfacet facet normal 0.787511 0.616301 0 outer loop - vertex 22.1028 20.5797 -0.1 + vertex 22.1028 20.5797 -0.2 vertex 22.2213 20.4283 0 - vertex 22.2213 20.4283 -0.1 + vertex 22.2213 20.4283 -0.2 endloop endfacet facet normal 0.859714 0.510776 0 outer loop vertex 22.1028 20.5797 0 - vertex 21.8989 20.9229 -0.1 + vertex 21.8989 20.9229 -0.2 vertex 21.8989 20.9229 0 endloop endfacet facet normal 0.859714 0.510776 0 outer loop - vertex 21.8989 20.9229 -0.1 + vertex 21.8989 20.9229 -0.2 vertex 22.1028 20.5797 0 - vertex 22.1028 20.5797 -0.1 + vertex 22.1028 20.5797 -0.2 endloop endfacet facet normal 0.926661 0.375897 0 outer loop vertex 21.8989 20.9229 0 - vertex 21.7362 21.3239 -0.1 + vertex 21.7362 21.3239 -0.2 vertex 21.7362 21.3239 0 endloop endfacet facet normal 0.926661 0.375897 0 outer loop - vertex 21.7362 21.3239 -0.1 + vertex 21.7362 21.3239 -0.2 vertex 21.8989 20.9229 0 - vertex 21.8989 20.9229 -0.1 + vertex 21.8989 20.9229 -0.2 endloop endfacet facet normal 0.965497 0.260414 0 outer loop vertex 21.7362 21.3239 0 - vertex 21.6111 21.7881 -0.1 + vertex 21.6111 21.7881 -0.2 vertex 21.6111 21.7881 0 endloop endfacet facet normal 0.965497 0.260414 0 outer loop - vertex 21.6111 21.7881 -0.1 + vertex 21.6111 21.7881 -0.2 vertex 21.7362 21.3239 0 - vertex 21.7362 21.3239 -0.1 + vertex 21.7362 21.3239 -0.2 endloop endfacet facet normal 0.985599 0.169101 0 outer loop vertex 21.6111 21.7881 0 - vertex 21.5197 22.3204 -0.1 + vertex 21.5197 22.3204 -0.2 vertex 21.5197 22.3204 0 endloop endfacet facet normal 0.985599 0.169101 0 outer loop - vertex 21.5197 22.3204 -0.1 + vertex 21.5197 22.3204 -0.2 vertex 21.6111 21.7881 0 - vertex 21.6111 21.7881 -0.1 + vertex 21.6111 21.7881 -0.2 endloop endfacet facet normal 0.981389 0.192031 0 outer loop vertex 21.5197 22.3204 0 - vertex 21.4205 22.8275 -0.1 + vertex 21.4205 22.8275 -0.2 vertex 21.4205 22.8275 0 endloop endfacet facet normal 0.981389 0.192031 0 outer loop - vertex 21.4205 22.8275 -0.1 + vertex 21.4205 22.8275 -0.2 vertex 21.5197 22.3204 0 - vertex 21.5197 22.3204 -0.1 + vertex 21.5197 22.3204 -0.2 endloop endfacet facet normal 0.957484 0.288485 0 outer loop vertex 21.4205 22.8275 0 - vertex 21.3493 23.064 -0.1 + vertex 21.3493 23.064 -0.2 vertex 21.3493 23.064 0 endloop endfacet facet normal 0.957484 0.288485 0 outer loop - vertex 21.3493 23.064 -0.1 + vertex 21.3493 23.064 -0.2 vertex 21.4205 22.8275 0 - vertex 21.4205 22.8275 -0.1 + vertex 21.4205 22.8275 -0.2 endloop endfacet facet normal 0.934507 0.355946 0 outer loop vertex 21.3493 23.064 0 - vertex 21.2635 23.2891 -0.1 + vertex 21.2635 23.2891 -0.2 vertex 21.2635 23.2891 0 endloop endfacet facet normal 0.934507 0.355946 0 outer loop - vertex 21.2635 23.2891 -0.1 + vertex 21.2635 23.2891 -0.2 vertex 21.3493 23.064 0 - vertex 21.3493 23.064 -0.1 + vertex 21.3493 23.064 -0.2 endloop endfacet facet normal 0.905346 0.424674 0 outer loop vertex 21.2635 23.2891 0 - vertex 21.1632 23.503 -0.1 + vertex 21.1632 23.503 -0.2 vertex 21.1632 23.503 0 endloop endfacet facet normal 0.905346 0.424674 0 outer loop - vertex 21.1632 23.503 -0.1 + vertex 21.1632 23.503 -0.2 vertex 21.2635 23.2891 0 - vertex 21.2635 23.2891 -0.1 + vertex 21.2635 23.2891 -0.2 endloop endfacet facet normal 0.869841 0.493332 0 outer loop vertex 21.1632 23.503 0 - vertex 21.0482 23.7058 -0.1 + vertex 21.0482 23.7058 -0.2 vertex 21.0482 23.7058 0 endloop endfacet facet normal 0.869841 0.493332 0 outer loop - vertex 21.0482 23.7058 -0.1 + vertex 21.0482 23.7058 -0.2 vertex 21.1632 23.503 0 - vertex 21.1632 23.503 -0.1 + vertex 21.1632 23.503 -0.2 endloop endfacet facet normal 0.828197 0.560437 0 outer loop vertex 21.0482 23.7058 0 - vertex 20.9184 23.8976 -0.1 + vertex 20.9184 23.8976 -0.2 vertex 20.9184 23.8976 0 endloop endfacet facet normal 0.828197 0.560437 0 outer loop - vertex 20.9184 23.8976 -0.1 + vertex 20.9184 23.8976 -0.2 vertex 21.0482 23.7058 0 - vertex 21.0482 23.7058 -0.1 + vertex 21.0482 23.7058 -0.2 endloop endfacet facet normal 0.781014 0.624513 0 outer loop vertex 20.9184 23.8976 0 - vertex 20.7738 24.0784 -0.1 + vertex 20.7738 24.0784 -0.2 vertex 20.7738 24.0784 0 endloop endfacet facet normal 0.781014 0.624513 0 outer loop - vertex 20.7738 24.0784 -0.1 + vertex 20.7738 24.0784 -0.2 vertex 20.9184 23.8976 0 - vertex 20.9184 23.8976 -0.1 + vertex 20.9184 23.8976 -0.2 endloop endfacet facet normal 0.729218 0.684281 0 outer loop vertex 20.7738 24.0784 0 - vertex 20.6143 24.2484 -0.1 + vertex 20.6143 24.2484 -0.2 vertex 20.6143 24.2484 0 endloop endfacet facet normal 0.729218 0.684281 0 outer loop - vertex 20.6143 24.2484 -0.1 + vertex 20.6143 24.2484 -0.2 vertex 20.7738 24.0784 0 - vertex 20.7738 24.0784 -0.1 + vertex 20.7738 24.0784 -0.2 endloop endfacet facet normal 0.674059 0.738677 -0 outer loop - vertex 20.6143 24.2484 -0.1 + vertex 20.6143 24.2484 -0.2 vertex 20.4398 24.4076 0 vertex 20.6143 24.2484 0 endloop @@ -33231,13 +33231,13 @@ solid OpenSCAD_Model facet normal 0.674059 0.738677 0 outer loop vertex 20.4398 24.4076 0 - vertex 20.6143 24.2484 -0.1 - vertex 20.4398 24.4076 -0.1 + vertex 20.6143 24.2484 -0.2 + vertex 20.4398 24.4076 -0.2 endloop endfacet facet normal 0.616853 0.787078 -0 outer loop - vertex 20.4398 24.4076 -0.1 + vertex 20.4398 24.4076 -0.2 vertex 20.2502 24.5562 0 vertex 20.4398 24.4076 0 endloop @@ -33245,13 +33245,13 @@ solid OpenSCAD_Model facet normal 0.616853 0.787078 0 outer loop vertex 20.2502 24.5562 0 - vertex 20.4398 24.4076 -0.1 - vertex 20.2502 24.5562 -0.1 + vertex 20.4398 24.4076 -0.2 + vertex 20.2502 24.5562 -0.2 endloop endfacet facet normal 0.558944 0.829206 -0 outer loop - vertex 20.2502 24.5562 -0.1 + vertex 20.2502 24.5562 -0.2 vertex 20.0455 24.6942 0 vertex 20.2502 24.5562 0 endloop @@ -33259,13 +33259,13 @@ solid OpenSCAD_Model facet normal 0.558944 0.829206 0 outer loop vertex 20.0455 24.6942 0 - vertex 20.2502 24.5562 -0.1 - vertex 20.0455 24.6942 -0.1 + vertex 20.2502 24.5562 -0.2 + vertex 20.0455 24.6942 -0.2 endloop endfacet facet normal 0.473385 0.880855 -0 outer loop - vertex 20.0455 24.6942 -0.1 + vertex 20.0455 24.6942 -0.2 vertex 19.5904 24.9388 0 vertex 20.0455 24.6942 0 endloop @@ -33273,13 +33273,13 @@ solid OpenSCAD_Model facet normal 0.473385 0.880855 0 outer loop vertex 19.5904 24.9388 0 - vertex 20.0455 24.6942 -0.1 - vertex 19.5904 24.9388 -0.1 + vertex 20.0455 24.6942 -0.2 + vertex 19.5904 24.9388 -0.2 endloop endfacet facet normal 0.366293 0.930499 -0 outer loop - vertex 19.5904 24.9388 -0.1 + vertex 19.5904 24.9388 -0.2 vertex 19.0737 25.1422 0 vertex 19.5904 24.9388 0 endloop @@ -33287,13 +33287,13 @@ solid OpenSCAD_Model facet normal 0.366293 0.930499 0 outer loop vertex 19.0737 25.1422 0 - vertex 19.5904 24.9388 -0.1 - vertex 19.0737 25.1422 -0.1 + vertex 19.5904 24.9388 -0.2 + vertex 19.0737 25.1422 -0.2 endloop endfacet facet normal 0.339314 0.940673 -0 outer loop - vertex 19.0737 25.1422 -0.1 + vertex 19.0737 25.1422 -0.2 vertex 18.5685 25.3244 0 vertex 19.0737 25.1422 0 endloop @@ -33301,13 +33301,13 @@ solid OpenSCAD_Model facet normal 0.339314 0.940673 0 outer loop vertex 18.5685 25.3244 0 - vertex 19.0737 25.1422 -0.1 - vertex 18.5685 25.3244 -0.1 + vertex 19.0737 25.1422 -0.2 + vertex 18.5685 25.3244 -0.2 endloop endfacet facet normal 0.390266 0.920702 -0 outer loop - vertex 18.5685 25.3244 -0.1 + vertex 18.5685 25.3244 -0.2 vertex 18.1033 25.5216 0 vertex 18.5685 25.3244 0 endloop @@ -33315,13 +33315,13 @@ solid OpenSCAD_Model facet normal 0.390266 0.920702 0 outer loop vertex 18.1033 25.5216 0 - vertex 18.5685 25.3244 -0.1 - vertex 18.1033 25.5216 -0.1 + vertex 18.5685 25.3244 -0.2 + vertex 18.1033 25.5216 -0.2 endloop endfacet facet normal 0.448214 0.893926 -0 outer loop - vertex 18.1033 25.5216 -0.1 + vertex 18.1033 25.5216 -0.2 vertex 17.6707 25.7385 0 vertex 18.1033 25.5216 0 endloop @@ -33329,13 +33329,13 @@ solid OpenSCAD_Model facet normal 0.448214 0.893926 0 outer loop vertex 17.6707 25.7385 0 - vertex 18.1033 25.5216 -0.1 - vertex 17.6707 25.7385 -0.1 + vertex 18.1033 25.5216 -0.2 + vertex 17.6707 25.7385 -0.2 endloop endfacet facet normal 0.509711 0.860346 -0 outer loop - vertex 17.6707 25.7385 -0.1 + vertex 17.6707 25.7385 -0.2 vertex 17.2631 25.98 0 vertex 17.6707 25.7385 0 endloop @@ -33343,13 +33343,13 @@ solid OpenSCAD_Model facet normal 0.509711 0.860346 0 outer loop vertex 17.2631 25.98 0 - vertex 17.6707 25.7385 -0.1 - vertex 17.2631 25.98 -0.1 + vertex 17.6707 25.7385 -0.2 + vertex 17.2631 25.98 -0.2 endloop endfacet facet normal 0.570375 0.821384 -0 outer loop - vertex 17.2631 25.98 -0.1 + vertex 17.2631 25.98 -0.2 vertex 16.873 26.2508 0 vertex 17.2631 25.98 0 endloop @@ -33357,13 +33357,13 @@ solid OpenSCAD_Model facet normal 0.570375 0.821384 0 outer loop vertex 16.873 26.2508 0 - vertex 17.2631 25.98 -0.1 - vertex 16.873 26.2508 -0.1 + vertex 17.2631 25.98 -0.2 + vertex 16.873 26.2508 -0.2 endloop endfacet facet normal 0.626027 0.779801 -0 outer loop - vertex 16.873 26.2508 -0.1 + vertex 16.873 26.2508 -0.2 vertex 16.4932 26.5558 0 vertex 16.873 26.2508 0 endloop @@ -33371,13 +33371,13 @@ solid OpenSCAD_Model facet normal 0.626027 0.779801 0 outer loop vertex 16.4932 26.5558 0 - vertex 16.873 26.2508 -0.1 - vertex 16.4932 26.5558 -0.1 + vertex 16.873 26.2508 -0.2 + vertex 16.4932 26.5558 -0.2 endloop endfacet facet normal 0.673725 0.738983 -0 outer loop - vertex 16.4932 26.5558 -0.1 + vertex 16.4932 26.5558 -0.2 vertex 16.116 26.8997 0 vertex 16.4932 26.5558 0 endloop @@ -33385,181 +33385,181 @@ solid OpenSCAD_Model facet normal 0.673725 0.738983 0 outer loop vertex 16.116 26.8997 0 - vertex 16.4932 26.5558 -0.1 - vertex 16.116 26.8997 -0.1 + vertex 16.4932 26.5558 -0.2 + vertex 16.116 26.8997 -0.2 endloop endfacet facet normal 0.71226 0.701916 0 outer loop vertex 16.116 26.8997 0 - vertex 15.734 27.2872 -0.1 + vertex 15.734 27.2872 -0.2 vertex 15.734 27.2872 0 endloop endfacet facet normal 0.71226 0.701916 0 outer loop - vertex 15.734 27.2872 -0.1 + vertex 15.734 27.2872 -0.2 vertex 16.116 26.8997 0 - vertex 16.116 26.8997 -0.1 + vertex 16.116 26.8997 -0.2 endloop endfacet facet normal 0.751608 0.65961 0 outer loop vertex 15.734 27.2872 0 - vertex 15.344 27.7317 -0.1 + vertex 15.344 27.7317 -0.2 vertex 15.344 27.7317 0 endloop endfacet facet normal 0.751608 0.65961 0 outer loop - vertex 15.344 27.7317 -0.1 + vertex 15.344 27.7317 -0.2 vertex 15.734 27.2872 0 - vertex 15.734 27.2872 -0.1 + vertex 15.734 27.2872 -0.2 endloop endfacet facet normal 0.827441 0.561552 0 outer loop vertex 15.344 27.7317 0 - vertex 15.2193 27.9155 -0.1 + vertex 15.2193 27.9155 -0.2 vertex 15.2193 27.9155 0 endloop endfacet facet normal 0.827441 0.561552 0 outer loop - vertex 15.2193 27.9155 -0.1 + vertex 15.2193 27.9155 -0.2 vertex 15.344 27.7317 0 - vertex 15.344 27.7317 -0.1 + vertex 15.344 27.7317 -0.2 endloop endfacet facet normal 0.901872 0.432003 0 outer loop vertex 15.2193 27.9155 0 - vertex 15.1337 28.0941 -0.1 + vertex 15.1337 28.0941 -0.2 vertex 15.1337 28.0941 0 endloop endfacet facet normal 0.901872 0.432003 0 outer loop - vertex 15.1337 28.0941 -0.1 + vertex 15.1337 28.0941 -0.2 vertex 15.2193 27.9155 0 - vertex 15.2193 27.9155 -0.1 + vertex 15.2193 27.9155 -0.2 endloop endfacet facet normal 0.963972 0.266005 0 outer loop vertex 15.1337 28.0941 0 - vertex 15.0817 28.2827 -0.1 + vertex 15.0817 28.2827 -0.2 vertex 15.0817 28.2827 0 endloop endfacet facet normal 0.963972 0.266005 0 outer loop - vertex 15.0817 28.2827 -0.1 + vertex 15.0817 28.2827 -0.2 vertex 15.1337 28.0941 0 - vertex 15.1337 28.0941 -0.1 + vertex 15.1337 28.0941 -0.2 endloop endfacet facet normal 0.993628 0.112714 0 outer loop vertex 15.0817 28.2827 0 - vertex 15.0574 28.4965 -0.1 + vertex 15.0574 28.4965 -0.2 vertex 15.0574 28.4965 0 endloop endfacet facet normal 0.993628 0.112714 0 outer loop - vertex 15.0574 28.4965 -0.1 + vertex 15.0574 28.4965 -0.2 vertex 15.0817 28.2827 0 - vertex 15.0817 28.2827 -0.1 + vertex 15.0817 28.2827 -0.2 endloop endfacet facet normal 0.999963 0.00862244 0 outer loop vertex 15.0574 28.4965 0 - vertex 15.0552 28.7509 -0.1 + vertex 15.0552 28.7509 -0.2 vertex 15.0552 28.7509 0 endloop endfacet facet normal 0.999963 0.00862244 0 outer loop - vertex 15.0552 28.7509 -0.1 + vertex 15.0552 28.7509 -0.2 vertex 15.0574 28.4965 0 - vertex 15.0574 28.4965 -0.1 + vertex 15.0574 28.4965 -0.2 endloop endfacet facet normal 0.99896 -0.0455854 0 outer loop vertex 15.0552 28.7509 0 - vertex 15.0694 29.0611 -0.1 + vertex 15.0694 29.0611 -0.2 vertex 15.0694 29.0611 0 endloop endfacet facet normal 0.99896 -0.0455854 0 outer loop - vertex 15.0694 29.0611 -0.1 + vertex 15.0694 29.0611 -0.2 vertex 15.0552 28.7509 0 - vertex 15.0552 28.7509 -0.1 + vertex 15.0552 28.7509 -0.2 endloop endfacet facet normal 0.995626 -0.0934289 0 outer loop vertex 15.0694 29.0611 0 - vertex 15.1102 29.496 -0.1 + vertex 15.1102 29.496 -0.2 vertex 15.1102 29.496 0 endloop endfacet facet normal 0.995626 -0.0934289 0 outer loop - vertex 15.1102 29.496 -0.1 + vertex 15.1102 29.496 -0.2 vertex 15.0694 29.0611 0 - vertex 15.0694 29.0611 -0.1 + vertex 15.0694 29.0611 -0.2 endloop endfacet facet normal 0.982507 -0.186226 0 outer loop vertex 15.1102 29.496 0 - vertex 15.1701 29.8123 -0.1 + vertex 15.1701 29.8123 -0.2 vertex 15.1701 29.8123 0 endloop endfacet facet normal 0.982507 -0.186226 0 outer loop - vertex 15.1701 29.8123 -0.1 + vertex 15.1701 29.8123 -0.2 vertex 15.1102 29.496 0 - vertex 15.1102 29.496 -0.1 + vertex 15.1102 29.496 -0.2 endloop endfacet facet normal 0.936612 -0.350368 0 outer loop vertex 15.1701 29.8123 0 - vertex 15.2437 30.0088 -0.1 + vertex 15.2437 30.0088 -0.2 vertex 15.2437 30.0088 0 endloop endfacet facet normal 0.936612 -0.350368 0 outer loop - vertex 15.2437 30.0088 -0.1 + vertex 15.2437 30.0088 -0.2 vertex 15.1701 29.8123 0 - vertex 15.1701 29.8123 -0.1 + vertex 15.1701 29.8123 -0.2 endloop endfacet facet normal 0.797615 -0.603167 0 outer loop vertex 15.2437 30.0088 0 - vertex 15.2838 30.0618 -0.1 + vertex 15.2838 30.0618 -0.2 vertex 15.2838 30.0618 0 endloop endfacet facet normal 0.797615 -0.603167 0 outer loop - vertex 15.2838 30.0618 -0.1 + vertex 15.2838 30.0618 -0.2 vertex 15.2437 30.0088 0 - vertex 15.2437 30.0088 -0.1 + vertex 15.2437 30.0088 -0.2 endloop endfacet facet normal 0.48104 -0.876698 0 outer loop - vertex 15.2838 30.0618 -0.1 + vertex 15.2838 30.0618 -0.2 vertex 15.3252 30.0845 0 vertex 15.2838 30.0618 0 endloop @@ -33567,13 +33567,13 @@ solid OpenSCAD_Model facet normal 0.48104 -0.876698 0 outer loop vertex 15.3252 30.0845 0 - vertex 15.2838 30.0618 -0.1 - vertex 15.3252 30.0845 -0.1 + vertex 15.2838 30.0618 -0.2 + vertex 15.3252 30.0845 -0.2 endloop endfacet facet normal -0.180566 -0.983563 0 outer loop - vertex 15.3252 30.0845 -0.1 + vertex 15.3252 30.0845 -0.2 vertex 15.3672 30.0768 0 vertex 15.3252 30.0845 0 endloop @@ -33581,13 +33581,13 @@ solid OpenSCAD_Model facet normal -0.180566 -0.983563 -0 outer loop vertex 15.3672 30.0768 0 - vertex 15.3252 30.0845 -0.1 - vertex 15.3672 30.0768 -0.1 + vertex 15.3252 30.0845 -0.2 + vertex 15.3672 30.0768 -0.2 endloop endfacet facet normal -0.674079 -0.738659 0 outer loop - vertex 15.3672 30.0768 -0.1 + vertex 15.3672 30.0768 -0.2 vertex 15.4091 30.0386 0 vertex 15.3672 30.0768 0 endloop @@ -33595,153 +33595,153 @@ solid OpenSCAD_Model facet normal -0.674079 -0.738659 -0 outer loop vertex 15.4091 30.0386 0 - vertex 15.3672 30.0768 -0.1 - vertex 15.4091 30.0386 -0.1 + vertex 15.3672 30.0768 -0.2 + vertex 15.4091 30.0386 -0.2 endloop endfacet facet normal -0.901794 -0.432166 0 outer loop - vertex 15.49 29.8698 -0.1 + vertex 15.49 29.8698 -0.2 vertex 15.4091 30.0386 0 - vertex 15.4091 30.0386 -0.1 + vertex 15.4091 30.0386 -0.2 endloop endfacet facet normal -0.901794 -0.432166 0 outer loop vertex 15.4091 30.0386 0 - vertex 15.49 29.8698 -0.1 + vertex 15.49 29.8698 -0.2 vertex 15.49 29.8698 0 endloop endfacet facet normal -0.970859 -0.239653 0 outer loop - vertex 15.5622 29.5773 -0.1 + vertex 15.5622 29.5773 -0.2 vertex 15.49 29.8698 0 - vertex 15.49 29.8698 -0.1 + vertex 15.49 29.8698 -0.2 endloop endfacet facet normal -0.970859 -0.239653 0 outer loop vertex 15.49 29.8698 0 - vertex 15.5622 29.5773 -0.1 + vertex 15.5622 29.5773 -0.2 vertex 15.5622 29.5773 0 endloop endfacet facet normal -0.990483 -0.137635 0 outer loop - vertex 15.6202 29.1601 -0.1 + vertex 15.6202 29.1601 -0.2 vertex 15.5622 29.5773 0 - vertex 15.5622 29.5773 -0.1 + vertex 15.5622 29.5773 -0.2 endloop endfacet facet normal -0.990483 -0.137635 0 outer loop vertex 15.5622 29.5773 0 - vertex 15.6202 29.1601 -0.1 + vertex 15.6202 29.1601 -0.2 vertex 15.6202 29.1601 0 endloop endfacet facet normal -0.987242 -0.159229 0 outer loop - vertex 15.6927 28.7106 -0.1 + vertex 15.6927 28.7106 -0.2 vertex 15.6202 29.1601 0 - vertex 15.6202 29.1601 -0.1 + vertex 15.6202 29.1601 -0.2 endloop endfacet facet normal -0.987242 -0.159229 0 outer loop vertex 15.6202 29.1601 0 - vertex 15.6927 28.7106 -0.1 + vertex 15.6927 28.7106 -0.2 vertex 15.6927 28.7106 0 endloop endfacet facet normal -0.964764 -0.263116 0 outer loop - vertex 15.7487 28.5051 -0.1 + vertex 15.7487 28.5051 -0.2 vertex 15.6927 28.7106 0 - vertex 15.6927 28.7106 -0.1 + vertex 15.6927 28.7106 -0.2 endloop endfacet facet normal -0.964764 -0.263116 0 outer loop vertex 15.6927 28.7106 0 - vertex 15.7487 28.5051 -0.1 + vertex 15.7487 28.5051 -0.2 vertex 15.7487 28.5051 0 endloop endfacet facet normal -0.93932 -0.343042 0 outer loop - vertex 15.8197 28.3106 -0.1 + vertex 15.8197 28.3106 -0.2 vertex 15.7487 28.5051 0 - vertex 15.7487 28.5051 -0.1 + vertex 15.7487 28.5051 -0.2 endloop endfacet facet normal -0.93932 -0.343042 0 outer loop vertex 15.7487 28.5051 0 - vertex 15.8197 28.3106 -0.1 + vertex 15.8197 28.3106 -0.2 vertex 15.8197 28.3106 0 endloop endfacet facet normal -0.904159 -0.427196 0 outer loop - vertex 15.9071 28.1258 -0.1 + vertex 15.9071 28.1258 -0.2 vertex 15.8197 28.3106 0 - vertex 15.8197 28.3106 -0.1 + vertex 15.8197 28.3106 -0.2 endloop endfacet facet normal -0.904159 -0.427196 0 outer loop vertex 15.8197 28.3106 0 - vertex 15.9071 28.1258 -0.1 + vertex 15.9071 28.1258 -0.2 vertex 15.9071 28.1258 0 endloop endfacet facet normal -0.859613 -0.510945 0 outer loop - vertex 16.0121 27.9491 -0.1 + vertex 16.0121 27.9491 -0.2 vertex 15.9071 28.1258 0 - vertex 15.9071 28.1258 -0.1 + vertex 15.9071 28.1258 -0.2 endloop endfacet facet normal -0.859613 -0.510945 0 outer loop vertex 15.9071 28.1258 0 - vertex 16.0121 27.9491 -0.1 + vertex 16.0121 27.9491 -0.2 vertex 16.0121 27.9491 0 endloop endfacet facet normal -0.807674 -0.589629 0 outer loop - vertex 16.1362 27.7792 -0.1 + vertex 16.1362 27.7792 -0.2 vertex 16.0121 27.9491 0 - vertex 16.0121 27.9491 -0.1 + vertex 16.0121 27.9491 -0.2 endloop endfacet facet normal -0.807674 -0.589629 0 outer loop vertex 16.0121 27.9491 0 - vertex 16.1362 27.7792 -0.1 + vertex 16.1362 27.7792 -0.2 vertex 16.1362 27.7792 0 endloop endfacet facet normal -0.751613 -0.659605 0 outer loop - vertex 16.2806 27.6146 -0.1 + vertex 16.2806 27.6146 -0.2 vertex 16.1362 27.7792 0 - vertex 16.1362 27.7792 -0.1 + vertex 16.1362 27.7792 -0.2 endloop endfacet facet normal -0.751613 -0.659605 0 outer loop vertex 16.1362 27.7792 0 - vertex 16.2806 27.6146 -0.1 + vertex 16.2806 27.6146 -0.2 vertex 16.2806 27.6146 0 endloop endfacet facet normal -0.695067 -0.718945 0 outer loop - vertex 16.2806 27.6146 -0.1 + vertex 16.2806 27.6146 -0.2 vertex 16.4467 27.454 0 vertex 16.2806 27.6146 0 endloop @@ -33749,13 +33749,13 @@ solid OpenSCAD_Model facet normal -0.695067 -0.718945 -0 outer loop vertex 16.4467 27.454 0 - vertex 16.2806 27.6146 -0.1 - vertex 16.4467 27.454 -0.1 + vertex 16.2806 27.6146 -0.2 + vertex 16.4467 27.454 -0.2 endloop endfacet facet normal -0.641168 -0.767401 0 outer loop - vertex 16.4467 27.454 -0.1 + vertex 16.4467 27.454 -0.2 vertex 16.6359 27.2959 0 vertex 16.4467 27.454 0 endloop @@ -33763,13 +33763,13 @@ solid OpenSCAD_Model facet normal -0.641168 -0.767401 -0 outer loop vertex 16.6359 27.2959 0 - vertex 16.4467 27.454 -0.1 - vertex 16.6359 27.2959 -0.1 + vertex 16.4467 27.454 -0.2 + vertex 16.6359 27.2959 -0.2 endloop endfacet facet normal -0.569935 -0.82169 0 outer loop - vertex 16.6359 27.2959 -0.1 + vertex 16.6359 27.2959 -0.2 vertex 17.0889 26.9817 0 vertex 16.6359 27.2959 0 endloop @@ -33777,13 +33777,13 @@ solid OpenSCAD_Model facet normal -0.569935 -0.82169 -0 outer loop vertex 17.0889 26.9817 0 - vertex 16.6359 27.2959 -0.1 - vertex 17.0889 26.9817 -0.1 + vertex 16.6359 27.2959 -0.2 + vertex 17.0889 26.9817 -0.2 endloop endfacet facet normal -0.496343 -0.868126 0 outer loop - vertex 17.0889 26.9817 -0.1 + vertex 17.0889 26.9817 -0.2 vertex 17.6504 26.6607 0 vertex 17.0889 26.9817 0 endloop @@ -33791,13 +33791,13 @@ solid OpenSCAD_Model facet normal -0.496343 -0.868126 -0 outer loop vertex 17.6504 26.6607 0 - vertex 17.0889 26.9817 -0.1 - vertex 17.6504 26.6607 -0.1 + vertex 17.0889 26.9817 -0.2 + vertex 17.6504 26.6607 -0.2 endloop endfacet facet normal -0.4459 -0.895083 0 outer loop - vertex 17.6504 26.6607 -0.1 + vertex 17.6504 26.6607 -0.2 vertex 18.3311 26.3216 0 vertex 17.6504 26.6607 0 endloop @@ -33805,13 +33805,13 @@ solid OpenSCAD_Model facet normal -0.4459 -0.895083 -0 outer loop vertex 18.3311 26.3216 0 - vertex 17.6504 26.6607 -0.1 - vertex 18.3311 26.3216 -0.1 + vertex 17.6504 26.6607 -0.2 + vertex 18.3311 26.3216 -0.2 endloop endfacet facet normal -0.437511 -0.899213 0 outer loop - vertex 18.3311 26.3216 -0.1 + vertex 18.3311 26.3216 -0.2 vertex 19.3729 25.8147 0 vertex 18.3311 26.3216 0 endloop @@ -33819,13 +33819,13 @@ solid OpenSCAD_Model facet normal -0.437511 -0.899213 -0 outer loop vertex 19.3729 25.8147 0 - vertex 18.3311 26.3216 -0.1 - vertex 19.3729 25.8147 -0.1 + vertex 18.3311 26.3216 -0.2 + vertex 19.3729 25.8147 -0.2 endloop endfacet facet normal -0.473558 -0.880763 0 outer loop - vertex 19.3729 25.8147 -0.1 + vertex 19.3729 25.8147 -0.2 vertex 20.1936 25.3734 0 vertex 19.3729 25.8147 0 endloop @@ -33833,13 +33833,13 @@ solid OpenSCAD_Model facet normal -0.473558 -0.880763 -0 outer loop vertex 20.1936 25.3734 0 - vertex 19.3729 25.8147 -0.1 - vertex 20.1936 25.3734 -0.1 + vertex 19.3729 25.8147 -0.2 + vertex 20.1936 25.3734 -0.2 endloop endfacet facet normal -0.521003 -0.853555 0 outer loop - vertex 20.1936 25.3734 -0.1 + vertex 20.1936 25.3734 -0.2 vertex 20.53 25.168 0 vertex 20.1936 25.3734 0 endloop @@ -33847,13 +33847,13 @@ solid OpenSCAD_Model facet normal -0.521003 -0.853555 -0 outer loop vertex 20.53 25.168 0 - vertex 20.1936 25.3734 -0.1 - vertex 20.53 25.168 -0.1 + vertex 20.1936 25.3734 -0.2 + vertex 20.53 25.168 -0.2 endloop endfacet facet normal -0.565431 -0.824796 0 outer loop - vertex 20.53 25.168 -0.1 + vertex 20.53 25.168 -0.2 vertex 20.8221 24.9679 0 vertex 20.53 25.168 0 endloop @@ -33861,13 +33861,13 @@ solid OpenSCAD_Model facet normal -0.565431 -0.824796 -0 outer loop vertex 20.8221 24.9679 0 - vertex 20.53 25.168 -0.1 - vertex 20.8221 24.9679 -0.1 + vertex 20.53 25.168 -0.2 + vertex 20.8221 24.9679 -0.2 endloop endfacet facet normal -0.620484 -0.784219 0 outer loop - vertex 20.8221 24.9679 -0.1 + vertex 20.8221 24.9679 -0.2 vertex 21.0733 24.7691 0 vertex 20.8221 24.9679 0 endloop @@ -33875,13 +33875,13 @@ solid OpenSCAD_Model facet normal -0.620484 -0.784219 -0 outer loop vertex 21.0733 24.7691 0 - vertex 20.8221 24.9679 -0.1 - vertex 21.0733 24.7691 -0.1 + vertex 20.8221 24.9679 -0.2 + vertex 21.0733 24.7691 -0.2 endloop endfacet facet normal -0.684731 -0.728796 0 outer loop - vertex 21.0733 24.7691 -0.1 + vertex 21.0733 24.7691 -0.2 vertex 21.2873 24.568 0 vertex 21.0733 24.7691 0 endloop @@ -33889,181 +33889,181 @@ solid OpenSCAD_Model facet normal -0.684731 -0.728796 -0 outer loop vertex 21.2873 24.568 0 - vertex 21.0733 24.7691 -0.1 - vertex 21.2873 24.568 -0.1 + vertex 21.0733 24.7691 -0.2 + vertex 21.2873 24.568 -0.2 endloop endfacet facet normal -0.754027 -0.656843 0 outer loop - vertex 21.4677 24.3609 -0.1 + vertex 21.4677 24.3609 -0.2 vertex 21.2873 24.568 0 - vertex 21.2873 24.568 -0.1 + vertex 21.2873 24.568 -0.2 endloop endfacet facet normal -0.754027 -0.656843 0 outer loop vertex 21.2873 24.568 0 - vertex 21.4677 24.3609 -0.1 + vertex 21.4677 24.3609 -0.2 vertex 21.4677 24.3609 0 endloop endfacet facet normal -0.821674 -0.569958 0 outer loop - vertex 21.6182 24.144 -0.1 + vertex 21.6182 24.144 -0.2 vertex 21.4677 24.3609 0 - vertex 21.4677 24.3609 -0.1 + vertex 21.4677 24.3609 -0.2 endloop endfacet facet normal -0.821674 -0.569958 0 outer loop vertex 21.4677 24.3609 0 - vertex 21.6182 24.144 -0.1 + vertex 21.6182 24.144 -0.2 vertex 21.6182 24.144 0 endloop endfacet facet normal -0.880428 -0.47418 0 outer loop - vertex 21.7423 23.9135 -0.1 + vertex 21.7423 23.9135 -0.2 vertex 21.6182 24.144 0 - vertex 21.6182 24.144 -0.1 + vertex 21.6182 24.144 -0.2 endloop endfacet facet normal -0.880428 -0.47418 0 outer loop vertex 21.6182 24.144 0 - vertex 21.7423 23.9135 -0.1 + vertex 21.7423 23.9135 -0.2 vertex 21.7423 23.9135 0 endloop endfacet facet normal -0.925485 -0.378785 0 outer loop - vertex 21.8437 23.6658 -0.1 + vertex 21.8437 23.6658 -0.2 vertex 21.7423 23.9135 0 - vertex 21.7423 23.9135 -0.1 + vertex 21.7423 23.9135 -0.2 endloop endfacet facet normal -0.925485 -0.378785 0 outer loop vertex 21.7423 23.9135 0 - vertex 21.8437 23.6658 -0.1 + vertex 21.8437 23.6658 -0.2 vertex 21.8437 23.6658 0 endloop endfacet facet normal -0.956187 -0.292757 0 outer loop - vertex 21.926 23.397 -0.1 + vertex 21.926 23.397 -0.2 vertex 21.8437 23.6658 0 - vertex 21.8437 23.6658 -0.1 + vertex 21.8437 23.6658 -0.2 endloop endfacet facet normal -0.956187 -0.292757 0 outer loop vertex 21.8437 23.6658 0 - vertex 21.926 23.397 -0.1 + vertex 21.926 23.397 -0.2 vertex 21.926 23.397 0 endloop endfacet facet normal -0.975069 -0.221901 0 outer loop - vertex 21.9928 23.1034 -0.1 + vertex 21.9928 23.1034 -0.2 vertex 21.926 23.397 0 - vertex 21.926 23.397 -0.1 + vertex 21.926 23.397 -0.2 endloop endfacet facet normal -0.975069 -0.221901 0 outer loop vertex 21.926 23.397 0 - vertex 21.9928 23.1034 -0.1 + vertex 21.9928 23.1034 -0.2 vertex 21.9928 23.1034 0 endloop endfacet facet normal -0.988902 -0.14857 0 outer loop - vertex 22.0944 22.427 -0.1 + vertex 22.0944 22.427 -0.2 vertex 21.9928 23.1034 0 - vertex 21.9928 23.1034 -0.1 + vertex 21.9928 23.1034 -0.2 endloop endfacet facet normal -0.988902 -0.14857 0 outer loop vertex 21.9928 23.1034 0 - vertex 22.0944 22.427 -0.1 + vertex 22.0944 22.427 -0.2 vertex 22.0944 22.427 0 endloop endfacet facet normal -0.986323 -0.164825 0 outer loop - vertex 22.1689 21.9813 -0.1 + vertex 22.1689 21.9813 -0.2 vertex 22.0944 22.427 0 - vertex 22.0944 22.427 -0.1 + vertex 22.0944 22.427 -0.2 endloop endfacet facet normal -0.986323 -0.164825 0 outer loop vertex 22.0944 22.427 0 - vertex 22.1689 21.9813 -0.1 + vertex 22.1689 21.9813 -0.2 vertex 22.1689 21.9813 0 endloop endfacet facet normal -0.960165 -0.279433 0 outer loop - vertex 22.2815 21.5943 -0.1 + vertex 22.2815 21.5943 -0.2 vertex 22.1689 21.9813 0 - vertex 22.1689 21.9813 -0.1 + vertex 22.1689 21.9813 -0.2 endloop endfacet facet normal -0.960165 -0.279433 0 outer loop vertex 22.1689 21.9813 0 - vertex 22.2815 21.5943 -0.1 + vertex 22.2815 21.5943 -0.2 vertex 22.2815 21.5943 0 endloop endfacet facet normal -0.907871 -0.41925 0 outer loop - vertex 22.4341 21.2638 -0.1 + vertex 22.4341 21.2638 -0.2 vertex 22.2815 21.5943 0 - vertex 22.2815 21.5943 -0.1 + vertex 22.2815 21.5943 -0.2 endloop endfacet facet normal -0.907871 -0.41925 0 outer loop vertex 22.2815 21.5943 0 - vertex 22.4341 21.2638 -0.1 + vertex 22.4341 21.2638 -0.2 vertex 22.4341 21.2638 0 endloop endfacet facet normal -0.817597 -0.575791 0 outer loop - vertex 22.6286 20.9877 -0.1 + vertex 22.6286 20.9877 -0.2 vertex 22.4341 21.2638 0 - vertex 22.4341 21.2638 -0.1 + vertex 22.4341 21.2638 -0.2 endloop endfacet facet normal -0.817597 -0.575791 0 outer loop vertex 22.4341 21.2638 0 - vertex 22.6286 20.9877 -0.1 + vertex 22.6286 20.9877 -0.2 vertex 22.6286 20.9877 0 endloop endfacet facet normal -0.721714 -0.692192 0 outer loop - vertex 22.7421 20.8693 -0.1 + vertex 22.7421 20.8693 -0.2 vertex 22.6286 20.9877 0 - vertex 22.6286 20.9877 -0.1 + vertex 22.6286 20.9877 -0.2 endloop endfacet facet normal -0.721714 -0.692192 0 outer loop vertex 22.6286 20.9877 0 - vertex 22.7421 20.8693 -0.1 + vertex 22.7421 20.8693 -0.2 vertex 22.7421 20.8693 0 endloop endfacet facet normal -0.646202 -0.763167 0 outer loop - vertex 22.7421 20.8693 -0.1 + vertex 22.7421 20.8693 -0.2 vertex 22.8668 20.7638 0 vertex 22.7421 20.8693 0 endloop @@ -34071,13 +34071,13 @@ solid OpenSCAD_Model facet normal -0.646202 -0.763167 -0 outer loop vertex 22.8668 20.7638 0 - vertex 22.7421 20.8693 -0.1 - vertex 22.8668 20.7638 -0.1 + vertex 22.7421 20.8693 -0.2 + vertex 22.8668 20.7638 -0.2 endloop endfacet facet normal -0.522339 -0.852738 0 outer loop - vertex 22.8668 20.7638 -0.1 + vertex 22.8668 20.7638 -0.2 vertex 23.1504 20.59 0 vertex 22.8668 20.7638 0 endloop @@ -34085,13 +34085,13 @@ solid OpenSCAD_Model facet normal -0.522339 -0.852738 -0 outer loop vertex 23.1504 20.59 0 - vertex 22.8668 20.7638 -0.1 - vertex 23.1504 20.59 -0.1 + vertex 22.8668 20.7638 -0.2 + vertex 23.1504 20.59 -0.2 endloop endfacet facet normal -0.355133 -0.934816 0 outer loop - vertex 23.1504 20.59 -0.1 + vertex 23.1504 20.59 -0.2 vertex 23.4814 20.4643 0 vertex 23.1504 20.59 0 endloop @@ -34099,13 +34099,13 @@ solid OpenSCAD_Model facet normal -0.355133 -0.934816 -0 outer loop vertex 23.4814 20.4643 0 - vertex 23.1504 20.59 -0.1 - vertex 23.4814 20.4643 -0.1 + vertex 23.1504 20.59 -0.2 + vertex 23.4814 20.4643 -0.2 endloop endfacet facet normal -0.205594 -0.978637 0 outer loop - vertex 23.4814 20.4643 -0.1 + vertex 23.4814 20.4643 -0.2 vertex 23.8617 20.3844 0 vertex 23.4814 20.4643 0 endloop @@ -34113,13 +34113,13 @@ solid OpenSCAD_Model facet normal -0.205594 -0.978637 -0 outer loop vertex 23.8617 20.3844 0 - vertex 23.4814 20.4643 -0.1 - vertex 23.8617 20.3844 -0.1 + vertex 23.4814 20.4643 -0.2 + vertex 23.8617 20.3844 -0.2 endloop endfacet facet normal -0.166383 -0.986061 0 outer loop - vertex 23.8617 20.3844 -0.1 + vertex 23.8617 20.3844 -0.2 vertex 24.2028 20.3268 0 vertex 23.8617 20.3844 0 endloop @@ -34127,13 +34127,13 @@ solid OpenSCAD_Model facet normal -0.166383 -0.986061 -0 outer loop vertex 24.2028 20.3268 0 - vertex 23.8617 20.3844 -0.1 - vertex 24.2028 20.3268 -0.1 + vertex 23.8617 20.3844 -0.2 + vertex 24.2028 20.3268 -0.2 endloop endfacet facet normal -0.222634 -0.974902 0 outer loop - vertex 24.2028 20.3268 -0.1 + vertex 24.2028 20.3268 -0.2 vertex 24.5205 20.2543 0 vertex 24.2028 20.3268 0 endloop @@ -34141,13 +34141,13 @@ solid OpenSCAD_Model facet normal -0.222634 -0.974902 -0 outer loop vertex 24.5205 20.2543 0 - vertex 24.2028 20.3268 -0.1 - vertex 24.5205 20.2543 -0.1 + vertex 24.2028 20.3268 -0.2 + vertex 24.5205 20.2543 -0.2 endloop endfacet facet normal -0.285939 -0.958248 0 outer loop - vertex 24.5205 20.2543 -0.1 + vertex 24.5205 20.2543 -0.2 vertex 24.8151 20.1664 0 vertex 24.5205 20.2543 0 endloop @@ -34155,13 +34155,13 @@ solid OpenSCAD_Model facet normal -0.285939 -0.958248 -0 outer loop vertex 24.8151 20.1664 0 - vertex 24.5205 20.2543 -0.1 - vertex 24.8151 20.1664 -0.1 + vertex 24.5205 20.2543 -0.2 + vertex 24.8151 20.1664 -0.2 endloop endfacet facet normal -0.356177 -0.934419 0 outer loop - vertex 24.8151 20.1664 -0.1 + vertex 24.8151 20.1664 -0.2 vertex 25.087 20.0627 0 vertex 24.8151 20.1664 0 endloop @@ -34169,13 +34169,13 @@ solid OpenSCAD_Model facet normal -0.356177 -0.934419 -0 outer loop vertex 25.087 20.0627 0 - vertex 24.8151 20.1664 -0.1 - vertex 25.087 20.0627 -0.1 + vertex 24.8151 20.1664 -0.2 + vertex 25.087 20.0627 -0.2 endloop endfacet facet normal -0.432613 -0.90158 0 outer loop - vertex 25.087 20.0627 -0.1 + vertex 25.087 20.0627 -0.2 vertex 25.3364 19.943 0 vertex 25.087 20.0627 0 endloop @@ -34183,13 +34183,13 @@ solid OpenSCAD_Model facet normal -0.432613 -0.90158 -0 outer loop vertex 25.3364 19.943 0 - vertex 25.087 20.0627 -0.1 - vertex 25.3364 19.943 -0.1 + vertex 25.087 20.0627 -0.2 + vertex 25.3364 19.943 -0.2 endloop endfacet facet normal -0.513641 -0.858005 0 outer loop - vertex 25.3364 19.943 -0.1 + vertex 25.3364 19.943 -0.2 vertex 25.5639 19.8069 0 vertex 25.3364 19.943 0 endloop @@ -34197,13 +34197,13 @@ solid OpenSCAD_Model facet normal -0.513641 -0.858005 -0 outer loop vertex 25.5639 19.8069 0 - vertex 25.3364 19.943 -0.1 - vertex 25.5639 19.8069 -0.1 + vertex 25.3364 19.943 -0.2 + vertex 25.5639 19.8069 -0.2 endloop endfacet facet normal -0.59661 -0.802531 0 outer loop - vertex 25.5639 19.8069 -0.1 + vertex 25.5639 19.8069 -0.2 vertex 25.7697 19.6539 0 vertex 25.5639 19.8069 0 endloop @@ -34211,13 +34211,13 @@ solid OpenSCAD_Model facet normal -0.59661 -0.802531 -0 outer loop vertex 25.7697 19.6539 0 - vertex 25.5639 19.8069 -0.1 - vertex 25.7697 19.6539 -0.1 + vertex 25.5639 19.8069 -0.2 + vertex 25.7697 19.6539 -0.2 endloop endfacet facet normal -0.678036 -0.735029 0 outer loop - vertex 25.7697 19.6539 -0.1 + vertex 25.7697 19.6539 -0.2 vertex 25.9541 19.4837 0 vertex 25.7697 19.6539 0 endloop @@ -34225,559 +34225,559 @@ solid OpenSCAD_Model facet normal -0.678036 -0.735029 -0 outer loop vertex 25.9541 19.4837 0 - vertex 25.7697 19.6539 -0.1 - vertex 25.9541 19.4837 -0.1 + vertex 25.7697 19.6539 -0.2 + vertex 25.9541 19.4837 -0.2 endloop endfacet facet normal -0.75405 -0.656818 0 outer loop - vertex 26.1176 19.296 -0.1 + vertex 26.1176 19.296 -0.2 vertex 25.9541 19.4837 0 - vertex 25.9541 19.4837 -0.1 + vertex 25.9541 19.4837 -0.2 endloop endfacet facet normal -0.75405 -0.656818 0 outer loop vertex 25.9541 19.4837 0 - vertex 26.1176 19.296 -0.1 + vertex 26.1176 19.296 -0.2 vertex 26.1176 19.296 0 endloop endfacet facet normal -0.821173 -0.570679 0 outer loop - vertex 26.2605 19.0904 -0.1 + vertex 26.2605 19.0904 -0.2 vertex 26.1176 19.296 0 - vertex 26.1176 19.296 -0.1 + vertex 26.1176 19.296 -0.2 endloop endfacet facet normal -0.821173 -0.570679 0 outer loop vertex 26.1176 19.296 0 - vertex 26.2605 19.0904 -0.1 + vertex 26.2605 19.0904 -0.2 vertex 26.2605 19.0904 0 endloop endfacet facet normal -0.877038 -0.480422 0 outer loop - vertex 26.3832 18.8665 -0.1 + vertex 26.3832 18.8665 -0.2 vertex 26.2605 19.0904 0 - vertex 26.2605 19.0904 -0.1 + vertex 26.2605 19.0904 -0.2 endloop endfacet facet normal -0.877038 -0.480422 0 outer loop vertex 26.2605 19.0904 0 - vertex 26.3832 18.8665 -0.1 + vertex 26.3832 18.8665 -0.2 vertex 26.3832 18.8665 0 endloop endfacet facet normal -0.920777 -0.390089 0 outer loop - vertex 26.4859 18.624 -0.1 + vertex 26.4859 18.624 -0.2 vertex 26.3832 18.8665 0 - vertex 26.3832 18.8665 -0.1 + vertex 26.3832 18.8665 -0.2 endloop endfacet facet normal -0.920777 -0.390089 0 outer loop vertex 26.3832 18.8665 0 - vertex 26.4859 18.624 -0.1 + vertex 26.4859 18.624 -0.2 vertex 26.4859 18.624 0 endloop endfacet facet normal -0.952936 -0.30317 0 outer loop - vertex 26.5691 18.3624 -0.1 + vertex 26.5691 18.3624 -0.2 vertex 26.4859 18.624 0 - vertex 26.4859 18.624 -0.1 + vertex 26.4859 18.624 -0.2 endloop endfacet facet normal -0.952936 -0.30317 0 outer loop vertex 26.4859 18.624 0 - vertex 26.5691 18.3624 -0.1 + vertex 26.5691 18.3624 -0.2 vertex 26.5691 18.3624 0 endloop endfacet facet normal -0.974998 -0.222215 0 outer loop - vertex 26.6332 18.0815 -0.1 + vertex 26.6332 18.0815 -0.2 vertex 26.5691 18.3624 0 - vertex 26.5691 18.3624 -0.1 + vertex 26.5691 18.3624 -0.2 endloop endfacet facet normal -0.974998 -0.222215 0 outer loop vertex 26.5691 18.3624 0 - vertex 26.6332 18.0815 -0.1 + vertex 26.6332 18.0815 -0.2 vertex 26.6332 18.0815 0 endloop endfacet facet normal -0.98889 -0.148648 0 outer loop - vertex 26.6784 17.7808 -0.1 + vertex 26.6784 17.7808 -0.2 vertex 26.6332 18.0815 0 - vertex 26.6332 18.0815 -0.1 + vertex 26.6332 18.0815 -0.2 endloop endfacet facet normal -0.98889 -0.148648 0 outer loop vertex 26.6332 18.0815 0 - vertex 26.6784 17.7808 -0.1 + vertex 26.6784 17.7808 -0.2 vertex 26.6784 17.7808 0 endloop endfacet facet normal -0.996548 -0.083019 0 outer loop - vertex 26.7051 17.4601 -0.1 + vertex 26.7051 17.4601 -0.2 vertex 26.6784 17.7808 0 - vertex 26.6784 17.7808 -0.1 + vertex 26.6784 17.7808 -0.2 endloop endfacet facet normal -0.996548 -0.083019 0 outer loop vertex 26.6784 17.7808 0 - vertex 26.7051 17.4601 -0.1 + vertex 26.7051 17.4601 -0.2 vertex 26.7051 17.4601 0 endloop endfacet facet normal -0.991209 -0.132303 0 outer loop - vertex 26.7571 17.0706 -0.1 + vertex 26.7571 17.0706 -0.2 vertex 26.7051 17.4601 0 - vertex 26.7051 17.4601 -0.1 + vertex 26.7051 17.4601 -0.2 endloop endfacet facet normal -0.991209 -0.132303 0 outer loop vertex 26.7051 17.4601 0 - vertex 26.7571 17.0706 -0.1 + vertex 26.7571 17.0706 -0.2 vertex 26.7571 17.0706 0 endloop endfacet facet normal -0.970274 -0.242008 0 outer loop - vertex 26.8653 16.6367 -0.1 + vertex 26.8653 16.6367 -0.2 vertex 26.7571 17.0706 0 - vertex 26.7571 17.0706 -0.1 + vertex 26.7571 17.0706 -0.2 endloop endfacet facet normal -0.970274 -0.242008 0 outer loop vertex 26.7571 17.0706 0 - vertex 26.8653 16.6367 -0.1 + vertex 26.8653 16.6367 -0.2 vertex 26.8653 16.6367 0 endloop endfacet facet normal -0.944031 -0.329856 0 outer loop - vertex 27.0139 16.2113 -0.1 + vertex 27.0139 16.2113 -0.2 vertex 26.8653 16.6367 0 - vertex 26.8653 16.6367 -0.1 + vertex 26.8653 16.6367 -0.2 endloop endfacet facet normal -0.944031 -0.329856 0 outer loop vertex 26.8653 16.6367 0 - vertex 27.0139 16.2113 -0.1 + vertex 27.0139 16.2113 -0.2 vertex 27.0139 16.2113 0 endloop endfacet facet normal -0.902944 -0.429757 0 outer loop - vertex 27.1872 15.8473 -0.1 + vertex 27.1872 15.8473 -0.2 vertex 27.0139 16.2113 0 - vertex 27.0139 16.2113 -0.1 + vertex 27.0139 16.2113 -0.2 endloop endfacet facet normal -0.902944 -0.429757 0 outer loop vertex 27.0139 16.2113 0 - vertex 27.1872 15.8473 -0.1 + vertex 27.1872 15.8473 -0.2 vertex 27.1872 15.8473 0 endloop endfacet facet normal -0.882286 -0.470713 0 outer loop - vertex 27.3198 15.5987 -0.1 + vertex 27.3198 15.5987 -0.2 vertex 27.1872 15.8473 0 - vertex 27.1872 15.8473 -0.1 + vertex 27.1872 15.8473 -0.2 endloop endfacet facet normal -0.882286 -0.470713 0 outer loop vertex 27.1872 15.8473 0 - vertex 27.3198 15.5987 -0.1 + vertex 27.3198 15.5987 -0.2 vertex 27.3198 15.5987 0 endloop endfacet facet normal -0.922173 -0.386777 0 outer loop - vertex 27.4227 15.3534 -0.1 + vertex 27.4227 15.3534 -0.2 vertex 27.3198 15.5987 0 - vertex 27.3198 15.5987 -0.1 + vertex 27.3198 15.5987 -0.2 endloop endfacet facet normal -0.922173 -0.386777 0 outer loop vertex 27.3198 15.5987 0 - vertex 27.4227 15.3534 -0.1 + vertex 27.4227 15.3534 -0.2 vertex 27.4227 15.3534 0 endloop endfacet facet normal -0.962502 -0.271275 0 outer loop - vertex 27.4995 15.0808 -0.1 + vertex 27.4995 15.0808 -0.2 vertex 27.4227 15.3534 0 - vertex 27.4227 15.3534 -0.1 + vertex 27.4227 15.3534 -0.2 endloop endfacet facet normal -0.962502 -0.271275 0 outer loop vertex 27.4227 15.3534 0 - vertex 27.4995 15.0808 -0.1 + vertex 27.4995 15.0808 -0.2 vertex 27.4995 15.0808 0 endloop endfacet facet normal -0.986697 -0.162567 0 outer loop - vertex 27.5539 14.7505 -0.1 + vertex 27.5539 14.7505 -0.2 vertex 27.4995 15.0808 0 - vertex 27.4995 15.0808 -0.1 + vertex 27.4995 15.0808 -0.2 endloop endfacet facet normal -0.986697 -0.162567 0 outer loop vertex 27.4995 15.0808 0 - vertex 27.5539 14.7505 -0.1 + vertex 27.5539 14.7505 -0.2 vertex 27.5539 14.7505 0 endloop endfacet facet normal -0.996383 -0.0849723 0 outer loop - vertex 27.5896 14.3319 -0.1 + vertex 27.5896 14.3319 -0.2 vertex 27.5539 14.7505 0 - vertex 27.5539 14.7505 -0.1 + vertex 27.5539 14.7505 -0.2 endloop endfacet facet normal -0.996383 -0.0849723 0 outer loop vertex 27.5539 14.7505 0 - vertex 27.5896 14.3319 -0.1 + vertex 27.5896 14.3319 -0.2 vertex 27.5896 14.3319 0 endloop endfacet facet normal -0.999262 -0.0383987 0 outer loop - vertex 27.6103 13.7945 -0.1 + vertex 27.6103 13.7945 -0.2 vertex 27.5896 14.3319 0 - vertex 27.5896 14.3319 -0.1 + vertex 27.5896 14.3319 -0.2 endloop endfacet facet normal -0.999262 -0.0383987 0 outer loop vertex 27.5896 14.3319 0 - vertex 27.6103 13.7945 -0.1 + vertex 27.6103 13.7945 -0.2 vertex 27.6103 13.7945 0 endloop endfacet facet normal -0.999976 -0.0069841 0 outer loop - vertex 27.6211 12.2412 -0.1 + vertex 27.6211 12.2412 -0.2 vertex 27.6103 13.7945 0 - vertex 27.6103 13.7945 -0.1 + vertex 27.6103 13.7945 -0.2 endloop endfacet facet normal -0.999976 -0.0069841 0 outer loop vertex 27.6103 13.7945 0 - vertex 27.6211 12.2412 -0.1 + vertex 27.6211 12.2412 -0.2 vertex 27.6211 12.2412 0 endloop endfacet facet normal -0.999918 0.0127851 0 outer loop - vertex 27.6024 10.7775 -0.1 + vertex 27.6024 10.7775 -0.2 vertex 27.6211 12.2412 0 - vertex 27.6211 12.2412 -0.1 + vertex 27.6211 12.2412 -0.2 endloop endfacet facet normal -0.999918 0.0127851 0 outer loop vertex 27.6211 12.2412 0 - vertex 27.6024 10.7775 -0.1 + vertex 27.6024 10.7775 -0.2 vertex 27.6024 10.7775 0 endloop endfacet facet normal -0.999067 0.0431942 0 outer loop - vertex 27.5775 10.2019 -0.1 + vertex 27.5775 10.2019 -0.2 vertex 27.6024 10.7775 0 - vertex 27.6024 10.7775 -0.1 + vertex 27.6024 10.7775 -0.2 endloop endfacet facet normal -0.999067 0.0431942 0 outer loop vertex 27.6024 10.7775 0 - vertex 27.5775 10.2019 -0.1 + vertex 27.5775 10.2019 -0.2 vertex 27.5775 10.2019 0 endloop endfacet facet normal -0.997132 0.0756876 0 outer loop - vertex 27.5397 9.70386 -0.1 + vertex 27.5397 9.70386 -0.2 vertex 27.5775 10.2019 0 - vertex 27.5775 10.2019 -0.1 + vertex 27.5775 10.2019 -0.2 endloop endfacet facet normal -0.997132 0.0756876 0 outer loop vertex 27.5775 10.2019 0 - vertex 27.5397 9.70386 -0.1 + vertex 27.5397 9.70386 -0.2 vertex 27.5397 9.70386 0 endloop endfacet facet normal -0.992933 0.118678 0 outer loop - vertex 27.4871 9.26334 -0.1 + vertex 27.4871 9.26334 -0.2 vertex 27.5397 9.70386 0 - vertex 27.5397 9.70386 -0.1 + vertex 27.5397 9.70386 -0.2 endloop endfacet facet normal -0.992933 0.118678 0 outer loop vertex 27.5397 9.70386 0 - vertex 27.4871 9.26334 -0.1 + vertex 27.4871 9.26334 -0.2 vertex 27.4871 9.26334 0 endloop endfacet facet normal -0.985483 0.169774 0 outer loop - vertex 27.4176 8.86037 -0.1 + vertex 27.4176 8.86037 -0.2 vertex 27.4871 9.26334 0 - vertex 27.4871 9.26334 -0.1 + vertex 27.4871 9.26334 -0.2 endloop endfacet facet normal -0.985483 0.169774 0 outer loop vertex 27.4871 9.26334 0 - vertex 27.4176 8.86037 -0.1 + vertex 27.4176 8.86037 -0.2 vertex 27.4176 8.86037 0 endloop endfacet facet normal -0.974842 0.222899 0 outer loop - vertex 27.3295 8.47496 -0.1 + vertex 27.3295 8.47496 -0.2 vertex 27.4176 8.86037 0 - vertex 27.4176 8.86037 -0.1 + vertex 27.4176 8.86037 -0.2 endloop endfacet facet normal -0.974842 0.222899 0 outer loop vertex 27.4176 8.86037 0 - vertex 27.3295 8.47496 -0.1 + vertex 27.3295 8.47496 -0.2 vertex 27.3295 8.47496 0 endloop endfacet facet normal -0.962864 0.269986 0 outer loop - vertex 27.2208 8.08714 -0.1 + vertex 27.2208 8.08714 -0.2 vertex 27.3295 8.47496 0 - vertex 27.3295 8.47496 -0.1 + vertex 27.3295 8.47496 -0.2 endloop endfacet facet normal -0.962864 0.269986 0 outer loop vertex 27.3295 8.47496 0 - vertex 27.2208 8.08714 -0.1 + vertex 27.2208 8.08714 -0.2 vertex 27.2208 8.08714 0 endloop endfacet facet normal -0.961499 0.274809 0 outer loop - vertex 27.1048 7.68143 -0.1 + vertex 27.1048 7.68143 -0.2 vertex 27.2208 8.08714 0 - vertex 27.2208 8.08714 -0.1 + vertex 27.2208 8.08714 -0.2 endloop endfacet facet normal -0.961499 0.274809 0 outer loop vertex 27.2208 8.08714 0 - vertex 27.1048 7.68143 -0.1 + vertex 27.1048 7.68143 -0.2 vertex 27.1048 7.68143 0 endloop endfacet facet normal -0.973193 0.229988 0 outer loop - vertex 27.0158 7.30485 -0.1 + vertex 27.0158 7.30485 -0.2 vertex 27.1048 7.68143 0 - vertex 27.1048 7.68143 -0.1 + vertex 27.1048 7.68143 -0.2 endloop endfacet facet normal -0.973193 0.229988 0 outer loop vertex 27.1048 7.68143 0 - vertex 27.0158 7.30485 -0.1 + vertex 27.0158 7.30485 -0.2 vertex 27.0158 7.30485 0 endloop endfacet facet normal -0.985852 0.167619 0 outer loop - vertex 26.9517 6.92758 -0.1 + vertex 26.9517 6.92758 -0.2 vertex 27.0158 7.30485 0 - vertex 27.0158 7.30485 -0.1 + vertex 27.0158 7.30485 -0.2 endloop endfacet facet normal -0.985852 0.167619 0 outer loop vertex 27.0158 7.30485 0 - vertex 26.9517 6.92758 -0.1 + vertex 26.9517 6.92758 -0.2 vertex 26.9517 6.92758 0 endloop endfacet facet normal -0.994881 0.101051 0 outer loop - vertex 26.9103 6.51977 -0.1 + vertex 26.9103 6.51977 -0.2 vertex 26.9517 6.92758 0 - vertex 26.9517 6.92758 -0.1 + vertex 26.9517 6.92758 -0.2 endloop endfacet facet normal -0.994881 0.101051 0 outer loop vertex 26.9517 6.92758 0 - vertex 26.9103 6.51977 -0.1 + vertex 26.9103 6.51977 -0.2 vertex 26.9103 6.51977 0 endloop endfacet facet normal -0.999013 0.0444183 0 outer loop - vertex 26.8894 6.05157 -0.1 + vertex 26.8894 6.05157 -0.2 vertex 26.9103 6.51977 0 - vertex 26.9103 6.51977 -0.1 + vertex 26.9103 6.51977 -0.2 endloop endfacet facet normal -0.999013 0.0444183 0 outer loop vertex 26.9103 6.51977 0 - vertex 26.8894 6.05157 -0.1 + vertex 26.8894 6.05157 -0.2 vertex 26.8894 6.05157 0 endloop endfacet facet normal -0.999991 0.00417733 0 outer loop - vertex 26.8871 5.49316 -0.1 + vertex 26.8871 5.49316 -0.2 vertex 26.8894 6.05157 0 - vertex 26.8894 6.05157 -0.1 + vertex 26.8894 6.05157 -0.2 endloop endfacet facet normal -0.999991 0.00417733 0 outer loop vertex 26.8894 6.05157 0 - vertex 26.8871 5.49316 -0.1 + vertex 26.8871 5.49316 -0.2 vertex 26.8871 5.49316 0 endloop endfacet facet normal -0.999606 -0.0280683 0 outer loop - vertex 26.9294 3.98634 -0.1 + vertex 26.9294 3.98634 -0.2 vertex 26.8871 5.49316 0 - vertex 26.8871 5.49316 -0.1 + vertex 26.8871 5.49316 -0.2 endloop endfacet facet normal -0.999606 -0.0280683 0 outer loop vertex 26.8871 5.49316 0 - vertex 26.9294 3.98634 -0.1 + vertex 26.9294 3.98634 -0.2 vertex 26.9294 3.98634 0 endloop endfacet facet normal -0.999521 -0.0309525 0 outer loop - vertex 26.9615 2.94949 -0.1 + vertex 26.9615 2.94949 -0.2 vertex 26.9294 3.98634 0 - vertex 26.9294 3.98634 -0.1 + vertex 26.9294 3.98634 -0.2 endloop endfacet facet normal -0.999521 -0.0309525 0 outer loop vertex 26.9294 3.98634 0 - vertex 26.9615 2.94949 -0.1 + vertex 26.9615 2.94949 -0.2 vertex 26.9615 2.94949 0 endloop endfacet facet normal -0.999992 -0.00407505 0 outer loop - vertex 26.9647 2.16551 -0.1 + vertex 26.9647 2.16551 -0.2 vertex 26.9615 2.94949 0 - vertex 26.9615 2.94949 -0.1 + vertex 26.9615 2.94949 -0.2 endloop endfacet facet normal -0.999992 -0.00407505 0 outer loop vertex 26.9615 2.94949 0 - vertex 26.9647 2.16551 -0.1 + vertex 26.9647 2.16551 -0.2 vertex 26.9647 2.16551 0 endloop endfacet facet normal -0.998255 0.0590558 0 outer loop - vertex 26.9324 1.61996 -0.1 + vertex 26.9324 1.61996 -0.2 vertex 26.9647 2.16551 0 - vertex 26.9647 2.16551 -0.1 + vertex 26.9647 2.16551 -0.2 endloop endfacet facet normal -0.998255 0.0590558 0 outer loop vertex 26.9647 2.16551 0 - vertex 26.9324 1.61996 -0.1 + vertex 26.9324 1.61996 -0.2 vertex 26.9324 1.61996 0 endloop endfacet facet normal -0.986243 0.165303 0 outer loop - vertex 26.901 1.43209 -0.1 + vertex 26.901 1.43209 -0.2 vertex 26.9324 1.61996 0 - vertex 26.9324 1.61996 -0.1 + vertex 26.9324 1.61996 -0.2 endloop endfacet facet normal -0.986243 0.165303 0 outer loop vertex 26.9324 1.61996 0 - vertex 26.901 1.43209 -0.1 + vertex 26.901 1.43209 -0.2 vertex 26.901 1.43209 0 endloop endfacet facet normal -0.952336 0.30505 0 outer loop - vertex 26.8581 1.29842 -0.1 + vertex 26.8581 1.29842 -0.2 vertex 26.901 1.43209 0 - vertex 26.901 1.43209 -0.1 + vertex 26.901 1.43209 -0.2 endloop endfacet facet normal -0.952336 0.30505 0 outer loop vertex 26.901 1.43209 0 - vertex 26.8581 1.29842 -0.1 + vertex 26.8581 1.29842 -0.2 vertex 26.8581 1.29842 0 endloop endfacet facet normal -0.828352 0.560208 0 outer loop - vertex 26.8032 1.21715 -0.1 + vertex 26.8032 1.21715 -0.2 vertex 26.8581 1.29842 0 - vertex 26.8581 1.29842 -0.1 + vertex 26.8581 1.29842 -0.2 endloop endfacet facet normal -0.828352 0.560208 0 outer loop vertex 26.8581 1.29842 0 - vertex 26.8032 1.21715 -0.1 + vertex 26.8032 1.21715 -0.2 vertex 26.8032 1.21715 0 endloop endfacet facet normal -0.411544 0.91139 0 outer loop - vertex 26.8032 1.21715 -0.1 + vertex 26.8032 1.21715 -0.2 vertex 26.7352 1.18648 0 vertex 26.8032 1.21715 0 endloop @@ -34785,13 +34785,13 @@ solid OpenSCAD_Model facet normal -0.411544 0.91139 0 outer loop vertex 26.7352 1.18648 0 - vertex 26.8032 1.21715 -0.1 - vertex 26.7352 1.18648 -0.1 + vertex 26.8032 1.21715 -0.2 + vertex 26.7352 1.18648 -0.2 endloop endfacet facet normal 0.216454 0.976293 -0 outer loop - vertex 26.7352 1.18648 -0.1 + vertex 26.7352 1.18648 -0.2 vertex 26.6535 1.20459 0 vertex 26.7352 1.18648 0 endloop @@ -34799,13 +34799,13 @@ solid OpenSCAD_Model facet normal 0.216454 0.976293 0 outer loop vertex 26.6535 1.20459 0 - vertex 26.7352 1.18648 -0.1 - vertex 26.6535 1.20459 -0.1 + vertex 26.7352 1.18648 -0.2 + vertex 26.6535 1.20459 -0.2 endloop endfacet facet normal 0.559991 0.828498 -0 outer loop - vertex 26.6535 1.20459 -0.1 + vertex 26.6535 1.20459 -0.2 vertex 26.5572 1.2697 0 vertex 26.6535 1.20459 0 endloop @@ -34813,13 +34813,13 @@ solid OpenSCAD_Model facet normal 0.559991 0.828498 0 outer loop vertex 26.5572 1.2697 0 - vertex 26.6535 1.20459 -0.1 - vertex 26.5572 1.2697 -0.1 + vertex 26.6535 1.20459 -0.2 + vertex 26.5572 1.2697 -0.2 endloop endfacet facet normal 0.702452 0.711731 -0 outer loop - vertex 26.5572 1.2697 -0.1 + vertex 26.5572 1.2697 -0.2 vertex 26.4455 1.37999 0 vertex 26.5572 1.2697 0 endloop @@ -34827,69 +34827,69 @@ solid OpenSCAD_Model facet normal 0.702452 0.711731 0 outer loop vertex 26.4455 1.37999 0 - vertex 26.5572 1.2697 -0.1 - vertex 26.4455 1.37999 -0.1 + vertex 26.5572 1.2697 -0.2 + vertex 26.4455 1.37999 -0.2 endloop endfacet facet normal 0.76838 0.639993 0 outer loop vertex 26.4455 1.37999 0 - vertex 26.3175 1.53367 -0.1 + vertex 26.3175 1.53367 -0.2 vertex 26.3175 1.53367 0 endloop endfacet facet normal 0.76838 0.639993 0 outer loop - vertex 26.3175 1.53367 -0.1 + vertex 26.3175 1.53367 -0.2 vertex 26.4455 1.37999 0 - vertex 26.4455 1.37999 -0.1 + vertex 26.4455 1.37999 -0.2 endloop endfacet facet normal 0.813139 0.58207 0 outer loop vertex 26.3175 1.53367 0 - vertex 26.0094 1.96397 -0.1 + vertex 26.0094 1.96397 -0.2 vertex 26.0094 1.96397 0 endloop endfacet facet normal 0.813139 0.58207 0 outer loop - vertex 26.0094 1.96397 -0.1 + vertex 26.0094 1.96397 -0.2 vertex 26.3175 1.53367 0 - vertex 26.3175 1.53367 -0.1 + vertex 26.3175 1.53367 -0.2 endloop endfacet facet normal 0.812733 0.582636 0 outer loop vertex 26.0094 1.96397 0 - vertex 25.8138 2.23679 -0.1 + vertex 25.8138 2.23679 -0.2 vertex 25.8138 2.23679 0 endloop endfacet facet normal 0.812733 0.582636 0 outer loop - vertex 25.8138 2.23679 -0.1 + vertex 25.8138 2.23679 -0.2 vertex 26.0094 1.96397 0 - vertex 26.0094 1.96397 -0.1 + vertex 26.0094 1.96397 -0.2 endloop endfacet facet normal 0.76488 0.644173 0 outer loop vertex 25.8138 2.23679 0 - vertex 25.6376 2.44612 -0.1 + vertex 25.6376 2.44612 -0.2 vertex 25.6376 2.44612 0 endloop endfacet facet normal 0.76488 0.644173 0 outer loop - vertex 25.6376 2.44612 -0.1 + vertex 25.6376 2.44612 -0.2 vertex 25.8138 2.23679 0 - vertex 25.8138 2.23679 -0.1 + vertex 25.8138 2.23679 -0.2 endloop endfacet facet normal 0.675362 0.737487 -0 outer loop - vertex 25.6376 2.44612 -0.1 + vertex 25.6376 2.44612 -0.2 vertex 25.4766 2.59351 0 vertex 25.6376 2.44612 0 endloop @@ -34897,13 +34897,13 @@ solid OpenSCAD_Model facet normal 0.675362 0.737487 0 outer loop vertex 25.4766 2.59351 0 - vertex 25.6376 2.44612 -0.1 - vertex 25.4766 2.59351 -0.1 + vertex 25.6376 2.44612 -0.2 + vertex 25.4766 2.59351 -0.2 endloop endfacet facet normal 0.502892 0.86435 -0 outer loop - vertex 25.4766 2.59351 -0.1 + vertex 25.4766 2.59351 -0.2 vertex 25.3271 2.68052 0 vertex 25.4766 2.59351 0 endloop @@ -34911,13 +34911,13 @@ solid OpenSCAD_Model facet normal 0.502892 0.86435 0 outer loop vertex 25.3271 2.68052 0 - vertex 25.4766 2.59351 -0.1 - vertex 25.3271 2.68052 -0.1 + vertex 25.4766 2.59351 -0.2 + vertex 25.3271 2.68052 -0.2 endloop endfacet facet normal 0.194571 0.980889 -0 outer loop - vertex 25.3271 2.68052 -0.1 + vertex 25.3271 2.68052 -0.2 vertex 25.185 2.7087 0 vertex 25.3271 2.68052 0 endloop @@ -34925,13 +34925,13 @@ solid OpenSCAD_Model facet normal 0.194571 0.980889 0 outer loop vertex 25.185 2.7087 0 - vertex 25.3271 2.68052 -0.1 - vertex 25.185 2.7087 -0.1 + vertex 25.3271 2.68052 -0.2 + vertex 25.185 2.7087 -0.2 endloop endfacet facet normal -0.205381 0.978682 0 outer loop - vertex 25.185 2.7087 -0.1 + vertex 25.185 2.7087 -0.2 vertex 25.0464 2.67962 0 vertex 25.185 2.7087 0 endloop @@ -34939,13 +34939,13 @@ solid OpenSCAD_Model facet normal -0.205381 0.978682 0 outer loop vertex 25.0464 2.67962 0 - vertex 25.185 2.7087 -0.1 - vertex 25.0464 2.67962 -0.1 + vertex 25.185 2.7087 -0.2 + vertex 25.0464 2.67962 -0.2 endloop endfacet facet normal -0.520731 0.853721 0 outer loop - vertex 25.0464 2.67962 -0.1 + vertex 25.0464 2.67962 -0.2 vertex 24.9074 2.59483 0 vertex 25.0464 2.67962 0 endloop @@ -34953,13 +34953,13 @@ solid OpenSCAD_Model facet normal -0.520731 0.853721 0 outer loop vertex 24.9074 2.59483 0 - vertex 25.0464 2.67962 -0.1 - vertex 24.9074 2.59483 -0.1 + vertex 25.0464 2.67962 -0.2 + vertex 24.9074 2.59483 -0.2 endloop endfacet facet normal -0.695882 0.718157 0 outer loop - vertex 24.9074 2.59483 -0.1 + vertex 24.9074 2.59483 -0.2 vertex 24.764 2.4559 0 vertex 24.9074 2.59483 0 endloop @@ -34967,13 +34967,13 @@ solid OpenSCAD_Model facet normal -0.695882 0.718157 0 outer loop vertex 24.764 2.4559 0 - vertex 24.9074 2.59483 -0.1 - vertex 24.764 2.4559 -0.1 + vertex 24.9074 2.59483 -0.2 + vertex 24.764 2.4559 -0.2 endloop endfacet facet normal -0.621809 0.783169 0 outer loop - vertex 24.764 2.4559 -0.1 + vertex 24.764 2.4559 -0.2 vertex 24.6285 2.34829 0 vertex 24.764 2.4559 0 endloop @@ -34981,13 +34981,13 @@ solid OpenSCAD_Model facet normal -0.621809 0.783169 0 outer loop vertex 24.6285 2.34829 0 - vertex 24.764 2.4559 -0.1 - vertex 24.6285 2.34829 -0.1 + vertex 24.764 2.4559 -0.2 + vertex 24.6285 2.34829 -0.2 endloop endfacet facet normal -0.432349 0.901706 0 outer loop - vertex 24.6285 2.34829 -0.1 + vertex 24.6285 2.34829 -0.2 vertex 24.4388 2.25734 0 vertex 24.6285 2.34829 0 endloop @@ -34995,13 +34995,13 @@ solid OpenSCAD_Model facet normal -0.432349 0.901706 0 outer loop vertex 24.4388 2.25734 0 - vertex 24.6285 2.34829 -0.1 - vertex 24.4388 2.25734 -0.1 + vertex 24.6285 2.34829 -0.2 + vertex 24.4388 2.25734 -0.2 endloop endfacet facet normal -0.283745 0.9589 0 outer loop - vertex 24.4388 2.25734 -0.1 + vertex 24.4388 2.25734 -0.2 vertex 24.2201 2.19262 0 vertex 24.4388 2.25734 0 endloop @@ -35009,13 +35009,13 @@ solid OpenSCAD_Model facet normal -0.283745 0.9589 0 outer loop vertex 24.2201 2.19262 0 - vertex 24.4388 2.25734 -0.1 - vertex 24.2201 2.19262 -0.1 + vertex 24.4388 2.25734 -0.2 + vertex 24.2201 2.19262 -0.2 endloop endfacet facet normal -0.128745 0.991678 0 outer loop - vertex 24.2201 2.19262 -0.1 + vertex 24.2201 2.19262 -0.2 vertex 23.9975 2.16372 0 vertex 24.2201 2.19262 0 endloop @@ -35023,13 +35023,13 @@ solid OpenSCAD_Model facet normal -0.128745 0.991678 0 outer loop vertex 23.9975 2.16372 0 - vertex 24.2201 2.19262 -0.1 - vertex 23.9975 2.16372 -0.1 + vertex 24.2201 2.19262 -0.2 + vertex 23.9975 2.16372 -0.2 endloop endfacet facet normal -0.0892316 0.996011 0 outer loop - vertex 23.9975 2.16372 -0.1 + vertex 23.9975 2.16372 -0.2 vertex 23.7673 2.14309 0 vertex 23.9975 2.16372 0 endloop @@ -35037,13 +35037,13 @@ solid OpenSCAD_Model facet normal -0.0892316 0.996011 0 outer loop vertex 23.7673 2.14309 0 - vertex 23.9975 2.16372 -0.1 - vertex 23.7673 2.14309 -0.1 + vertex 23.9975 2.16372 -0.2 + vertex 23.7673 2.14309 -0.2 endloop endfacet facet normal -0.173492 0.984835 0 outer loop - vertex 23.7673 2.14309 -0.1 + vertex 23.7673 2.14309 -0.2 vertex 23.5277 2.10089 0 vertex 23.7673 2.14309 0 endloop @@ -35051,13 +35051,13 @@ solid OpenSCAD_Model facet normal -0.173492 0.984835 0 outer loop vertex 23.5277 2.10089 0 - vertex 23.7673 2.14309 -0.1 - vertex 23.5277 2.10089 -0.1 + vertex 23.7673 2.14309 -0.2 + vertex 23.5277 2.10089 -0.2 endloop endfacet facet normal -0.252811 0.967516 0 outer loop - vertex 23.5277 2.10089 -0.1 + vertex 23.5277 2.10089 -0.2 vertex 23.3072 2.04326 0 vertex 23.5277 2.10089 0 endloop @@ -35065,13 +35065,13 @@ solid OpenSCAD_Model facet normal -0.252811 0.967516 0 outer loop vertex 23.3072 2.04326 0 - vertex 23.5277 2.10089 -0.1 - vertex 23.3072 2.04326 -0.1 + vertex 23.5277 2.10089 -0.2 + vertex 23.3072 2.04326 -0.2 endloop endfacet facet normal -0.360079 0.932922 0 outer loop - vertex 23.3072 2.04326 -0.1 + vertex 23.3072 2.04326 -0.2 vertex 23.0469 1.94283 0 vertex 23.3072 2.04326 0 endloop @@ -35079,13 +35079,13 @@ solid OpenSCAD_Model facet normal -0.360079 0.932922 0 outer loop vertex 23.0469 1.94283 0 - vertex 23.3072 2.04326 -0.1 - vertex 23.0469 1.94283 -0.1 + vertex 23.3072 2.04326 -0.2 + vertex 23.0469 1.94283 -0.2 endloop endfacet facet normal -0.120091 0.992763 0 outer loop - vertex 23.0469 1.94283 -0.1 + vertex 23.0469 1.94283 -0.2 vertex 22.9727 1.93385 0 vertex 23.0469 1.94283 0 endloop @@ -35093,13 +35093,13 @@ solid OpenSCAD_Model facet normal -0.120091 0.992763 0 outer loop vertex 22.9727 1.93385 0 - vertex 23.0469 1.94283 -0.1 - vertex 22.9727 1.93385 -0.1 + vertex 23.0469 1.94283 -0.2 + vertex 22.9727 1.93385 -0.2 endloop endfacet facet normal 0.220007 0.975498 -0 outer loop - vertex 22.9727 1.93385 -0.1 + vertex 22.9727 1.93385 -0.2 vertex 22.9112 1.94773 0 vertex 22.9727 1.93385 0 endloop @@ -35107,13 +35107,13 @@ solid OpenSCAD_Model facet normal 0.220007 0.975498 0 outer loop vertex 22.9112 1.94773 0 - vertex 22.9727 1.93385 -0.1 - vertex 22.9112 1.94773 -0.1 + vertex 22.9727 1.93385 -0.2 + vertex 22.9112 1.94773 -0.2 endloop endfacet facet normal 0.582178 0.813061 -0 outer loop - vertex 22.9112 1.94773 -0.1 + vertex 22.9112 1.94773 -0.2 vertex 22.8622 1.9828 0 vertex 22.9112 1.94773 0 endloop @@ -35121,293 +35121,293 @@ solid OpenSCAD_Model facet normal 0.582178 0.813061 0 outer loop vertex 22.8622 1.9828 0 - vertex 22.9112 1.94773 -0.1 - vertex 22.8622 1.9828 -0.1 + vertex 22.9112 1.94773 -0.2 + vertex 22.8622 1.9828 -0.2 endloop endfacet facet normal 0.831256 0.55589 0 outer loop vertex 22.8622 1.9828 0 - vertex 22.8257 2.03737 -0.1 + vertex 22.8257 2.03737 -0.2 vertex 22.8257 2.03737 0 endloop endfacet facet normal 0.831256 0.55589 0 outer loop - vertex 22.8257 2.03737 -0.1 + vertex 22.8257 2.03737 -0.2 vertex 22.8622 1.9828 0 - vertex 22.8622 1.9828 -0.1 + vertex 22.8622 1.9828 -0.2 endloop endfacet facet normal 0.948775 0.315953 0 outer loop vertex 22.8257 2.03737 0 - vertex 22.8016 2.10976 -0.1 + vertex 22.8016 2.10976 -0.2 vertex 22.8016 2.10976 0 endloop endfacet facet normal 0.948775 0.315953 0 outer loop - vertex 22.8016 2.10976 -0.1 + vertex 22.8016 2.10976 -0.2 vertex 22.8257 2.03737 0 - vertex 22.8257 2.03737 -0.1 + vertex 22.8257 2.03737 -0.2 endloop endfacet facet normal 0.998216 0.059713 0 outer loop vertex 22.8016 2.10976 0 - vertex 22.7901 2.30129 -0.1 + vertex 22.7901 2.30129 -0.2 vertex 22.7901 2.30129 0 endloop endfacet facet normal 0.998216 0.059713 0 outer loop - vertex 22.7901 2.30129 -0.1 + vertex 22.7901 2.30129 -0.2 vertex 22.8016 2.10976 0 - vertex 22.8016 2.10976 -0.1 + vertex 22.8016 2.10976 -0.2 endloop endfacet facet normal 0.988638 -0.150314 0 outer loop vertex 22.7901 2.30129 0 - vertex 22.827 2.54396 -0.1 + vertex 22.827 2.54396 -0.2 vertex 22.827 2.54396 0 endloop endfacet facet normal 0.988638 -0.150314 0 outer loop - vertex 22.827 2.54396 -0.1 + vertex 22.827 2.54396 -0.2 vertex 22.7901 2.30129 0 - vertex 22.7901 2.30129 -0.1 + vertex 22.7901 2.30129 -0.2 endloop endfacet facet normal 0.957496 -0.288446 0 outer loop vertex 22.827 2.54396 0 - vertex 22.9115 2.82433 -0.1 + vertex 22.9115 2.82433 -0.2 vertex 22.9115 2.82433 0 endloop endfacet facet normal 0.957496 -0.288446 0 outer loop - vertex 22.9115 2.82433 -0.1 + vertex 22.9115 2.82433 -0.2 vertex 22.827 2.54396 0 - vertex 22.827 2.54396 -0.1 + vertex 22.827 2.54396 -0.2 endloop endfacet facet normal 0.918399 -0.395656 0 outer loop vertex 22.9115 2.82433 0 - vertex 23.0427 3.12896 -0.1 + vertex 23.0427 3.12896 -0.2 vertex 23.0427 3.12896 0 endloop endfacet facet normal 0.918399 -0.395656 0 outer loop - vertex 23.0427 3.12896 -0.1 + vertex 23.0427 3.12896 -0.2 vertex 22.9115 2.82433 0 - vertex 22.9115 2.82433 -0.1 + vertex 22.9115 2.82433 -0.2 endloop endfacet facet normal 0.87183 -0.489809 0 outer loop vertex 23.0427 3.12896 0 - vertex 23.22 3.44442 -0.1 + vertex 23.22 3.44442 -0.2 vertex 23.22 3.44442 0 endloop endfacet facet normal 0.87183 -0.489809 0 outer loop - vertex 23.22 3.44442 -0.1 + vertex 23.22 3.44442 -0.2 vertex 23.0427 3.12896 0 - vertex 23.0427 3.12896 -0.1 + vertex 23.0427 3.12896 -0.2 endloop endfacet facet normal 0.879841 -0.475268 0 outer loop vertex 23.22 3.44442 0 - vertex 23.4183 3.81156 -0.1 + vertex 23.4183 3.81156 -0.2 vertex 23.4183 3.81156 0 endloop endfacet facet normal 0.879841 -0.475268 0 outer loop - vertex 23.4183 3.81156 -0.1 + vertex 23.4183 3.81156 -0.2 vertex 23.22 3.44442 0 - vertex 23.22 3.44442 -0.1 + vertex 23.22 3.44442 -0.2 endloop endfacet facet normal 0.942923 -0.33301 0 outer loop vertex 23.4183 3.81156 0 - vertex 23.5494 4.18291 -0.1 + vertex 23.5494 4.18291 -0.2 vertex 23.5494 4.18291 0 endloop endfacet facet normal 0.942923 -0.33301 0 outer loop - vertex 23.5494 4.18291 -0.1 + vertex 23.5494 4.18291 -0.2 vertex 23.4183 3.81156 0 - vertex 23.4183 3.81156 -0.1 + vertex 23.4183 3.81156 -0.2 endloop endfacet facet normal 0.978031 -0.208457 0 outer loop vertex 23.5494 4.18291 0 - vertex 23.5897 4.3717 -0.1 + vertex 23.5897 4.3717 -0.2 vertex 23.5897 4.3717 0 endloop endfacet facet normal 0.978031 -0.208457 0 outer loop - vertex 23.5897 4.3717 -0.1 + vertex 23.5897 4.3717 -0.2 vertex 23.5494 4.18291 0 - vertex 23.5494 4.18291 -0.1 + vertex 23.5494 4.18291 -0.2 endloop endfacet facet normal 0.992713 -0.120506 0 outer loop vertex 23.5897 4.3717 0 - vertex 23.6129 4.5634 -0.1 + vertex 23.6129 4.5634 -0.2 vertex 23.6129 4.5634 0 endloop endfacet facet normal 0.992713 -0.120506 0 outer loop - vertex 23.6129 4.5634 -0.1 + vertex 23.6129 4.5634 -0.2 vertex 23.5897 4.3717 0 - vertex 23.5897 4.3717 -0.1 + vertex 23.5897 4.3717 -0.2 endloop endfacet facet normal 0.99949 -0.0319444 0 outer loop vertex 23.6129 4.5634 0 - vertex 23.6192 4.7586 -0.1 + vertex 23.6192 4.7586 -0.2 vertex 23.6192 4.7586 0 endloop endfacet facet normal 0.99949 -0.0319444 0 outer loop - vertex 23.6192 4.7586 -0.1 + vertex 23.6192 4.7586 -0.2 vertex 23.6129 4.5634 0 - vertex 23.6129 4.5634 -0.1 + vertex 23.6129 4.5634 -0.2 endloop endfacet facet normal 0.998522 0.054345 0 outer loop vertex 23.6192 4.7586 0 - vertex 23.6083 4.95794 -0.1 + vertex 23.6083 4.95794 -0.2 vertex 23.6083 4.95794 0 endloop endfacet facet normal 0.998522 0.054345 0 outer loop - vertex 23.6083 4.95794 -0.1 + vertex 23.6083 4.95794 -0.2 vertex 23.6192 4.7586 0 - vertex 23.6192 4.7586 -0.1 + vertex 23.6192 4.7586 -0.2 endloop endfacet facet normal 0.984692 0.174301 0 outer loop vertex 23.6083 4.95794 0 - vertex 23.5351 5.37146 -0.1 + vertex 23.5351 5.37146 -0.2 vertex 23.5351 5.37146 0 endloop endfacet facet normal 0.984692 0.174301 0 outer loop - vertex 23.5351 5.37146 -0.1 + vertex 23.5351 5.37146 -0.2 vertex 23.6083 4.95794 0 - vertex 23.6083 4.95794 -0.1 + vertex 23.6083 4.95794 -0.2 endloop endfacet facet normal 0.95097 0.309282 0 outer loop vertex 23.5351 5.37146 0 - vertex 23.3929 5.8089 -0.1 + vertex 23.3929 5.8089 -0.2 vertex 23.3929 5.8089 0 endloop endfacet facet normal 0.95097 0.309282 0 outer loop - vertex 23.3929 5.8089 -0.1 + vertex 23.3929 5.8089 -0.2 vertex 23.5351 5.37146 0 - vertex 23.5351 5.37146 -0.1 + vertex 23.5351 5.37146 -0.2 endloop endfacet facet normal 0.910464 0.413588 0 outer loop vertex 23.3929 5.8089 0 - vertex 23.1811 6.27516 -0.1 + vertex 23.1811 6.27516 -0.2 vertex 23.1811 6.27516 0 endloop endfacet facet normal 0.910464 0.413588 0 outer loop - vertex 23.1811 6.27516 -0.1 + vertex 23.1811 6.27516 -0.2 vertex 23.3929 5.8089 0 - vertex 23.3929 5.8089 -0.1 + vertex 23.3929 5.8089 -0.2 endloop endfacet facet normal 0.871161 0.490997 0 outer loop vertex 23.1811 6.27516 0 - vertex 22.8992 6.77518 -0.1 + vertex 22.8992 6.77518 -0.2 vertex 22.8992 6.77518 0 endloop endfacet facet normal 0.871161 0.490997 0 outer loop - vertex 22.8992 6.77518 -0.1 + vertex 22.8992 6.77518 -0.2 vertex 23.1811 6.27516 0 - vertex 23.1811 6.27516 -0.1 + vertex 23.1811 6.27516 -0.2 endloop endfacet facet normal 0.839072 0.54402 0 outer loop vertex 22.8992 6.77518 0 - vertex 22.6364 7.18064 -0.1 + vertex 22.6364 7.18064 -0.2 vertex 22.6364 7.18064 0 endloop endfacet facet normal 0.839072 0.54402 0 outer loop - vertex 22.6364 7.18064 -0.1 + vertex 22.6364 7.18064 -0.2 vertex 22.8992 6.77518 0 - vertex 22.8992 6.77518 -0.1 + vertex 22.8992 6.77518 -0.2 endloop endfacet facet normal 0.802153 0.597118 0 outer loop vertex 22.6364 7.18064 0 - vertex 22.3621 7.54907 -0.1 + vertex 22.3621 7.54907 -0.2 vertex 22.3621 7.54907 0 endloop endfacet facet normal 0.802153 0.597118 0 outer loop - vertex 22.3621 7.54907 -0.1 + vertex 22.3621 7.54907 -0.2 vertex 22.6364 7.18064 0 - vertex 22.6364 7.18064 -0.1 + vertex 22.6364 7.18064 -0.2 endloop endfacet facet normal 0.754344 0.65648 0 outer loop vertex 22.3621 7.54907 0 - vertex 22.0631 7.89267 -0.1 + vertex 22.0631 7.89267 -0.2 vertex 22.0631 7.89267 0 endloop endfacet facet normal 0.754344 0.65648 0 outer loop - vertex 22.0631 7.89267 -0.1 + vertex 22.0631 7.89267 -0.2 vertex 22.3621 7.54907 0 - vertex 22.3621 7.54907 -0.1 + vertex 22.3621 7.54907 -0.2 endloop endfacet facet normal 0.700509 0.713644 -0 outer loop - vertex 22.0631 7.89267 -0.1 + vertex 22.0631 7.89267 -0.2 vertex 21.7259 8.22365 0 vertex 22.0631 7.89267 0 endloop @@ -35415,13 +35415,13 @@ solid OpenSCAD_Model facet normal 0.700509 0.713644 0 outer loop vertex 21.7259 8.22365 0 - vertex 22.0631 7.89267 -0.1 - vertex 21.7259 8.22365 -0.1 + vertex 22.0631 7.89267 -0.2 + vertex 21.7259 8.22365 -0.2 endloop endfacet facet normal 0.647802 0.761808 -0 outer loop - vertex 21.7259 8.22365 -0.1 + vertex 21.7259 8.22365 -0.2 vertex 21.3371 8.55423 0 vertex 21.7259 8.22365 0 endloop @@ -35429,13 +35429,13 @@ solid OpenSCAD_Model facet normal 0.647802 0.761808 0 outer loop vertex 21.3371 8.55423 0 - vertex 21.7259 8.22365 -0.1 - vertex 21.3371 8.55423 -0.1 + vertex 21.7259 8.22365 -0.2 + vertex 21.3371 8.55423 -0.2 endloop endfacet facet normal 0.602358 0.798226 -0 outer loop - vertex 21.3371 8.55423 -0.1 + vertex 21.3371 8.55423 -0.2 vertex 20.8834 8.89663 0 vertex 21.3371 8.55423 0 endloop @@ -35443,13 +35443,13 @@ solid OpenSCAD_Model facet normal 0.602358 0.798226 0 outer loop vertex 20.8834 8.89663 0 - vertex 21.3371 8.55423 -0.1 - vertex 20.8834 8.89663 -0.1 + vertex 21.3371 8.55423 -0.2 + vertex 20.8834 8.89663 -0.2 endloop endfacet facet normal 0.567155 0.823611 -0 outer loop - vertex 20.8834 8.89663 -0.1 + vertex 20.8834 8.89663 -0.2 vertex 20.3513 9.26304 0 vertex 20.8834 8.89663 0 endloop @@ -35457,13 +35457,13 @@ solid OpenSCAD_Model facet normal 0.567155 0.823611 0 outer loop vertex 20.3513 9.26304 0 - vertex 20.8834 8.89663 -0.1 - vertex 20.3513 9.26304 -0.1 + vertex 20.8834 8.89663 -0.2 + vertex 20.3513 9.26304 -0.2 endloop endfacet facet normal 0.542271 0.840203 -0 outer loop - vertex 20.3513 9.26304 -0.1 + vertex 20.3513 9.26304 -0.2 vertex 19.7274 9.66569 0 vertex 20.3513 9.26304 0 endloop @@ -35471,13 +35471,13 @@ solid OpenSCAD_Model facet normal 0.542271 0.840203 0 outer loop vertex 19.7274 9.66569 0 - vertex 20.3513 9.26304 -0.1 - vertex 19.7274 9.66569 -0.1 + vertex 20.3513 9.26304 -0.2 + vertex 19.7274 9.66569 -0.2 endloop endfacet facet normal 0.509213 0.86064 -0 outer loop - vertex 19.7274 9.66569 -0.1 + vertex 19.7274 9.66569 -0.2 vertex 19.4723 9.81661 0 vertex 19.7274 9.66569 0 endloop @@ -35485,13 +35485,13 @@ solid OpenSCAD_Model facet normal 0.509213 0.86064 0 outer loop vertex 19.4723 9.81661 0 - vertex 19.7274 9.66569 -0.1 - vertex 19.4723 9.81661 -0.1 + vertex 19.7274 9.66569 -0.2 + vertex 19.4723 9.81661 -0.2 endloop endfacet facet normal 0.451586 0.892227 -0 outer loop - vertex 19.4723 9.81661 -0.1 + vertex 19.4723 9.81661 -0.2 vertex 19.2206 9.94402 0 vertex 19.4723 9.81661 0 endloop @@ -35499,13 +35499,13 @@ solid OpenSCAD_Model facet normal 0.451586 0.892227 0 outer loop vertex 19.2206 9.94402 0 - vertex 19.4723 9.81661 -0.1 - vertex 19.2206 9.94402 -0.1 + vertex 19.4723 9.81661 -0.2 + vertex 19.2206 9.94402 -0.2 endloop endfacet facet normal 0.382649 0.923894 -0 outer loop - vertex 19.2206 9.94402 -0.1 + vertex 19.2206 9.94402 -0.2 vertex 18.9645 10.0501 0 vertex 19.2206 9.94402 0 endloop @@ -35513,13 +35513,13 @@ solid OpenSCAD_Model facet normal 0.382649 0.923894 0 outer loop vertex 18.9645 10.0501 0 - vertex 19.2206 9.94402 -0.1 - vertex 18.9645 10.0501 -0.1 + vertex 19.2206 9.94402 -0.2 + vertex 18.9645 10.0501 -0.2 endloop endfacet facet normal 0.308251 0.951305 -0 outer loop - vertex 18.9645 10.0501 -0.1 + vertex 18.9645 10.0501 -0.2 vertex 18.6964 10.137 0 vertex 18.9645 10.0501 0 endloop @@ -35527,13 +35527,13 @@ solid OpenSCAD_Model facet normal 0.308251 0.951305 0 outer loop vertex 18.6964 10.137 0 - vertex 18.9645 10.0501 -0.1 - vertex 18.6964 10.137 -0.1 + vertex 18.9645 10.0501 -0.2 + vertex 18.6964 10.137 -0.2 endloop endfacet facet normal 0.235891 0.971779 -0 outer loop - vertex 18.6964 10.137 -0.1 + vertex 18.6964 10.137 -0.2 vertex 18.4085 10.2069 0 vertex 18.6964 10.137 0 endloop @@ -35541,13 +35541,13 @@ solid OpenSCAD_Model facet normal 0.235891 0.971779 0 outer loop vertex 18.4085 10.2069 0 - vertex 18.6964 10.137 -0.1 - vertex 18.4085 10.2069 -0.1 + vertex 18.6964 10.137 -0.2 + vertex 18.4085 10.2069 -0.2 endloop endfacet facet normal 0.172 0.985097 -0 outer loop - vertex 18.4085 10.2069 -0.1 + vertex 18.4085 10.2069 -0.2 vertex 18.093 10.2619 0 vertex 18.4085 10.2069 0 endloop @@ -35555,13 +35555,13 @@ solid OpenSCAD_Model facet normal 0.172 0.985097 0 outer loop vertex 18.093 10.2619 0 - vertex 18.4085 10.2069 -0.1 - vertex 18.093 10.2619 -0.1 + vertex 18.4085 10.2069 -0.2 + vertex 18.093 10.2619 -0.2 endloop endfacet facet normal 0.0994696 0.995041 -0 outer loop - vertex 18.093 10.2619 -0.1 + vertex 18.093 10.2619 -0.2 vertex 17.3487 10.3363 0 vertex 18.093 10.2619 0 endloop @@ -35569,13 +35569,13 @@ solid OpenSCAD_Model facet normal 0.0994696 0.995041 0 outer loop vertex 17.3487 10.3363 0 - vertex 18.093 10.2619 -0.1 - vertex 17.3487 10.3363 -0.1 + vertex 18.093 10.2619 -0.2 + vertex 17.3487 10.3363 -0.2 endloop endfacet facet normal 0.0510048 0.998698 -0 outer loop - vertex 17.3487 10.3363 -0.1 + vertex 17.3487 10.3363 -0.2 vertex 16.499 10.3797 0 vertex 17.3487 10.3363 0 endloop @@ -35583,13 +35583,13 @@ solid OpenSCAD_Model facet normal 0.0510048 0.998698 0 outer loop vertex 16.499 10.3797 0 - vertex 17.3487 10.3363 -0.1 - vertex 16.499 10.3797 -0.1 + vertex 17.3487 10.3363 -0.2 + vertex 16.499 10.3797 -0.2 endloop endfacet facet normal -0.0333465 0.999444 0 outer loop - vertex 16.499 10.3797 -0.1 + vertex 16.499 10.3797 -0.2 vertex 16.2187 10.3704 0 vertex 16.499 10.3797 0 endloop @@ -35597,13 +35597,13 @@ solid OpenSCAD_Model facet normal -0.0333465 0.999444 0 outer loop vertex 16.2187 10.3704 0 - vertex 16.499 10.3797 -0.1 - vertex 16.2187 10.3704 -0.1 + vertex 16.499 10.3797 -0.2 + vertex 16.2187 10.3704 -0.2 endloop endfacet facet normal -0.179208 0.983811 0 outer loop - vertex 16.2187 10.3704 -0.1 + vertex 16.2187 10.3704 -0.2 vertex 16.005 10.3315 0 vertex 16.2187 10.3704 0 endloop @@ -35611,13 +35611,13 @@ solid OpenSCAD_Model facet normal -0.179208 0.983811 0 outer loop vertex 16.005 10.3315 0 - vertex 16.2187 10.3704 -0.1 - vertex 16.005 10.3315 -0.1 + vertex 16.2187 10.3704 -0.2 + vertex 16.005 10.3315 -0.2 endloop endfacet facet normal -0.405411 0.914135 0 outer loop - vertex 16.005 10.3315 -0.1 + vertex 16.005 10.3315 -0.2 vertex 15.8355 10.2563 0 vertex 16.005 10.3315 0 endloop @@ -35625,13 +35625,13 @@ solid OpenSCAD_Model facet normal -0.405411 0.914135 0 outer loop vertex 15.8355 10.2563 0 - vertex 16.005 10.3315 -0.1 - vertex 15.8355 10.2563 -0.1 + vertex 16.005 10.3315 -0.2 + vertex 15.8355 10.2563 -0.2 endloop endfacet facet normal -0.624597 0.780947 0 outer loop - vertex 15.8355 10.2563 -0.1 + vertex 15.8355 10.2563 -0.2 vertex 15.6879 10.1383 0 vertex 15.8355 10.2563 0 endloop @@ -35639,335 +35639,335 @@ solid OpenSCAD_Model facet normal -0.624597 0.780947 0 outer loop vertex 15.6879 10.1383 0 - vertex 15.8355 10.2563 -0.1 - vertex 15.6879 10.1383 -0.1 + vertex 15.8355 10.2563 -0.2 + vertex 15.6879 10.1383 -0.2 endloop endfacet facet normal -0.749396 0.662122 0 outer loop - vertex 15.5399 9.97068 -0.1 + vertex 15.5399 9.97068 -0.2 vertex 15.6879 10.1383 0 - vertex 15.6879 10.1383 -0.1 + vertex 15.6879 10.1383 -0.2 endloop endfacet facet normal -0.749396 0.662122 0 outer loop vertex 15.6879 10.1383 0 - vertex 15.5399 9.97068 -0.1 + vertex 15.5399 9.97068 -0.2 vertex 15.5399 9.97068 0 endloop endfacet facet normal -0.794739 0.606951 0 outer loop - vertex 15.369 9.74689 -0.1 + vertex 15.369 9.74689 -0.2 vertex 15.5399 9.97068 0 - vertex 15.5399 9.97068 -0.1 + vertex 15.5399 9.97068 -0.2 endloop endfacet facet normal -0.794739 0.606951 0 outer loop vertex 15.5399 9.97068 0 - vertex 15.369 9.74689 -0.1 + vertex 15.369 9.74689 -0.2 vertex 15.369 9.74689 0 endloop endfacet facet normal -0.812079 0.583548 0 outer loop - vertex 15.213 9.52982 -0.1 + vertex 15.213 9.52982 -0.2 vertex 15.369 9.74689 0 - vertex 15.369 9.74689 -0.1 + vertex 15.369 9.74689 -0.2 endloop endfacet facet normal -0.812079 0.583548 0 outer loop vertex 15.369 9.74689 0 - vertex 15.213 9.52982 -0.1 + vertex 15.213 9.52982 -0.2 vertex 15.213 9.52982 0 endloop endfacet facet normal -0.851006 0.525156 0 outer loop - vertex 15.0942 9.33737 -0.1 + vertex 15.0942 9.33737 -0.2 vertex 15.213 9.52982 0 - vertex 15.213 9.52982 -0.1 + vertex 15.213 9.52982 -0.2 endloop endfacet facet normal -0.851006 0.525156 0 outer loop vertex 15.213 9.52982 0 - vertex 15.0942 9.33737 -0.1 + vertex 15.0942 9.33737 -0.2 vertex 15.0942 9.33737 0 endloop endfacet facet normal -0.909184 0.416395 0 outer loop - vertex 15.0092 9.15168 -0.1 + vertex 15.0092 9.15168 -0.2 vertex 15.0942 9.33737 0 - vertex 15.0942 9.33737 -0.1 + vertex 15.0942 9.33737 -0.2 endloop endfacet facet normal -0.909184 0.416395 0 outer loop vertex 15.0942 9.33737 0 - vertex 15.0092 9.15168 -0.1 + vertex 15.0092 9.15168 -0.2 vertex 15.0092 9.15168 0 endloop endfacet facet normal -0.963304 0.268412 0 outer loop - vertex 14.9543 8.95485 -0.1 + vertex 14.9543 8.95485 -0.2 vertex 15.0092 9.15168 0 - vertex 15.0092 9.15168 -0.1 + vertex 15.0092 9.15168 -0.2 endloop endfacet facet normal -0.963304 0.268412 0 outer loop vertex 15.0092 9.15168 0 - vertex 14.9543 8.95485 -0.1 + vertex 14.9543 8.95485 -0.2 vertex 14.9543 8.95485 0 endloop endfacet facet normal -0.99232 0.1237 0 outer loop - vertex 14.9262 8.72903 -0.1 + vertex 14.9262 8.72903 -0.2 vertex 14.9543 8.95485 0 - vertex 14.9543 8.95485 -0.1 + vertex 14.9543 8.95485 -0.2 endloop endfacet facet normal -0.99232 0.1237 0 outer loop vertex 14.9543 8.95485 0 - vertex 14.9262 8.72903 -0.1 + vertex 14.9262 8.72903 -0.2 vertex 14.9262 8.72903 0 endloop endfacet facet normal -0.999834 0.0182102 0 outer loop - vertex 14.9212 8.45633 -0.1 + vertex 14.9212 8.45633 -0.2 vertex 14.9262 8.72903 0 - vertex 14.9262 8.72903 -0.1 + vertex 14.9262 8.72903 -0.2 endloop endfacet facet normal -0.999834 0.0182102 0 outer loop vertex 14.9262 8.72903 0 - vertex 14.9212 8.45633 -0.1 + vertex 14.9212 8.45633 -0.2 vertex 14.9212 8.45633 0 endloop endfacet facet normal -0.998195 -0.0600559 0 outer loop - vertex 14.9668 7.69881 -0.1 + vertex 14.9668 7.69881 -0.2 vertex 14.9212 8.45633 0 - vertex 14.9212 8.45633 -0.1 + vertex 14.9212 8.45633 -0.2 endloop endfacet facet normal -0.998195 -0.0600559 0 outer loop vertex 14.9212 8.45633 0 - vertex 14.9668 7.69881 -0.1 + vertex 14.9668 7.69881 -0.2 vertex 14.9668 7.69881 0 endloop endfacet facet normal -0.99465 -0.103302 0 outer loop - vertex 15.0249 7.13954 -0.1 + vertex 15.0249 7.13954 -0.2 vertex 14.9668 7.69881 0 - vertex 14.9668 7.69881 -0.1 + vertex 14.9668 7.69881 -0.2 endloop endfacet facet normal -0.99465 -0.103302 0 outer loop vertex 14.9668 7.69881 0 - vertex 15.0249 7.13954 -0.1 + vertex 15.0249 7.13954 -0.2 vertex 15.0249 7.13954 0 endloop endfacet facet normal -0.989699 -0.143163 0 outer loop - vertex 15.1095 6.5543 -0.1 + vertex 15.1095 6.5543 -0.2 vertex 15.0249 7.13954 0 - vertex 15.0249 7.13954 -0.1 + vertex 15.0249 7.13954 -0.2 endloop endfacet facet normal -0.989699 -0.143163 0 outer loop vertex 15.0249 7.13954 0 - vertex 15.1095 6.5543 -0.1 + vertex 15.1095 6.5543 -0.2 vertex 15.1095 6.5543 0 endloop endfacet facet normal -0.984174 -0.177204 0 outer loop - vertex 15.2183 5.95043 -0.1 + vertex 15.2183 5.95043 -0.2 vertex 15.1095 6.5543 0 - vertex 15.1095 6.5543 -0.1 + vertex 15.1095 6.5543 -0.2 endloop endfacet facet normal -0.984174 -0.177204 0 outer loop vertex 15.1095 6.5543 0 - vertex 15.2183 5.95043 -0.1 + vertex 15.2183 5.95043 -0.2 vertex 15.2183 5.95043 0 endloop endfacet facet normal -0.978296 -0.207212 0 outer loop - vertex 15.3486 5.33522 -0.1 + vertex 15.3486 5.33522 -0.2 vertex 15.2183 5.95043 0 - vertex 15.2183 5.95043 -0.1 + vertex 15.2183 5.95043 -0.2 endloop endfacet facet normal -0.978296 -0.207212 0 outer loop vertex 15.2183 5.95043 0 - vertex 15.3486 5.33522 -0.1 + vertex 15.3486 5.33522 -0.2 vertex 15.3486 5.33522 0 endloop endfacet facet normal -0.972111 -0.23452 0 outer loop - vertex 15.498 4.716 -0.1 + vertex 15.498 4.716 -0.2 vertex 15.3486 5.33522 0 - vertex 15.3486 5.33522 -0.1 + vertex 15.3486 5.33522 -0.2 endloop endfacet facet normal -0.972111 -0.23452 0 outer loop vertex 15.3486 5.33522 0 - vertex 15.498 4.716 -0.1 + vertex 15.498 4.716 -0.2 vertex 15.498 4.716 0 endloop endfacet facet normal -0.965559 -0.260185 0 outer loop - vertex 15.6639 4.10009 -0.1 + vertex 15.6639 4.10009 -0.2 vertex 15.498 4.716 0 - vertex 15.498 4.716 -0.1 + vertex 15.498 4.716 -0.2 endloop endfacet facet normal -0.965559 -0.260185 0 outer loop vertex 15.498 4.716 0 - vertex 15.6639 4.10009 -0.1 + vertex 15.6639 4.10009 -0.2 vertex 15.6639 4.10009 0 endloop endfacet facet normal -0.95471 -0.297537 0 outer loop - vertex 16.0356 2.90743 -0.1 + vertex 16.0356 2.90743 -0.2 vertex 15.6639 4.10009 0 - vertex 15.6639 4.10009 -0.1 + vertex 15.6639 4.10009 -0.2 endloop endfacet facet normal -0.95471 -0.297537 0 outer loop vertex 15.6639 4.10009 0 - vertex 16.0356 2.90743 -0.1 + vertex 16.0356 2.90743 -0.2 vertex 16.0356 2.90743 0 endloop endfacet facet normal -0.941754 -0.336302 0 outer loop - vertex 16.2363 2.34533 -0.1 + vertex 16.2363 2.34533 -0.2 vertex 16.0356 2.90743 0 - vertex 16.0356 2.90743 -0.1 + vertex 16.0356 2.90743 -0.2 endloop endfacet facet normal -0.941754 -0.336302 0 outer loop vertex 16.0356 2.90743 0 - vertex 16.2363 2.34533 -0.1 + vertex 16.2363 2.34533 -0.2 vertex 16.2363 2.34533 0 endloop endfacet facet normal -0.931176 -0.364571 0 outer loop - vertex 16.4437 1.81579 -0.1 + vertex 16.4437 1.81579 -0.2 vertex 16.2363 2.34533 0 - vertex 16.2363 2.34533 -0.1 + vertex 16.2363 2.34533 -0.2 endloop endfacet facet normal -0.931176 -0.364571 0 outer loop vertex 16.2363 2.34533 0 - vertex 16.4437 1.81579 -0.1 + vertex 16.4437 1.81579 -0.2 vertex 16.4437 1.81579 0 endloop endfacet facet normal -0.91808 -0.396396 0 outer loop - vertex 16.6551 1.32614 -0.1 + vertex 16.6551 1.32614 -0.2 vertex 16.4437 1.81579 0 - vertex 16.4437 1.81579 -0.1 + vertex 16.4437 1.81579 -0.2 endloop endfacet facet normal -0.91808 -0.396396 0 outer loop vertex 16.4437 1.81579 0 - vertex 16.6551 1.32614 -0.1 + vertex 16.6551 1.32614 -0.2 vertex 16.6551 1.32614 0 endloop endfacet facet normal -0.901015 -0.433787 0 outer loop - vertex 16.8681 0.883681 -0.1 + vertex 16.8681 0.883681 -0.2 vertex 16.6551 1.32614 0 - vertex 16.6551 1.32614 -0.1 + vertex 16.6551 1.32614 -0.2 endloop endfacet facet normal -0.901015 -0.433787 0 outer loop vertex 16.6551 1.32614 0 - vertex 16.8681 0.883681 -0.1 + vertex 16.8681 0.883681 -0.2 vertex 16.8681 0.883681 0 endloop endfacet facet normal -0.877409 -0.479744 0 outer loop - vertex 17.0802 0.495742 -0.1 + vertex 17.0802 0.495742 -0.2 vertex 16.8681 0.883681 0 - vertex 16.8681 0.883681 -0.1 + vertex 16.8681 0.883681 -0.2 endloop endfacet facet normal -0.877409 -0.479744 0 outer loop vertex 16.8681 0.883681 0 - vertex 17.0802 0.495742 -0.1 + vertex 17.0802 0.495742 -0.2 vertex 17.0802 0.495742 0 endloop endfacet facet normal -0.842258 -0.539075 0 outer loop - vertex 17.2889 0.169637 -0.1 + vertex 17.2889 0.169637 -0.2 vertex 17.0802 0.495742 0 - vertex 17.0802 0.495742 -0.1 + vertex 17.0802 0.495742 -0.2 endloop endfacet facet normal -0.842258 -0.539075 0 outer loop vertex 17.0802 0.495742 0 - vertex 17.2889 0.169637 -0.1 + vertex 17.2889 0.169637 -0.2 vertex 17.2889 0.169637 0 endloop endfacet facet normal -0.784932 -0.619582 0 outer loop - vertex 17.4918 -0.0873203 -0.1 + vertex 17.4918 -0.0873203 -0.2 vertex 17.2889 0.169637 0 - vertex 17.2889 0.169637 -0.1 + vertex 17.2889 0.169637 -0.2 endloop endfacet facet normal -0.784932 -0.619582 0 outer loop vertex 17.2889 0.169637 0 - vertex 17.4918 -0.0873203 -0.1 + vertex 17.4918 -0.0873203 -0.2 vertex 17.4918 -0.0873203 0 endloop endfacet facet normal -0.680344 -0.732893 0 outer loop - vertex 17.4918 -0.0873203 -0.1 + vertex 17.4918 -0.0873203 -0.2 vertex 17.6862 -0.267812 0 vertex 17.4918 -0.0873203 0 endloop @@ -35975,13 +35975,13 @@ solid OpenSCAD_Model facet normal -0.680344 -0.732893 -0 outer loop vertex 17.6862 -0.267812 0 - vertex 17.4918 -0.0873203 -0.1 - vertex 17.6862 -0.267812 -0.1 + vertex 17.4918 -0.0873203 -0.2 + vertex 17.6862 -0.267812 -0.2 endloop endfacet facet normal -0.560342 -0.828261 0 outer loop - vertex 17.6862 -0.267812 -0.1 + vertex 17.6862 -0.267812 -0.2 vertex 17.8284 -0.36402 0 vertex 17.6862 -0.267812 0 endloop @@ -35989,13 +35989,13 @@ solid OpenSCAD_Model facet normal -0.560342 -0.828261 -0 outer loop vertex 17.8284 -0.36402 0 - vertex 17.6862 -0.267812 -0.1 - vertex 17.8284 -0.36402 -0.1 + vertex 17.6862 -0.267812 -0.2 + vertex 17.8284 -0.36402 -0.2 endloop endfacet facet normal -0.436276 -0.899813 0 outer loop - vertex 17.8284 -0.36402 -0.1 + vertex 17.8284 -0.36402 -0.2 vertex 17.9646 -0.430052 0 vertex 17.8284 -0.36402 0 endloop @@ -36003,13 +36003,13 @@ solid OpenSCAD_Model facet normal -0.436276 -0.899813 -0 outer loop vertex 17.9646 -0.430052 0 - vertex 17.8284 -0.36402 -0.1 - vertex 17.9646 -0.430052 -0.1 + vertex 17.8284 -0.36402 -0.2 + vertex 17.9646 -0.430052 -0.2 endloop endfacet facet normal -0.23232 -0.972639 0 outer loop - vertex 17.9646 -0.430052 -0.1 + vertex 17.9646 -0.430052 -0.2 vertex 18.1098 -0.464739 0 vertex 17.9646 -0.430052 0 endloop @@ -36017,13 +36017,13 @@ solid OpenSCAD_Model facet normal -0.23232 -0.972639 -0 outer loop vertex 18.1098 -0.464739 0 - vertex 17.9646 -0.430052 -0.1 - vertex 18.1098 -0.464739 -0.1 + vertex 17.9646 -0.430052 -0.2 + vertex 18.1098 -0.464739 -0.2 endloop endfacet facet normal -0.0128436 -0.999918 0 outer loop - vertex 18.1098 -0.464739 -0.1 + vertex 18.1098 -0.464739 -0.2 vertex 18.2791 -0.466914 0 vertex 18.1098 -0.464739 0 endloop @@ -36031,13 +36031,13 @@ solid OpenSCAD_Model facet normal -0.0128436 -0.999918 -0 outer loop vertex 18.2791 -0.466914 0 - vertex 18.1098 -0.464739 -0.1 - vertex 18.2791 -0.466914 -0.1 + vertex 18.1098 -0.464739 -0.2 + vertex 18.2791 -0.466914 -0.2 endloop endfacet facet normal 0.149466 -0.988767 0 outer loop - vertex 18.2791 -0.466914 -0.1 + vertex 18.2791 -0.466914 -0.2 vertex 18.4876 -0.435405 0 vertex 18.2791 -0.466914 0 endloop @@ -36045,13 +36045,13 @@ solid OpenSCAD_Model facet normal 0.149466 -0.988767 0 outer loop vertex 18.4876 -0.435405 0 - vertex 18.2791 -0.466914 -0.1 - vertex 18.4876 -0.435405 -0.1 + vertex 18.2791 -0.466914 -0.2 + vertex 18.4876 -0.435405 -0.2 endloop endfacet facet normal 0.244974 -0.96953 0 outer loop - vertex 18.4876 -0.435405 -0.1 + vertex 18.4876 -0.435405 -0.2 vertex 18.7502 -0.369046 0 vertex 18.4876 -0.435405 0 endloop @@ -36059,13 +36059,13 @@ solid OpenSCAD_Model facet normal 0.244974 -0.96953 0 outer loop vertex 18.7502 -0.369046 0 - vertex 18.4876 -0.435405 -0.1 - vertex 18.7502 -0.369046 -0.1 + vertex 18.4876 -0.435405 -0.2 + vertex 18.7502 -0.369046 -0.2 endloop endfacet facet normal 0.307753 -0.951466 0 outer loop - vertex 18.7502 -0.369046 -0.1 + vertex 18.7502 -0.369046 -0.2 vertex 19.4982 -0.127099 0 vertex 18.7502 -0.369046 0 endloop @@ -36073,13 +36073,13 @@ solid OpenSCAD_Model facet normal 0.307753 -0.951466 0 outer loop vertex 19.4982 -0.127099 0 - vertex 18.7502 -0.369046 -0.1 - vertex 19.4982 -0.127099 -0.1 + vertex 18.7502 -0.369046 -0.2 + vertex 19.4982 -0.127099 -0.2 endloop endfacet facet normal 0.301432 -0.953488 0 outer loop - vertex 19.4982 -0.127099 -0.1 + vertex 19.4982 -0.127099 -0.2 vertex 20.0432 0.0451876 0 vertex 19.4982 -0.127099 0 endloop @@ -36087,13 +36087,13 @@ solid OpenSCAD_Model facet normal 0.301432 -0.953488 0 outer loop vertex 20.0432 0.0451876 0 - vertex 19.4982 -0.127099 -0.1 - vertex 20.0432 0.0451876 -0.1 + vertex 19.4982 -0.127099 -0.2 + vertex 20.0432 0.0451876 -0.2 endloop endfacet facet normal 0.251907 -0.967752 0 outer loop - vertex 20.0432 0.0451876 -0.1 + vertex 20.0432 0.0451876 -0.2 vertex 20.5155 0.168137 0 vertex 20.0432 0.0451876 0 endloop @@ -36101,13 +36101,13 @@ solid OpenSCAD_Model facet normal 0.251907 -0.967752 0 outer loop vertex 20.5155 0.168137 0 - vertex 20.0432 0.0451876 -0.1 - vertex 20.5155 0.168137 -0.1 + vertex 20.0432 0.0451876 -0.2 + vertex 20.5155 0.168137 -0.2 endloop endfacet facet normal 0.175432 -0.984492 0 outer loop - vertex 20.5155 0.168137 -0.1 + vertex 20.5155 0.168137 -0.2 vertex 20.8646 0.230347 0 vertex 20.5155 0.168137 0 endloop @@ -36115,13 +36115,13 @@ solid OpenSCAD_Model facet normal 0.175432 -0.984492 0 outer loop vertex 20.8646 0.230347 0 - vertex 20.5155 0.168137 -0.1 - vertex 20.8646 0.230347 -0.1 + vertex 20.5155 0.168137 -0.2 + vertex 20.8646 0.230347 -0.2 endloop endfacet facet normal 0.0422921 -0.999105 0 outer loop - vertex 20.8646 0.230347 -0.1 + vertex 20.8646 0.230347 -0.2 vertex 20.9772 0.235111 0 vertex 20.8646 0.230347 0 endloop @@ -36129,13 +36129,13 @@ solid OpenSCAD_Model facet normal 0.0422921 -0.999105 0 outer loop vertex 20.9772 0.235111 0 - vertex 20.8646 0.230347 -0.1 - vertex 20.9772 0.235111 -0.1 + vertex 20.8646 0.230347 -0.2 + vertex 20.9772 0.235111 -0.2 endloop endfacet facet normal -0.228021 -0.973656 0 outer loop - vertex 20.9772 0.235111 -0.1 + vertex 20.9772 0.235111 -0.2 vertex 21.0399 0.220413 0 vertex 20.9772 0.235111 0 endloop @@ -36143,195 +36143,195 @@ solid OpenSCAD_Model facet normal -0.228021 -0.973656 -0 outer loop vertex 21.0399 0.220413 0 - vertex 20.9772 0.235111 -0.1 - vertex 21.0399 0.220413 -0.1 + vertex 20.9772 0.235111 -0.2 + vertex 21.0399 0.220413 -0.2 endloop endfacet facet normal -0.836215 -0.548402 0 outer loop - vertex 21.0726 0.170561 -0.1 + vertex 21.0726 0.170561 -0.2 vertex 21.0399 0.220413 0 - vertex 21.0399 0.220413 -0.1 + vertex 21.0399 0.220413 -0.2 endloop endfacet facet normal -0.836215 -0.548402 0 outer loop vertex 21.0399 0.220413 0 - vertex 21.0726 0.170561 -0.1 + vertex 21.0726 0.170561 -0.2 vertex 21.0726 0.170561 0 endloop endfacet facet normal -0.964289 -0.264852 0 outer loop - vertex 21.099 0.0745682 -0.1 + vertex 21.099 0.0745682 -0.2 vertex 21.0726 0.170561 0 - vertex 21.0726 0.170561 -0.1 + vertex 21.0726 0.170561 -0.2 endloop endfacet facet normal -0.964289 -0.264852 0 outer loop vertex 21.0726 0.170561 0 - vertex 21.099 0.0745682 -0.1 + vertex 21.099 0.0745682 -0.2 vertex 21.099 0.0745682 0 endloop endfacet facet normal -0.994432 -0.105376 0 outer loop - vertex 21.1316 -0.233279 -0.1 + vertex 21.1316 -0.233279 -0.2 vertex 21.099 0.0745682 0 - vertex 21.099 0.0745682 -0.1 + vertex 21.099 0.0745682 -0.2 endloop endfacet facet normal -0.994432 -0.105376 0 outer loop vertex 21.099 0.0745682 0 - vertex 21.1316 -0.233279 -0.1 + vertex 21.1316 -0.233279 -0.2 vertex 21.1316 -0.233279 0 endloop endfacet facet normal -0.999957 -0.00925488 0 outer loop - vertex 21.1355 -0.658014 -0.1 + vertex 21.1355 -0.658014 -0.2 vertex 21.1316 -0.233279 0 - vertex 21.1316 -0.233279 -0.1 + vertex 21.1316 -0.233279 -0.2 endloop endfacet facet normal -0.999957 -0.00925488 0 outer loop vertex 21.1316 -0.233279 0 - vertex 21.1355 -0.658014 -0.1 + vertex 21.1355 -0.658014 -0.2 vertex 21.1355 -0.658014 0 endloop endfacet facet normal -0.998524 0.0543158 0 outer loop - vertex 21.1085 -1.15452 -0.1 + vertex 21.1085 -1.15452 -0.2 vertex 21.1355 -0.658014 0 - vertex 21.1355 -0.658014 -0.1 + vertex 21.1355 -0.658014 -0.2 endloop endfacet facet normal -0.998524 0.0543158 0 outer loop vertex 21.1355 -0.658014 0 - vertex 21.1085 -1.15452 -0.1 + vertex 21.1085 -1.15452 -0.2 vertex 21.1085 -1.15452 0 endloop endfacet facet normal -0.992587 0.121535 0 outer loop - vertex 21.0399 -1.71534 -0.1 + vertex 21.0399 -1.71534 -0.2 vertex 21.1085 -1.15452 0 - vertex 21.1085 -1.15452 -0.1 + vertex 21.1085 -1.15452 -0.2 endloop endfacet facet normal -0.992587 0.121535 0 outer loop vertex 21.1085 -1.15452 0 - vertex 21.0399 -1.71534 -0.1 + vertex 21.0399 -1.71534 -0.2 vertex 21.0399 -1.71534 0 endloop endfacet facet normal -0.978633 0.205615 0 outer loop - vertex 20.9878 -1.96317 -0.1 + vertex 20.9878 -1.96317 -0.2 vertex 21.0399 -1.71534 0 - vertex 21.0399 -1.71534 -0.1 + vertex 21.0399 -1.71534 -0.2 endloop endfacet facet normal -0.978633 0.205615 0 outer loop vertex 21.0399 -1.71534 0 - vertex 20.9878 -1.96317 -0.1 + vertex 20.9878 -1.96317 -0.2 vertex 20.9878 -1.96317 0 endloop endfacet facet normal -0.959237 0.282603 0 outer loop - vertex 20.9199 -2.19366 -0.1 + vertex 20.9199 -2.19366 -0.2 vertex 20.9878 -1.96317 0 - vertex 20.9878 -1.96317 -0.1 + vertex 20.9878 -1.96317 -0.2 endloop endfacet facet normal -0.959237 0.282603 0 outer loop vertex 20.9878 -1.96317 0 - vertex 20.9199 -2.19366 -0.1 + vertex 20.9199 -2.19366 -0.2 vertex 20.9199 -2.19366 0 endloop endfacet facet normal -0.92823 0.372008 0 outer loop - vertex 20.8331 -2.41014 -0.1 + vertex 20.8331 -2.41014 -0.2 vertex 20.9199 -2.19366 0 - vertex 20.9199 -2.19366 -0.1 + vertex 20.9199 -2.19366 -0.2 endloop endfacet facet normal -0.92823 0.372008 0 outer loop vertex 20.9199 -2.19366 0 - vertex 20.8331 -2.41014 -0.1 + vertex 20.8331 -2.41014 -0.2 vertex 20.8331 -2.41014 0 endloop endfacet facet normal -0.884337 0.46685 0 outer loop - vertex 20.7245 -2.61588 -0.1 + vertex 20.7245 -2.61588 -0.2 vertex 20.8331 -2.41014 0 - vertex 20.8331 -2.41014 -0.1 + vertex 20.8331 -2.41014 -0.2 endloop endfacet facet normal -0.884337 0.46685 0 outer loop vertex 20.8331 -2.41014 0 - vertex 20.7245 -2.61588 -0.1 + vertex 20.7245 -2.61588 -0.2 vertex 20.7245 -2.61588 0 endloop endfacet facet normal -0.829583 0.558383 0 outer loop - vertex 20.591 -2.8142 -0.1 + vertex 20.591 -2.8142 -0.2 vertex 20.7245 -2.61588 0 - vertex 20.7245 -2.61588 -0.1 + vertex 20.7245 -2.61588 -0.2 endloop endfacet facet normal -0.829583 0.558383 0 outer loop vertex 20.7245 -2.61588 0 - vertex 20.591 -2.8142 -0.1 + vertex 20.591 -2.8142 -0.2 vertex 20.591 -2.8142 0 endloop endfacet facet normal -0.769117 0.639107 0 outer loop - vertex 20.4297 -3.0084 -0.1 + vertex 20.4297 -3.0084 -0.2 vertex 20.591 -2.8142 0 - vertex 20.591 -2.8142 -0.1 + vertex 20.591 -2.8142 -0.2 endloop endfacet facet normal -0.769117 0.639107 0 outer loop vertex 20.591 -2.8142 0 - vertex 20.4297 -3.0084 -0.1 + vertex 20.4297 -3.0084 -0.2 vertex 20.4297 -3.0084 0 endloop endfacet facet normal -0.709135 0.705072 0 outer loop - vertex 20.2374 -3.20177 -0.1 + vertex 20.2374 -3.20177 -0.2 vertex 20.4297 -3.0084 0 - vertex 20.4297 -3.0084 -0.1 + vertex 20.4297 -3.0084 -0.2 endloop endfacet facet normal -0.709135 0.705072 0 outer loop vertex 20.4297 -3.0084 0 - vertex 20.2374 -3.20177 -0.1 + vertex 20.2374 -3.20177 -0.2 vertex 20.2374 -3.20177 0 endloop endfacet facet normal -0.654612 0.755965 0 outer loop - vertex 20.2374 -3.20177 -0.1 + vertex 20.2374 -3.20177 -0.2 vertex 20.0112 -3.39762 0 vertex 20.2374 -3.20177 0 endloop @@ -36339,13 +36339,13 @@ solid OpenSCAD_Model facet normal -0.654612 0.755965 0 outer loop vertex 20.0112 -3.39762 0 - vertex 20.2374 -3.20177 -0.1 - vertex 20.0112 -3.39762 -0.1 + vertex 20.2374 -3.20177 -0.2 + vertex 20.0112 -3.39762 -0.2 endloop endfacet facet normal -0.588742 0.808321 0 outer loop - vertex 20.0112 -3.39762 -0.1 + vertex 20.0112 -3.39762 -0.2 vertex 19.4451 -3.80993 0 vertex 20.0112 -3.39762 0 endloop @@ -36353,13 +36353,13 @@ solid OpenSCAD_Model facet normal -0.588742 0.808321 0 outer loop vertex 19.4451 -3.80993 0 - vertex 20.0112 -3.39762 -0.1 - vertex 19.4451 -3.80993 -0.1 + vertex 20.0112 -3.39762 -0.2 + vertex 19.4451 -3.80993 -0.2 endloop endfacet facet normal -0.530543 0.847658 0 outer loop - vertex 19.4451 -3.80993 -0.1 + vertex 19.4451 -3.80993 -0.2 vertex 18.7073 -4.27174 0 vertex 19.4451 -3.80993 0 endloop @@ -36367,13 +36367,13 @@ solid OpenSCAD_Model facet normal -0.530543 0.847658 0 outer loop vertex 18.7073 -4.27174 0 - vertex 19.4451 -3.80993 -0.1 - vertex 18.7073 -4.27174 -0.1 + vertex 19.4451 -3.80993 -0.2 + vertex 18.7073 -4.27174 -0.2 endloop endfacet facet normal -0.499058 0.866569 0 outer loop - vertex 18.7073 -4.27174 -0.1 + vertex 18.7073 -4.27174 -0.2 vertex 17.7736 -4.80944 0 vertex 18.7073 -4.27174 0 endloop @@ -36381,13 +36381,13 @@ solid OpenSCAD_Model facet normal -0.499058 0.866569 0 outer loop vertex 17.7736 -4.80944 0 - vertex 18.7073 -4.27174 -0.1 - vertex 17.7736 -4.80944 -0.1 + vertex 18.7073 -4.27174 -0.2 + vertex 17.7736 -4.80944 -0.2 endloop endfacet facet normal -0.476856 0.878981 0 outer loop - vertex 17.7736 -4.80944 -0.1 + vertex 17.7736 -4.80944 -0.2 vertex 16.3254 -5.59514 0 vertex 17.7736 -4.80944 0 endloop @@ -36395,13 +36395,13 @@ solid OpenSCAD_Model facet normal -0.476856 0.878981 0 outer loop vertex 16.3254 -5.59514 0 - vertex 17.7736 -4.80944 -0.1 - vertex 16.3254 -5.59514 -0.1 + vertex 17.7736 -4.80944 -0.2 + vertex 16.3254 -5.59514 -0.2 endloop endfacet facet normal -0.451418 0.892312 0 outer loop - vertex 16.3254 -5.59514 -0.1 + vertex 16.3254 -5.59514 -0.2 vertex 15.6549 -5.93433 0 vertex 16.3254 -5.59514 0 endloop @@ -36409,13 +36409,13 @@ solid OpenSCAD_Model facet normal -0.451418 0.892312 0 outer loop vertex 15.6549 -5.93433 0 - vertex 16.3254 -5.59514 -0.1 - vertex 15.6549 -5.93433 -0.1 + vertex 16.3254 -5.59514 -0.2 + vertex 15.6549 -5.93433 -0.2 endloop endfacet facet normal -0.429833 0.902908 0 outer loop - vertex 15.6549 -5.93433 -0.1 + vertex 15.6549 -5.93433 -0.2 vertex 15.0129 -6.23993 0 vertex 15.6549 -5.93433 0 endloop @@ -36423,13 +36423,13 @@ solid OpenSCAD_Model facet normal -0.429833 0.902908 0 outer loop vertex 15.0129 -6.23993 0 - vertex 15.6549 -5.93433 -0.1 - vertex 15.0129 -6.23993 -0.1 + vertex 15.6549 -5.93433 -0.2 + vertex 15.0129 -6.23993 -0.2 endloop endfacet facet normal -0.404408 0.914579 0 outer loop - vertex 15.0129 -6.23993 -0.1 + vertex 15.0129 -6.23993 -0.2 vertex 14.3941 -6.51356 0 vertex 15.0129 -6.23993 0 endloop @@ -36437,13 +36437,13 @@ solid OpenSCAD_Model facet normal -0.404408 0.914579 0 outer loop vertex 14.3941 -6.51356 0 - vertex 15.0129 -6.23993 -0.1 - vertex 14.3941 -6.51356 -0.1 + vertex 15.0129 -6.23993 -0.2 + vertex 14.3941 -6.51356 -0.2 endloop endfacet facet normal -0.375168 0.926957 0 outer loop - vertex 14.3941 -6.51356 -0.1 + vertex 14.3941 -6.51356 -0.2 vertex 13.793 -6.75686 0 vertex 14.3941 -6.51356 0 endloop @@ -36451,13 +36451,13 @@ solid OpenSCAD_Model facet normal -0.375168 0.926957 0 outer loop vertex 13.793 -6.75686 0 - vertex 14.3941 -6.51356 -0.1 - vertex 13.793 -6.75686 -0.1 + vertex 14.3941 -6.51356 -0.2 + vertex 13.793 -6.75686 -0.2 endloop endfacet facet normal -0.342394 0.939557 0 outer loop - vertex 13.793 -6.75686 -0.1 + vertex 13.793 -6.75686 -0.2 vertex 13.2041 -6.97145 0 vertex 13.793 -6.75686 0 endloop @@ -36465,13 +36465,13 @@ solid OpenSCAD_Model facet normal -0.342394 0.939557 0 outer loop vertex 13.2041 -6.97145 0 - vertex 13.793 -6.75686 -0.1 - vertex 13.2041 -6.97145 -0.1 + vertex 13.793 -6.75686 -0.2 + vertex 13.2041 -6.97145 -0.2 endloop endfacet facet normal -0.306665 0.951818 0 outer loop - vertex 13.2041 -6.97145 -0.1 + vertex 13.2041 -6.97145 -0.2 vertex 12.6221 -7.15898 0 vertex 13.2041 -6.97145 0 endloop @@ -36479,13 +36479,13 @@ solid OpenSCAD_Model facet normal -0.306665 0.951818 0 outer loop vertex 12.6221 -7.15898 0 - vertex 13.2041 -6.97145 -0.1 - vertex 12.6221 -7.15898 -0.1 + vertex 13.2041 -6.97145 -0.2 + vertex 12.6221 -7.15898 -0.2 endloop endfacet facet normal -0.268881 0.963173 0 outer loop - vertex 12.6221 -7.15898 -0.1 + vertex 12.6221 -7.15898 -0.2 vertex 12.0414 -7.32107 0 vertex 12.6221 -7.15898 0 endloop @@ -36493,13 +36493,13 @@ solid OpenSCAD_Model facet normal -0.268881 0.963173 0 outer loop vertex 12.0414 -7.32107 0 - vertex 12.6221 -7.15898 -0.1 - vertex 12.0414 -7.32107 -0.1 + vertex 12.6221 -7.15898 -0.2 + vertex 12.0414 -7.32107 -0.2 endloop endfacet facet normal -0.230173 0.97315 0 outer loop - vertex 12.0414 -7.32107 -0.1 + vertex 12.0414 -7.32107 -0.2 vertex 11.4568 -7.45935 0 vertex 12.0414 -7.32107 0 endloop @@ -36507,13 +36507,13 @@ solid OpenSCAD_Model facet normal -0.230173 0.97315 0 outer loop vertex 11.4568 -7.45935 0 - vertex 12.0414 -7.32107 -0.1 - vertex 11.4568 -7.45935 -0.1 + vertex 12.0414 -7.32107 -0.2 + vertex 11.4568 -7.45935 -0.2 endloop endfacet facet normal -0.191808 0.981433 0 outer loop - vertex 11.4568 -7.45935 -0.1 + vertex 11.4568 -7.45935 -0.2 vertex 10.8627 -7.57545 0 vertex 11.4568 -7.45935 0 endloop @@ -36521,13 +36521,13 @@ solid OpenSCAD_Model facet normal -0.191808 0.981433 0 outer loop vertex 10.8627 -7.57545 0 - vertex 11.4568 -7.45935 -0.1 - vertex 10.8627 -7.57545 -0.1 + vertex 11.4568 -7.45935 -0.2 + vertex 10.8627 -7.57545 -0.2 endloop endfacet facet normal -0.155029 0.98791 0 outer loop - vertex 10.8627 -7.57545 -0.1 + vertex 10.8627 -7.57545 -0.2 vertex 10.2538 -7.67101 0 vertex 10.8627 -7.57545 0 endloop @@ -36535,13 +36535,13 @@ solid OpenSCAD_Model facet normal -0.155029 0.98791 0 outer loop vertex 10.2538 -7.67101 0 - vertex 10.8627 -7.57545 -0.1 - vertex 10.2538 -7.67101 -0.1 + vertex 10.8627 -7.57545 -0.2 + vertex 10.2538 -7.67101 -0.2 endloop endfacet facet normal -0.120913 0.992663 0 outer loop - vertex 10.2538 -7.67101 -0.1 + vertex 10.2538 -7.67101 -0.2 vertex 9.62459 -7.74765 0 vertex 10.2538 -7.67101 0 endloop @@ -36549,13 +36549,13 @@ solid OpenSCAD_Model facet normal -0.120913 0.992663 0 outer loop vertex 9.62459 -7.74765 0 - vertex 10.2538 -7.67101 -0.1 - vertex 9.62459 -7.74765 -0.1 + vertex 10.2538 -7.67101 -0.2 + vertex 9.62459 -7.74765 -0.2 endloop endfacet facet normal -0.0902671 0.995918 0 outer loop - vertex 9.62459 -7.74765 -0.1 + vertex 9.62459 -7.74765 -0.2 vertex 8.96966 -7.80701 0 vertex 9.62459 -7.74765 0 endloop @@ -36563,13 +36563,13 @@ solid OpenSCAD_Model facet normal -0.0902671 0.995918 0 outer loop vertex 8.96966 -7.80701 0 - vertex 9.62459 -7.74765 -0.1 - vertex 8.96966 -7.80701 -0.1 + vertex 9.62459 -7.74765 -0.2 + vertex 8.96966 -7.80701 -0.2 endloop endfacet facet normal -0.0520328 0.998645 0 outer loop - vertex 8.96966 -7.80701 -0.1 + vertex 8.96966 -7.80701 -0.2 vertex 7.56097 -7.88041 0 vertex 8.96966 -7.80701 0 endloop @@ -36577,13 +36577,13 @@ solid OpenSCAD_Model facet normal -0.0520328 0.998645 0 outer loop vertex 7.56097 -7.88041 0 - vertex 8.96966 -7.80701 -0.1 - vertex 7.56097 -7.88041 -0.1 + vertex 8.96966 -7.80701 -0.2 + vertex 7.56097 -7.88041 -0.2 endloop endfacet facet normal -0.0211888 0.999775 0 outer loop - vertex 7.56097 -7.88041 -0.1 + vertex 7.56097 -7.88041 -0.2 vertex 6.04455 -7.91255 0 vertex 7.56097 -7.88041 0 endloop @@ -36591,13 +36591,13 @@ solid OpenSCAD_Model facet normal -0.0211888 0.999775 0 outer loop vertex 6.04455 -7.91255 0 - vertex 7.56097 -7.88041 -0.1 - vertex 6.04455 -7.91255 -0.1 + vertex 7.56097 -7.88041 -0.2 + vertex 6.04455 -7.91255 -0.2 endloop endfacet facet normal 0.00984088 0.999952 -0 outer loop - vertex 6.04455 -7.91255 -0.1 + vertex 6.04455 -7.91255 -0.2 vertex 5.49083 -7.9071 0 vertex 6.04455 -7.91255 0 endloop @@ -36605,13 +36605,13 @@ solid OpenSCAD_Model facet normal 0.00984088 0.999952 0 outer loop vertex 5.49083 -7.9071 0 - vertex 6.04455 -7.91255 -0.1 - vertex 5.49083 -7.9071 -0.1 + vertex 6.04455 -7.91255 -0.2 + vertex 5.49083 -7.9071 -0.2 endloop endfacet facet normal 0.0493656 0.998781 -0 outer loop - vertex 5.49083 -7.9071 -0.1 + vertex 5.49083 -7.9071 -0.2 vertex 5.0434 -7.88498 0 vertex 5.49083 -7.9071 0 endloop @@ -36619,13 +36619,13 @@ solid OpenSCAD_Model facet normal 0.0493656 0.998781 0 outer loop vertex 5.0434 -7.88498 0 - vertex 5.49083 -7.9071 -0.1 - vertex 5.0434 -7.88498 -0.1 + vertex 5.49083 -7.9071 -0.2 + vertex 5.0434 -7.88498 -0.2 endloop endfacet facet normal 0.110735 0.99385 -0 outer loop - vertex 5.0434 -7.88498 -0.1 + vertex 5.0434 -7.88498 -0.2 vertex 4.67971 -7.84446 0 vertex 5.0434 -7.88498 0 endloop @@ -36633,13 +36633,13 @@ solid OpenSCAD_Model facet normal 0.110735 0.99385 0 outer loop vertex 4.67971 -7.84446 0 - vertex 5.0434 -7.88498 -0.1 - vertex 4.67971 -7.84446 -0.1 + vertex 5.0434 -7.88498 -0.2 + vertex 4.67971 -7.84446 -0.2 endloop endfacet facet normal 0.196653 0.980473 -0 outer loop - vertex 4.67971 -7.84446 -0.1 + vertex 4.67971 -7.84446 -0.2 vertex 4.37723 -7.78379 0 vertex 4.67971 -7.84446 0 endloop @@ -36647,13 +36647,13 @@ solid OpenSCAD_Model facet normal 0.196653 0.980473 0 outer loop vertex 4.37723 -7.78379 0 - vertex 4.67971 -7.84446 -0.1 - vertex 4.37723 -7.78379 -0.1 + vertex 4.67971 -7.84446 -0.2 + vertex 4.37723 -7.78379 -0.2 endloop endfacet facet normal 0.298658 0.95436 -0 outer loop - vertex 4.37723 -7.78379 -0.1 + vertex 4.37723 -7.78379 -0.2 vertex 4.11342 -7.70123 0 vertex 4.37723 -7.78379 0 endloop @@ -36661,13 +36661,13 @@ solid OpenSCAD_Model facet normal 0.298658 0.95436 0 outer loop vertex 4.11342 -7.70123 0 - vertex 4.37723 -7.78379 -0.1 - vertex 4.11342 -7.70123 -0.1 + vertex 4.37723 -7.78379 -0.2 + vertex 4.11342 -7.70123 -0.2 endloop endfacet facet normal 0.39403 0.919098 -0 outer loop - vertex 4.11342 -7.70123 -0.1 + vertex 4.11342 -7.70123 -0.2 vertex 3.86574 -7.59505 0 vertex 4.11342 -7.70123 0 endloop @@ -36675,13 +36675,13 @@ solid OpenSCAD_Model facet normal 0.39403 0.919098 0 outer loop vertex 3.86574 -7.59505 0 - vertex 4.11342 -7.70123 -0.1 - vertex 3.86574 -7.59505 -0.1 + vertex 4.11342 -7.70123 -0.2 + vertex 3.86574 -7.59505 -0.2 endloop endfacet facet normal 0.472054 0.88157 -0 outer loop - vertex 3.86574 -7.59505 -0.1 + vertex 3.86574 -7.59505 -0.2 vertex 3.40104 -7.34622 0 vertex 3.86574 -7.59505 0 endloop @@ -36689,13 +36689,13 @@ solid OpenSCAD_Model facet normal 0.472054 0.88157 0 outer loop vertex 3.40104 -7.34622 0 - vertex 3.86574 -7.59505 -0.1 - vertex 3.40104 -7.34622 -0.1 + vertex 3.86574 -7.59505 -0.2 + vertex 3.40104 -7.34622 -0.2 endloop endfacet facet normal 0.50336 0.864077 -0 outer loop - vertex 3.40104 -7.34622 -0.1 + vertex 3.40104 -7.34622 -0.2 vertex 2.71562 -6.94693 0 vertex 3.40104 -7.34622 0 endloop @@ -36703,13 +36703,13 @@ solid OpenSCAD_Model facet normal 0.50336 0.864077 0 outer loop vertex 2.71562 -6.94693 0 - vertex 3.40104 -7.34622 -0.1 - vertex 2.71562 -6.94693 -0.1 + vertex 3.40104 -7.34622 -0.2 + vertex 2.71562 -6.94693 -0.2 endloop endfacet facet normal 0.526285 0.850308 -0 outer loop - vertex 2.71562 -6.94693 -0.1 + vertex 2.71562 -6.94693 -0.2 vertex 1.05193 -5.91722 0 vertex 2.71562 -6.94693 0 endloop @@ -36717,13 +36717,13 @@ solid OpenSCAD_Model facet normal 0.526285 0.850308 0 outer loop vertex 1.05193 -5.91722 0 - vertex 2.71562 -6.94693 -0.1 - vertex 1.05193 -5.91722 -0.1 + vertex 2.71562 -6.94693 -0.2 + vertex 1.05193 -5.91722 -0.2 endloop endfacet facet normal 0.529768 0.848143 -0 outer loop - vertex 1.05193 -5.91722 -0.1 + vertex 1.05193 -5.91722 -0.2 vertex -0.694871 -4.82613 0 vertex 1.05193 -5.91722 0 endloop @@ -36731,13 +36731,13 @@ solid OpenSCAD_Model facet normal 0.529768 0.848143 0 outer loop vertex -0.694871 -4.82613 0 - vertex 1.05193 -5.91722 -0.1 - vertex -0.694871 -4.82613 -0.1 + vertex 1.05193 -5.91722 -0.2 + vertex -0.694871 -4.82613 -0.2 endloop endfacet facet normal 0.507777 0.861489 -0 outer loop - vertex -0.694871 -4.82613 -0.1 + vertex -0.694871 -4.82613 -0.2 vertex -2.47177 -3.7788 0 vertex -0.694871 -4.82613 0 endloop @@ -36745,13 +36745,13 @@ solid OpenSCAD_Model facet normal 0.507777 0.861489 0 outer loop vertex -2.47177 -3.7788 0 - vertex -0.694871 -4.82613 -0.1 - vertex -2.47177 -3.7788 -0.1 + vertex -0.694871 -4.82613 -0.2 + vertex -2.47177 -3.7788 -0.2 endloop endfacet facet normal 0.55979 0.828634 -0 outer loop - vertex -2.47177 -3.7788 -0.1 + vertex -2.47177 -3.7788 -0.2 vertex -2.8551 -3.51984 0 vertex -2.47177 -3.7788 0 endloop @@ -36759,13 +36759,13 @@ solid OpenSCAD_Model facet normal 0.55979 0.828634 0 outer loop vertex -2.8551 -3.51984 0 - vertex -2.47177 -3.7788 -0.1 - vertex -2.8551 -3.51984 -0.1 + vertex -2.47177 -3.7788 -0.2 + vertex -2.8551 -3.51984 -0.2 endloop endfacet facet normal 0.612658 0.790348 -0 outer loop - vertex -2.8551 -3.51984 -0.1 + vertex -2.8551 -3.51984 -0.2 vertex -3.18232 -3.26618 0 vertex -2.8551 -3.51984 0 endloop @@ -36773,13 +36773,13 @@ solid OpenSCAD_Model facet normal 0.612658 0.790348 0 outer loop vertex -3.18232 -3.26618 0 - vertex -2.8551 -3.51984 -0.1 - vertex -3.18232 -3.26618 -0.1 + vertex -2.8551 -3.51984 -0.2 + vertex -3.18232 -3.26618 -0.2 endloop endfacet facet normal 0.673628 0.73907 -0 outer loop - vertex -3.18232 -3.26618 -0.1 + vertex -3.18232 -3.26618 -0.2 vertex -3.44099 -3.03042 0 vertex -3.18232 -3.26618 0 endloop @@ -36787,69 +36787,69 @@ solid OpenSCAD_Model facet normal 0.673628 0.73907 0 outer loop vertex -3.44099 -3.03042 0 - vertex -3.18232 -3.26618 -0.1 - vertex -3.44099 -3.03042 -0.1 + vertex -3.18232 -3.26618 -0.2 + vertex -3.44099 -3.03042 -0.2 endloop endfacet facet normal 0.756151 0.654397 0 outer loop vertex -3.44099 -3.03042 0 - vertex -3.61865 -2.82513 -0.1 + vertex -3.61865 -2.82513 -0.2 vertex -3.61865 -2.82513 0 endloop endfacet facet normal 0.756151 0.654397 0 outer loop - vertex -3.61865 -2.82513 -0.1 + vertex -3.61865 -2.82513 -0.2 vertex -3.44099 -3.03042 0 - vertex -3.44099 -3.03042 -0.1 + vertex -3.44099 -3.03042 -0.2 endloop endfacet facet normal 0.887562 0.460688 0 outer loop vertex -3.61865 -2.82513 0 - vertex -3.70285 -2.66292 -0.1 + vertex -3.70285 -2.66292 -0.2 vertex -3.70285 -2.66292 0 endloop endfacet facet normal 0.887562 0.460688 0 outer loop - vertex -3.70285 -2.66292 -0.1 + vertex -3.70285 -2.66292 -0.2 vertex -3.61865 -2.82513 0 - vertex -3.61865 -2.82513 -0.1 + vertex -3.61865 -2.82513 -0.2 endloop endfacet facet normal 0.998663 0.0516973 0 outer loop vertex -3.70285 -2.66292 0 - vertex -3.70601 -2.60189 -0.1 + vertex -3.70601 -2.60189 -0.2 vertex -3.70601 -2.60189 0 endloop endfacet facet normal 0.998663 0.0516973 0 outer loop - vertex -3.70601 -2.60189 -0.1 + vertex -3.70601 -2.60189 -0.2 vertex -3.70285 -2.66292 0 - vertex -3.70285 -2.66292 -0.1 + vertex -3.70285 -2.66292 -0.2 endloop endfacet facet normal 0.877591 -0.479411 0 outer loop vertex -3.70601 -2.60189 0 - vertex -3.68113 -2.55635 -0.1 + vertex -3.68113 -2.55635 -0.2 vertex -3.68113 -2.55635 0 endloop endfacet facet normal 0.877591 -0.479411 0 outer loop - vertex -3.68113 -2.55635 -0.1 + vertex -3.68113 -2.55635 -0.2 vertex -3.70601 -2.60189 0 - vertex -3.70601 -2.60189 -0.1 + vertex -3.70601 -2.60189 -0.2 endloop endfacet facet normal 0.463305 -0.886199 0 outer loop - vertex -3.68113 -2.55635 -0.1 + vertex -3.68113 -2.55635 -0.2 vertex -3.62666 -2.52788 0 vertex -3.68113 -2.55635 0 endloop @@ -36857,13 +36857,13 @@ solid OpenSCAD_Model facet normal 0.463305 -0.886199 0 outer loop vertex -3.62666 -2.52788 0 - vertex -3.68113 -2.55635 -0.1 - vertex -3.62666 -2.52788 -0.1 + vertex -3.68113 -2.55635 -0.2 + vertex -3.62666 -2.52788 -0.2 endloop endfacet facet normal 0.114199 -0.993458 0 outer loop - vertex -3.62666 -2.52788 -0.1 + vertex -3.62666 -2.52788 -0.2 vertex -3.54104 -2.51804 0 vertex -3.62666 -2.52788 0 endloop @@ -36871,13 +36871,13 @@ solid OpenSCAD_Model facet normal 0.114199 -0.993458 0 outer loop vertex -3.54104 -2.51804 0 - vertex -3.62666 -2.52788 -0.1 - vertex -3.54104 -2.51804 -0.1 + vertex -3.62666 -2.52788 -0.2 + vertex -3.54104 -2.51804 -0.2 endloop endfacet facet normal -0.250917 -0.968009 0 outer loop - vertex -3.54104 -2.51804 -0.1 + vertex -3.54104 -2.51804 -0.2 vertex -3.301 -2.58026 0 vertex -3.54104 -2.51804 0 endloop @@ -36885,13 +36885,13 @@ solid OpenSCAD_Model facet normal -0.250917 -0.968009 -0 outer loop vertex -3.301 -2.58026 0 - vertex -3.54104 -2.51804 -0.1 - vertex -3.301 -2.58026 -0.1 + vertex -3.54104 -2.51804 -0.2 + vertex -3.301 -2.58026 -0.2 endloop endfacet facet normal -0.37095 -0.928653 0 outer loop - vertex -3.301 -2.58026 -0.1 + vertex -3.301 -2.58026 -0.2 vertex -2.87688 -2.74967 0 vertex -3.301 -2.58026 0 endloop @@ -36899,13 +36899,13 @@ solid OpenSCAD_Model facet normal -0.37095 -0.928653 -0 outer loop vertex -2.87688 -2.74967 0 - vertex -3.301 -2.58026 -0.1 - vertex -2.87688 -2.74967 -0.1 + vertex -3.301 -2.58026 -0.2 + vertex -2.87688 -2.74967 -0.2 endloop endfacet facet normal -0.415868 -0.909425 0 outer loop - vertex -2.87688 -2.74967 -0.1 + vertex -2.87688 -2.74967 -0.2 vertex -2.32857 -3.00041 0 vertex -2.87688 -2.74967 0 endloop @@ -36913,13 +36913,13 @@ solid OpenSCAD_Model facet normal -0.415868 -0.909425 -0 outer loop vertex -2.32857 -3.00041 0 - vertex -2.87688 -2.74967 -0.1 - vertex -2.32857 -3.00041 -0.1 + vertex -2.87688 -2.74967 -0.2 + vertex -2.32857 -3.00041 -0.2 endloop endfacet facet normal -0.447064 -0.894502 0 outer loop - vertex -2.32857 -3.00041 -0.1 + vertex -2.32857 -3.00041 -0.2 vertex -1.71595 -3.30659 0 vertex -2.32857 -3.00041 0 endloop @@ -36927,13 +36927,13 @@ solid OpenSCAD_Model facet normal -0.447064 -0.894502 -0 outer loop vertex -1.71595 -3.30659 0 - vertex -2.32857 -3.00041 -0.1 - vertex -1.71595 -3.30659 -0.1 + vertex -2.32857 -3.00041 -0.2 + vertex -1.71595 -3.30659 -0.2 endloop endfacet facet normal -0.450995 -0.892526 0 outer loop - vertex -1.71595 -3.30659 -0.1 + vertex -1.71595 -3.30659 -0.2 vertex -1.01669 -3.65993 0 vertex -1.71595 -3.30659 0 endloop @@ -36941,13 +36941,13 @@ solid OpenSCAD_Model facet normal -0.450995 -0.892526 -0 outer loop vertex -1.01669 -3.65993 0 - vertex -1.71595 -3.30659 -0.1 - vertex -1.01669 -3.65993 -0.1 + vertex -1.71595 -3.30659 -0.2 + vertex -1.01669 -3.65993 -0.2 endloop endfacet facet normal -0.429074 -0.903269 0 outer loop - vertex -1.01669 -3.65993 -0.1 + vertex -1.01669 -3.65993 -0.2 vertex -0.313177 -3.99411 0 vertex -1.01669 -3.65993 0 endloop @@ -36955,13 +36955,13 @@ solid OpenSCAD_Model facet normal -0.429074 -0.903269 -0 outer loop vertex -0.313177 -3.99411 0 - vertex -1.01669 -3.65993 -0.1 - vertex -0.313177 -3.99411 -0.1 + vertex -1.01669 -3.65993 -0.2 + vertex -0.313177 -3.99411 -0.2 endloop endfacet facet normal -0.406667 -0.913576 0 outer loop - vertex -0.313177 -3.99411 -0.1 + vertex -0.313177 -3.99411 -0.2 vertex 0.394112 -4.30895 0 vertex -0.313177 -3.99411 0 endloop @@ -36969,13 +36969,13 @@ solid OpenSCAD_Model facet normal -0.406667 -0.913576 -0 outer loop vertex 0.394112 -4.30895 0 - vertex -0.313177 -3.99411 -0.1 - vertex 0.394112 -4.30895 -0.1 + vertex -0.313177 -3.99411 -0.2 + vertex 0.394112 -4.30895 -0.2 endloop endfacet facet normal -0.383759 -0.923433 0 outer loop - vertex 0.394112 -4.30895 -0.1 + vertex 0.394112 -4.30895 -0.2 vertex 1.10471 -4.60426 0 vertex 0.394112 -4.30895 0 endloop @@ -36983,13 +36983,13 @@ solid OpenSCAD_Model facet normal -0.383759 -0.923433 -0 outer loop vertex 1.10471 -4.60426 0 - vertex 0.394112 -4.30895 -0.1 - vertex 1.10471 -4.60426 -0.1 + vertex 0.394112 -4.30895 -0.2 + vertex 1.10471 -4.60426 -0.2 endloop endfacet facet normal -0.360336 -0.932823 0 outer loop - vertex 1.10471 -4.60426 -0.1 + vertex 1.10471 -4.60426 -0.2 vertex 1.81816 -4.87986 0 vertex 1.10471 -4.60426 0 endloop @@ -36997,13 +36997,13 @@ solid OpenSCAD_Model facet normal -0.360336 -0.932823 -0 outer loop vertex 1.81816 -4.87986 0 - vertex 1.10471 -4.60426 -0.1 - vertex 1.81816 -4.87986 -0.1 + vertex 1.10471 -4.60426 -0.2 + vertex 1.81816 -4.87986 -0.2 endloop endfacet facet normal -0.33638 -0.941726 0 outer loop - vertex 1.81816 -4.87986 -0.1 + vertex 1.81816 -4.87986 -0.2 vertex 2.534 -5.13555 0 vertex 1.81816 -4.87986 0 endloop @@ -37011,13 +37011,13 @@ solid OpenSCAD_Model facet normal -0.33638 -0.941726 -0 outer loop vertex 2.534 -5.13555 0 - vertex 1.81816 -4.87986 -0.1 - vertex 2.534 -5.13555 -0.1 + vertex 1.81816 -4.87986 -0.2 + vertex 2.534 -5.13555 -0.2 endloop endfacet facet normal -0.311879 -0.950122 0 outer loop - vertex 2.534 -5.13555 -0.1 + vertex 2.534 -5.13555 -0.2 vertex 3.25174 -5.37115 0 vertex 2.534 -5.13555 0 endloop @@ -37025,13 +37025,13 @@ solid OpenSCAD_Model facet normal -0.311879 -0.950122 -0 outer loop vertex 3.25174 -5.37115 0 - vertex 2.534 -5.13555 -0.1 - vertex 3.25174 -5.37115 -0.1 + vertex 2.534 -5.13555 -0.2 + vertex 3.25174 -5.37115 -0.2 endloop endfacet facet normal -0.286817 -0.957985 0 outer loop - vertex 3.25174 -5.37115 -0.1 + vertex 3.25174 -5.37115 -0.2 vertex 3.97093 -5.58648 0 vertex 3.25174 -5.37115 0 endloop @@ -37039,13 +37039,13 @@ solid OpenSCAD_Model facet normal -0.286817 -0.957985 -0 outer loop vertex 3.97093 -5.58648 0 - vertex 3.25174 -5.37115 -0.1 - vertex 3.97093 -5.58648 -0.1 + vertex 3.25174 -5.37115 -0.2 + vertex 3.97093 -5.58648 -0.2 endloop endfacet facet normal -0.262141 -0.965029 0 outer loop - vertex 3.97093 -5.58648 -0.1 + vertex 3.97093 -5.58648 -0.2 vertex 4.51611 -5.73457 0 vertex 3.97093 -5.58648 0 endloop @@ -37053,13 +37053,13 @@ solid OpenSCAD_Model facet normal -0.262141 -0.965029 -0 outer loop vertex 4.51611 -5.73457 0 - vertex 3.97093 -5.58648 -0.1 - vertex 4.51611 -5.73457 -0.1 + vertex 3.97093 -5.58648 -0.2 + vertex 4.51611 -5.73457 -0.2 endloop endfacet facet normal -0.230397 -0.973097 0 outer loop - vertex 4.51611 -5.73457 -0.1 + vertex 4.51611 -5.73457 -0.2 vertex 4.99906 -5.84891 0 vertex 4.51611 -5.73457 0 endloop @@ -37067,13 +37067,13 @@ solid OpenSCAD_Model facet normal -0.230397 -0.973097 -0 outer loop vertex 4.99906 -5.84891 0 - vertex 4.51611 -5.73457 -0.1 - vertex 4.99906 -5.84891 -0.1 + vertex 4.51611 -5.73457 -0.2 + vertex 4.99906 -5.84891 -0.2 endloop endfacet facet normal -0.18567 -0.982612 0 outer loop - vertex 4.99906 -5.84891 -0.1 + vertex 4.99906 -5.84891 -0.2 vertex 5.4311 -5.93055 0 vertex 4.99906 -5.84891 0 endloop @@ -37081,13 +37081,13 @@ solid OpenSCAD_Model facet normal -0.18567 -0.982612 -0 outer loop vertex 5.4311 -5.93055 0 - vertex 4.99906 -5.84891 -0.1 - vertex 5.4311 -5.93055 -0.1 + vertex 4.99906 -5.84891 -0.2 + vertex 5.4311 -5.93055 -0.2 endloop endfacet facet normal -0.126289 -0.991994 0 outer loop - vertex 5.4311 -5.93055 -0.1 + vertex 5.4311 -5.93055 -0.2 vertex 5.82356 -5.98052 0 vertex 5.4311 -5.93055 0 endloop @@ -37095,13 +37095,13 @@ solid OpenSCAD_Model facet normal -0.126289 -0.991994 -0 outer loop vertex 5.82356 -5.98052 0 - vertex 5.4311 -5.93055 -0.1 - vertex 5.82356 -5.98052 -0.1 + vertex 5.4311 -5.93055 -0.2 + vertex 5.82356 -5.98052 -0.2 endloop endfacet facet normal -0.0529968 -0.998595 0 outer loop - vertex 5.82356 -5.98052 -0.1 + vertex 5.82356 -5.98052 -0.2 vertex 6.18777 -5.99984 0 vertex 5.82356 -5.98052 0 endloop @@ -37109,13 +37109,13 @@ solid OpenSCAD_Model facet normal -0.0529968 -0.998595 -0 outer loop vertex 6.18777 -5.99984 0 - vertex 5.82356 -5.98052 -0.1 - vertex 6.18777 -5.99984 -0.1 + vertex 5.82356 -5.98052 -0.2 + vertex 6.18777 -5.99984 -0.2 endloop endfacet facet normal 0.0295577 -0.999563 0 outer loop - vertex 6.18777 -5.99984 -0.1 + vertex 6.18777 -5.99984 -0.2 vertex 6.53505 -5.98957 0 vertex 6.18777 -5.99984 0 endloop @@ -37123,13 +37123,13 @@ solid OpenSCAD_Model facet normal 0.0295577 -0.999563 0 outer loop vertex 6.53505 -5.98957 0 - vertex 6.18777 -5.99984 -0.1 - vertex 6.53505 -5.98957 -0.1 + vertex 6.18777 -5.99984 -0.2 + vertex 6.53505 -5.98957 -0.2 endloop endfacet facet normal 0.112922 -0.993604 0 outer loop - vertex 6.53505 -5.98957 -0.1 + vertex 6.53505 -5.98957 -0.2 vertex 6.87672 -5.95074 0 vertex 6.53505 -5.98957 0 endloop @@ -37137,13 +37137,13 @@ solid OpenSCAD_Model facet normal 0.112922 -0.993604 0 outer loop vertex 6.87672 -5.95074 0 - vertex 6.53505 -5.98957 -0.1 - vertex 6.87672 -5.95074 -0.1 + vertex 6.53505 -5.98957 -0.2 + vertex 6.87672 -5.95074 -0.2 endloop endfacet facet normal 0.18762 -0.982242 0 outer loop - vertex 6.87672 -5.95074 -0.1 + vertex 6.87672 -5.95074 -0.2 vertex 7.2241 -5.88439 0 vertex 6.87672 -5.95074 0 endloop @@ -37151,13 +37151,13 @@ solid OpenSCAD_Model facet normal 0.18762 -0.982242 0 outer loop vertex 7.2241 -5.88439 0 - vertex 6.87672 -5.95074 -0.1 - vertex 7.2241 -5.88439 -0.1 + vertex 6.87672 -5.95074 -0.2 + vertex 7.2241 -5.88439 -0.2 endloop endfacet facet normal 0.21982 -0.975541 0 outer loop - vertex 7.2241 -5.88439 -0.1 + vertex 7.2241 -5.88439 -0.2 vertex 7.809 -5.75259 0 vertex 7.2241 -5.88439 0 endloop @@ -37165,237 +37165,237 @@ solid OpenSCAD_Model facet normal 0.21982 -0.975541 0 outer loop vertex 7.809 -5.75259 0 - vertex 7.2241 -5.88439 -0.1 - vertex 7.809 -5.75259 -0.1 + vertex 7.2241 -5.88439 -0.2 + vertex 7.809 -5.75259 -0.2 endloop endfacet facet normal 0.71334 0.700818 0 outer loop vertex 7.809 -5.75259 0 - vertex 7.04277 -4.97268 -0.1 + vertex 7.04277 -4.97268 -0.2 vertex 7.04277 -4.97268 0 endloop endfacet facet normal 0.71334 0.700818 0 outer loop - vertex 7.04277 -4.97268 -0.1 + vertex 7.04277 -4.97268 -0.2 vertex 7.809 -5.75259 0 - vertex 7.809 -5.75259 -0.1 + vertex 7.809 -5.75259 -0.2 endloop endfacet facet normal 0.735784 0.677216 0 outer loop vertex 7.04277 -4.97268 0 - vertex 6.78219 -4.68956 -0.1 + vertex 6.78219 -4.68956 -0.2 vertex 6.78219 -4.68956 0 endloop endfacet facet normal 0.735784 0.677216 0 outer loop - vertex 6.78219 -4.68956 -0.1 + vertex 6.78219 -4.68956 -0.2 vertex 7.04277 -4.97268 0 - vertex 7.04277 -4.97268 -0.1 + vertex 7.04277 -4.97268 -0.2 endloop endfacet facet normal 0.771549 0.636169 0 outer loop vertex 6.78219 -4.68956 0 - vertex 6.51759 -4.36865 -0.1 + vertex 6.51759 -4.36865 -0.2 vertex 6.51759 -4.36865 0 endloop endfacet facet normal 0.771549 0.636169 0 outer loop - vertex 6.51759 -4.36865 -0.1 + vertex 6.51759 -4.36865 -0.2 vertex 6.78219 -4.68956 0 - vertex 6.78219 -4.68956 -0.1 + vertex 6.78219 -4.68956 -0.2 endloop endfacet facet normal 0.79877 0.601637 0 outer loop vertex 6.51759 -4.36865 0 - vertex 6.2523 -4.01644 -0.1 + vertex 6.2523 -4.01644 -0.2 vertex 6.2523 -4.01644 0 endloop endfacet facet normal 0.79877 0.601637 0 outer loop - vertex 6.2523 -4.01644 -0.1 + vertex 6.2523 -4.01644 -0.2 vertex 6.51759 -4.36865 0 - vertex 6.51759 -4.36865 -0.1 + vertex 6.51759 -4.36865 -0.2 endloop endfacet facet normal 0.820534 0.571597 0 outer loop vertex 6.2523 -4.01644 0 - vertex 5.98964 -3.63939 -0.1 + vertex 5.98964 -3.63939 -0.2 vertex 5.98964 -3.63939 0 endloop endfacet facet normal 0.820534 0.571597 0 outer loop - vertex 5.98964 -3.63939 -0.1 + vertex 5.98964 -3.63939 -0.2 vertex 6.2523 -4.01644 0 - vertex 6.2523 -4.01644 -0.1 + vertex 6.2523 -4.01644 -0.2 endloop endfacet facet normal 0.846837 0.531853 0 outer loop vertex 5.98964 -3.63939 0 - vertex 5.48552 -2.8367 -0.1 + vertex 5.48552 -2.8367 -0.2 vertex 5.48552 -2.8367 0 endloop endfacet facet normal 0.846837 0.531853 0 outer loop - vertex 5.48552 -2.8367 -0.1 + vertex 5.48552 -2.8367 -0.2 vertex 5.98964 -3.63939 0 - vertex 5.98964 -3.63939 -0.1 + vertex 5.98964 -3.63939 -0.2 endloop endfacet facet normal 0.876057 0.482207 0 outer loop vertex 5.48552 -2.8367 0 - vertex 5.03179 -2.01239 -0.1 + vertex 5.03179 -2.01239 -0.2 vertex 5.03179 -2.01239 0 endloop endfacet facet normal 0.876057 0.482207 0 outer loop - vertex 5.03179 -2.01239 -0.1 + vertex 5.03179 -2.01239 -0.2 vertex 5.48552 -2.8367 0 - vertex 5.48552 -2.8367 -0.1 + vertex 5.48552 -2.8367 -0.2 endloop endfacet facet normal 0.903486 0.428618 0 outer loop vertex 5.03179 -2.01239 0 - vertex 4.65505 -1.21825 -0.1 + vertex 4.65505 -1.21825 -0.2 vertex 4.65505 -1.21825 0 endloop endfacet facet normal 0.903486 0.428618 0 outer loop - vertex 4.65505 -1.21825 -0.1 + vertex 4.65505 -1.21825 -0.2 vertex 5.03179 -2.01239 0 - vertex 5.03179 -2.01239 -0.1 + vertex 5.03179 -2.01239 -0.2 endloop endfacet facet normal 0.925537 0.378657 0 outer loop vertex 4.65505 -1.21825 0 - vertex 4.50386 -0.848697 -0.1 + vertex 4.50386 -0.848697 -0.2 vertex 4.50386 -0.848697 0 endloop endfacet facet normal 0.925537 0.378657 0 outer loop - vertex 4.50386 -0.848697 -0.1 + vertex 4.50386 -0.848697 -0.2 vertex 4.65505 -1.21825 0 - vertex 4.65505 -1.21825 -0.1 + vertex 4.65505 -1.21825 -0.2 endloop endfacet facet normal 0.942067 0.335426 0 outer loop vertex 4.50386 -0.848697 0 - vertex 4.38188 -0.506111 -0.1 + vertex 4.38188 -0.506111 -0.2 vertex 4.38188 -0.506111 0 endloop endfacet facet normal 0.942067 0.335426 0 outer loop - vertex 4.38188 -0.506111 -0.1 + vertex 4.38188 -0.506111 -0.2 vertex 4.50386 -0.848697 0 - vertex 4.50386 -0.848697 -0.1 + vertex 4.50386 -0.848697 -0.2 endloop endfacet facet normal 0.960602 0.277927 0 outer loop vertex 4.38188 -0.506111 0 - vertex 4.29244 -0.196974 -0.1 + vertex 4.29244 -0.196974 -0.2 vertex 4.29244 -0.196974 0 endloop endfacet facet normal 0.960602 0.277927 0 outer loop - vertex 4.29244 -0.196974 -0.1 + vertex 4.29244 -0.196974 -0.2 vertex 4.38188 -0.506111 0 - vertex 4.38188 -0.506111 -0.1 + vertex 4.38188 -0.506111 -0.2 endloop endfacet facet normal 0.980763 0.1952 0 outer loop vertex 4.29244 -0.196974 0 - vertex 4.23886 0.0722368 -0.1 + vertex 4.23886 0.0722368 -0.2 vertex 4.23886 0.0722368 0 endloop endfacet facet normal 0.980763 0.1952 0 outer loop - vertex 4.23886 0.0722368 -0.1 + vertex 4.23886 0.0722368 -0.2 vertex 4.29244 -0.196974 0 - vertex 4.29244 -0.196974 -0.1 + vertex 4.29244 -0.196974 -0.2 endloop endfacet facet normal 0.997919 0.0644811 0 outer loop vertex 4.23886 0.0722368 0 - vertex 4.22446 0.295049 -0.1 + vertex 4.22446 0.295049 -0.2 vertex 4.22446 0.295049 0 endloop endfacet facet normal 0.997919 0.0644811 0 outer loop - vertex 4.22446 0.295049 -0.1 + vertex 4.22446 0.295049 -0.2 vertex 4.23886 0.0722368 0 - vertex 4.23886 0.0722368 -0.1 + vertex 4.23886 0.0722368 -0.2 endloop endfacet facet normal 0.986595 -0.163189 0 outer loop vertex 4.22446 0.295049 0 - vertex 4.25257 0.464986 -0.1 + vertex 4.25257 0.464986 -0.2 vertex 4.25257 0.464986 0 endloop endfacet facet normal 0.986595 -0.163189 0 outer loop - vertex 4.25257 0.464986 -0.1 + vertex 4.25257 0.464986 -0.2 vertex 4.22446 0.295049 0 - vertex 4.22446 0.295049 -0.1 + vertex 4.22446 0.295049 -0.2 endloop endfacet facet normal 0.930706 -0.365767 0 outer loop vertex 4.25257 0.464986 0 - vertex 4.33872 0.684191 -0.1 + vertex 4.33872 0.684191 -0.2 vertex 4.33872 0.684191 0 endloop endfacet facet normal 0.930706 -0.365767 0 outer loop - vertex 4.33872 0.684191 -0.1 + vertex 4.33872 0.684191 -0.2 vertex 4.25257 0.464986 0 - vertex 4.25257 0.464986 -0.1 + vertex 4.25257 0.464986 -0.2 endloop endfacet facet normal 0.83908 -0.544009 0 outer loop vertex 4.33872 0.684191 0 - vertex 4.3737 0.738144 -0.1 + vertex 4.3737 0.738144 -0.2 vertex 4.3737 0.738144 0 endloop endfacet facet normal 0.83908 -0.544009 0 outer loop - vertex 4.3737 0.738144 -0.1 + vertex 4.3737 0.738144 -0.2 vertex 4.33872 0.684191 0 - vertex 4.33872 0.684191 -0.1 + vertex 4.33872 0.684191 -0.2 endloop endfacet facet normal 0.430226 -0.902721 0 outer loop - vertex 4.3737 0.738144 -0.1 + vertex 4.3737 0.738144 -0.2 vertex 4.40839 0.754677 0 vertex 4.3737 0.738144 0 endloop @@ -37403,13 +37403,13 @@ solid OpenSCAD_Model facet normal 0.430226 -0.902721 0 outer loop vertex 4.40839 0.754677 0 - vertex 4.3737 0.738144 -0.1 - vertex 4.40839 0.754677 -0.1 + vertex 4.3737 0.738144 -0.2 + vertex 4.40839 0.754677 -0.2 endloop endfacet facet normal -0.483736 -0.875214 0 outer loop - vertex 4.40839 0.754677 -0.1 + vertex 4.40839 0.754677 -0.2 vertex 4.44662 0.733548 0 vertex 4.40839 0.754677 0 endloop @@ -37417,111 +37417,111 @@ solid OpenSCAD_Model facet normal -0.483736 -0.875214 -0 outer loop vertex 4.44662 0.733548 0 - vertex 4.40839 0.754677 -0.1 - vertex 4.44662 0.733548 -0.1 + vertex 4.40839 0.754677 -0.2 + vertex 4.44662 0.733548 -0.2 endloop endfacet facet normal -0.791399 -0.6113 0 outer loop - vertex 4.49221 0.674515 -0.1 + vertex 4.49221 0.674515 -0.2 vertex 4.44662 0.733548 0 - vertex 4.44662 0.733548 -0.1 + vertex 4.44662 0.733548 -0.2 endloop endfacet facet normal -0.791399 -0.6113 0 outer loop vertex 4.44662 0.733548 0 - vertex 4.49221 0.674515 -0.1 + vertex 4.49221 0.674515 -0.2 vertex 4.49221 0.674515 0 endloop endfacet facet normal -0.875249 -0.483672 0 outer loop - vertex 4.62083 0.441773 -0.1 + vertex 4.62083 0.441773 -0.2 vertex 4.49221 0.674515 0 - vertex 4.49221 0.674515 -0.1 + vertex 4.49221 0.674515 -0.2 endloop endfacet facet normal -0.875249 -0.483672 0 outer loop vertex 4.49221 0.674515 0 - vertex 4.62083 0.441773 -0.1 + vertex 4.62083 0.441773 -0.2 vertex 4.62083 0.441773 0 endloop endfacet facet normal -0.8234 -0.567461 0 outer loop - vertex 4.83246 0.134689 -0.1 + vertex 4.83246 0.134689 -0.2 vertex 4.62083 0.441773 0 - vertex 4.62083 0.441773 -0.1 + vertex 4.62083 0.441773 -0.2 endloop endfacet facet normal -0.8234 -0.567461 0 outer loop vertex 4.62083 0.441773 0 - vertex 4.83246 0.134689 -0.1 + vertex 4.83246 0.134689 -0.2 vertex 4.83246 0.134689 0 endloop endfacet facet normal -0.783851 -0.620949 0 outer loop - vertex 5.24358 -0.384283 -0.1 + vertex 5.24358 -0.384283 -0.2 vertex 4.83246 0.134689 0 - vertex 4.83246 0.134689 -0.1 + vertex 4.83246 0.134689 -0.2 endloop endfacet facet normal -0.783851 -0.620949 0 outer loop vertex 4.83246 0.134689 0 - vertex 5.24358 -0.384283 -0.1 + vertex 5.24358 -0.384283 -0.2 vertex 5.24358 -0.384283 0 endloop endfacet facet normal -0.766673 -0.642037 0 outer loop - vertex 5.79491 -1.04264 -0.1 + vertex 5.79491 -1.04264 -0.2 vertex 5.24358 -0.384283 0 - vertex 5.24358 -0.384283 -0.1 + vertex 5.24358 -0.384283 -0.2 endloop endfacet facet normal -0.766673 -0.642037 0 outer loop vertex 5.24358 -0.384283 0 - vertex 5.79491 -1.04264 -0.1 + vertex 5.79491 -1.04264 -0.2 vertex 5.79491 -1.04264 0 endloop endfacet facet normal -0.753766 -0.657143 0 outer loop - vertex 6.42718 -1.76788 -0.1 + vertex 6.42718 -1.76788 -0.2 vertex 5.79491 -1.04264 0 - vertex 5.79491 -1.04264 -0.1 + vertex 5.79491 -1.04264 -0.2 endloop endfacet facet normal -0.753766 -0.657143 0 outer loop vertex 5.79491 -1.04264 0 - vertex 6.42718 -1.76788 -0.1 + vertex 6.42718 -1.76788 -0.2 vertex 6.42718 -1.76788 0 endloop endfacet facet normal -0.728754 -0.684775 0 outer loop - vertex 7.10115 -2.48513 -0.1 + vertex 7.10115 -2.48513 -0.2 vertex 6.42718 -1.76788 0 - vertex 6.42718 -1.76788 -0.1 + vertex 6.42718 -1.76788 -0.2 endloop endfacet facet normal -0.728754 -0.684775 0 outer loop vertex 6.42718 -1.76788 0 - vertex 7.10115 -2.48513 -0.1 + vertex 7.10115 -2.48513 -0.2 vertex 7.10115 -2.48513 0 endloop endfacet facet normal -0.682466 -0.730918 0 outer loop - vertex 7.10115 -2.48513 -0.1 + vertex 7.10115 -2.48513 -0.2 vertex 7.75455 -3.09522 0 vertex 7.10115 -2.48513 0 endloop @@ -37529,13 +37529,13 @@ solid OpenSCAD_Model facet normal -0.682466 -0.730918 -0 outer loop vertex 7.75455 -3.09522 0 - vertex 7.10115 -2.48513 -0.1 - vertex 7.75455 -3.09522 -0.1 + vertex 7.10115 -2.48513 -0.2 + vertex 7.75455 -3.09522 -0.2 endloop endfacet facet normal -0.638085 -0.769966 0 outer loop - vertex 7.75455 -3.09522 -0.1 + vertex 7.75455 -3.09522 -0.2 vertex 8.0755 -3.36119 0 vertex 7.75455 -3.09522 0 endloop @@ -37543,13 +37543,13 @@ solid OpenSCAD_Model facet normal -0.638085 -0.769966 -0 outer loop vertex 8.0755 -3.36119 0 - vertex 7.75455 -3.09522 -0.1 - vertex 8.0755 -3.36119 -0.1 + vertex 7.75455 -3.09522 -0.2 + vertex 8.0755 -3.36119 -0.2 endloop endfacet facet normal -0.60305 -0.797703 0 outer loop - vertex 8.0755 -3.36119 -0.1 + vertex 8.0755 -3.36119 -0.2 vertex 8.39365 -3.60171 0 vertex 8.0755 -3.36119 0 endloop @@ -37557,13 +37557,13 @@ solid OpenSCAD_Model facet normal -0.60305 -0.797703 -0 outer loop vertex 8.39365 -3.60171 0 - vertex 8.0755 -3.36119 -0.1 - vertex 8.39365 -3.60171 -0.1 + vertex 8.0755 -3.36119 -0.2 + vertex 8.39365 -3.60171 -0.2 endloop endfacet facet normal -0.563259 -0.826281 0 outer loop - vertex 8.39365 -3.60171 -0.1 + vertex 8.39365 -3.60171 -0.2 vertex 8.70978 -3.81721 0 vertex 8.39365 -3.60171 0 endloop @@ -37571,13 +37571,13 @@ solid OpenSCAD_Model facet normal -0.563259 -0.826281 -0 outer loop vertex 8.70978 -3.81721 0 - vertex 8.39365 -3.60171 -0.1 - vertex 8.70978 -3.81721 -0.1 + vertex 8.39365 -3.60171 -0.2 + vertex 8.70978 -3.81721 -0.2 endloop endfacet facet normal -0.518472 -0.855094 0 outer loop - vertex 8.70978 -3.81721 -0.1 + vertex 8.70978 -3.81721 -0.2 vertex 9.02468 -4.00814 0 vertex 8.70978 -3.81721 0 endloop @@ -37585,13 +37585,13 @@ solid OpenSCAD_Model facet normal -0.518472 -0.855094 -0 outer loop vertex 9.02468 -4.00814 0 - vertex 8.70978 -3.81721 -0.1 - vertex 9.02468 -4.00814 -0.1 + vertex 8.70978 -3.81721 -0.2 + vertex 9.02468 -4.00814 -0.2 endloop endfacet facet normal -0.468624 -0.883398 0 outer loop - vertex 9.02468 -4.00814 -0.1 + vertex 9.02468 -4.00814 -0.2 vertex 9.33912 -4.17495 0 vertex 9.02468 -4.00814 0 endloop @@ -37599,13 +37599,13 @@ solid OpenSCAD_Model facet normal -0.468624 -0.883398 -0 outer loop vertex 9.33912 -4.17495 0 - vertex 9.02468 -4.00814 -0.1 - vertex 9.33912 -4.17495 -0.1 + vertex 9.02468 -4.00814 -0.2 + vertex 9.33912 -4.17495 -0.2 endloop endfacet facet normal -0.413918 -0.910314 0 outer loop - vertex 9.33912 -4.17495 -0.1 + vertex 9.33912 -4.17495 -0.2 vertex 9.65389 -4.31807 0 vertex 9.33912 -4.17495 0 endloop @@ -37613,13 +37613,13 @@ solid OpenSCAD_Model facet normal -0.413918 -0.910314 -0 outer loop vertex 9.65389 -4.31807 0 - vertex 9.33912 -4.17495 -0.1 - vertex 9.65389 -4.31807 -0.1 + vertex 9.33912 -4.17495 -0.2 + vertex 9.65389 -4.31807 -0.2 endloop endfacet facet normal -0.354841 -0.934927 0 outer loop - vertex 9.65389 -4.31807 -0.1 + vertex 9.65389 -4.31807 -0.2 vertex 9.96977 -4.43796 0 vertex 9.65389 -4.31807 0 endloop @@ -37627,13 +37627,13 @@ solid OpenSCAD_Model facet normal -0.354841 -0.934927 -0 outer loop vertex 9.96977 -4.43796 0 - vertex 9.65389 -4.31807 -0.1 - vertex 9.96977 -4.43796 -0.1 + vertex 9.65389 -4.31807 -0.2 + vertex 9.96977 -4.43796 -0.2 endloop endfacet facet normal -0.292213 -0.956353 0 outer loop - vertex 9.96977 -4.43796 -0.1 + vertex 9.96977 -4.43796 -0.2 vertex 10.2875 -4.53506 0 vertex 9.96977 -4.43796 0 endloop @@ -37641,13 +37641,13 @@ solid OpenSCAD_Model facet normal -0.292213 -0.956353 -0 outer loop vertex 10.2875 -4.53506 0 - vertex 9.96977 -4.43796 -0.1 - vertex 10.2875 -4.53506 -0.1 + vertex 9.96977 -4.43796 -0.2 + vertex 10.2875 -4.53506 -0.2 endloop endfacet facet normal -0.227161 -0.973857 0 outer loop - vertex 10.2875 -4.53506 -0.1 + vertex 10.2875 -4.53506 -0.2 vertex 10.608 -4.6098 0 vertex 10.2875 -4.53506 0 endloop @@ -37655,13 +37655,13 @@ solid OpenSCAD_Model facet normal -0.227161 -0.973857 -0 outer loop vertex 10.608 -4.6098 0 - vertex 10.2875 -4.53506 -0.1 - vertex 10.608 -4.6098 -0.1 + vertex 10.2875 -4.53506 -0.2 + vertex 10.608 -4.6098 -0.2 endloop endfacet facet normal -0.161011 -0.986953 0 outer loop - vertex 10.608 -4.6098 -0.1 + vertex 10.608 -4.6098 -0.2 vertex 10.9319 -4.66264 0 vertex 10.608 -4.6098 0 endloop @@ -37669,13 +37669,13 @@ solid OpenSCAD_Model facet normal -0.161011 -0.986953 -0 outer loop vertex 10.9319 -4.66264 0 - vertex 10.608 -4.6098 -0.1 - vertex 10.9319 -4.66264 -0.1 + vertex 10.608 -4.6098 -0.2 + vertex 10.9319 -4.66264 -0.2 endloop endfacet facet normal -0.0951962 -0.995459 0 outer loop - vertex 10.9319 -4.66264 -0.1 + vertex 10.9319 -4.66264 -0.2 vertex 11.26 -4.69402 0 vertex 10.9319 -4.66264 0 endloop @@ -37683,13 +37683,13 @@ solid OpenSCAD_Model facet normal -0.0951962 -0.995459 -0 outer loop vertex 11.26 -4.69402 0 - vertex 10.9319 -4.66264 -0.1 - vertex 11.26 -4.69402 -0.1 + vertex 10.9319 -4.66264 -0.2 + vertex 11.26 -4.69402 -0.2 endloop endfacet facet normal -0.0310839 -0.999517 0 outer loop - vertex 11.26 -4.69402 -0.1 + vertex 11.26 -4.69402 -0.2 vertex 11.5931 -4.70438 0 vertex 11.26 -4.69402 0 endloop @@ -37697,13 +37697,13 @@ solid OpenSCAD_Model facet normal -0.0310839 -0.999517 -0 outer loop vertex 11.5931 -4.70438 0 - vertex 11.26 -4.69402 -0.1 - vertex 11.5931 -4.70438 -0.1 + vertex 11.26 -4.69402 -0.2 + vertex 11.5931 -4.70438 -0.2 endloop endfacet facet normal 0.0736121 -0.997287 0 outer loop - vertex 11.5931 -4.70438 -0.1 + vertex 11.5931 -4.70438 -0.2 vertex 12.006 -4.67391 0 vertex 11.5931 -4.70438 0 endloop @@ -37711,13 +37711,13 @@ solid OpenSCAD_Model facet normal 0.0736121 -0.997287 0 outer loop vertex 12.006 -4.67391 0 - vertex 11.5931 -4.70438 -0.1 - vertex 12.006 -4.67391 -0.1 + vertex 11.5931 -4.70438 -0.2 + vertex 12.006 -4.67391 -0.2 endloop endfacet facet normal 0.209942 -0.977714 0 outer loop - vertex 12.006 -4.67391 -0.1 + vertex 12.006 -4.67391 -0.2 vertex 12.4149 -4.5861 0 vertex 12.006 -4.67391 0 endloop @@ -37725,13 +37725,13 @@ solid OpenSCAD_Model facet normal 0.209942 -0.977714 0 outer loop vertex 12.4149 -4.5861 0 - vertex 12.006 -4.67391 -0.1 - vertex 12.4149 -4.5861 -0.1 + vertex 12.006 -4.67391 -0.2 + vertex 12.4149 -4.5861 -0.2 endloop endfacet facet normal 0.332988 -0.942931 0 outer loop - vertex 12.4149 -4.5861 -0.1 + vertex 12.4149 -4.5861 -0.2 vertex 12.8106 -4.44636 0 vertex 12.4149 -4.5861 0 endloop @@ -37739,13 +37739,13 @@ solid OpenSCAD_Model facet normal 0.332988 -0.942931 0 outer loop vertex 12.8106 -4.44636 0 - vertex 12.4149 -4.5861 -0.1 - vertex 12.8106 -4.44636 -0.1 + vertex 12.4149 -4.5861 -0.2 + vertex 12.8106 -4.44636 -0.2 endloop endfacet facet normal 0.44663 -0.894719 0 outer loop - vertex 12.8106 -4.44636 -0.1 + vertex 12.8106 -4.44636 -0.2 vertex 13.1837 -4.26011 0 vertex 12.8106 -4.44636 0 endloop @@ -37753,13 +37753,13 @@ solid OpenSCAD_Model facet normal 0.44663 -0.894719 0 outer loop vertex 13.1837 -4.26011 0 - vertex 12.8106 -4.44636 -0.1 - vertex 13.1837 -4.26011 -0.1 + vertex 12.8106 -4.44636 -0.2 + vertex 13.1837 -4.26011 -0.2 endloop endfacet facet normal 0.554537 -0.832159 0 outer loop - vertex 13.1837 -4.26011 -0.1 + vertex 13.1837 -4.26011 -0.2 vertex 13.5249 -4.03275 0 vertex 13.1837 -4.26011 0 endloop @@ -37767,13 +37767,13 @@ solid OpenSCAD_Model facet normal 0.554537 -0.832159 0 outer loop vertex 13.5249 -4.03275 0 - vertex 13.1837 -4.26011 -0.1 - vertex 13.5249 -4.03275 -0.1 + vertex 13.1837 -4.26011 -0.2 + vertex 13.5249 -4.03275 -0.2 endloop endfacet facet normal 0.65941 -0.751784 0 outer loop - vertex 13.5249 -4.03275 -0.1 + vertex 13.5249 -4.03275 -0.2 vertex 13.8248 -3.7697 0 vertex 13.5249 -4.03275 0 endloop @@ -37781,237 +37781,237 @@ solid OpenSCAD_Model facet normal 0.65941 -0.751784 0 outer loop vertex 13.8248 -3.7697 0 - vertex 13.5249 -4.03275 -0.1 - vertex 13.8248 -3.7697 -0.1 + vertex 13.5249 -4.03275 -0.2 + vertex 13.8248 -3.7697 -0.2 endloop endfacet facet normal 0.762012 -0.647563 0 outer loop vertex 13.8248 -3.7697 0 - vertex 14.0741 -3.47638 -0.1 + vertex 14.0741 -3.47638 -0.2 vertex 14.0741 -3.47638 0 endloop endfacet facet normal 0.762012 -0.647563 0 outer loop - vertex 14.0741 -3.47638 -0.1 + vertex 14.0741 -3.47638 -0.2 vertex 13.8248 -3.7697 0 - vertex 13.8248 -3.7697 -0.1 + vertex 13.8248 -3.7697 -0.2 endloop endfacet facet normal 0.835702 -0.549183 0 outer loop vertex 14.0741 -3.47638 0 - vertex 14.1768 -3.32005 -0.1 + vertex 14.1768 -3.32005 -0.2 vertex 14.1768 -3.32005 0 endloop endfacet facet normal 0.835702 -0.549183 0 outer loop - vertex 14.1768 -3.32005 -0.1 + vertex 14.1768 -3.32005 -0.2 vertex 14.0741 -3.47638 0 - vertex 14.0741 -3.47638 -0.1 + vertex 14.0741 -3.47638 -0.2 endloop endfacet facet normal 0.88181 -0.471605 0 outer loop vertex 14.1768 -3.32005 0 - vertex 14.2634 -3.15818 -0.1 + vertex 14.2634 -3.15818 -0.2 vertex 14.2634 -3.15818 0 endloop endfacet facet normal 0.88181 -0.471605 0 outer loop - vertex 14.2634 -3.15818 -0.1 + vertex 14.2634 -3.15818 -0.2 vertex 14.1768 -3.32005 0 - vertex 14.1768 -3.32005 -0.1 + vertex 14.1768 -3.32005 -0.2 endloop endfacet facet normal 0.950814 -0.309764 0 outer loop vertex 14.2634 -3.15818 0 - vertex 14.3256 -2.96711 -0.1 + vertex 14.3256 -2.96711 -0.2 vertex 14.3256 -2.96711 0 endloop endfacet facet normal 0.950814 -0.309764 0 outer loop - vertex 14.3256 -2.96711 -0.1 + vertex 14.3256 -2.96711 -0.2 vertex 14.2634 -3.15818 0 - vertex 14.2634 -3.15818 -0.1 + vertex 14.2634 -3.15818 -0.2 endloop endfacet facet normal 0.996178 -0.0873495 0 outer loop vertex 14.3256 -2.96711 0 - vertex 14.3448 -2.7489 -0.1 + vertex 14.3448 -2.7489 -0.2 vertex 14.3448 -2.7489 0 endloop endfacet facet normal 0.996178 -0.0873495 0 outer loop - vertex 14.3448 -2.7489 -0.1 + vertex 14.3448 -2.7489 -0.2 vertex 14.3256 -2.96711 0 - vertex 14.3256 -2.96711 -0.1 + vertex 14.3256 -2.96711 -0.2 endloop endfacet facet normal 0.995552 0.0942095 0 outer loop vertex 14.3448 -2.7489 0 - vertex 14.3217 -2.5049 -0.1 + vertex 14.3217 -2.5049 -0.2 vertex 14.3217 -2.5049 0 endloop endfacet facet normal 0.995552 0.0942095 0 outer loop - vertex 14.3217 -2.5049 -0.1 + vertex 14.3217 -2.5049 -0.2 vertex 14.3448 -2.7489 0 - vertex 14.3448 -2.7489 -0.1 + vertex 14.3448 -2.7489 -0.2 endloop endfacet facet normal 0.972391 0.233358 0 outer loop vertex 14.3217 -2.5049 0 - vertex 14.2572 -2.23644 -0.1 + vertex 14.2572 -2.23644 -0.2 vertex 14.2572 -2.23644 0 endloop endfacet facet normal 0.972391 0.233358 0 outer loop - vertex 14.2572 -2.23644 -0.1 + vertex 14.2572 -2.23644 -0.2 vertex 14.3217 -2.5049 0 - vertex 14.3217 -2.5049 -0.1 + vertex 14.3217 -2.5049 -0.2 endloop endfacet facet normal 0.940985 0.338449 0 outer loop vertex 14.2572 -2.23644 0 - vertex 14.1524 -1.94488 -0.1 + vertex 14.1524 -1.94488 -0.2 vertex 14.1524 -1.94488 0 endloop endfacet facet normal 0.940985 0.338449 0 outer loop - vertex 14.1524 -1.94488 -0.1 + vertex 14.1524 -1.94488 -0.2 vertex 14.2572 -2.23644 0 - vertex 14.2572 -2.23644 -0.1 + vertex 14.2572 -2.23644 -0.2 endloop endfacet facet normal 0.908169 0.418604 0 outer loop vertex 14.1524 -1.94488 0 - vertex 14.008 -1.63155 -0.1 + vertex 14.008 -1.63155 -0.2 vertex 14.008 -1.63155 0 endloop endfacet facet normal 0.908169 0.418604 0 outer loop - vertex 14.008 -1.63155 -0.1 + vertex 14.008 -1.63155 -0.2 vertex 14.1524 -1.94488 0 - vertex 14.1524 -1.94488 -0.1 + vertex 14.1524 -1.94488 -0.2 endloop endfacet facet normal 0.876739 0.480967 0 outer loop vertex 14.008 -1.63155 0 - vertex 13.8249 -1.29782 -0.1 + vertex 13.8249 -1.29782 -0.2 vertex 13.8249 -1.29782 0 endloop endfacet facet normal 0.876739 0.480967 0 outer loop - vertex 13.8249 -1.29782 -0.1 + vertex 13.8249 -1.29782 -0.2 vertex 14.008 -1.63155 0 - vertex 14.008 -1.63155 -0.1 + vertex 14.008 -1.63155 -0.2 endloop endfacet facet normal 0.847618 0.530607 0 outer loop vertex 13.8249 -1.29782 0 - vertex 13.604 -0.945011 -0.1 + vertex 13.604 -0.945011 -0.2 vertex 13.604 -0.945011 0 endloop endfacet facet normal 0.847618 0.530607 0 outer loop - vertex 13.604 -0.945011 -0.1 + vertex 13.604 -0.945011 -0.2 vertex 13.8249 -1.29782 0 - vertex 13.8249 -1.29782 -0.1 + vertex 13.8249 -1.29782 -0.2 endloop endfacet facet normal 0.820927 0.571033 0 outer loop vertex 13.604 -0.945011 0 - vertex 13.3463 -0.574481 -0.1 + vertex 13.3463 -0.574481 -0.2 vertex 13.3463 -0.574481 0 endloop endfacet facet normal 0.820927 0.571033 0 outer loop - vertex 13.3463 -0.574481 -0.1 + vertex 13.3463 -0.574481 -0.2 vertex 13.604 -0.945011 0 - vertex 13.604 -0.945011 -0.1 + vertex 13.604 -0.945011 -0.2 endloop endfacet facet normal 0.796478 0.604667 0 outer loop vertex 13.3463 -0.574481 0 - vertex 13.0525 -0.187573 -0.1 + vertex 13.0525 -0.187573 -0.2 vertex 13.0525 -0.187573 0 endloop endfacet facet normal 0.796478 0.604667 0 outer loop - vertex 13.0525 -0.187573 -0.1 + vertex 13.0525 -0.187573 -0.2 vertex 13.3463 -0.574481 0 - vertex 13.3463 -0.574481 -0.1 + vertex 13.3463 -0.574481 -0.2 endloop endfacet facet normal 0.773983 0.633206 0 outer loop vertex 13.0525 -0.187573 0 - vertex 12.7237 0.214368 -0.1 + vertex 12.7237 0.214368 -0.2 vertex 12.7237 0.214368 0 endloop endfacet facet normal 0.773983 0.633206 0 outer loop - vertex 12.7237 0.214368 -0.1 + vertex 12.7237 0.214368 -0.2 vertex 13.0525 -0.187573 0 - vertex 13.0525 -0.187573 -0.1 + vertex 13.0525 -0.187573 -0.2 endloop endfacet facet normal 0.753142 0.657858 0 outer loop vertex 12.7237 0.214368 0 - vertex 12.3607 0.629996 -0.1 + vertex 12.3607 0.629996 -0.2 vertex 12.3607 0.629996 0 endloop endfacet facet normal 0.753142 0.657858 0 outer loop - vertex 12.3607 0.629996 -0.1 + vertex 12.3607 0.629996 -0.2 vertex 12.7237 0.214368 0 - vertex 12.7237 0.214368 -0.1 + vertex 12.7237 0.214368 -0.2 endloop endfacet facet normal 0.724343 0.68944 0 outer loop vertex 12.3607 0.629996 0 - vertex 11.5355 1.49693 -0.1 + vertex 11.5355 1.49693 -0.2 vertex 11.5355 1.49693 0 endloop endfacet facet normal 0.724343 0.68944 0 outer loop - vertex 11.5355 1.49693 -0.1 + vertex 11.5355 1.49693 -0.2 vertex 12.3607 0.629996 0 - vertex 12.3607 0.629996 -0.1 + vertex 12.3607 0.629996 -0.2 endloop endfacet facet normal 0.689461 0.724323 -0 outer loop - vertex 11.5355 1.49693 -0.1 + vertex 11.5355 1.49693 -0.2 vertex 10.5842 2.40247 0 vertex 11.5355 1.49693 0 endloop @@ -38019,13 +38019,13 @@ solid OpenSCAD_Model facet normal 0.689461 0.724323 0 outer loop vertex 10.5842 2.40247 0 - vertex 11.5355 1.49693 -0.1 - vertex 10.5842 2.40247 -0.1 + vertex 11.5355 1.49693 -0.2 + vertex 10.5842 2.40247 -0.2 endloop endfacet facet normal 0.659589 0.751627 -0 outer loop - vertex 10.5842 2.40247 -0.1 + vertex 10.5842 2.40247 -0.2 vertex 9.61741 3.25086 0 vertex 10.5842 2.40247 0 endloop @@ -38033,13 +38033,13 @@ solid OpenSCAD_Model facet normal 0.659589 0.751627 0 outer loop vertex 9.61741 3.25086 0 - vertex 10.5842 2.40247 -0.1 - vertex 9.61741 3.25086 -0.1 + vertex 10.5842 2.40247 -0.2 + vertex 9.61741 3.25086 -0.2 endloop endfacet facet normal 0.626395 0.779506 -0 outer loop - vertex 9.61741 3.25086 -0.1 + vertex 9.61741 3.25086 -0.2 vertex 9.29624 3.50894 0 vertex 9.61741 3.25086 0 endloop @@ -38047,13 +38047,13 @@ solid OpenSCAD_Model facet normal 0.626395 0.779506 0 outer loop vertex 9.29624 3.50894 0 - vertex 9.61741 3.25086 -0.1 - vertex 9.29624 3.50894 -0.1 + vertex 9.61741 3.25086 -0.2 + vertex 9.29624 3.50894 -0.2 endloop endfacet facet normal 0.533935 0.845526 -0 outer loop - vertex 9.29624 3.50894 -0.1 + vertex 9.29624 3.50894 -0.2 vertex 9.14614 3.60373 0 vertex 9.29624 3.50894 0 endloop @@ -38061,13 +38061,13 @@ solid OpenSCAD_Model facet normal 0.533935 0.845526 0 outer loop vertex 9.14614 3.60373 0 - vertex 9.29624 3.50894 -0.1 - vertex 9.14614 3.60373 -0.1 + vertex 9.29624 3.50894 -0.2 + vertex 9.14614 3.60373 -0.2 endloop endfacet facet normal 0.419972 0.907537 -0 outer loop - vertex 9.14614 3.60373 -0.1 + vertex 9.14614 3.60373 -0.2 vertex 9.03464 3.65533 0 vertex 9.14614 3.60373 0 endloop @@ -38075,13 +38075,13 @@ solid OpenSCAD_Model facet normal 0.419972 0.907537 0 outer loop vertex 9.03464 3.65533 0 - vertex 9.14614 3.60373 -0.1 - vertex 9.03464 3.65533 -0.1 + vertex 9.14614 3.60373 -0.2 + vertex 9.03464 3.65533 -0.2 endloop endfacet facet normal 0.545127 0.838353 -0 outer loop - vertex 9.03464 3.65533 -0.1 + vertex 9.03464 3.65533 -0.2 vertex 8.81858 3.79581 0 vertex 9.03464 3.65533 0 endloop @@ -38089,13 +38089,13 @@ solid OpenSCAD_Model facet normal 0.545127 0.838353 0 outer loop vertex 8.81858 3.79581 0 - vertex 9.03464 3.65533 -0.1 - vertex 8.81858 3.79581 -0.1 + vertex 9.03464 3.65533 -0.2 + vertex 8.81858 3.79581 -0.2 endloop endfacet facet normal 0.596587 0.802549 -0 outer loop - vertex 8.81858 3.79581 -0.1 + vertex 8.81858 3.79581 -0.2 vertex 8.19732 4.25764 0 vertex 8.81858 3.79581 0 endloop @@ -38103,13 +38103,13 @@ solid OpenSCAD_Model facet normal 0.596587 0.802549 0 outer loop vertex 8.19732 4.25764 0 - vertex 8.81858 3.79581 -0.1 - vertex 8.19732 4.25764 -0.1 + vertex 8.81858 3.79581 -0.2 + vertex 8.19732 4.25764 -0.2 endloop endfacet facet normal 0.576403 0.817166 -0 outer loop - vertex 8.19732 4.25764 -0.1 + vertex 8.19732 4.25764 -0.2 vertex 8.00725 4.39171 0 vertex 8.19732 4.25764 0 endloop @@ -38117,13 +38117,13 @@ solid OpenSCAD_Model facet normal 0.576403 0.817166 0 outer loop vertex 8.00725 4.39171 0 - vertex 8.19732 4.25764 -0.1 - vertex 8.00725 4.39171 -0.1 + vertex 8.19732 4.25764 -0.2 + vertex 8.00725 4.39171 -0.2 endloop endfacet facet normal 0.52168 0.853141 -0 outer loop - vertex 8.00725 4.39171 -0.1 + vertex 8.00725 4.39171 -0.2 vertex 7.75154 4.54807 0 vertex 8.00725 4.39171 0 endloop @@ -38131,13 +38131,13 @@ solid OpenSCAD_Model facet normal 0.52168 0.853141 0 outer loop vertex 7.75154 4.54807 0 - vertex 8.00725 4.39171 -0.1 - vertex 7.75154 4.54807 -0.1 + vertex 8.00725 4.39171 -0.2 + vertex 7.75154 4.54807 -0.2 endloop endfacet facet normal 0.475339 0.879803 -0 outer loop - vertex 7.75154 4.54807 -0.1 + vertex 7.75154 4.54807 -0.2 vertex 7.07462 4.9138 0 vertex 7.75154 4.54807 0 endloop @@ -38145,13 +38145,13 @@ solid OpenSCAD_Model facet normal 0.475339 0.879803 0 outer loop vertex 7.07462 4.9138 0 - vertex 7.75154 4.54807 -0.1 - vertex 7.07462 4.9138 -0.1 + vertex 7.75154 4.54807 -0.2 + vertex 7.07462 4.9138 -0.2 endloop endfacet facet normal 0.439259 0.89836 -0 outer loop - vertex 7.07462 4.9138 -0.1 + vertex 7.07462 4.9138 -0.2 vertex 6.22936 5.32709 0 vertex 7.07462 4.9138 0 endloop @@ -38159,13 +38159,13 @@ solid OpenSCAD_Model facet normal 0.439259 0.89836 0 outer loop vertex 6.22936 5.32709 0 - vertex 7.07462 4.9138 -0.1 - vertex 6.22936 5.32709 -0.1 + vertex 7.07462 4.9138 -0.2 + vertex 6.22936 5.32709 -0.2 endloop endfacet facet normal 0.414563 0.910021 -0 outer loop - vertex 6.22936 5.32709 -0.1 + vertex 6.22936 5.32709 -0.2 vertex 5.27855 5.76024 0 vertex 6.22936 5.32709 0 endloop @@ -38173,13 +38173,13 @@ solid OpenSCAD_Model facet normal 0.414563 0.910021 0 outer loop vertex 5.27855 5.76024 0 - vertex 6.22936 5.32709 -0.1 - vertex 5.27855 5.76024 -0.1 + vertex 6.22936 5.32709 -0.2 + vertex 5.27855 5.76024 -0.2 endloop endfacet facet normal 0.393495 0.919327 -0 outer loop - vertex 5.27855 5.76024 -0.1 + vertex 5.27855 5.76024 -0.2 vertex 4.285 6.1855 0 vertex 5.27855 5.76024 0 endloop @@ -38187,13 +38187,13 @@ solid OpenSCAD_Model facet normal 0.393495 0.919327 0 outer loop vertex 4.285 6.1855 0 - vertex 5.27855 5.76024 -0.1 - vertex 4.285 6.1855 -0.1 + vertex 5.27855 5.76024 -0.2 + vertex 4.285 6.1855 -0.2 endloop endfacet facet normal 0.371607 0.92839 -0 outer loop - vertex 4.285 6.1855 -0.1 + vertex 4.285 6.1855 -0.2 vertex 3.31149 6.57517 0 vertex 4.285 6.1855 0 endloop @@ -38201,13 +38201,13 @@ solid OpenSCAD_Model facet normal 0.371607 0.92839 0 outer loop vertex 3.31149 6.57517 0 - vertex 4.285 6.1855 -0.1 - vertex 3.31149 6.57517 -0.1 + vertex 4.285 6.1855 -0.2 + vertex 3.31149 6.57517 -0.2 endloop endfacet facet normal 0.344035 0.938957 -0 outer loop - vertex 3.31149 6.57517 -0.1 + vertex 3.31149 6.57517 -0.2 vertex 2.42084 6.9015 0 vertex 3.31149 6.57517 0 endloop @@ -38215,13 +38215,13 @@ solid OpenSCAD_Model facet normal 0.344035 0.938957 0 outer loop vertex 2.42084 6.9015 0 - vertex 3.31149 6.57517 -0.1 - vertex 2.42084 6.9015 -0.1 + vertex 3.31149 6.57517 -0.2 + vertex 2.42084 6.9015 -0.2 endloop endfacet facet normal 0.301156 0.953575 -0 outer loop - vertex 2.42084 6.9015 -0.1 + vertex 2.42084 6.9015 -0.2 vertex 1.67583 7.13679 0 vertex 2.42084 6.9015 0 endloop @@ -38229,13 +38229,13 @@ solid OpenSCAD_Model facet normal 0.301156 0.953575 0 outer loop vertex 1.67583 7.13679 0 - vertex 2.42084 6.9015 -0.1 - vertex 1.67583 7.13679 -0.1 + vertex 2.42084 6.9015 -0.2 + vertex 1.67583 7.13679 -0.2 endloop endfacet facet normal 0.313822 0.949482 -0 outer loop - vertex 1.67583 7.13679 -0.1 + vertex 1.67583 7.13679 -0.2 vertex 1.30727 7.25861 0 vertex 1.67583 7.13679 0 endloop @@ -38243,13 +38243,13 @@ solid OpenSCAD_Model facet normal 0.313822 0.949482 0 outer loop vertex 1.30727 7.25861 0 - vertex 1.67583 7.13679 -0.1 - vertex 1.30727 7.25861 -0.1 + vertex 1.67583 7.13679 -0.2 + vertex 1.30727 7.25861 -0.2 endloop endfacet facet normal 0.372489 0.928036 -0 outer loop - vertex 1.30727 7.25861 -0.1 + vertex 1.30727 7.25861 -0.2 vertex 0.855811 7.43981 0 vertex 1.30727 7.25861 0 endloop @@ -38257,13 +38257,13 @@ solid OpenSCAD_Model facet normal 0.372489 0.928036 0 outer loop vertex 0.855811 7.43981 0 - vertex 1.30727 7.25861 -0.1 - vertex 0.855811 7.43981 -0.1 + vertex 1.30727 7.25861 -0.2 + vertex 0.855811 7.43981 -0.2 endloop endfacet facet normal 0.420776 0.907164 -0 outer loop - vertex 0.855811 7.43981 -0.1 + vertex 0.855811 7.43981 -0.2 vertex -0.23691 7.94665 0 vertex 0.855811 7.43981 0 endloop @@ -38271,13 +38271,13 @@ solid OpenSCAD_Model facet normal 0.420776 0.907164 0 outer loop vertex -0.23691 7.94665 0 - vertex 0.855811 7.43981 -0.1 - vertex -0.23691 7.94665 -0.1 + vertex 0.855811 7.43981 -0.2 + vertex -0.23691 7.94665 -0.2 endloop endfacet facet normal 0.458228 0.888835 -0 outer loop - vertex -0.23691 7.94665 -0.1 + vertex -0.23691 7.94665 -0.2 vertex -1.48458 8.58988 0 vertex -0.23691 7.94665 0 endloop @@ -38285,13 +38285,13 @@ solid OpenSCAD_Model facet normal 0.458228 0.888835 0 outer loop vertex -1.48458 8.58988 0 - vertex -0.23691 7.94665 -0.1 - vertex -1.48458 8.58988 -0.1 + vertex -0.23691 7.94665 -0.2 + vertex -1.48458 8.58988 -0.2 endloop endfacet facet normal 0.484776 0.874638 -0 outer loop - vertex -1.48458 8.58988 -0.1 + vertex -1.48458 8.58988 -0.2 vertex -2.76946 9.30203 0 vertex -1.48458 8.58988 0 endloop @@ -38299,13 +38299,13 @@ solid OpenSCAD_Model facet normal 0.484776 0.874638 0 outer loop vertex -2.76946 9.30203 0 - vertex -1.48458 8.58988 -0.1 - vertex -2.76946 9.30203 -0.1 + vertex -1.48458 8.58988 -0.2 + vertex -2.76946 9.30203 -0.2 endloop endfacet facet normal 0.509783 0.860303 -0 outer loop - vertex -2.76946 9.30203 -0.1 + vertex -2.76946 9.30203 -0.2 vertex -3.97378 10.0157 0 vertex -2.76946 9.30203 0 endloop @@ -38313,13 +38313,13 @@ solid OpenSCAD_Model facet normal 0.509783 0.860303 0 outer loop vertex -3.97378 10.0157 0 - vertex -2.76946 9.30203 -0.1 - vertex -3.97378 10.0157 -0.1 + vertex -2.76946 9.30203 -0.2 + vertex -3.97378 10.0157 -0.2 endloop endfacet facet normal 0.541316 0.840819 -0 outer loop - vertex -3.97378 10.0157 -0.1 + vertex -3.97378 10.0157 -0.2 vertex -4.9798 10.6633 0 vertex -3.97378 10.0157 0 endloop @@ -38327,13 +38327,13 @@ solid OpenSCAD_Model facet normal 0.541316 0.840819 0 outer loop vertex -4.9798 10.6633 0 - vertex -3.97378 10.0157 -0.1 - vertex -4.9798 10.6633 -0.1 + vertex -3.97378 10.0157 -0.2 + vertex -4.9798 10.6633 -0.2 endloop endfacet facet normal 0.578658 0.81557 -0 outer loop - vertex -4.9798 10.6633 -0.1 + vertex -4.9798 10.6633 -0.2 vertex -5.37165 10.9414 0 vertex -4.9798 10.6633 0 endloop @@ -38341,13 +38341,13 @@ solid OpenSCAD_Model facet normal 0.578658 0.81557 0 outer loop vertex -5.37165 10.9414 0 - vertex -4.9798 10.6633 -0.1 - vertex -5.37165 10.9414 -0.1 + vertex -4.9798 10.6633 -0.2 + vertex -5.37165 10.9414 -0.2 endloop endfacet facet normal 0.621078 0.783749 -0 outer loop - vertex -5.37165 10.9414 -0.1 + vertex -5.37165 10.9414 -0.2 vertex -5.66976 11.1776 0 vertex -5.37165 10.9414 0 endloop @@ -38355,13 +38355,13 @@ solid OpenSCAD_Model facet normal 0.621078 0.783749 0 outer loop vertex -5.66976 11.1776 0 - vertex -5.37165 10.9414 -0.1 - vertex -5.66976 11.1776 -0.1 + vertex -5.37165 10.9414 -0.2 + vertex -5.66976 11.1776 -0.2 endloop endfacet facet normal 0.700224 0.713923 -0 outer loop - vertex -5.66976 11.1776 -0.1 + vertex -5.66976 11.1776 -0.2 vertex -5.85942 11.3636 0 vertex -5.66976 11.1776 0 endloop @@ -38369,69 +38369,69 @@ solid OpenSCAD_Model facet normal 0.700224 0.713923 0 outer loop vertex -5.85942 11.3636 0 - vertex -5.66976 11.1776 -0.1 - vertex -5.85942 11.3636 -0.1 + vertex -5.66976 11.1776 -0.2 + vertex -5.85942 11.3636 -0.2 endloop endfacet facet normal 0.822029 0.569446 0 outer loop vertex -5.85942 11.3636 0 - vertex -5.90899 11.4352 -0.1 + vertex -5.90899 11.4352 -0.2 vertex -5.90899 11.4352 0 endloop endfacet facet normal 0.822029 0.569446 0 outer loop - vertex -5.90899 11.4352 -0.1 + vertex -5.90899 11.4352 -0.2 vertex -5.85942 11.3636 0 - vertex -5.85942 11.3636 -0.1 + vertex -5.85942 11.3636 -0.2 endloop endfacet facet normal 0.95697 0.290185 0 outer loop vertex -5.90899 11.4352 0 - vertex -5.92592 11.491 -0.1 + vertex -5.92592 11.491 -0.2 vertex -5.92592 11.491 0 endloop endfacet facet normal 0.95697 0.290185 0 outer loop - vertex -5.92592 11.491 -0.1 + vertex -5.92592 11.491 -0.2 vertex -5.90899 11.4352 0 - vertex -5.90899 11.4352 -0.1 + vertex -5.90899 11.4352 -0.2 endloop endfacet facet normal 0.964129 -0.265435 0 outer loop vertex -5.92592 11.491 0 - vertex -5.91161 11.5429 -0.1 + vertex -5.91161 11.5429 -0.2 vertex -5.91161 11.5429 0 endloop endfacet facet normal 0.964129 -0.265435 0 outer loop - vertex -5.91161 11.5429 -0.1 + vertex -5.91161 11.5429 -0.2 vertex -5.92592 11.491 0 - vertex -5.92592 11.491 -0.1 + vertex -5.92592 11.491 -0.2 endloop endfacet facet normal 0.717664 -0.69639 0 outer loop vertex -5.91161 11.5429 0 - vertex -5.8692 11.5867 -0.1 + vertex -5.8692 11.5867 -0.2 vertex -5.8692 11.5867 0 endloop endfacet facet normal 0.717664 -0.69639 0 outer loop - vertex -5.8692 11.5867 -0.1 + vertex -5.8692 11.5867 -0.2 vertex -5.91161 11.5429 0 - vertex -5.91161 11.5429 -0.1 + vertex -5.91161 11.5429 -0.2 endloop endfacet facet normal 0.453397 -0.891309 0 outer loop - vertex -5.8692 11.5867 -0.1 + vertex -5.8692 11.5867 -0.2 vertex -5.79943 11.6221 0 vertex -5.8692 11.5867 0 endloop @@ -38439,13 +38439,13 @@ solid OpenSCAD_Model facet normal 0.453397 -0.891309 0 outer loop vertex -5.79943 11.6221 0 - vertex -5.8692 11.5867 -0.1 - vertex -5.79943 11.6221 -0.1 + vertex -5.8692 11.5867 -0.2 + vertex -5.79943 11.6221 -0.2 endloop endfacet facet normal 0.272626 -0.96212 0 outer loop - vertex -5.79943 11.6221 -0.1 + vertex -5.79943 11.6221 -0.2 vertex -5.70304 11.6495 0 vertex -5.79943 11.6221 0 endloop @@ -38453,13 +38453,13 @@ solid OpenSCAD_Model facet normal 0.272626 -0.96212 0 outer loop vertex -5.70304 11.6495 0 - vertex -5.79943 11.6221 -0.1 - vertex -5.70304 11.6495 -0.1 + vertex -5.79943 11.6221 -0.2 + vertex -5.70304 11.6495 -0.2 endloop endfacet facet normal 0.111359 -0.99378 0 outer loop - vertex -5.70304 11.6495 -0.1 + vertex -5.70304 11.6495 -0.2 vertex -5.4334 11.6797 0 vertex -5.70304 11.6495 0 endloop @@ -38467,13 +38467,13 @@ solid OpenSCAD_Model facet normal 0.111359 -0.99378 0 outer loop vertex -5.4334 11.6797 0 - vertex -5.70304 11.6495 -0.1 - vertex -5.4334 11.6797 -0.1 + vertex -5.70304 11.6495 -0.2 + vertex -5.4334 11.6797 -0.2 endloop endfacet facet normal -0.00575054 -0.999983 0 outer loop - vertex -5.4334 11.6797 -0.1 + vertex -5.4334 11.6797 -0.2 vertex -5.06624 11.6776 0 vertex -5.4334 11.6797 0 endloop @@ -38481,13 +38481,13 @@ solid OpenSCAD_Model facet normal -0.00575054 -0.999983 -0 outer loop vertex -5.06624 11.6776 0 - vertex -5.4334 11.6797 -0.1 - vertex -5.06624 11.6776 -0.1 + vertex -5.4334 11.6797 -0.2 + vertex -5.06624 11.6776 -0.2 endloop endfacet facet normal -0.0742941 -0.997236 0 outer loop - vertex -5.06624 11.6776 -0.1 + vertex -5.06624 11.6776 -0.2 vertex -4.60751 11.6434 0 vertex -5.06624 11.6776 0 endloop @@ -38495,13 +38495,13 @@ solid OpenSCAD_Model facet normal -0.0742941 -0.997236 -0 outer loop vertex -4.60751 11.6434 0 - vertex -5.06624 11.6776 -0.1 - vertex -4.60751 11.6434 -0.1 + vertex -5.06624 11.6776 -0.2 + vertex -4.60751 11.6434 -0.2 endloop endfacet facet normal -0.120331 -0.992734 0 outer loop - vertex -4.60751 11.6434 -0.1 + vertex -4.60751 11.6434 -0.2 vertex -4.06319 11.5774 0 vertex -4.60751 11.6434 0 endloop @@ -38509,13 +38509,13 @@ solid OpenSCAD_Model facet normal -0.120331 -0.992734 -0 outer loop vertex -4.06319 11.5774 0 - vertex -4.60751 11.6434 -0.1 - vertex -4.06319 11.5774 -0.1 + vertex -4.60751 11.6434 -0.2 + vertex -4.06319 11.5774 -0.2 endloop endfacet facet normal -0.154416 -0.988006 0 outer loop - vertex -4.06319 11.5774 -0.1 + vertex -4.06319 11.5774 -0.2 vertex -3.43924 11.4799 0 vertex -4.06319 11.5774 0 endloop @@ -38523,13 +38523,13 @@ solid OpenSCAD_Model facet normal -0.154416 -0.988006 -0 outer loop vertex -3.43924 11.4799 0 - vertex -4.06319 11.5774 -0.1 - vertex -3.43924 11.4799 -0.1 + vertex -4.06319 11.5774 -0.2 + vertex -3.43924 11.4799 -0.2 endloop endfacet facet normal -0.181553 -0.983381 0 outer loop - vertex -3.43924 11.4799 -0.1 + vertex -3.43924 11.4799 -0.2 vertex -2.74162 11.3511 0 vertex -3.43924 11.4799 0 endloop @@ -38537,13 +38537,13 @@ solid OpenSCAD_Model facet normal -0.181553 -0.983381 -0 outer loop vertex -2.74162 11.3511 0 - vertex -3.43924 11.4799 -0.1 - vertex -2.74162 11.3511 -0.1 + vertex -3.43924 11.4799 -0.2 + vertex -2.74162 11.3511 -0.2 endloop endfacet facet normal -0.168602 -0.985684 0 outer loop - vertex -2.74162 11.3511 -0.1 + vertex -2.74162 11.3511 -0.2 vertex -2.06279 11.235 0 vertex -2.74162 11.3511 0 endloop @@ -38551,13 +38551,13 @@ solid OpenSCAD_Model facet normal -0.168602 -0.985684 -0 outer loop vertex -2.06279 11.235 0 - vertex -2.74162 11.3511 -0.1 - vertex -2.06279 11.235 -0.1 + vertex -2.74162 11.3511 -0.2 + vertex -2.06279 11.235 -0.2 endloop endfacet facet normal -0.106074 -0.994358 0 outer loop - vertex -2.06279 11.235 -0.1 + vertex -2.06279 11.235 -0.2 vertex -1.45038 11.1697 0 vertex -2.06279 11.235 0 endloop @@ -38565,13 +38565,13 @@ solid OpenSCAD_Model facet normal -0.106074 -0.994358 -0 outer loop vertex -1.45038 11.1697 0 - vertex -2.06279 11.235 -0.1 - vertex -1.45038 11.1697 -0.1 + vertex -2.06279 11.235 -0.2 + vertex -1.45038 11.1697 -0.2 endloop endfacet facet normal -0.0235022 -0.999724 0 outer loop - vertex -1.45038 11.1697 -0.1 + vertex -1.45038 11.1697 -0.2 vertex -0.893798 11.1566 0 vertex -1.45038 11.1697 0 endloop @@ -38579,13 +38579,13 @@ solid OpenSCAD_Model facet normal -0.0235022 -0.999724 -0 outer loop vertex -0.893798 11.1566 0 - vertex -1.45038 11.1697 -0.1 - vertex -0.893798 11.1566 -0.1 + vertex -1.45038 11.1697 -0.2 + vertex -0.893798 11.1566 -0.2 endloop endfacet facet normal 0.0792039 -0.996858 0 outer loop - vertex -0.893798 11.1566 -0.1 + vertex -0.893798 11.1566 -0.2 vertex -0.382462 11.1972 0 vertex -0.893798 11.1566 0 endloop @@ -38593,13 +38593,13 @@ solid OpenSCAD_Model facet normal 0.0792039 -0.996858 0 outer loop vertex -0.382462 11.1972 0 - vertex -0.893798 11.1566 -0.1 - vertex -0.382462 11.1972 -0.1 + vertex -0.893798 11.1566 -0.2 + vertex -0.382462 11.1972 -0.2 endloop endfacet facet normal 0.197027 -0.980398 0 outer loop - vertex -0.382462 11.1972 -0.1 + vertex -0.382462 11.1972 -0.2 vertex 0.0942225 11.293 0 vertex -0.382462 11.1972 0 endloop @@ -38607,13 +38607,13 @@ solid OpenSCAD_Model facet normal 0.197027 -0.980398 0 outer loop vertex 0.0942225 11.293 0 - vertex -0.382462 11.1972 -0.1 - vertex 0.0942225 11.293 -0.1 + vertex -0.382462 11.1972 -0.2 + vertex 0.0942225 11.293 -0.2 endloop endfacet facet normal 0.319159 -0.947701 0 outer loop - vertex 0.0942225 11.293 -0.1 + vertex 0.0942225 11.293 -0.2 vertex 0.546849 11.4454 0 vertex 0.0942225 11.293 0 endloop @@ -38621,13 +38621,13 @@ solid OpenSCAD_Model facet normal 0.319159 -0.947701 0 outer loop vertex 0.546849 11.4454 0 - vertex 0.0942225 11.293 -0.1 - vertex 0.546849 11.4454 -0.1 + vertex 0.0942225 11.293 -0.2 + vertex 0.546849 11.4454 -0.2 endloop endfacet facet normal 0.432288 -0.901736 0 outer loop - vertex 0.546849 11.4454 -0.1 + vertex 0.546849 11.4454 -0.2 vertex 0.986004 11.656 0 vertex 0.546849 11.4454 0 endloop @@ -38635,13 +38635,13 @@ solid OpenSCAD_Model facet normal 0.432288 -0.901736 0 outer loop vertex 0.986004 11.656 0 - vertex 0.546849 11.4454 -0.1 - vertex 0.986004 11.656 -0.1 + vertex 0.546849 11.4454 -0.2 + vertex 0.986004 11.656 -0.2 endloop endfacet facet normal 0.52637 -0.850255 0 outer loop - vertex 0.986004 11.656 -0.1 + vertex 0.986004 11.656 -0.2 vertex 1.42228 11.926 0 vertex 0.986004 11.656 0 endloop @@ -38649,13 +38649,13 @@ solid OpenSCAD_Model facet normal 0.52637 -0.850255 0 outer loop vertex 1.42228 11.926 0 - vertex 0.986004 11.656 -0.1 - vertex 1.42228 11.926 -0.1 + vertex 0.986004 11.656 -0.2 + vertex 1.42228 11.926 -0.2 endloop endfacet facet normal 0.604613 -0.796519 0 outer loop - vertex 1.42228 11.926 -0.1 + vertex 1.42228 11.926 -0.2 vertex 1.72214 12.1537 0 vertex 1.42228 11.926 0 endloop @@ -38663,125 +38663,125 @@ solid OpenSCAD_Model facet normal 0.604613 -0.796519 0 outer loop vertex 1.72214 12.1537 0 - vertex 1.42228 11.926 -0.1 - vertex 1.72214 12.1537 -0.1 + vertex 1.42228 11.926 -0.2 + vertex 1.72214 12.1537 -0.2 endloop endfacet facet normal 0.710535 -0.703661 0 outer loop vertex 1.72214 12.1537 0 - vertex 1.81906 12.2515 -0.1 + vertex 1.81906 12.2515 -0.2 vertex 1.81906 12.2515 0 endloop endfacet facet normal 0.710535 -0.703661 0 outer loop - vertex 1.81906 12.2515 -0.1 + vertex 1.81906 12.2515 -0.2 vertex 1.72214 12.1537 0 - vertex 1.72214 12.1537 -0.1 + vertex 1.72214 12.1537 -0.2 endloop endfacet facet normal 0.820717 -0.571334 0 outer loop vertex 1.81906 12.2515 0 - vertex 1.88346 12.344 -0.1 + vertex 1.88346 12.344 -0.2 vertex 1.88346 12.344 0 endloop endfacet facet normal 0.820717 -0.571334 0 outer loop - vertex 1.88346 12.344 -0.1 + vertex 1.88346 12.344 -0.2 vertex 1.81906 12.2515 0 - vertex 1.81906 12.2515 -0.1 + vertex 1.81906 12.2515 -0.2 endloop endfacet facet normal 0.936854 -0.349721 0 outer loop vertex 1.88346 12.344 0 - vertex 1.91748 12.4352 -0.1 + vertex 1.91748 12.4352 -0.2 vertex 1.91748 12.4352 0 endloop endfacet facet normal 0.936854 -0.349721 0 outer loop - vertex 1.91748 12.4352 -0.1 + vertex 1.91748 12.4352 -0.2 vertex 1.88346 12.344 0 - vertex 1.88346 12.344 -0.1 + vertex 1.88346 12.344 -0.2 endloop endfacet facet normal 0.998121 -0.0612747 0 outer loop vertex 1.91748 12.4352 0 - vertex 1.92323 12.5289 -0.1 + vertex 1.92323 12.5289 -0.2 vertex 1.92323 12.5289 0 endloop endfacet facet normal 0.998121 -0.0612747 0 outer loop - vertex 1.92323 12.5289 -0.1 + vertex 1.92323 12.5289 -0.2 vertex 1.91748 12.4352 0 - vertex 1.91748 12.4352 -0.1 + vertex 1.91748 12.4352 -0.2 endloop endfacet facet normal 0.979928 0.199352 0 outer loop vertex 1.92323 12.5289 0 - vertex 1.90284 12.6291 -0.1 + vertex 1.90284 12.6291 -0.2 vertex 1.90284 12.6291 0 endloop endfacet facet normal 0.979928 0.199352 0 outer loop - vertex 1.90284 12.6291 -0.1 + vertex 1.90284 12.6291 -0.2 vertex 1.92323 12.5289 0 - vertex 1.92323 12.5289 -0.1 + vertex 1.92323 12.5289 -0.2 endloop endfacet facet normal 0.928124 0.372271 0 outer loop vertex 1.90284 12.6291 0 - vertex 1.85843 12.7398 -0.1 + vertex 1.85843 12.7398 -0.2 vertex 1.85843 12.7398 0 endloop endfacet facet normal 0.928124 0.372271 0 outer loop - vertex 1.85843 12.7398 -0.1 + vertex 1.85843 12.7398 -0.2 vertex 1.90284 12.6291 0 - vertex 1.90284 12.6291 -0.1 + vertex 1.90284 12.6291 -0.2 endloop endfacet facet normal 0.849902 0.526941 0 outer loop vertex 1.85843 12.7398 0 - vertex 1.7147 12.9716 -0.1 + vertex 1.7147 12.9716 -0.2 vertex 1.7147 12.9716 0 endloop endfacet facet normal 0.849902 0.526941 0 outer loop - vertex 1.7147 12.9716 -0.1 + vertex 1.7147 12.9716 -0.2 vertex 1.85843 12.7398 0 - vertex 1.85843 12.7398 -0.1 + vertex 1.85843 12.7398 -0.2 endloop endfacet facet normal 0.728356 0.685198 0 outer loop vertex 1.7147 12.9716 0 - vertex 1.51175 13.1874 -0.1 + vertex 1.51175 13.1874 -0.2 vertex 1.51175 13.1874 0 endloop endfacet facet normal 0.728356 0.685198 0 outer loop - vertex 1.51175 13.1874 -0.1 + vertex 1.51175 13.1874 -0.2 vertex 1.7147 12.9716 0 - vertex 1.7147 12.9716 -0.1 + vertex 1.7147 12.9716 -0.2 endloop endfacet facet normal 0.606497 0.795086 -0 outer loop - vertex 1.51175 13.1874 -0.1 + vertex 1.51175 13.1874 -0.2 vertex 1.25015 13.3869 0 vertex 1.51175 13.1874 0 endloop @@ -38789,13 +38789,13 @@ solid OpenSCAD_Model facet normal 0.606497 0.795086 0 outer loop vertex 1.25015 13.3869 0 - vertex 1.51175 13.1874 -0.1 - vertex 1.25015 13.3869 -0.1 + vertex 1.51175 13.1874 -0.2 + vertex 1.25015 13.3869 -0.2 endloop endfacet facet normal 0.497341 0.867555 -0 outer loop - vertex 1.25015 13.3869 -0.1 + vertex 1.25015 13.3869 -0.2 vertex 0.930489 13.5702 0 vertex 1.25015 13.3869 0 endloop @@ -38803,13 +38803,13 @@ solid OpenSCAD_Model facet normal 0.497341 0.867555 0 outer loop vertex 0.930489 13.5702 0 - vertex 1.25015 13.3869 -0.1 - vertex 0.930489 13.5702 -0.1 + vertex 1.25015 13.3869 -0.2 + vertex 0.930489 13.5702 -0.2 endloop endfacet facet normal 0.404567 0.914508 -0 outer loop - vertex 0.930489 13.5702 -0.1 + vertex 0.930489 13.5702 -0.2 vertex 0.55335 13.737 0 vertex 0.930489 13.5702 0 endloop @@ -38817,13 +38817,13 @@ solid OpenSCAD_Model facet normal 0.404567 0.914508 0 outer loop vertex 0.55335 13.737 0 - vertex 0.930489 13.5702 -0.1 - vertex 0.55335 13.737 -0.1 + vertex 0.930489 13.5702 -0.2 + vertex 0.55335 13.737 -0.2 endloop endfacet facet normal 0.327265 0.944933 -0 outer loop - vertex 0.55335 13.737 -0.1 + vertex 0.55335 13.737 -0.2 vertex 0.119316 13.8873 0 vertex 0.55335 13.737 0 endloop @@ -38831,13 +38831,13 @@ solid OpenSCAD_Model facet normal 0.327265 0.944933 0 outer loop vertex 0.119316 13.8873 0 - vertex 0.55335 13.737 -0.1 - vertex 0.119316 13.8873 -0.1 + vertex 0.55335 13.737 -0.2 + vertex 0.119316 13.8873 -0.2 endloop endfacet facet normal 0.263047 0.964783 -0 outer loop - vertex 0.119316 13.8873 -0.1 + vertex 0.119316 13.8873 -0.2 vertex -0.371032 14.021 0 vertex 0.119316 13.8873 0 endloop @@ -38845,13 +38845,13 @@ solid OpenSCAD_Model facet normal 0.263047 0.964783 0 outer loop vertex -0.371032 14.021 0 - vertex 0.119316 13.8873 -0.1 - vertex -0.371032 14.021 -0.1 + vertex 0.119316 13.8873 -0.2 + vertex -0.371032 14.021 -0.2 endloop endfacet facet normal 0.209418 0.977826 -0 outer loop - vertex -0.371032 14.021 -0.1 + vertex -0.371032 14.021 -0.2 vertex -0.917111 14.138 0 vertex -0.371032 14.021 0 endloop @@ -38859,13 +38859,13 @@ solid OpenSCAD_Model facet normal 0.209418 0.977826 0 outer loop vertex -0.917111 14.138 0 - vertex -0.371032 14.021 -0.1 - vertex -0.917111 14.138 -0.1 + vertex -0.371032 14.021 -0.2 + vertex -0.917111 14.138 -0.2 endloop endfacet facet normal 0.164236 0.986421 -0 outer loop - vertex -0.917111 14.138 -0.1 + vertex -0.917111 14.138 -0.2 vertex -1.51834 14.2381 0 vertex -0.917111 14.138 0 endloop @@ -38873,13 +38873,13 @@ solid OpenSCAD_Model facet normal 0.164236 0.986421 0 outer loop vertex -1.51834 14.2381 0 - vertex -0.917111 14.138 -0.1 - vertex -1.51834 14.2381 -0.1 + vertex -0.917111 14.138 -0.2 + vertex -1.51834 14.2381 -0.2 endloop endfacet facet normal 0.125776 0.992059 -0 outer loop - vertex -1.51834 14.2381 -0.1 + vertex -1.51834 14.2381 -0.2 vertex -2.17413 14.3212 0 vertex -1.51834 14.2381 0 endloop @@ -38887,13 +38887,13 @@ solid OpenSCAD_Model facet normal 0.125776 0.992059 0 outer loop vertex -2.17413 14.3212 0 - vertex -1.51834 14.2381 -0.1 - vertex -2.17413 14.3212 -0.1 + vertex -1.51834 14.2381 -0.2 + vertex -2.17413 14.3212 -0.2 endloop endfacet facet normal 0.0926874 0.995695 -0 outer loop - vertex -2.17413 14.3212 -0.1 + vertex -2.17413 14.3212 -0.2 vertex -2.8839 14.3873 0 vertex -2.17413 14.3212 0 endloop @@ -38901,13 +38901,13 @@ solid OpenSCAD_Model facet normal 0.0926874 0.995695 0 outer loop vertex -2.8839 14.3873 0 - vertex -2.17413 14.3212 -0.1 - vertex -2.8839 14.3873 -0.1 + vertex -2.17413 14.3212 -0.2 + vertex -2.8839 14.3873 -0.2 endloop endfacet facet normal 0.0639318 0.997954 -0 outer loop - vertex -2.8839 14.3873 -0.1 + vertex -2.8839 14.3873 -0.2 vertex -3.64708 14.4362 0 vertex -2.8839 14.3873 0 endloop @@ -38915,13 +38915,13 @@ solid OpenSCAD_Model facet normal 0.0639318 0.997954 0 outer loop vertex -3.64708 14.4362 0 - vertex -2.8839 14.3873 -0.1 - vertex -3.64708 14.4362 -0.1 + vertex -2.8839 14.3873 -0.2 + vertex -3.64708 14.4362 -0.2 endloop endfacet facet normal 0.0386969 0.999251 -0 outer loop - vertex -3.64708 14.4362 -0.1 + vertex -3.64708 14.4362 -0.2 vertex -4.46307 14.4678 0 vertex -3.64708 14.4362 0 endloop @@ -38929,13 +38929,13 @@ solid OpenSCAD_Model facet normal 0.0386969 0.999251 0 outer loop vertex -4.46307 14.4678 0 - vertex -3.64708 14.4362 -0.1 - vertex -4.46307 14.4678 -0.1 + vertex -3.64708 14.4362 -0.2 + vertex -4.46307 14.4678 -0.2 endloop endfacet facet normal 0.0163522 0.999866 -0 outer loop - vertex -4.46307 14.4678 -0.1 + vertex -4.46307 14.4678 -0.2 vertex -5.33129 14.482 0 vertex -4.46307 14.4678 0 endloop @@ -38943,13 +38943,13 @@ solid OpenSCAD_Model facet normal 0.0163522 0.999866 0 outer loop vertex -5.33129 14.482 0 - vertex -4.46307 14.4678 -0.1 - vertex -5.33129 14.482 -0.1 + vertex -4.46307 14.4678 -0.2 + vertex -5.33129 14.482 -0.2 endloop endfacet facet normal -0.00360162 0.999994 0 outer loop - vertex -5.33129 14.482 -0.1 + vertex -5.33129 14.482 -0.2 vertex -6.25117 14.4787 0 vertex -5.33129 14.482 0 endloop @@ -38957,13 +38957,13 @@ solid OpenSCAD_Model facet normal -0.00360162 0.999994 0 outer loop vertex -6.25117 14.4787 0 - vertex -5.33129 14.482 -0.1 - vertex -6.25117 14.4787 -0.1 + vertex -5.33129 14.482 -0.2 + vertex -6.25117 14.4787 -0.2 endloop endfacet facet normal -0.0215556 0.999768 0 outer loop - vertex -6.25117 14.4787 -0.1 + vertex -6.25117 14.4787 -0.2 vertex -7.22211 14.4578 0 vertex -6.25117 14.4787 0 endloop @@ -38971,13 +38971,13 @@ solid OpenSCAD_Model facet normal -0.0215556 0.999768 0 outer loop vertex -7.22211 14.4578 0 - vertex -6.25117 14.4787 -0.1 - vertex -7.22211 14.4578 -0.1 + vertex -6.25117 14.4787 -0.2 + vertex -7.22211 14.4578 -0.2 endloop endfacet facet normal -0.0376222 0.999292 0 outer loop - vertex -7.22211 14.4578 -0.1 + vertex -7.22211 14.4578 -0.2 vertex -9.25643 14.3812 0 vertex -7.22211 14.4578 0 endloop @@ -38985,13 +38985,13 @@ solid OpenSCAD_Model facet normal -0.0376222 0.999292 0 outer loop vertex -9.25643 14.3812 0 - vertex -7.22211 14.4578 -0.1 - vertex -9.25643 14.3812 -0.1 + vertex -7.22211 14.4578 -0.2 + vertex -9.25643 14.3812 -0.2 endloop endfacet facet normal -0.0777977 0.996969 0 outer loop - vertex -9.25643 14.3812 -0.1 + vertex -9.25643 14.3812 -0.2 vertex -9.98725 14.3241 0 vertex -9.25643 14.3812 0 endloop @@ -38999,13 +38999,13 @@ solid OpenSCAD_Model facet normal -0.0777977 0.996969 0 outer loop vertex -9.98725 14.3241 0 - vertex -9.25643 14.3812 -0.1 - vertex -9.98725 14.3241 -0.1 + vertex -9.25643 14.3812 -0.2 + vertex -9.98725 14.3241 -0.2 endloop endfacet facet normal -0.133926 0.990991 0 outer loop - vertex -9.98725 14.3241 -0.1 + vertex -9.98725 14.3241 -0.2 vertex -10.6249 14.238 0 vertex -9.98725 14.3241 0 endloop @@ -39013,13 +39013,13 @@ solid OpenSCAD_Model facet normal -0.133926 0.990991 0 outer loop vertex -10.6249 14.238 0 - vertex -9.98725 14.3241 -0.1 - vertex -10.6249 14.238 -0.1 + vertex -9.98725 14.3241 -0.2 + vertex -10.6249 14.238 -0.2 endloop endfacet facet normal -0.202593 0.979263 0 outer loop - vertex -10.6249 14.238 -0.1 + vertex -10.6249 14.238 -0.2 vertex -11.2428 14.1101 0 vertex -10.6249 14.238 0 endloop @@ -39027,13 +39027,13 @@ solid OpenSCAD_Model facet normal -0.202593 0.979263 0 outer loop vertex -11.2428 14.1101 0 - vertex -10.6249 14.238 -0.1 - vertex -11.2428 14.1101 -0.1 + vertex -10.6249 14.238 -0.2 + vertex -11.2428 14.1101 -0.2 endloop endfacet facet normal -0.261603 0.965176 0 outer loop - vertex -11.2428 14.1101 -0.1 + vertex -11.2428 14.1101 -0.2 vertex -11.9142 13.9281 0 vertex -11.2428 14.1101 0 endloop @@ -39041,13 +39041,13 @@ solid OpenSCAD_Model facet normal -0.261603 0.965176 0 outer loop vertex -11.9142 13.9281 0 - vertex -11.2428 14.1101 -0.1 - vertex -11.9142 13.9281 -0.1 + vertex -11.2428 14.1101 -0.2 + vertex -11.9142 13.9281 -0.2 endloop endfacet facet normal -0.297369 0.954762 0 outer loop - vertex -11.9142 13.9281 -0.1 + vertex -11.9142 13.9281 -0.2 vertex -12.7125 13.6795 0 vertex -11.9142 13.9281 0 endloop @@ -39055,13 +39055,13 @@ solid OpenSCAD_Model facet normal -0.297369 0.954762 0 outer loop vertex -12.7125 13.6795 0 - vertex -11.9142 13.9281 -0.1 - vertex -12.7125 13.6795 -0.1 + vertex -11.9142 13.9281 -0.2 + vertex -12.7125 13.6795 -0.2 endloop endfacet facet normal -0.311908 0.950112 0 outer loop - vertex -12.7125 13.6795 -0.1 + vertex -12.7125 13.6795 -0.2 vertex -13.7109 13.3517 0 vertex -12.7125 13.6795 0 endloop @@ -39069,13 +39069,13 @@ solid OpenSCAD_Model facet normal -0.311908 0.950112 0 outer loop vertex -13.7109 13.3517 0 - vertex -12.7125 13.6795 -0.1 - vertex -13.7109 13.3517 -0.1 + vertex -12.7125 13.6795 -0.2 + vertex -13.7109 13.3517 -0.2 endloop endfacet facet normal -0.299976 0.953947 0 outer loop - vertex -13.7109 13.3517 -0.1 + vertex -13.7109 13.3517 -0.2 vertex -14.949 12.9624 0 vertex -13.7109 13.3517 0 endloop @@ -39083,13 +39083,13 @@ solid OpenSCAD_Model facet normal -0.299976 0.953947 0 outer loop vertex -14.949 12.9624 0 - vertex -13.7109 13.3517 -0.1 - vertex -14.949 12.9624 -0.1 + vertex -13.7109 13.3517 -0.2 + vertex -14.949 12.9624 -0.2 endloop endfacet facet normal -0.271422 0.96246 0 outer loop - vertex -14.949 12.9624 -0.1 + vertex -14.949 12.9624 -0.2 vertex -16.0795 12.6436 0 vertex -14.949 12.9624 0 endloop @@ -39097,13 +39097,13 @@ solid OpenSCAD_Model facet normal -0.271422 0.96246 0 outer loop vertex -16.0795 12.6436 0 - vertex -14.949 12.9624 -0.1 - vertex -16.0795 12.6436 -0.1 + vertex -14.949 12.9624 -0.2 + vertex -16.0795 12.6436 -0.2 endloop endfacet facet normal -0.233252 0.972416 0 outer loop - vertex -16.0795 12.6436 -0.1 + vertex -16.0795 12.6436 -0.2 vertex -16.9775 12.4282 0 vertex -16.0795 12.6436 0 endloop @@ -39111,13 +39111,13 @@ solid OpenSCAD_Model facet normal -0.233252 0.972416 0 outer loop vertex -16.9775 12.4282 0 - vertex -16.0795 12.6436 -0.1 - vertex -16.9775 12.4282 -0.1 + vertex -16.0795 12.6436 -0.2 + vertex -16.9775 12.4282 -0.2 endloop endfacet facet normal -0.178763 0.983892 0 outer loop - vertex -16.9775 12.4282 -0.1 + vertex -16.9775 12.4282 -0.2 vertex -17.3003 12.3696 0 vertex -16.9775 12.4282 0 endloop @@ -39125,13 +39125,13 @@ solid OpenSCAD_Model facet normal -0.178763 0.983892 0 outer loop vertex -17.3003 12.3696 0 - vertex -16.9775 12.4282 -0.1 - vertex -17.3003 12.3696 -0.1 + vertex -16.9775 12.4282 -0.2 + vertex -17.3003 12.3696 -0.2 endloop endfacet facet normal -0.0935268 0.995617 0 outer loop - vertex -17.3003 12.3696 -0.1 + vertex -17.3003 12.3696 -0.2 vertex -17.5181 12.3491 0 vertex -17.3003 12.3696 0 endloop @@ -39139,13 +39139,13 @@ solid OpenSCAD_Model facet normal -0.0935268 0.995617 0 outer loop vertex -17.5181 12.3491 0 - vertex -17.3003 12.3696 -0.1 - vertex -17.5181 12.3491 -0.1 + vertex -17.3003 12.3696 -0.2 + vertex -17.5181 12.3491 -0.2 endloop endfacet facet normal -0.0617051 0.998094 0 outer loop - vertex -17.5181 12.3491 -0.1 + vertex -17.5181 12.3491 -0.2 vertex -17.9556 12.3221 0 vertex -17.5181 12.3491 0 endloop @@ -39153,13 +39153,13 @@ solid OpenSCAD_Model facet normal -0.0617051 0.998094 0 outer loop vertex -17.9556 12.3221 0 - vertex -17.5181 12.3491 -0.1 - vertex -17.9556 12.3221 -0.1 + vertex -17.5181 12.3491 -0.2 + vertex -17.9556 12.3221 -0.2 endloop endfacet facet normal -0.11848 0.992956 0 outer loop - vertex -17.9556 12.3221 -0.1 + vertex -17.9556 12.3221 -0.2 vertex -18.5728 12.2484 0 vertex -17.9556 12.3221 0 endloop @@ -39167,13 +39167,13 @@ solid OpenSCAD_Model facet normal -0.11848 0.992956 0 outer loop vertex -18.5728 12.2484 0 - vertex -17.9556 12.3221 -0.1 - vertex -18.5728 12.2484 -0.1 + vertex -17.9556 12.3221 -0.2 + vertex -18.5728 12.2484 -0.2 endloop endfacet facet normal -0.150729 0.988575 0 outer loop - vertex -18.5728 12.2484 -0.1 + vertex -18.5728 12.2484 -0.2 vertex -19.2876 12.1394 0 vertex -18.5728 12.2484 0 endloop @@ -39181,13 +39181,13 @@ solid OpenSCAD_Model facet normal -0.150729 0.988575 0 outer loop vertex -19.2876 12.1394 0 - vertex -18.5728 12.2484 -0.1 - vertex -19.2876 12.1394 -0.1 + vertex -18.5728 12.2484 -0.2 + vertex -19.2876 12.1394 -0.2 endloop endfacet facet normal -0.179254 0.983803 0 outer loop - vertex -19.2876 12.1394 -0.1 + vertex -19.2876 12.1394 -0.2 vertex -20.0181 12.0063 0 vertex -19.2876 12.1394 0 endloop @@ -39195,13 +39195,13 @@ solid OpenSCAD_Model facet normal -0.179254 0.983803 0 outer loop vertex -20.0181 12.0063 0 - vertex -19.2876 12.1394 -0.1 - vertex -20.0181 12.0063 -0.1 + vertex -19.2876 12.1394 -0.2 + vertex -20.0181 12.0063 -0.2 endloop endfacet facet normal -0.161235 0.986916 0 outer loop - vertex -20.0181 12.0063 -0.1 + vertex -20.0181 12.0063 -0.2 vertex -20.4772 11.9313 0 vertex -20.0181 12.0063 0 endloop @@ -39209,13 +39209,13 @@ solid OpenSCAD_Model facet normal -0.161235 0.986916 0 outer loop vertex -20.4772 11.9313 0 - vertex -20.0181 12.0063 -0.1 - vertex -20.4772 11.9313 -0.1 + vertex -20.0181 12.0063 -0.2 + vertex -20.4772 11.9313 -0.2 endloop endfacet facet normal -0.116007 0.993248 0 outer loop - vertex -20.4772 11.9313 -0.1 + vertex -20.4772 11.9313 -0.2 vertex -21.0446 11.8651 0 vertex -20.4772 11.9313 0 endloop @@ -39223,13 +39223,13 @@ solid OpenSCAD_Model facet normal -0.116007 0.993248 0 outer loop vertex -21.0446 11.8651 0 - vertex -20.4772 11.9313 -0.1 - vertex -21.0446 11.8651 -0.1 + vertex -20.4772 11.9313 -0.2 + vertex -21.0446 11.8651 -0.2 endloop endfacet facet normal -0.076075 0.997102 0 outer loop - vertex -21.0446 11.8651 -0.1 + vertex -21.0446 11.8651 -0.2 vertex -22.4311 11.7593 0 vertex -21.0446 11.8651 0 endloop @@ -39237,13 +39237,13 @@ solid OpenSCAD_Model facet normal -0.076075 0.997102 0 outer loop vertex -22.4311 11.7593 0 - vertex -21.0446 11.8651 -0.1 - vertex -22.4311 11.7593 -0.1 + vertex -21.0446 11.8651 -0.2 + vertex -22.4311 11.7593 -0.2 endloop endfacet facet normal -0.0432101 0.999066 0 outer loop - vertex -22.4311 11.7593 -0.1 + vertex -22.4311 11.7593 -0.2 vertex -24.031 11.6901 0 vertex -22.4311 11.7593 0 endloop @@ -39251,13 +39251,13 @@ solid OpenSCAD_Model facet normal -0.0432101 0.999066 0 outer loop vertex -24.031 11.6901 0 - vertex -22.4311 11.7593 -0.1 - vertex -24.031 11.6901 -0.1 + vertex -22.4311 11.7593 -0.2 + vertex -24.031 11.6901 -0.2 endloop endfacet facet normal -0.0189053 0.999821 0 outer loop - vertex -24.031 11.6901 -0.1 + vertex -24.031 11.6901 -0.2 vertex -25.698 11.6586 0 vertex -24.031 11.6901 0 endloop @@ -39265,13 +39265,13 @@ solid OpenSCAD_Model facet normal -0.0189053 0.999821 0 outer loop vertex -25.698 11.6586 0 - vertex -24.031 11.6901 -0.1 - vertex -25.698 11.6586 -0.1 + vertex -24.031 11.6901 -0.2 + vertex -25.698 11.6586 -0.2 endloop endfacet facet normal 0.00456618 0.99999 -0 outer loop - vertex -25.698 11.6586 -0.1 + vertex -25.698 11.6586 -0.2 vertex -27.2855 11.6658 0 vertex -25.698 11.6586 0 endloop @@ -39279,13 +39279,13 @@ solid OpenSCAD_Model facet normal 0.00456618 0.99999 0 outer loop vertex -27.2855 11.6658 0 - vertex -25.698 11.6586 -0.1 - vertex -27.2855 11.6658 -0.1 + vertex -25.698 11.6586 -0.2 + vertex -27.2855 11.6658 -0.2 endloop endfacet facet normal 0.034581 0.999402 -0 outer loop - vertex -27.2855 11.6658 -0.1 + vertex -27.2855 11.6658 -0.2 vertex -28.647 11.7129 0 vertex -27.2855 11.6658 0 endloop @@ -39293,13 +39293,13 @@ solid OpenSCAD_Model facet normal 0.034581 0.999402 0 outer loop vertex -28.647 11.7129 0 - vertex -27.2855 11.6658 -0.1 - vertex -28.647 11.7129 -0.1 + vertex -27.2855 11.6658 -0.2 + vertex -28.647 11.7129 -0.2 endloop endfacet facet normal 0.0704155 0.997518 -0 outer loop - vertex -28.647 11.7129 -0.1 + vertex -28.647 11.7129 -0.2 vertex -29.1973 11.7518 0 vertex -28.647 11.7129 0 endloop @@ -39307,13 +39307,13 @@ solid OpenSCAD_Model facet normal 0.0704155 0.997518 0 outer loop vertex -29.1973 11.7518 0 - vertex -28.647 11.7129 -0.1 - vertex -29.1973 11.7518 -0.1 + vertex -28.647 11.7129 -0.2 + vertex -29.1973 11.7518 -0.2 endloop endfacet facet normal 0.111453 0.99377 -0 outer loop - vertex -29.1973 11.7518 -0.1 + vertex -29.1973 11.7518 -0.2 vertex -29.6362 11.801 0 vertex -29.1973 11.7518 0 endloop @@ -39321,13 +39321,13 @@ solid OpenSCAD_Model facet normal 0.111453 0.99377 0 outer loop vertex -29.6362 11.801 0 - vertex -29.1973 11.7518 -0.1 - vertex -29.6362 11.801 -0.1 + vertex -29.1973 11.7518 -0.2 + vertex -29.6362 11.801 -0.2 endloop endfacet facet normal 0.189706 0.981841 -0 outer loop - vertex -29.6362 11.801 -0.1 + vertex -29.6362 11.801 -0.2 vertex -29.9453 11.8607 0 vertex -29.6362 11.801 0 endloop @@ -39335,13 +39335,13 @@ solid OpenSCAD_Model facet normal 0.189706 0.981841 0 outer loop vertex -29.9453 11.8607 0 - vertex -29.6362 11.801 -0.1 - vertex -29.9453 11.8607 -0.1 + vertex -29.6362 11.801 -0.2 + vertex -29.9453 11.8607 -0.2 endloop endfacet facet normal 0.320034 0.947406 -0 outer loop - vertex -29.9453 11.8607 -0.1 + vertex -29.9453 11.8607 -0.2 vertex -30.0456 11.8946 0 vertex -29.9453 11.8607 0 endloop @@ -39349,13 +39349,13 @@ solid OpenSCAD_Model facet normal 0.320034 0.947406 0 outer loop vertex -30.0456 11.8946 0 - vertex -29.9453 11.8607 -0.1 - vertex -30.0456 11.8946 -0.1 + vertex -29.9453 11.8607 -0.2 + vertex -30.0456 11.8946 -0.2 endloop endfacet facet normal 0.514271 0.857628 -0 outer loop - vertex -30.0456 11.8946 -0.1 + vertex -30.0456 11.8946 -0.2 vertex -30.1065 11.9311 0 vertex -30.0456 11.8946 0 endloop @@ -39363,125 +39363,125 @@ solid OpenSCAD_Model facet normal 0.514271 0.857628 0 outer loop vertex -30.1065 11.9311 0 - vertex -30.0456 11.8946 -0.1 - vertex -30.1065 11.9311 -0.1 + vertex -30.0456 11.8946 -0.2 + vertex -30.1065 11.9311 -0.2 endloop endfacet facet normal 0.794078 0.607816 0 outer loop vertex -30.1065 11.9311 0 - vertex -30.2115 12.0683 -0.1 + vertex -30.2115 12.0683 -0.2 vertex -30.2115 12.0683 0 endloop endfacet facet normal 0.794078 0.607816 0 outer loop - vertex -30.2115 12.0683 -0.1 + vertex -30.2115 12.0683 -0.2 vertex -30.1065 11.9311 0 - vertex -30.1065 11.9311 -0.1 + vertex -30.1065 11.9311 -0.2 endloop endfacet facet normal 0.908198 0.418541 0 outer loop vertex -30.2115 12.0683 0 - vertex -30.2975 12.2549 -0.1 + vertex -30.2975 12.2549 -0.2 vertex -30.2975 12.2549 0 endloop endfacet facet normal 0.908198 0.418541 0 outer loop - vertex -30.2975 12.2549 -0.1 + vertex -30.2975 12.2549 -0.2 vertex -30.2115 12.0683 0 - vertex -30.2115 12.0683 -0.1 + vertex -30.2115 12.0683 -0.2 endloop endfacet facet normal 0.964271 0.264918 0 outer loop vertex -30.2975 12.2549 0 - vertex -30.3556 12.4664 -0.1 + vertex -30.3556 12.4664 -0.2 vertex -30.3556 12.4664 0 endloop endfacet facet normal 0.964271 0.264918 0 outer loop - vertex -30.3556 12.4664 -0.1 + vertex -30.3556 12.4664 -0.2 vertex -30.2975 12.2549 0 - vertex -30.2975 12.2549 -0.1 + vertex -30.2975 12.2549 -0.2 endloop endfacet facet normal 0.994966 0.10021 0 outer loop vertex -30.3556 12.4664 0 - vertex -30.377 12.6783 -0.1 + vertex -30.377 12.6783 -0.2 vertex -30.377 12.6783 0 endloop endfacet facet normal 0.994966 0.10021 0 outer loop - vertex -30.377 12.6783 -0.1 + vertex -30.377 12.6783 -0.2 vertex -30.3556 12.4664 0 - vertex -30.3556 12.4664 -0.1 + vertex -30.3556 12.4664 -0.2 endloop endfacet facet normal 0.99734 -0.0728833 0 outer loop vertex -30.377 12.6783 0 - vertex -30.3621 12.8813 -0.1 + vertex -30.3621 12.8813 -0.2 vertex -30.3621 12.8813 0 endloop endfacet facet normal 0.99734 -0.0728833 0 outer loop - vertex -30.3621 12.8813 -0.1 + vertex -30.3621 12.8813 -0.2 vertex -30.377 12.6783 0 - vertex -30.377 12.6783 -0.1 + vertex -30.377 12.6783 -0.2 endloop endfacet facet normal 0.963268 -0.268541 0 outer loop vertex -30.3621 12.8813 0 - vertex -30.3387 12.9655 -0.1 + vertex -30.3387 12.9655 -0.2 vertex -30.3387 12.9655 0 endloop endfacet facet normal 0.963268 -0.268541 0 outer loop - vertex -30.3387 12.9655 -0.1 + vertex -30.3387 12.9655 -0.2 vertex -30.3621 12.8813 0 - vertex -30.3621 12.8813 -0.1 + vertex -30.3621 12.8813 -0.2 endloop endfacet facet normal 0.886257 -0.463194 0 outer loop vertex -30.3387 12.9655 0 - vertex -30.3001 13.0393 -0.1 + vertex -30.3001 13.0393 -0.2 vertex -30.3001 13.0393 0 endloop endfacet facet normal 0.886257 -0.463194 0 outer loop - vertex -30.3001 13.0393 -0.1 + vertex -30.3001 13.0393 -0.2 vertex -30.3387 12.9655 0 - vertex -30.3387 12.9655 -0.1 + vertex -30.3387 12.9655 -0.2 endloop endfacet facet normal 0.748065 -0.663625 0 outer loop vertex -30.3001 13.0393 0 - vertex -30.2432 13.1034 -0.1 + vertex -30.2432 13.1034 -0.2 vertex -30.2432 13.1034 0 endloop endfacet facet normal 0.748065 -0.663625 0 outer loop - vertex -30.2432 13.1034 -0.1 + vertex -30.2432 13.1034 -0.2 vertex -30.3001 13.0393 0 - vertex -30.3001 13.0393 -0.1 + vertex -30.3001 13.0393 -0.2 endloop endfacet facet normal 0.576127 -0.81736 0 outer loop - vertex -30.2432 13.1034 -0.1 + vertex -30.2432 13.1034 -0.2 vertex -30.1646 13.1588 0 vertex -30.2432 13.1034 0 endloop @@ -39489,13 +39489,13 @@ solid OpenSCAD_Model facet normal 0.576127 -0.81736 0 outer loop vertex -30.1646 13.1588 0 - vertex -30.2432 13.1034 -0.1 - vertex -30.1646 13.1588 -0.1 + vertex -30.2432 13.1034 -0.2 + vertex -30.1646 13.1588 -0.2 endloop endfacet facet normal 0.349457 -0.936953 0 outer loop - vertex -30.1646 13.1588 -0.1 + vertex -30.1646 13.1588 -0.2 vertex -29.9294 13.2465 0 vertex -30.1646 13.1588 0 endloop @@ -39503,13 +39503,13 @@ solid OpenSCAD_Model facet normal 0.349457 -0.936953 0 outer loop vertex -29.9294 13.2465 0 - vertex -30.1646 13.1588 -0.1 - vertex -29.9294 13.2465 -0.1 + vertex -30.1646 13.1588 -0.2 + vertex -29.9294 13.2465 -0.2 endloop endfacet facet normal 0.170605 -0.985339 0 outer loop - vertex -29.9294 13.2465 -0.1 + vertex -29.9294 13.2465 -0.2 vertex -29.5683 13.309 0 vertex -29.9294 13.2465 0 endloop @@ -39517,13 +39517,13 @@ solid OpenSCAD_Model facet normal 0.170605 -0.985339 0 outer loop vertex -29.5683 13.309 0 - vertex -29.9294 13.2465 -0.1 - vertex -29.5683 13.309 -0.1 + vertex -29.9294 13.2465 -0.2 + vertex -29.5683 13.309 -0.2 endloop endfacet facet normal 0.0853267 -0.996353 0 outer loop - vertex -29.5683 13.309 -0.1 + vertex -29.5683 13.309 -0.2 vertex -29.0548 13.353 0 vertex -29.5683 13.309 0 endloop @@ -39531,13 +39531,13 @@ solid OpenSCAD_Model facet normal 0.0853267 -0.996353 0 outer loop vertex -29.0548 13.353 0 - vertex -29.5683 13.309 -0.1 - vertex -29.0548 13.353 -0.1 + vertex -29.5683 13.309 -0.2 + vertex -29.0548 13.353 -0.2 endloop endfacet facet normal 0.0369327 -0.999318 0 outer loop - vertex -29.0548 13.353 -0.1 + vertex -29.0548 13.353 -0.2 vertex -27.4661 13.4117 0 vertex -29.0548 13.353 0 endloop @@ -39545,13 +39545,13 @@ solid OpenSCAD_Model facet normal 0.0369327 -0.999318 0 outer loop vertex -27.4661 13.4117 0 - vertex -29.0548 13.353 -0.1 - vertex -27.4661 13.4117 -0.1 + vertex -29.0548 13.353 -0.2 + vertex -27.4661 13.4117 -0.2 endloop endfacet facet normal 0.0488074 -0.998808 0 outer loop - vertex -27.4661 13.4117 -0.1 + vertex -27.4661 13.4117 -0.2 vertex -26.1544 13.4758 0 vertex -27.4661 13.4117 0 endloop @@ -39559,13 +39559,13 @@ solid OpenSCAD_Model facet normal 0.0488074 -0.998808 0 outer loop vertex -26.1544 13.4758 0 - vertex -27.4661 13.4117 -0.1 - vertex -26.1544 13.4758 -0.1 + vertex -27.4661 13.4117 -0.2 + vertex -26.1544 13.4758 -0.2 endloop endfacet facet normal 0.0958463 -0.995396 0 outer loop - vertex -26.1544 13.4758 -0.1 + vertex -26.1544 13.4758 -0.2 vertex -24.8613 13.6003 0 vertex -26.1544 13.4758 0 endloop @@ -39573,13 +39573,13 @@ solid OpenSCAD_Model facet normal 0.0958463 -0.995396 0 outer loop vertex -24.8613 13.6003 0 - vertex -26.1544 13.4758 -0.1 - vertex -24.8613 13.6003 -0.1 + vertex -26.1544 13.4758 -0.2 + vertex -24.8613 13.6003 -0.2 endloop endfacet facet normal 0.144031 -0.989573 0 outer loop - vertex -24.8613 13.6003 -0.1 + vertex -24.8613 13.6003 -0.2 vertex -23.579 13.787 0 vertex -24.8613 13.6003 0 endloop @@ -39587,13 +39587,13 @@ solid OpenSCAD_Model facet normal 0.144031 -0.989573 0 outer loop vertex -23.579 13.787 0 - vertex -24.8613 13.6003 -0.1 - vertex -23.579 13.787 -0.1 + vertex -24.8613 13.6003 -0.2 + vertex -23.579 13.787 -0.2 endloop endfacet facet normal 0.192155 -0.981365 0 outer loop - vertex -23.579 13.787 -0.1 + vertex -23.579 13.787 -0.2 vertex -22.3001 14.0374 0 vertex -23.579 13.787 0 endloop @@ -39601,13 +39601,13 @@ solid OpenSCAD_Model facet normal 0.192155 -0.981365 0 outer loop vertex -22.3001 14.0374 0 - vertex -23.579 13.787 -0.1 - vertex -22.3001 14.0374 -0.1 + vertex -23.579 13.787 -0.2 + vertex -22.3001 14.0374 -0.2 endloop endfacet facet normal 0.239032 -0.971012 0 outer loop - vertex -22.3001 14.0374 -0.1 + vertex -22.3001 14.0374 -0.2 vertex -21.0167 14.3533 0 vertex -22.3001 14.0374 0 endloop @@ -39615,13 +39615,13 @@ solid OpenSCAD_Model facet normal 0.239032 -0.971012 0 outer loop vertex -21.0167 14.3533 0 - vertex -22.3001 14.0374 -0.1 - vertex -21.0167 14.3533 -0.1 + vertex -22.3001 14.0374 -0.2 + vertex -21.0167 14.3533 -0.2 endloop endfacet facet normal 0.283599 -0.958943 0 outer loop - vertex -21.0167 14.3533 -0.1 + vertex -21.0167 14.3533 -0.2 vertex -19.7213 14.7364 0 vertex -21.0167 14.3533 0 endloop @@ -39629,13 +39629,13 @@ solid OpenSCAD_Model facet normal 0.283599 -0.958943 0 outer loop vertex -19.7213 14.7364 0 - vertex -21.0167 14.3533 -0.1 - vertex -19.7213 14.7364 -0.1 + vertex -21.0167 14.3533 -0.2 + vertex -19.7213 14.7364 -0.2 endloop endfacet facet normal 0.325025 -0.945706 0 outer loop - vertex -19.7213 14.7364 -0.1 + vertex -19.7213 14.7364 -0.2 vertex -18.4061 15.1884 0 vertex -19.7213 14.7364 0 endloop @@ -39643,13 +39643,13 @@ solid OpenSCAD_Model facet normal 0.325025 -0.945706 0 outer loop vertex -18.4061 15.1884 0 - vertex -19.7213 14.7364 -0.1 - vertex -18.4061 15.1884 -0.1 + vertex -19.7213 14.7364 -0.2 + vertex -18.4061 15.1884 -0.2 endloop endfacet facet normal 0.362736 -0.931892 0 outer loop - vertex -18.4061 15.1884 -0.1 + vertex -18.4061 15.1884 -0.2 vertex -17.0637 15.711 0 vertex -18.4061 15.1884 0 endloop @@ -39657,13 +39657,13 @@ solid OpenSCAD_Model facet normal 0.362736 -0.931892 0 outer loop vertex -17.0637 15.711 0 - vertex -18.4061 15.1884 -0.1 - vertex -17.0637 15.711 -0.1 + vertex -18.4061 15.1884 -0.2 + vertex -17.0637 15.711 -0.2 endloop endfacet facet normal 0.385262 -0.922807 0 outer loop - vertex -17.0637 15.711 -0.1 + vertex -17.0637 15.711 -0.2 vertex -16.4531 15.9659 0 vertex -17.0637 15.711 0 endloop @@ -39671,13 +39671,13 @@ solid OpenSCAD_Model facet normal 0.385262 -0.922807 0 outer loop vertex -16.4531 15.9659 0 - vertex -17.0637 15.711 -0.1 - vertex -16.4531 15.9659 -0.1 + vertex -17.0637 15.711 -0.2 + vertex -16.4531 15.9659 -0.2 endloop endfacet facet normal 0.409178 -0.912454 0 outer loop - vertex -16.4531 15.9659 -0.1 + vertex -16.4531 15.9659 -0.2 vertex -15.9397 16.1961 0 vertex -16.4531 15.9659 0 endloop @@ -39685,13 +39685,13 @@ solid OpenSCAD_Model facet normal 0.409178 -0.912454 0 outer loop vertex -15.9397 16.1961 0 - vertex -16.4531 15.9659 -0.1 - vertex -15.9397 16.1961 -0.1 + vertex -16.4531 15.9659 -0.2 + vertex -15.9397 16.1961 -0.2 endloop endfacet facet normal 0.452989 -0.891516 0 outer loop - vertex -15.9397 16.1961 -0.1 + vertex -15.9397 16.1961 -0.2 vertex -15.4716 16.4339 0 vertex -15.9397 16.1961 0 endloop @@ -39699,13 +39699,13 @@ solid OpenSCAD_Model facet normal 0.452989 -0.891516 0 outer loop vertex -15.4716 16.4339 0 - vertex -15.9397 16.1961 -0.1 - vertex -15.4716 16.4339 -0.1 + vertex -15.9397 16.1961 -0.2 + vertex -15.4716 16.4339 -0.2 endloop endfacet facet normal 0.505092 -0.863065 0 outer loop - vertex -15.4716 16.4339 -0.1 + vertex -15.4716 16.4339 -0.2 vertex -14.9972 16.7116 0 vertex -15.4716 16.4339 0 endloop @@ -39713,13 +39713,13 @@ solid OpenSCAD_Model facet normal 0.505092 -0.863065 0 outer loop vertex -14.9972 16.7116 0 - vertex -15.4716 16.4339 -0.1 - vertex -14.9972 16.7116 -0.1 + vertex -15.4716 16.4339 -0.2 + vertex -14.9972 16.7116 -0.2 endloop endfacet facet normal 0.548914 -0.835879 0 outer loop - vertex -14.9972 16.7116 -0.1 + vertex -14.9972 16.7116 -0.2 vertex -14.4648 17.0612 0 vertex -14.9972 16.7116 0 endloop @@ -39727,13 +39727,13 @@ solid OpenSCAD_Model facet normal 0.548914 -0.835879 0 outer loop vertex -14.4648 17.0612 0 - vertex -14.9972 16.7116 -0.1 - vertex -14.4648 17.0612 -0.1 + vertex -14.9972 16.7116 -0.2 + vertex -14.4648 17.0612 -0.2 endloop endfacet facet normal 0.577162 -0.81663 0 outer loop - vertex -14.4648 17.0612 -0.1 + vertex -14.4648 17.0612 -0.2 vertex -13.8225 17.5152 0 vertex -14.4648 17.0612 0 endloop @@ -39741,13 +39741,13 @@ solid OpenSCAD_Model facet normal 0.577162 -0.81663 0 outer loop vertex -13.8225 17.5152 0 - vertex -14.4648 17.0612 -0.1 - vertex -13.8225 17.5152 -0.1 + vertex -14.4648 17.0612 -0.2 + vertex -13.8225 17.5152 -0.2 endloop endfacet facet normal 0.595448 -0.803394 0 outer loop - vertex -13.8225 17.5152 -0.1 + vertex -13.8225 17.5152 -0.2 vertex -12.0016 18.8648 0 vertex -13.8225 17.5152 0 endloop @@ -39755,13 +39755,13 @@ solid OpenSCAD_Model facet normal 0.595448 -0.803394 0 outer loop vertex -12.0016 18.8648 0 - vertex -13.8225 17.5152 -0.1 - vertex -12.0016 18.8648 -0.1 + vertex -13.8225 17.5152 -0.2 + vertex -12.0016 18.8648 -0.2 endloop endfacet facet normal 0.610957 -0.791663 0 outer loop - vertex -12.0016 18.8648 -0.1 + vertex -12.0016 18.8648 -0.2 vertex -11.4702 19.2748 0 vertex -12.0016 18.8648 0 endloop @@ -39769,13 +39769,13 @@ solid OpenSCAD_Model facet normal 0.610957 -0.791663 0 outer loop vertex -11.4702 19.2748 0 - vertex -12.0016 18.8648 -0.1 - vertex -11.4702 19.2748 -0.1 + vertex -12.0016 18.8648 -0.2 + vertex -11.4702 19.2748 -0.2 endloop endfacet facet normal 0.661597 -0.749859 0 outer loop - vertex -11.4702 19.2748 -0.1 + vertex -11.4702 19.2748 -0.2 vertex -11.1091 19.5935 0 vertex -11.4702 19.2748 0 endloop @@ -39783,69 +39783,69 @@ solid OpenSCAD_Model facet normal 0.661597 -0.749859 0 outer loop vertex -11.1091 19.5935 0 - vertex -11.4702 19.2748 -0.1 - vertex -11.1091 19.5935 -0.1 + vertex -11.4702 19.2748 -0.2 + vertex -11.1091 19.5935 -0.2 endloop endfacet facet normal 0.747538 -0.664219 0 outer loop vertex -11.1091 19.5935 0 - vertex -10.9948 19.7221 -0.1 + vertex -10.9948 19.7221 -0.2 vertex -10.9948 19.7221 0 endloop endfacet facet normal 0.747538 -0.664219 0 outer loop - vertex -10.9948 19.7221 -0.1 + vertex -10.9948 19.7221 -0.2 vertex -11.1091 19.5935 0 - vertex -11.1091 19.5935 -0.1 + vertex -11.1091 19.5935 -0.2 endloop endfacet facet normal 0.848145 -0.529765 0 outer loop vertex -10.9948 19.7221 0 - vertex -10.9261 19.832 -0.1 + vertex -10.9261 19.832 -0.2 vertex -10.9261 19.832 0 endloop endfacet facet normal 0.848145 -0.529765 0 outer loop - vertex -10.9261 19.832 -0.1 + vertex -10.9261 19.832 -0.2 vertex -10.9948 19.7221 0 - vertex -10.9948 19.7221 -0.1 + vertex -10.9948 19.7221 -0.2 endloop endfacet facet normal 0.972725 -0.231962 0 outer loop vertex -10.9261 19.832 0 - vertex -10.904 19.9248 -0.1 + vertex -10.904 19.9248 -0.2 vertex -10.904 19.9248 0 endloop endfacet facet normal 0.972725 -0.231962 0 outer loop - vertex -10.904 19.9248 -0.1 + vertex -10.904 19.9248 -0.2 vertex -10.9261 19.832 0 - vertex -10.9261 19.832 -0.1 + vertex -10.9261 19.832 -0.2 endloop endfacet facet normal 0.949443 0.31394 0 outer loop vertex -10.904 19.9248 0 - vertex -10.9294 20.0018 -0.1 + vertex -10.9294 20.0018 -0.2 vertex -10.9294 20.0018 0 endloop endfacet facet normal 0.949443 0.31394 0 outer loop - vertex -10.9294 20.0018 -0.1 + vertex -10.9294 20.0018 -0.2 vertex -10.904 19.9248 0 - vertex -10.904 19.9248 -0.1 + vertex -10.904 19.9248 -0.2 endloop endfacet facet normal 0.645708 0.763585 -0 outer loop - vertex -10.9294 20.0018 -0.1 + vertex -10.9294 20.0018 -0.2 vertex -11.0035 20.0644 0 vertex -10.9294 20.0018 0 endloop @@ -39853,13 +39853,13 @@ solid OpenSCAD_Model facet normal 0.645708 0.763585 0 outer loop vertex -11.0035 20.0644 0 - vertex -10.9294 20.0018 -0.1 - vertex -11.0035 20.0644 -0.1 + vertex -10.9294 20.0018 -0.2 + vertex -11.0035 20.0644 -0.2 endloop endfacet facet normal 0.372622 0.927983 -0 outer loop - vertex -11.0035 20.0644 -0.1 + vertex -11.0035 20.0644 -0.2 vertex -11.1271 20.114 0 vertex -11.0035 20.0644 0 endloop @@ -39867,13 +39867,13 @@ solid OpenSCAD_Model facet normal 0.372622 0.927983 0 outer loop vertex -11.1271 20.114 0 - vertex -11.0035 20.0644 -0.1 - vertex -11.1271 20.114 -0.1 + vertex -11.0035 20.0644 -0.2 + vertex -11.1271 20.114 -0.2 endloop endfacet facet normal 0.213569 0.976928 -0 outer loop - vertex -11.1271 20.114 -0.1 + vertex -11.1271 20.114 -0.2 vertex -11.3013 20.1521 0 vertex -11.1271 20.114 0 endloop @@ -39881,13 +39881,13 @@ solid OpenSCAD_Model facet normal 0.213569 0.976928 0 outer loop vertex -11.3013 20.1521 0 - vertex -11.1271 20.114 -0.1 - vertex -11.3013 20.1521 -0.1 + vertex -11.1271 20.114 -0.2 + vertex -11.3013 20.1521 -0.2 endloop endfacet facet normal 0.122812 0.99243 -0 outer loop - vertex -11.3013 20.1521 -0.1 + vertex -11.3013 20.1521 -0.2 vertex -11.5271 20.1801 0 vertex -11.3013 20.1521 0 endloop @@ -39895,13 +39895,13 @@ solid OpenSCAD_Model facet normal 0.122812 0.99243 0 outer loop vertex -11.5271 20.1801 0 - vertex -11.3013 20.1521 -0.1 - vertex -11.5271 20.1801 -0.1 + vertex -11.3013 20.1521 -0.2 + vertex -11.5271 20.1801 -0.2 endloop endfacet facet normal 0.050903 0.998704 -0 outer loop - vertex -11.5271 20.1801 -0.1 + vertex -11.5271 20.1801 -0.2 vertex -12.1376 20.2112 0 vertex -11.5271 20.1801 0 endloop @@ -39909,13 +39909,13 @@ solid OpenSCAD_Model facet normal 0.050903 0.998704 0 outer loop vertex -12.1376 20.2112 0 - vertex -11.5271 20.1801 -0.1 - vertex -12.1376 20.2112 -0.1 + vertex -11.5271 20.1801 -0.2 + vertex -12.1376 20.2112 -0.2 endloop endfacet facet normal 0.00904467 0.999959 -0 outer loop - vertex -12.1376 20.2112 -0.1 + vertex -12.1376 20.2112 -0.2 vertex -12.9665 20.2187 0 vertex -12.1376 20.2112 0 endloop @@ -39923,13 +39923,13 @@ solid OpenSCAD_Model facet normal 0.00904467 0.999959 0 outer loop vertex -12.9665 20.2187 0 - vertex -12.1376 20.2112 -0.1 - vertex -12.9665 20.2187 -0.1 + vertex -12.1376 20.2112 -0.2 + vertex -12.9665 20.2187 -0.2 endloop endfacet facet normal -0.0191031 0.999818 0 outer loop - vertex -12.9665 20.2187 -0.1 + vertex -12.9665 20.2187 -0.2 vertex -13.9037 20.2008 0 vertex -12.9665 20.2187 0 endloop @@ -39937,13 +39937,13 @@ solid OpenSCAD_Model facet normal -0.0191031 0.999818 0 outer loop vertex -13.9037 20.2008 0 - vertex -12.9665 20.2187 -0.1 - vertex -13.9037 20.2008 -0.1 + vertex -12.9665 20.2187 -0.2 + vertex -13.9037 20.2008 -0.2 endloop endfacet facet normal -0.0506696 0.998715 0 outer loop - vertex -13.9037 20.2008 -0.1 + vertex -13.9037 20.2008 -0.2 vertex -14.8461 20.153 0 vertex -13.9037 20.2008 0 endloop @@ -39951,13 +39951,13 @@ solid OpenSCAD_Model facet normal -0.0506696 0.998715 0 outer loop vertex -14.8461 20.153 0 - vertex -13.9037 20.2008 -0.1 - vertex -14.8461 20.153 -0.1 + vertex -13.9037 20.2008 -0.2 + vertex -14.8461 20.153 -0.2 endloop endfacet facet normal -0.0837631 0.996486 0 outer loop - vertex -14.8461 20.153 -0.1 + vertex -14.8461 20.153 -0.2 vertex -15.684 20.0825 0 vertex -14.8461 20.153 0 endloop @@ -39965,13 +39965,13 @@ solid OpenSCAD_Model facet normal -0.0837631 0.996486 0 outer loop vertex -15.684 20.0825 0 - vertex -14.8461 20.153 -0.1 - vertex -15.684 20.0825 -0.1 + vertex -14.8461 20.153 -0.2 + vertex -15.684 20.0825 -0.2 endloop endfacet facet normal -0.136213 0.99068 0 outer loop - vertex -15.684 20.0825 -0.1 + vertex -15.684 20.0825 -0.2 vertex -16.3079 19.9967 0 vertex -15.684 20.0825 0 endloop @@ -39979,13 +39979,13 @@ solid OpenSCAD_Model facet normal -0.136213 0.99068 0 outer loop vertex -16.3079 19.9967 0 - vertex -15.684 20.0825 -0.1 - vertex -16.3079 19.9967 -0.1 + vertex -15.684 20.0825 -0.2 + vertex -16.3079 19.9967 -0.2 endloop endfacet facet normal -0.175854 0.984416 0 outer loop - vertex -16.3079 19.9967 -0.1 + vertex -16.3079 19.9967 -0.2 vertex -17.2235 19.8332 0 vertex -16.3079 19.9967 0 endloop @@ -39993,13 +39993,13 @@ solid OpenSCAD_Model facet normal -0.175854 0.984416 0 outer loop vertex -17.2235 19.8332 0 - vertex -16.3079 19.9967 -0.1 - vertex -17.2235 19.8332 -0.1 + vertex -16.3079 19.9967 -0.2 + vertex -17.2235 19.8332 -0.2 endloop endfacet facet normal -0.15721 0.987565 0 outer loop - vertex -17.2235 19.8332 -0.1 + vertex -17.2235 19.8332 -0.2 vertex -18.1791 19.6811 0 vertex -17.2235 19.8332 0 endloop @@ -40007,13 +40007,13 @@ solid OpenSCAD_Model facet normal -0.15721 0.987565 0 outer loop vertex -18.1791 19.6811 0 - vertex -17.2235 19.8332 -0.1 - vertex -18.1791 19.6811 -0.1 + vertex -17.2235 19.8332 -0.2 + vertex -18.1791 19.6811 -0.2 endloop endfacet facet normal -0.133206 0.991088 0 outer loop - vertex -18.1791 19.6811 -0.1 + vertex -18.1791 19.6811 -0.2 vertex -20.1671 19.4139 0 vertex -18.1791 19.6811 0 endloop @@ -40021,13 +40021,13 @@ solid OpenSCAD_Model facet normal -0.133206 0.991088 0 outer loop vertex -20.1671 19.4139 0 - vertex -18.1791 19.6811 -0.1 - vertex -20.1671 19.4139 -0.1 + vertex -18.1791 19.6811 -0.2 + vertex -20.1671 19.4139 -0.2 endloop endfacet facet normal -0.105044 0.994468 0 outer loop - vertex -20.1671 19.4139 -0.1 + vertex -20.1671 19.4139 -0.2 vertex -22.1849 19.2007 0 vertex -20.1671 19.4139 0 endloop @@ -40035,13 +40035,13 @@ solid OpenSCAD_Model facet normal -0.105044 0.994468 0 outer loop vertex -22.1849 19.2007 0 - vertex -20.1671 19.4139 -0.1 - vertex -22.1849 19.2007 -0.1 + vertex -20.1671 19.4139 -0.2 + vertex -22.1849 19.2007 -0.2 endloop endfacet facet normal -0.0780607 0.996949 0 outer loop - vertex -22.1849 19.2007 -0.1 + vertex -22.1849 19.2007 -0.2 vertex -24.1455 19.0472 0 vertex -22.1849 19.2007 0 endloop @@ -40049,13 +40049,13 @@ solid OpenSCAD_Model facet normal -0.0780607 0.996949 0 outer loop vertex -24.1455 19.0472 0 - vertex -22.1849 19.2007 -0.1 - vertex -24.1455 19.0472 -0.1 + vertex -22.1849 19.2007 -0.2 + vertex -24.1455 19.0472 -0.2 endloop endfacet facet normal -0.0485635 0.99882 0 outer loop - vertex -24.1455 19.0472 -0.1 + vertex -24.1455 19.0472 -0.2 vertex -25.9619 18.9589 0 vertex -24.1455 19.0472 0 endloop @@ -40063,13 +40063,13 @@ solid OpenSCAD_Model facet normal -0.0485635 0.99882 0 outer loop vertex -25.9619 18.9589 0 - vertex -24.1455 19.0472 -0.1 - vertex -25.9619 18.9589 -0.1 + vertex -24.1455 19.0472 -0.2 + vertex -25.9619 18.9589 -0.2 endloop endfacet facet normal -0.0217214 0.999764 0 outer loop - vertex -25.9619 18.9589 -0.1 + vertex -25.9619 18.9589 -0.2 vertex -26.7887 18.9409 0 vertex -25.9619 18.9589 0 endloop @@ -40077,13 +40077,13 @@ solid OpenSCAD_Model facet normal -0.0217214 0.999764 0 outer loop vertex -26.7887 18.9409 0 - vertex -25.9619 18.9589 -0.1 - vertex -26.7887 18.9409 -0.1 + vertex -25.9619 18.9589 -0.2 + vertex -26.7887 18.9409 -0.2 endloop endfacet facet normal 0.000558472 1 -0 outer loop - vertex -26.7887 18.9409 -0.1 + vertex -26.7887 18.9409 -0.2 vertex -27.5469 18.9414 0 vertex -26.7887 18.9409 0 endloop @@ -40091,13 +40091,13 @@ solid OpenSCAD_Model facet normal 0.000558472 1 0 outer loop vertex -27.5469 18.9414 0 - vertex -26.7887 18.9409 -0.1 - vertex -27.5469 18.9414 -0.1 + vertex -26.7887 18.9409 -0.2 + vertex -27.5469 18.9414 -0.2 endloop endfacet facet normal 0.0287379 0.999587 -0 outer loop - vertex -27.5469 18.9414 -0.1 + vertex -27.5469 18.9414 -0.2 vertex -28.2256 18.9609 0 vertex -27.5469 18.9414 0 endloop @@ -40105,13 +40105,13 @@ solid OpenSCAD_Model facet normal 0.0287379 0.999587 0 outer loop vertex -28.2256 18.9609 0 - vertex -27.5469 18.9414 -0.1 - vertex -28.2256 18.9609 -0.1 + vertex -27.5469 18.9414 -0.2 + vertex -28.2256 18.9609 -0.2 endloop endfacet facet normal 0.0666534 0.997776 -0 outer loop - vertex -28.2256 18.9609 -0.1 + vertex -28.2256 18.9609 -0.2 vertex -28.8137 19.0002 0 vertex -28.2256 18.9609 0 endloop @@ -40119,13 +40119,13 @@ solid OpenSCAD_Model facet normal 0.0666534 0.997776 0 outer loop vertex -28.8137 19.0002 0 - vertex -28.2256 18.9609 -0.1 - vertex -28.8137 19.0002 -0.1 + vertex -28.2256 18.9609 -0.2 + vertex -28.8137 19.0002 -0.2 endloop endfacet facet normal 0.121854 0.992548 -0 outer loop - vertex -28.8137 19.0002 -0.1 + vertex -28.8137 19.0002 -0.2 vertex -29.3006 19.0599 0 vertex -28.8137 19.0002 0 endloop @@ -40133,13 +40133,13 @@ solid OpenSCAD_Model facet normal 0.121854 0.992548 0 outer loop vertex -29.3006 19.0599 0 - vertex -28.8137 19.0002 -0.1 - vertex -29.3006 19.0599 -0.1 + vertex -28.8137 19.0002 -0.2 + vertex -29.3006 19.0599 -0.2 endloop endfacet facet normal 0.211179 0.977447 -0 outer loop - vertex -29.3006 19.0599 -0.1 + vertex -29.3006 19.0599 -0.2 vertex -29.6752 19.1409 0 vertex -29.3006 19.0599 0 endloop @@ -40147,13 +40147,13 @@ solid OpenSCAD_Model facet normal 0.211179 0.977447 0 outer loop vertex -29.6752 19.1409 0 - vertex -29.3006 19.0599 -0.1 - vertex -29.6752 19.1409 -0.1 + vertex -29.3006 19.0599 -0.2 + vertex -29.6752 19.1409 -0.2 endloop endfacet facet normal 0.291073 0.956701 -0 outer loop - vertex -29.6752 19.1409 -0.1 + vertex -29.6752 19.1409 -0.2 vertex -30.5811 19.4165 0 vertex -29.6752 19.1409 0 endloop @@ -40161,13 +40161,13 @@ solid OpenSCAD_Model facet normal 0.291073 0.956701 0 outer loop vertex -30.5811 19.4165 0 - vertex -29.6752 19.1409 -0.1 - vertex -30.5811 19.4165 -0.1 + vertex -29.6752 19.1409 -0.2 + vertex -30.5811 19.4165 -0.2 endloop endfacet facet normal 0.314696 0.949192 -0 outer loop - vertex -30.5811 19.4165 -0.1 + vertex -30.5811 19.4165 -0.2 vertex -31.4466 19.7034 0 vertex -30.5811 19.4165 0 endloop @@ -40175,13 +40175,13 @@ solid OpenSCAD_Model facet normal 0.314696 0.949192 0 outer loop vertex -31.4466 19.7034 0 - vertex -30.5811 19.4165 -0.1 - vertex -31.4466 19.7034 -0.1 + vertex -30.5811 19.4165 -0.2 + vertex -31.4466 19.7034 -0.2 endloop endfacet facet normal 0.339748 0.940516 -0 outer loop - vertex -31.4466 19.7034 -0.1 + vertex -31.4466 19.7034 -0.2 vertex -32.271 20.0012 0 vertex -31.4466 19.7034 0 endloop @@ -40189,13 +40189,13 @@ solid OpenSCAD_Model facet normal 0.339748 0.940516 0 outer loop vertex -32.271 20.0012 0 - vertex -31.4466 19.7034 -0.1 - vertex -32.271 20.0012 -0.1 + vertex -31.4466 19.7034 -0.2 + vertex -32.271 20.0012 -0.2 endloop endfacet facet normal 0.366429 0.930446 -0 outer loop - vertex -32.271 20.0012 -0.1 + vertex -32.271 20.0012 -0.2 vertex -33.0533 20.3093 0 vertex -32.271 20.0012 0 endloop @@ -40203,13 +40203,13 @@ solid OpenSCAD_Model facet normal 0.366429 0.930446 0 outer loop vertex -33.0533 20.3093 0 - vertex -32.271 20.0012 -0.1 - vertex -33.0533 20.3093 -0.1 + vertex -32.271 20.0012 -0.2 + vertex -33.0533 20.3093 -0.2 endloop endfacet facet normal 0.394948 0.918703 -0 outer loop - vertex -33.0533 20.3093 -0.1 + vertex -33.0533 20.3093 -0.2 vertex -33.7926 20.6272 0 vertex -33.0533 20.3093 0 endloop @@ -40217,13 +40217,13 @@ solid OpenSCAD_Model facet normal 0.394948 0.918703 0 outer loop vertex -33.7926 20.6272 0 - vertex -33.0533 20.3093 -0.1 - vertex -33.7926 20.6272 -0.1 + vertex -33.0533 20.3093 -0.2 + vertex -33.7926 20.6272 -0.2 endloop endfacet facet normal 0.425556 0.904932 -0 outer loop - vertex -33.7926 20.6272 -0.1 + vertex -33.7926 20.6272 -0.2 vertex -34.4881 20.9542 0 vertex -33.7926 20.6272 0 endloop @@ -40231,13 +40231,13 @@ solid OpenSCAD_Model facet normal 0.425556 0.904932 0 outer loop vertex -34.4881 20.9542 0 - vertex -33.7926 20.6272 -0.1 - vertex -34.4881 20.9542 -0.1 + vertex -33.7926 20.6272 -0.2 + vertex -34.4881 20.9542 -0.2 endloop endfacet facet normal 0.458522 0.888683 -0 outer loop - vertex -34.4881 20.9542 -0.1 + vertex -34.4881 20.9542 -0.2 vertex -35.1386 21.2899 0 vertex -34.4881 20.9542 0 endloop @@ -40245,13 +40245,13 @@ solid OpenSCAD_Model facet normal 0.458522 0.888683 0 outer loop vertex -35.1386 21.2899 0 - vertex -34.4881 20.9542 -0.1 - vertex -35.1386 21.2899 -0.1 + vertex -34.4881 20.9542 -0.2 + vertex -35.1386 21.2899 -0.2 endloop endfacet facet normal 0.494132 0.869387 -0 outer loop - vertex -35.1386 21.2899 -0.1 + vertex -35.1386 21.2899 -0.2 vertex -35.7435 21.6336 0 vertex -35.1386 21.2899 0 endloop @@ -40259,13 +40259,13 @@ solid OpenSCAD_Model facet normal 0.494132 0.869387 0 outer loop vertex -35.7435 21.6336 0 - vertex -35.1386 21.2899 -0.1 - vertex -35.7435 21.6336 -0.1 + vertex -35.1386 21.2899 -0.2 + vertex -35.7435 21.6336 -0.2 endloop endfacet facet normal 0.532679 0.846317 -0 outer loop - vertex -35.7435 21.6336 -0.1 + vertex -35.7435 21.6336 -0.2 vertex -36.3017 21.985 0 vertex -35.7435 21.6336 0 endloop @@ -40273,13 +40273,13 @@ solid OpenSCAD_Model facet normal 0.532679 0.846317 0 outer loop vertex -36.3017 21.985 0 - vertex -35.7435 21.6336 -0.1 - vertex -36.3017 21.985 -0.1 + vertex -35.7435 21.6336 -0.2 + vertex -36.3017 21.985 -0.2 endloop endfacet facet normal 0.574426 0.818556 -0 outer loop - vertex -36.3017 21.985 -0.1 + vertex -36.3017 21.985 -0.2 vertex -36.8124 22.3433 0 vertex -36.3017 21.985 0 endloop @@ -40287,13 +40287,13 @@ solid OpenSCAD_Model facet normal 0.574426 0.818556 0 outer loop vertex -36.8124 22.3433 0 - vertex -36.3017 21.985 -0.1 - vertex -36.8124 22.3433 -0.1 + vertex -36.3017 21.985 -0.2 + vertex -36.8124 22.3433 -0.2 endloop endfacet facet normal 0.619583 0.784931 -0 outer loop - vertex -36.8124 22.3433 -0.1 + vertex -36.8124 22.3433 -0.2 vertex -37.2746 22.7082 0 vertex -36.8124 22.3433 0 endloop @@ -40301,13 +40301,13 @@ solid OpenSCAD_Model facet normal 0.619583 0.784931 0 outer loop vertex -37.2746 22.7082 0 - vertex -36.8124 22.3433 -0.1 - vertex -37.2746 22.7082 -0.1 + vertex -36.8124 22.3433 -0.2 + vertex -37.2746 22.7082 -0.2 endloop endfacet facet normal 0.668193 0.743988 -0 outer loop - vertex -37.2746 22.7082 -0.1 + vertex -37.2746 22.7082 -0.2 vertex -37.6874 23.0789 0 vertex -37.2746 22.7082 0 endloop @@ -40315,139 +40315,139 @@ solid OpenSCAD_Model facet normal 0.668193 0.743988 0 outer loop vertex -37.6874 23.0789 0 - vertex -37.2746 22.7082 -0.1 - vertex -37.6874 23.0789 -0.1 + vertex -37.2746 22.7082 -0.2 + vertex -37.6874 23.0789 -0.2 endloop endfacet facet normal 0.720024 0.69395 0 outer loop vertex -37.6874 23.0789 0 - vertex -38.0499 23.455 -0.1 + vertex -38.0499 23.455 -0.2 vertex -38.0499 23.455 0 endloop endfacet facet normal 0.720024 0.69395 0 outer loop - vertex -38.0499 23.455 -0.1 + vertex -38.0499 23.455 -0.2 vertex -37.6874 23.0789 0 - vertex -37.6874 23.0789 -0.1 + vertex -37.6874 23.0789 -0.2 endloop endfacet facet normal 0.774355 0.632751 0 outer loop vertex -38.0499 23.455 0 - vertex -38.3611 23.836 -0.1 + vertex -38.3611 23.836 -0.2 vertex -38.3611 23.836 0 endloop endfacet facet normal 0.774355 0.632751 0 outer loop - vertex -38.3611 23.836 -0.1 + vertex -38.3611 23.836 -0.2 vertex -38.0499 23.455 0 - vertex -38.0499 23.455 -0.1 + vertex -38.0499 23.455 -0.2 endloop endfacet facet normal 0.829712 0.558192 0 outer loop vertex -38.3611 23.836 0 - vertex -38.6203 24.2212 -0.1 + vertex -38.6203 24.2212 -0.2 vertex -38.6203 24.2212 0 endloop endfacet facet normal 0.829712 0.558192 0 outer loop - vertex -38.6203 24.2212 -0.1 + vertex -38.6203 24.2212 -0.2 vertex -38.3611 23.836 0 - vertex -38.3611 23.836 -0.1 + vertex -38.3611 23.836 -0.2 endloop endfacet facet normal 0.883596 0.468251 0 outer loop vertex -38.6203 24.2212 0 - vertex -38.8265 24.6102 -0.1 + vertex -38.8265 24.6102 -0.2 vertex -38.8265 24.6102 0 endloop endfacet facet normal 0.883596 0.468251 0 outer loop - vertex -38.8265 24.6102 -0.1 + vertex -38.8265 24.6102 -0.2 vertex -38.6203 24.2212 0 - vertex -38.6203 24.2212 -0.1 + vertex -38.6203 24.2212 -0.2 endloop endfacet facet normal 0.926216 0.376994 0 outer loop vertex -38.8265 24.6102 0 - vertex -39.0227 25.0923 -0.1 + vertex -39.0227 25.0923 -0.2 vertex -39.0227 25.0923 0 endloop endfacet facet normal 0.926216 0.376994 0 outer loop - vertex -39.0227 25.0923 -0.1 + vertex -39.0227 25.0923 -0.2 vertex -38.8265 24.6102 0 - vertex -38.8265 24.6102 -0.1 + vertex -38.8265 24.6102 -0.2 endloop endfacet facet normal 0.967451 0.253059 0 outer loop vertex -39.0227 25.0923 0 - vertex -39.1186 25.4589 -0.1 + vertex -39.1186 25.4589 -0.2 vertex -39.1186 25.4589 0 endloop endfacet facet normal 0.967451 0.253059 0 outer loop - vertex -39.1186 25.4589 -0.1 + vertex -39.1186 25.4589 -0.2 vertex -39.0227 25.0923 0 - vertex -39.0227 25.0923 -0.1 + vertex -39.0227 25.0923 -0.2 endloop endfacet facet normal 0.996684 0.0813708 0 outer loop vertex -39.1186 25.4589 0 - vertex -39.13 25.5984 -0.1 + vertex -39.13 25.5984 -0.2 vertex -39.13 25.5984 0 endloop endfacet facet normal 0.996684 0.0813708 0 outer loop - vertex -39.13 25.5984 -0.1 + vertex -39.13 25.5984 -0.2 vertex -39.1186 25.4589 0 - vertex -39.1186 25.4589 -0.1 + vertex -39.1186 25.4589 -0.2 endloop endfacet facet normal 0.993685 -0.112203 0 outer loop vertex -39.13 25.5984 0 - vertex -39.1175 25.7085 -0.1 + vertex -39.1175 25.7085 -0.2 vertex -39.1175 25.7085 0 endloop endfacet facet normal 0.993685 -0.112203 0 outer loop - vertex -39.1175 25.7085 -0.1 + vertex -39.1175 25.7085 -0.2 vertex -39.13 25.5984 0 - vertex -39.13 25.5984 -0.1 + vertex -39.13 25.5984 -0.2 endloop endfacet facet normal 0.913337 -0.407205 0 outer loop vertex -39.1175 25.7085 0 - vertex -39.0817 25.7888 -0.1 + vertex -39.0817 25.7888 -0.2 vertex -39.0817 25.7888 0 endloop endfacet facet normal 0.913337 -0.407205 0 outer loop - vertex -39.0817 25.7888 -0.1 + vertex -39.0817 25.7888 -0.2 vertex -39.1175 25.7085 0 - vertex -39.1175 25.7085 -0.1 + vertex -39.1175 25.7085 -0.2 endloop endfacet facet normal 0.651025 -0.759057 0 outer loop - vertex -39.0817 25.7888 -0.1 + vertex -39.0817 25.7888 -0.2 vertex -39.0229 25.8392 0 vertex -39.0817 25.7888 0 endloop @@ -40455,13 +40455,13 @@ solid OpenSCAD_Model facet normal 0.651025 -0.759057 0 outer loop vertex -39.0229 25.8392 0 - vertex -39.0817 25.7888 -0.1 - vertex -39.0229 25.8392 -0.1 + vertex -39.0817 25.7888 -0.2 + vertex -39.0229 25.8392 -0.2 endloop endfacet facet normal 0.24215 -0.970239 0 outer loop - vertex -39.0229 25.8392 -0.1 + vertex -39.0229 25.8392 -0.2 vertex -38.9416 25.8595 0 vertex -39.0229 25.8392 0 endloop @@ -40469,13 +40469,13 @@ solid OpenSCAD_Model facet normal 0.24215 -0.970239 0 outer loop vertex -38.9416 25.8595 0 - vertex -39.0229 25.8392 -0.1 - vertex -38.9416 25.8595 -0.1 + vertex -39.0229 25.8392 -0.2 + vertex -38.9416 25.8595 -0.2 endloop endfacet facet normal -0.0965024 -0.995333 0 outer loop - vertex -38.9416 25.8595 -0.1 + vertex -38.9416 25.8595 -0.2 vertex -38.8381 25.8495 0 vertex -38.9416 25.8595 0 endloop @@ -40483,13 +40483,13 @@ solid OpenSCAD_Model facet normal -0.0965024 -0.995333 -0 outer loop vertex -38.8381 25.8495 0 - vertex -38.9416 25.8595 -0.1 - vertex -38.8381 25.8495 -0.1 + vertex -38.9416 25.8595 -0.2 + vertex -38.8381 25.8495 -0.2 endloop endfacet facet normal -0.308343 -0.951275 0 outer loop - vertex -38.8381 25.8495 -0.1 + vertex -38.8381 25.8495 -0.2 vertex -38.7129 25.8089 0 vertex -38.8381 25.8495 0 endloop @@ -40497,13 +40497,13 @@ solid OpenSCAD_Model facet normal -0.308343 -0.951275 -0 outer loop vertex -38.7129 25.8089 0 - vertex -38.8381 25.8495 -0.1 - vertex -38.7129 25.8089 -0.1 + vertex -38.8381 25.8495 -0.2 + vertex -38.7129 25.8089 -0.2 endloop endfacet facet normal -0.437843 -0.899052 0 outer loop - vertex -38.7129 25.8089 -0.1 + vertex -38.7129 25.8089 -0.2 vertex -38.5664 25.7376 0 vertex -38.7129 25.8089 0 endloop @@ -40511,13 +40511,13 @@ solid OpenSCAD_Model facet normal -0.437843 -0.899052 -0 outer loop vertex -38.5664 25.7376 0 - vertex -38.7129 25.8089 -0.1 - vertex -38.5664 25.7376 -0.1 + vertex -38.7129 25.8089 -0.2 + vertex -38.5664 25.7376 -0.2 endloop endfacet facet normal -0.553117 -0.833103 0 outer loop - vertex -38.5664 25.7376 -0.1 + vertex -38.5664 25.7376 -0.2 vertex -38.2113 25.5018 0 vertex -38.5664 25.7376 0 endloop @@ -40525,13 +40525,13 @@ solid OpenSCAD_Model facet normal -0.553117 -0.833103 -0 outer loop vertex -38.2113 25.5018 0 - vertex -38.5664 25.7376 -0.1 - vertex -38.2113 25.5018 -0.1 + vertex -38.5664 25.7376 -0.2 + vertex -38.2113 25.5018 -0.2 endloop endfacet facet normal -0.638761 -0.769405 0 outer loop - vertex -38.2113 25.5018 -0.1 + vertex -38.2113 25.5018 -0.2 vertex -37.776 25.1404 0 vertex -38.2113 25.5018 0 endloop @@ -40539,13 +40539,13 @@ solid OpenSCAD_Model facet normal -0.638761 -0.769405 -0 outer loop vertex -37.776 25.1404 0 - vertex -38.2113 25.5018 -0.1 - vertex -37.776 25.1404 -0.1 + vertex -38.2113 25.5018 -0.2 + vertex -37.776 25.1404 -0.2 endloop endfacet facet normal -0.64475 -0.764393 0 outer loop - vertex -37.776 25.1404 -0.1 + vertex -37.776 25.1404 -0.2 vertex -37.4147 24.8357 0 vertex -37.776 25.1404 0 endloop @@ -40553,13 +40553,13 @@ solid OpenSCAD_Model facet normal -0.64475 -0.764393 -0 outer loop vertex -37.4147 24.8357 0 - vertex -37.776 25.1404 -0.1 - vertex -37.4147 24.8357 -0.1 + vertex -37.776 25.1404 -0.2 + vertex -37.4147 24.8357 -0.2 endloop endfacet facet normal -0.602189 -0.798353 0 outer loop - vertex -37.4147 24.8357 -0.1 + vertex -37.4147 24.8357 -0.2 vertex -37.0225 24.5398 0 vertex -37.4147 24.8357 0 endloop @@ -40567,13 +40567,13 @@ solid OpenSCAD_Model facet normal -0.602189 -0.798353 -0 outer loop vertex -37.0225 24.5398 0 - vertex -37.4147 24.8357 -0.1 - vertex -37.0225 24.5398 -0.1 + vertex -37.4147 24.8357 -0.2 + vertex -37.0225 24.5398 -0.2 endloop endfacet facet normal -0.562472 -0.826816 0 outer loop - vertex -37.0225 24.5398 -0.1 + vertex -37.0225 24.5398 -0.2 vertex -36.6025 24.2541 0 vertex -37.0225 24.5398 0 endloop @@ -40581,13 +40581,13 @@ solid OpenSCAD_Model facet normal -0.562472 -0.826816 -0 outer loop vertex -36.6025 24.2541 0 - vertex -37.0225 24.5398 -0.1 - vertex -36.6025 24.2541 -0.1 + vertex -37.0225 24.5398 -0.2 + vertex -36.6025 24.2541 -0.2 endloop endfacet facet normal -0.525102 -0.851039 0 outer loop - vertex -36.6025 24.2541 -0.1 + vertex -36.6025 24.2541 -0.2 vertex -36.1579 23.9798 0 vertex -36.6025 24.2541 0 endloop @@ -40595,13 +40595,13 @@ solid OpenSCAD_Model facet normal -0.525102 -0.851039 -0 outer loop vertex -36.1579 23.9798 0 - vertex -36.6025 24.2541 -0.1 - vertex -36.1579 23.9798 -0.1 + vertex -36.6025 24.2541 -0.2 + vertex -36.1579 23.9798 -0.2 endloop endfacet facet normal -0.489575 -0.871961 0 outer loop - vertex -36.1579 23.9798 -0.1 + vertex -36.1579 23.9798 -0.2 vertex -35.6921 23.7183 0 vertex -36.1579 23.9798 0 endloop @@ -40609,13 +40609,13 @@ solid OpenSCAD_Model facet normal -0.489575 -0.871961 -0 outer loop vertex -35.6921 23.7183 0 - vertex -36.1579 23.9798 -0.1 - vertex -35.6921 23.7183 -0.1 + vertex -36.1579 23.9798 -0.2 + vertex -35.6921 23.7183 -0.2 endloop endfacet facet normal -0.455389 -0.890292 0 outer loop - vertex -35.6921 23.7183 -0.1 + vertex -35.6921 23.7183 -0.2 vertex -35.2082 23.4707 0 vertex -35.6921 23.7183 0 endloop @@ -40623,13 +40623,13 @@ solid OpenSCAD_Model facet normal -0.455389 -0.890292 -0 outer loop vertex -35.2082 23.4707 0 - vertex -35.6921 23.7183 -0.1 - vertex -35.2082 23.4707 -0.1 + vertex -35.6921 23.7183 -0.2 + vertex -35.2082 23.4707 -0.2 endloop endfacet facet normal -0.422055 -0.90657 0 outer loop - vertex -35.2082 23.4707 -0.1 + vertex -35.2082 23.4707 -0.2 vertex -34.7094 23.2385 0 vertex -35.2082 23.4707 0 endloop @@ -40637,13 +40637,13 @@ solid OpenSCAD_Model facet normal -0.422055 -0.90657 -0 outer loop vertex -34.7094 23.2385 0 - vertex -35.2082 23.4707 -0.1 - vertex -34.7094 23.2385 -0.1 + vertex -35.2082 23.4707 -0.2 + vertex -34.7094 23.2385 -0.2 endloop endfacet facet normal -0.389101 -0.921195 0 outer loop - vertex -34.7094 23.2385 -0.1 + vertex -34.7094 23.2385 -0.2 vertex -34.199 23.023 0 vertex -34.7094 23.2385 0 endloop @@ -40651,13 +40651,13 @@ solid OpenSCAD_Model facet normal -0.389101 -0.921195 -0 outer loop vertex -34.199 23.023 0 - vertex -34.7094 23.2385 -0.1 - vertex -34.199 23.023 -0.1 + vertex -34.7094 23.2385 -0.2 + vertex -34.199 23.023 -0.2 endloop endfacet facet normal -0.356052 -0.934466 0 outer loop - vertex -34.199 23.023 -0.1 + vertex -34.199 23.023 -0.2 vertex -33.6803 22.8253 0 vertex -34.199 23.023 0 endloop @@ -40665,13 +40665,13 @@ solid OpenSCAD_Model facet normal -0.356052 -0.934466 -0 outer loop vertex -33.6803 22.8253 0 - vertex -34.199 23.023 -0.1 - vertex -33.6803 22.8253 -0.1 + vertex -34.199 23.023 -0.2 + vertex -33.6803 22.8253 -0.2 endloop endfacet facet normal -0.3224 -0.946604 0 outer loop - vertex -33.6803 22.8253 -0.1 + vertex -33.6803 22.8253 -0.2 vertex -33.1564 22.6469 0 vertex -33.6803 22.8253 0 endloop @@ -40679,13 +40679,13 @@ solid OpenSCAD_Model facet normal -0.3224 -0.946604 -0 outer loop vertex -33.1564 22.6469 0 - vertex -33.6803 22.8253 -0.1 - vertex -33.1564 22.6469 -0.1 + vertex -33.6803 22.8253 -0.2 + vertex -33.1564 22.6469 -0.2 endloop endfacet facet normal -0.287637 -0.95774 0 outer loop - vertex -33.1564 22.6469 -0.1 + vertex -33.1564 22.6469 -0.2 vertex -32.6306 22.489 0 vertex -33.1564 22.6469 0 endloop @@ -40693,13 +40693,13 @@ solid OpenSCAD_Model facet normal -0.287637 -0.95774 -0 outer loop vertex -32.6306 22.489 0 - vertex -33.1564 22.6469 -0.1 - vertex -32.6306 22.489 -0.1 + vertex -33.1564 22.6469 -0.2 + vertex -32.6306 22.489 -0.2 endloop endfacet facet normal -0.251171 -0.967943 0 outer loop - vertex -32.6306 22.489 -0.1 + vertex -32.6306 22.489 -0.2 vertex -32.1061 22.3529 0 vertex -32.6306 22.489 0 endloop @@ -40707,13 +40707,13 @@ solid OpenSCAD_Model facet normal -0.251171 -0.967943 -0 outer loop vertex -32.1061 22.3529 0 - vertex -32.6306 22.489 -0.1 - vertex -32.1061 22.3529 -0.1 + vertex -32.6306 22.489 -0.2 + vertex -32.1061 22.3529 -0.2 endloop endfacet facet normal -0.212348 -0.977194 0 outer loop - vertex -32.1061 22.3529 -0.1 + vertex -32.1061 22.3529 -0.2 vertex -31.5861 22.2399 0 vertex -32.1061 22.3529 0 endloop @@ -40721,13 +40721,13 @@ solid OpenSCAD_Model facet normal -0.212348 -0.977194 -0 outer loop vertex -31.5861 22.2399 0 - vertex -32.1061 22.3529 -0.1 - vertex -31.5861 22.2399 -0.1 + vertex -32.1061 22.3529 -0.2 + vertex -31.5861 22.2399 -0.2 endloop endfacet facet normal -0.170418 -0.985372 0 outer loop - vertex -31.5861 22.2399 -0.1 + vertex -31.5861 22.2399 -0.2 vertex -31.074 22.1513 0 vertex -31.5861 22.2399 0 endloop @@ -40735,13 +40735,13 @@ solid OpenSCAD_Model facet normal -0.170418 -0.985372 -0 outer loop vertex -31.074 22.1513 0 - vertex -31.5861 22.2399 -0.1 - vertex -31.074 22.1513 -0.1 + vertex -31.5861 22.2399 -0.2 + vertex -31.074 22.1513 -0.2 endloop endfacet facet normal -0.124476 -0.992223 0 outer loop - vertex -31.074 22.1513 -0.1 + vertex -31.074 22.1513 -0.2 vertex -30.5728 22.0884 0 vertex -31.074 22.1513 0 endloop @@ -40749,13 +40749,13 @@ solid OpenSCAD_Model facet normal -0.124476 -0.992223 -0 outer loop vertex -30.5728 22.0884 0 - vertex -31.074 22.1513 -0.1 - vertex -30.5728 22.0884 -0.1 + vertex -31.074 22.1513 -0.2 + vertex -30.5728 22.0884 -0.2 endloop endfacet facet normal -0.0734593 -0.997298 0 outer loop - vertex -30.5728 22.0884 -0.1 + vertex -30.5728 22.0884 -0.2 vertex -30.0859 22.0525 0 vertex -30.5728 22.0884 0 endloop @@ -40763,13 +40763,13 @@ solid OpenSCAD_Model facet normal -0.0734593 -0.997298 -0 outer loop vertex -30.0859 22.0525 0 - vertex -30.5728 22.0884 -0.1 - vertex -30.0859 22.0525 -0.1 + vertex -30.5728 22.0884 -0.2 + vertex -30.0859 22.0525 -0.2 endloop endfacet facet normal -0.0457633 -0.998952 0 outer loop - vertex -30.0859 22.0525 -0.1 + vertex -30.0859 22.0525 -0.2 vertex -28.3394 21.9725 0 vertex -30.0859 22.0525 0 endloop @@ -40777,13 +40777,13 @@ solid OpenSCAD_Model facet normal -0.0457633 -0.998952 -0 outer loop vertex -28.3394 21.9725 0 - vertex -30.0859 22.0525 -0.1 - vertex -28.3394 21.9725 -0.1 + vertex -30.0859 22.0525 -0.2 + vertex -28.3394 21.9725 -0.2 endloop endfacet facet normal 0.491953 0.870622 -0 outer loop - vertex -28.3394 21.9725 -0.1 + vertex -28.3394 21.9725 -0.2 vertex -29.0186 22.3563 0 vertex -28.3394 21.9725 0 endloop @@ -40791,13 +40791,13 @@ solid OpenSCAD_Model facet normal 0.491953 0.870622 0 outer loop vertex -29.0186 22.3563 0 - vertex -28.3394 21.9725 -0.1 - vertex -29.0186 22.3563 -0.1 + vertex -28.3394 21.9725 -0.2 + vertex -29.0186 22.3563 -0.2 endloop endfacet facet normal 0.506614 0.862173 -0 outer loop - vertex -29.0186 22.3563 -0.1 + vertex -29.0186 22.3563 -0.2 vertex -29.4321 22.5993 0 vertex -29.0186 22.3563 0 endloop @@ -40805,13 +40805,13 @@ solid OpenSCAD_Model facet normal 0.506614 0.862173 0 outer loop vertex -29.4321 22.5993 0 - vertex -29.0186 22.3563 -0.1 - vertex -29.4321 22.5993 -0.1 + vertex -29.0186 22.3563 -0.2 + vertex -29.4321 22.5993 -0.2 endloop endfacet facet normal 0.54186 0.840469 -0 outer loop - vertex -29.4321 22.5993 -0.1 + vertex -29.4321 22.5993 -0.2 vertex -29.7937 22.8325 0 vertex -29.4321 22.5993 0 endloop @@ -40819,13 +40819,13 @@ solid OpenSCAD_Model facet normal 0.54186 0.840469 0 outer loop vertex -29.7937 22.8325 0 - vertex -29.4321 22.5993 -0.1 - vertex -29.7937 22.8325 -0.1 + vertex -29.4321 22.5993 -0.2 + vertex -29.7937 22.8325 -0.2 endloop endfacet facet normal 0.585975 0.810329 -0 outer loop - vertex -29.7937 22.8325 -0.1 + vertex -29.7937 22.8325 -0.2 vertex -30.1071 23.0591 0 vertex -29.7937 22.8325 0 endloop @@ -40833,13 +40833,13 @@ solid OpenSCAD_Model facet normal 0.585975 0.810329 0 outer loop vertex -30.1071 23.0591 0 - vertex -29.7937 22.8325 -0.1 - vertex -30.1071 23.0591 -0.1 + vertex -29.7937 22.8325 -0.2 + vertex -30.1071 23.0591 -0.2 endloop endfacet facet normal 0.639127 0.769101 -0 outer loop - vertex -30.1071 23.0591 -0.1 + vertex -30.1071 23.0591 -0.2 vertex -30.3761 23.2826 0 vertex -30.1071 23.0591 0 endloop @@ -40847,13 +40847,13 @@ solid OpenSCAD_Model facet normal 0.639127 0.769101 0 outer loop vertex -30.3761 23.2826 0 - vertex -30.1071 23.0591 -0.1 - vertex -30.3761 23.2826 -0.1 + vertex -30.1071 23.0591 -0.2 + vertex -30.3761 23.2826 -0.2 endloop endfacet facet normal 0.700019 0.714124 -0 outer loop - vertex -30.3761 23.2826 -0.1 + vertex -30.3761 23.2826 -0.2 vertex -30.6044 23.5064 0 vertex -30.3761 23.2826 0 endloop @@ -40861,125 +40861,125 @@ solid OpenSCAD_Model facet normal 0.700019 0.714124 0 outer loop vertex -30.6044 23.5064 0 - vertex -30.3761 23.2826 -0.1 - vertex -30.6044 23.5064 -0.1 + vertex -30.3761 23.2826 -0.2 + vertex -30.6044 23.5064 -0.2 endloop endfacet facet normal 0.765169 0.643829 0 outer loop vertex -30.6044 23.5064 0 - vertex -30.7957 23.7338 -0.1 + vertex -30.7957 23.7338 -0.2 vertex -30.7957 23.7338 0 endloop endfacet facet normal 0.765169 0.643829 0 outer loop - vertex -30.7957 23.7338 -0.1 + vertex -30.7957 23.7338 -0.2 vertex -30.6044 23.5064 0 - vertex -30.6044 23.5064 -0.1 + vertex -30.6044 23.5064 -0.2 endloop endfacet facet normal 0.828969 0.559295 0 outer loop vertex -30.7957 23.7338 0 - vertex -30.9539 23.9682 -0.1 + vertex -30.9539 23.9682 -0.2 vertex -30.9539 23.9682 0 endloop endfacet facet normal 0.828969 0.559295 0 outer loop - vertex -30.9539 23.9682 -0.1 + vertex -30.9539 23.9682 -0.2 vertex -30.7957 23.7338 0 - vertex -30.7957 23.7338 -0.1 + vertex -30.7957 23.7338 -0.2 endloop endfacet facet normal 0.885091 0.465418 0 outer loop vertex -30.9539 23.9682 0 - vertex -31.0826 24.213 -0.1 + vertex -31.0826 24.213 -0.2 vertex -31.0826 24.213 0 endloop endfacet facet normal 0.885091 0.465418 0 outer loop - vertex -31.0826 24.213 -0.1 + vertex -31.0826 24.213 -0.2 vertex -30.9539 23.9682 0 - vertex -30.9539 23.9682 -0.1 + vertex -30.9539 23.9682 -0.2 endloop endfacet facet normal 0.929158 0.369682 0 outer loop vertex -31.0826 24.213 0 - vertex -31.2103 24.5339 -0.1 + vertex -31.2103 24.5339 -0.2 vertex -31.2103 24.5339 0 endloop endfacet facet normal 0.929158 0.369682 0 outer loop - vertex -31.2103 24.5339 -0.1 + vertex -31.2103 24.5339 -0.2 vertex -31.0826 24.213 0 - vertex -31.0826 24.213 -0.1 + vertex -31.0826 24.213 -0.2 endloop endfacet facet normal 0.975453 0.220208 0 outer loop vertex -31.2103 24.5339 0 - vertex -31.2656 24.779 -0.1 + vertex -31.2656 24.779 -0.2 vertex -31.2656 24.779 0 endloop endfacet facet normal 0.975453 0.220208 0 outer loop - vertex -31.2656 24.779 -0.1 + vertex -31.2656 24.779 -0.2 vertex -31.2103 24.5339 0 - vertex -31.2103 24.5339 -0.1 + vertex -31.2103 24.5339 -0.2 endloop endfacet facet normal 0.99992 0.0126114 0 outer loop vertex -31.2656 24.779 0 - vertex -31.2668 24.8727 -0.1 + vertex -31.2668 24.8727 -0.2 vertex -31.2668 24.8727 0 endloop endfacet facet normal 0.99992 0.0126114 0 outer loop - vertex -31.2668 24.8727 -0.1 + vertex -31.2668 24.8727 -0.2 vertex -31.2656 24.779 0 - vertex -31.2656 24.779 -0.1 + vertex -31.2656 24.779 -0.2 endloop endfacet facet normal 0.977346 -0.211648 0 outer loop vertex -31.2668 24.8727 0 - vertex -31.2507 24.9472 -0.1 + vertex -31.2507 24.9472 -0.2 vertex -31.2507 24.9472 0 endloop endfacet facet normal 0.977346 -0.211648 0 outer loop - vertex -31.2507 24.9472 -0.1 + vertex -31.2507 24.9472 -0.2 vertex -31.2668 24.8727 0 - vertex -31.2668 24.8727 -0.1 + vertex -31.2668 24.8727 -0.2 endloop endfacet facet normal 0.856395 -0.516321 0 outer loop vertex -31.2507 24.9472 0 - vertex -31.2175 25.0021 -0.1 + vertex -31.2175 25.0021 -0.2 vertex -31.2175 25.0021 0 endloop endfacet facet normal 0.856395 -0.516321 0 outer loop - vertex -31.2175 25.0021 -0.1 + vertex -31.2175 25.0021 -0.2 vertex -31.2507 24.9472 0 - vertex -31.2507 24.9472 -0.1 + vertex -31.2507 24.9472 -0.2 endloop endfacet facet normal 0.578733 -0.815517 0 outer loop - vertex -31.2175 25.0021 -0.1 + vertex -31.2175 25.0021 -0.2 vertex -31.1676 25.0376 0 vertex -31.2175 25.0021 0 endloop @@ -40987,13 +40987,13 @@ solid OpenSCAD_Model facet normal 0.578733 -0.815517 0 outer loop vertex -31.1676 25.0376 0 - vertex -31.2175 25.0021 -0.1 - vertex -31.1676 25.0376 -0.1 + vertex -31.2175 25.0021 -0.2 + vertex -31.1676 25.0376 -0.2 endloop endfacet facet normal 0.230651 -0.973037 0 outer loop - vertex -31.1676 25.0376 -0.1 + vertex -31.1676 25.0376 -0.2 vertex -31.1012 25.0533 0 vertex -31.1676 25.0376 0 endloop @@ -41001,13 +41001,13 @@ solid OpenSCAD_Model facet normal 0.230651 -0.973037 0 outer loop vertex -31.1012 25.0533 0 - vertex -31.1676 25.0376 -0.1 - vertex -31.1012 25.0533 -0.1 + vertex -31.1676 25.0376 -0.2 + vertex -31.1012 25.0533 -0.2 endloop endfacet facet normal -0.0489514 -0.998801 0 outer loop - vertex -31.1012 25.0533 -0.1 + vertex -31.1012 25.0533 -0.2 vertex -31.0185 25.0493 0 vertex -31.1012 25.0533 0 endloop @@ -41015,13 +41015,13 @@ solid OpenSCAD_Model facet normal -0.0489514 -0.998801 -0 outer loop vertex -31.0185 25.0493 0 - vertex -31.1012 25.0533 -0.1 - vertex -31.0185 25.0493 -0.1 + vertex -31.1012 25.0533 -0.2 + vertex -31.0185 25.0493 -0.2 endloop endfacet facet normal -0.303972 -0.952681 0 outer loop - vertex -31.0185 25.0493 -0.1 + vertex -31.0185 25.0493 -0.2 vertex -30.8055 24.9813 0 vertex -31.0185 25.0493 0 endloop @@ -41029,13 +41029,13 @@ solid OpenSCAD_Model facet normal -0.303972 -0.952681 -0 outer loop vertex -30.8055 24.9813 0 - vertex -31.0185 25.0493 -0.1 - vertex -30.8055 24.9813 -0.1 + vertex -31.0185 25.0493 -0.2 + vertex -30.8055 24.9813 -0.2 endloop endfacet facet normal -0.475595 -0.879664 0 outer loop - vertex -30.8055 24.9813 -0.1 + vertex -30.8055 24.9813 -0.2 vertex -30.5308 24.8328 0 vertex -30.8055 24.9813 0 endloop @@ -41043,13 +41043,13 @@ solid OpenSCAD_Model facet normal -0.475595 -0.879664 -0 outer loop vertex -30.5308 24.8328 0 - vertex -30.8055 24.9813 -0.1 - vertex -30.5308 24.8328 -0.1 + vertex -30.8055 24.9813 -0.2 + vertex -30.5308 24.8328 -0.2 endloop endfacet facet normal -0.566807 -0.82385 0 outer loop - vertex -30.5308 24.8328 -0.1 + vertex -30.5308 24.8328 -0.2 vertex -30.1964 24.6027 0 vertex -30.5308 24.8328 0 endloop @@ -41057,13 +41057,13 @@ solid OpenSCAD_Model facet normal -0.566807 -0.82385 -0 outer loop vertex -30.1964 24.6027 0 - vertex -30.5308 24.8328 -0.1 - vertex -30.1964 24.6027 -0.1 + vertex -30.5308 24.8328 -0.2 + vertex -30.1964 24.6027 -0.2 endloop endfacet facet normal -0.552424 -0.833564 0 outer loop - vertex -30.1964 24.6027 -0.1 + vertex -30.1964 24.6027 -0.2 vertex -29.8023 24.3416 0 vertex -30.1964 24.6027 0 endloop @@ -41071,13 +41071,13 @@ solid OpenSCAD_Model facet normal -0.552424 -0.833564 -0 outer loop vertex -29.8023 24.3416 0 - vertex -30.1964 24.6027 -0.1 - vertex -29.8023 24.3416 -0.1 + vertex -30.1964 24.6027 -0.2 + vertex -29.8023 24.3416 -0.2 endloop endfacet facet normal -0.451398 -0.892323 0 outer loop - vertex -29.8023 24.3416 -0.1 + vertex -29.8023 24.3416 -0.2 vertex -29.384 24.13 0 vertex -29.8023 24.3416 0 endloop @@ -41085,13 +41085,13 @@ solid OpenSCAD_Model facet normal -0.451398 -0.892323 -0 outer loop vertex -29.384 24.13 0 - vertex -29.8023 24.3416 -0.1 - vertex -29.384 24.13 -0.1 + vertex -29.8023 24.3416 -0.2 + vertex -29.384 24.13 -0.2 endloop endfacet facet normal -0.34198 -0.939707 0 outer loop - vertex -29.384 24.13 -0.1 + vertex -29.384 24.13 -0.2 vertex -28.9359 23.9669 0 vertex -29.384 24.13 0 endloop @@ -41099,13 +41099,13 @@ solid OpenSCAD_Model facet normal -0.34198 -0.939707 -0 outer loop vertex -28.9359 23.9669 0 - vertex -29.384 24.13 -0.1 - vertex -28.9359 23.9669 -0.1 + vertex -29.384 24.13 -0.2 + vertex -28.9359 23.9669 -0.2 endloop endfacet facet normal -0.232476 -0.972602 0 outer loop - vertex -28.9359 23.9669 -0.1 + vertex -28.9359 23.9669 -0.2 vertex -28.4524 23.8513 0 vertex -28.9359 23.9669 0 endloop @@ -41113,13 +41113,13 @@ solid OpenSCAD_Model facet normal -0.232476 -0.972602 -0 outer loop vertex -28.4524 23.8513 0 - vertex -28.9359 23.9669 -0.1 - vertex -28.4524 23.8513 -0.1 + vertex -28.9359 23.9669 -0.2 + vertex -28.4524 23.8513 -0.2 endloop endfacet facet normal -0.130593 -0.991436 0 outer loop - vertex -28.4524 23.8513 -0.1 + vertex -28.4524 23.8513 -0.2 vertex -27.9279 23.7822 0 vertex -28.4524 23.8513 0 endloop @@ -41127,13 +41127,13 @@ solid OpenSCAD_Model facet normal -0.130593 -0.991436 -0 outer loop vertex -27.9279 23.7822 0 - vertex -28.4524 23.8513 -0.1 - vertex -27.9279 23.7822 -0.1 + vertex -28.4524 23.8513 -0.2 + vertex -27.9279 23.7822 -0.2 endloop endfacet facet normal -0.0413274 -0.999146 0 outer loop - vertex -27.9279 23.7822 -0.1 + vertex -27.9279 23.7822 -0.2 vertex -27.3569 23.7586 0 vertex -27.9279 23.7822 0 endloop @@ -41141,13 +41141,13 @@ solid OpenSCAD_Model facet normal -0.0413274 -0.999146 -0 outer loop vertex -27.3569 23.7586 0 - vertex -27.9279 23.7822 -0.1 - vertex -27.3569 23.7586 -0.1 + vertex -27.9279 23.7822 -0.2 + vertex -27.3569 23.7586 -0.2 endloop endfacet facet normal 0.0333972 -0.999442 0 outer loop - vertex -27.3569 23.7586 -0.1 + vertex -27.3569 23.7586 -0.2 vertex -26.7338 23.7794 0 vertex -27.3569 23.7586 0 endloop @@ -41155,13 +41155,13 @@ solid OpenSCAD_Model facet normal 0.0333972 -0.999442 0 outer loop vertex -26.7338 23.7794 0 - vertex -27.3569 23.7586 -0.1 - vertex -26.7338 23.7794 -0.1 + vertex -27.3569 23.7586 -0.2 + vertex -26.7338 23.7794 -0.2 endloop endfacet facet normal 0.0939488 -0.995577 0 outer loop - vertex -26.7338 23.7794 -0.1 + vertex -26.7338 23.7794 -0.2 vertex -26.053 23.8437 0 vertex -26.7338 23.7794 0 endloop @@ -41169,13 +41169,13 @@ solid OpenSCAD_Model facet normal 0.0939488 -0.995577 0 outer loop vertex -26.053 23.8437 0 - vertex -26.7338 23.7794 -0.1 - vertex -26.053 23.8437 -0.1 + vertex -26.7338 23.7794 -0.2 + vertex -26.053 23.8437 -0.2 endloop endfacet facet normal 0.119464 -0.992839 0 outer loop - vertex -26.053 23.8437 -0.1 + vertex -26.053 23.8437 -0.2 vertex -24.6523 24.0122 0 vertex -26.053 23.8437 0 endloop @@ -41183,13 +41183,13 @@ solid OpenSCAD_Model facet normal 0.119464 -0.992839 0 outer loop vertex -24.6523 24.0122 0 - vertex -26.053 23.8437 -0.1 - vertex -24.6523 24.0122 -0.1 + vertex -26.053 23.8437 -0.2 + vertex -24.6523 24.0122 -0.2 endloop endfacet facet normal 0.193693 0.981062 -0 outer loop - vertex -24.6523 24.0122 -0.1 + vertex -24.6523 24.0122 -0.2 vertex -26.0107 24.2804 0 vertex -24.6523 24.0122 0 endloop @@ -41197,13 +41197,13 @@ solid OpenSCAD_Model facet normal 0.193693 0.981062 0 outer loop vertex -26.0107 24.2804 0 - vertex -24.6523 24.0122 -0.1 - vertex -26.0107 24.2804 -0.1 + vertex -24.6523 24.0122 -0.2 + vertex -26.0107 24.2804 -0.2 endloop endfacet facet normal 0.214134 0.976804 -0 outer loop - vertex -26.0107 24.2804 -0.1 + vertex -26.0107 24.2804 -0.2 vertex -26.5818 24.4056 0 vertex -26.0107 24.2804 0 endloop @@ -41211,13 +41211,13 @@ solid OpenSCAD_Model facet normal 0.214134 0.976804 0 outer loop vertex -26.5818 24.4056 0 - vertex -26.0107 24.2804 -0.1 - vertex -26.5818 24.4056 -0.1 + vertex -26.0107 24.2804 -0.2 + vertex -26.5818 24.4056 -0.2 endloop endfacet facet normal 0.258173 0.966099 -0 outer loop - vertex -26.5818 24.4056 -0.1 + vertex -26.5818 24.4056 -0.2 vertex -27.1227 24.5501 0 vertex -26.5818 24.4056 0 endloop @@ -41225,13 +41225,13 @@ solid OpenSCAD_Model facet normal 0.258173 0.966099 0 outer loop vertex -27.1227 24.5501 0 - vertex -26.5818 24.4056 -0.1 - vertex -27.1227 24.5501 -0.1 + vertex -26.5818 24.4056 -0.2 + vertex -27.1227 24.5501 -0.2 endloop endfacet facet normal 0.306051 0.952015 -0 outer loop - vertex -27.1227 24.5501 -0.1 + vertex -27.1227 24.5501 -0.2 vertex -27.636 24.7152 0 vertex -27.1227 24.5501 0 endloop @@ -41239,13 +41239,13 @@ solid OpenSCAD_Model facet normal 0.306051 0.952015 0 outer loop vertex -27.636 24.7152 0 - vertex -27.1227 24.5501 -0.1 - vertex -27.636 24.7152 -0.1 + vertex -27.1227 24.5501 -0.2 + vertex -27.636 24.7152 -0.2 endloop endfacet facet normal 0.356888 0.934147 -0 outer loop - vertex -27.636 24.7152 -0.1 + vertex -27.636 24.7152 -0.2 vertex -28.1248 24.9019 0 vertex -27.636 24.7152 0 endloop @@ -41253,13 +41253,13 @@ solid OpenSCAD_Model facet normal 0.356888 0.934147 0 outer loop vertex -28.1248 24.9019 0 - vertex -27.636 24.7152 -0.1 - vertex -28.1248 24.9019 -0.1 + vertex -27.636 24.7152 -0.2 + vertex -28.1248 24.9019 -0.2 endloop endfacet facet normal 0.409468 0.912325 -0 outer loop - vertex -28.1248 24.9019 -0.1 + vertex -28.1248 24.9019 -0.2 vertex -28.5919 25.1115 0 vertex -28.1248 24.9019 0 endloop @@ -41267,13 +41267,13 @@ solid OpenSCAD_Model facet normal 0.409468 0.912325 0 outer loop vertex -28.5919 25.1115 0 - vertex -28.1248 24.9019 -0.1 - vertex -28.5919 25.1115 -0.1 + vertex -28.1248 24.9019 -0.2 + vertex -28.5919 25.1115 -0.2 endloop endfacet facet normal 0.462329 0.886708 -0 outer loop - vertex -28.5919 25.1115 -0.1 + vertex -28.5919 25.1115 -0.2 vertex -29.0402 25.3453 0 vertex -28.5919 25.1115 0 endloop @@ -41281,13 +41281,13 @@ solid OpenSCAD_Model facet normal 0.462329 0.886708 0 outer loop vertex -29.0402 25.3453 0 - vertex -28.5919 25.1115 -0.1 - vertex -29.0402 25.3453 -0.1 + vertex -28.5919 25.1115 -0.2 + vertex -29.0402 25.3453 -0.2 endloop endfacet facet normal 0.51393 0.857832 -0 outer loop - vertex -29.0402 25.3453 -0.1 + vertex -29.0402 25.3453 -0.2 vertex -29.4725 25.6043 0 vertex -29.0402 25.3453 0 endloop @@ -41295,13 +41295,13 @@ solid OpenSCAD_Model facet normal 0.51393 0.857832 0 outer loop vertex -29.4725 25.6043 0 - vertex -29.0402 25.3453 -0.1 - vertex -29.4725 25.6043 -0.1 + vertex -29.0402 25.3453 -0.2 + vertex -29.4725 25.6043 -0.2 endloop endfacet facet normal 0.562822 0.826578 -0 outer loop - vertex -29.4725 25.6043 -0.1 + vertex -29.4725 25.6043 -0.2 vertex -29.8918 25.8898 0 vertex -29.4725 25.6043 0 endloop @@ -41309,13 +41309,13 @@ solid OpenSCAD_Model facet normal 0.562822 0.826578 0 outer loop vertex -29.8918 25.8898 0 - vertex -29.4725 25.6043 -0.1 - vertex -29.8918 25.8898 -0.1 + vertex -29.4725 25.6043 -0.2 + vertex -29.8918 25.8898 -0.2 endloop endfacet facet normal 0.607723 0.794149 -0 outer loop - vertex -29.8918 25.8898 -0.1 + vertex -29.8918 25.8898 -0.2 vertex -30.6514 26.471 0 vertex -29.8918 25.8898 0 endloop @@ -41323,13 +41323,13 @@ solid OpenSCAD_Model facet normal 0.607723 0.794149 0 outer loop vertex -30.6514 26.471 0 - vertex -29.8918 25.8898 -0.1 - vertex -30.6514 26.471 -0.1 + vertex -29.8918 25.8898 -0.2 + vertex -30.6514 26.471 -0.2 endloop endfacet facet normal 0.662833 0.748767 -0 outer loop - vertex -30.6514 26.471 -0.1 + vertex -30.6514 26.471 -0.2 vertex -30.9143 26.7038 0 vertex -30.6514 26.471 0 endloop @@ -41337,83 +41337,83 @@ solid OpenSCAD_Model facet normal 0.662833 0.748767 0 outer loop vertex -30.9143 26.7038 0 - vertex -30.6514 26.471 -0.1 - vertex -30.9143 26.7038 -0.1 + vertex -30.6514 26.471 -0.2 + vertex -30.9143 26.7038 -0.2 endloop endfacet facet normal 0.725171 0.688569 0 outer loop vertex -30.9143 26.7038 0 - vertex -31.1043 26.9038 -0.1 + vertex -31.1043 26.9038 -0.2 vertex -31.1043 26.9038 0 endloop endfacet facet normal 0.725171 0.688569 0 outer loop - vertex -31.1043 26.9038 -0.1 + vertex -31.1043 26.9038 -0.2 vertex -30.9143 26.7038 0 - vertex -30.9143 26.7038 -0.1 + vertex -30.9143 26.7038 -0.2 endloop endfacet facet normal 0.818345 0.574727 0 outer loop vertex -31.1043 26.9038 0 - vertex -31.2248 27.0754 -0.1 + vertex -31.2248 27.0754 -0.2 vertex -31.2248 27.0754 0 endloop endfacet facet normal 0.818345 0.574727 0 outer loop - vertex -31.2248 27.0754 -0.1 + vertex -31.2248 27.0754 -0.2 vertex -31.1043 26.9038 0 - vertex -31.1043 26.9038 -0.1 + vertex -31.1043 26.9038 -0.2 endloop endfacet facet normal 0.937593 0.347734 0 outer loop vertex -31.2248 27.0754 0 - vertex -31.2795 27.2229 -0.1 + vertex -31.2795 27.2229 -0.2 vertex -31.2795 27.2229 0 endloop endfacet facet normal 0.937593 0.347734 0 outer loop - vertex -31.2795 27.2229 -0.1 + vertex -31.2795 27.2229 -0.2 vertex -31.2248 27.0754 0 - vertex -31.2248 27.0754 -0.1 + vertex -31.2248 27.0754 -0.2 endloop endfacet facet normal 0.99829 -0.0584589 0 outer loop vertex -31.2795 27.2229 0 - vertex -31.272 27.3506 -0.1 + vertex -31.272 27.3506 -0.2 vertex -31.272 27.3506 0 endloop endfacet facet normal 0.99829 -0.0584589 0 outer loop - vertex -31.272 27.3506 -0.1 + vertex -31.272 27.3506 -0.2 vertex -31.2795 27.2229 0 - vertex -31.2795 27.2229 -0.1 + vertex -31.2795 27.2229 -0.2 endloop endfacet facet normal 0.861994 -0.506918 0 outer loop vertex -31.272 27.3506 0 - vertex -31.2059 27.4629 -0.1 + vertex -31.2059 27.4629 -0.2 vertex -31.2059 27.4629 0 endloop endfacet facet normal 0.861994 -0.506918 0 outer loop - vertex -31.2059 27.4629 -0.1 + vertex -31.2059 27.4629 -0.2 vertex -31.272 27.3506 0 - vertex -31.272 27.3506 -0.1 + vertex -31.272 27.3506 -0.2 endloop endfacet facet normal 0.566536 -0.824037 0 outer loop - vertex -31.2059 27.4629 -0.1 + vertex -31.2059 27.4629 -0.2 vertex -31.1289 27.5158 0 vertex -31.2059 27.4629 0 endloop @@ -41421,13 +41421,13 @@ solid OpenSCAD_Model facet normal 0.566536 -0.824037 0 outer loop vertex -31.1289 27.5158 0 - vertex -31.2059 27.4629 -0.1 - vertex -31.1289 27.5158 -0.1 + vertex -31.2059 27.4629 -0.2 + vertex -31.1289 27.5158 -0.2 endloop endfacet facet normal 0.198224 -0.980157 0 outer loop - vertex -31.1289 27.5158 -0.1 + vertex -31.1289 27.5158 -0.2 vertex -31.0145 27.539 0 vertex -31.1289 27.5158 0 endloop @@ -41435,13 +41435,13 @@ solid OpenSCAD_Model facet normal 0.198224 -0.980157 0 outer loop vertex -31.0145 27.539 0 - vertex -31.1289 27.5158 -0.1 - vertex -31.0145 27.539 -0.1 + vertex -31.1289 27.5158 -0.2 + vertex -31.0145 27.539 -0.2 endloop endfacet facet normal -0.0498903 -0.998755 0 outer loop - vertex -31.0145 27.539 -0.1 + vertex -31.0145 27.539 -0.2 vertex -30.8579 27.5312 0 vertex -31.0145 27.539 0 endloop @@ -41449,13 +41449,13 @@ solid OpenSCAD_Model facet normal -0.0498903 -0.998755 -0 outer loop vertex -30.8579 27.5312 0 - vertex -31.0145 27.539 -0.1 - vertex -30.8579 27.5312 -0.1 + vertex -31.0145 27.539 -0.2 + vertex -30.8579 27.5312 -0.2 endloop endfacet facet normal -0.192665 -0.981265 0 outer loop - vertex -30.8579 27.5312 -0.1 + vertex -30.8579 27.5312 -0.2 vertex -30.6543 27.4912 0 vertex -30.8579 27.5312 0 endloop @@ -41463,13 +41463,13 @@ solid OpenSCAD_Model facet normal -0.192665 -0.981265 -0 outer loop vertex -30.6543 27.4912 0 - vertex -30.8579 27.5312 -0.1 - vertex -30.6543 27.4912 -0.1 + vertex -30.8579 27.5312 -0.2 + vertex -30.6543 27.4912 -0.2 endloop endfacet facet normal -0.304248 -0.952593 0 outer loop - vertex -30.6543 27.4912 -0.1 + vertex -30.6543 27.4912 -0.2 vertex -30.0875 27.3102 0 vertex -30.6543 27.4912 0 endloop @@ -41477,13 +41477,13 @@ solid OpenSCAD_Model facet normal -0.304248 -0.952593 -0 outer loop vertex -30.0875 27.3102 0 - vertex -30.6543 27.4912 -0.1 - vertex -30.0875 27.3102 -0.1 + vertex -30.6543 27.4912 -0.2 + vertex -30.0875 27.3102 -0.2 endloop endfacet facet normal -0.370492 -0.928836 0 outer loop - vertex -30.0875 27.3102 -0.1 + vertex -30.0875 27.3102 -0.2 vertex -29.2762 26.9865 0 vertex -30.0875 27.3102 0 endloop @@ -41491,13 +41491,13 @@ solid OpenSCAD_Model facet normal -0.370492 -0.928836 -0 outer loop vertex -29.2762 26.9865 0 - vertex -30.0875 27.3102 -0.1 - vertex -29.2762 26.9865 -0.1 + vertex -30.0875 27.3102 -0.2 + vertex -29.2762 26.9865 -0.2 endloop endfacet facet normal -0.380261 -0.924879 0 outer loop - vertex -29.2762 26.9865 -0.1 + vertex -29.2762 26.9865 -0.2 vertex -28.7314 26.7626 0 vertex -29.2762 26.9865 0 endloop @@ -41505,13 +41505,13 @@ solid OpenSCAD_Model facet normal -0.380261 -0.924879 -0 outer loop vertex -28.7314 26.7626 0 - vertex -29.2762 26.9865 -0.1 - vertex -28.7314 26.7626 -0.1 + vertex -29.2762 26.9865 -0.2 + vertex -28.7314 26.7626 -0.2 endloop endfacet facet normal -0.349246 -0.937031 0 outer loop - vertex -28.7314 26.7626 -0.1 + vertex -28.7314 26.7626 -0.2 vertex -28.2663 26.5892 0 vertex -28.7314 26.7626 0 endloop @@ -41519,13 +41519,13 @@ solid OpenSCAD_Model facet normal -0.349246 -0.937031 -0 outer loop vertex -28.2663 26.5892 0 - vertex -28.7314 26.7626 -0.1 - vertex -28.2663 26.5892 -0.1 + vertex -28.7314 26.7626 -0.2 + vertex -28.2663 26.5892 -0.2 endloop endfacet facet normal -0.29135 -0.956616 0 outer loop - vertex -28.2663 26.5892 -0.1 + vertex -28.2663 26.5892 -0.2 vertex -27.8395 26.4592 0 vertex -28.2663 26.5892 0 endloop @@ -41533,13 +41533,13 @@ solid OpenSCAD_Model facet normal -0.29135 -0.956616 -0 outer loop vertex -27.8395 26.4592 0 - vertex -28.2663 26.5892 -0.1 - vertex -27.8395 26.4592 -0.1 + vertex -28.2663 26.5892 -0.2 + vertex -27.8395 26.4592 -0.2 endloop endfacet facet normal -0.213404 -0.976964 0 outer loop - vertex -27.8395 26.4592 -0.1 + vertex -27.8395 26.4592 -0.2 vertex -27.4097 26.3653 0 vertex -27.8395 26.4592 0 endloop @@ -41547,13 +41547,13 @@ solid OpenSCAD_Model facet normal -0.213404 -0.976964 -0 outer loop vertex -27.4097 26.3653 0 - vertex -27.8395 26.4592 -0.1 - vertex -27.4097 26.3653 -0.1 + vertex -27.8395 26.4592 -0.2 + vertex -27.4097 26.3653 -0.2 endloop endfacet facet normal -0.13595 -0.990716 0 outer loop - vertex -27.4097 26.3653 -0.1 + vertex -27.4097 26.3653 -0.2 vertex -26.9353 26.3003 0 vertex -27.4097 26.3653 0 endloop @@ -41561,13 +41561,13 @@ solid OpenSCAD_Model facet normal -0.13595 -0.990716 -0 outer loop vertex -26.9353 26.3003 0 - vertex -27.4097 26.3653 -0.1 - vertex -26.9353 26.3003 -0.1 + vertex -27.4097 26.3653 -0.2 + vertex -26.9353 26.3003 -0.2 endloop endfacet facet normal -0.077531 -0.99699 0 outer loop - vertex -26.9353 26.3003 -0.1 + vertex -26.9353 26.3003 -0.2 vertex -26.3751 26.2567 0 vertex -26.9353 26.3003 0 endloop @@ -41575,13 +41575,13 @@ solid OpenSCAD_Model facet normal -0.077531 -0.99699 -0 outer loop vertex -26.3751 26.2567 0 - vertex -26.9353 26.3003 -0.1 - vertex -26.3751 26.2567 -0.1 + vertex -26.9353 26.3003 -0.2 + vertex -26.3751 26.2567 -0.2 endloop endfacet facet normal -0.0334453 -0.999441 0 outer loop - vertex -26.3751 26.2567 -0.1 + vertex -26.3751 26.2567 -0.2 vertex -24.8316 26.205 0 vertex -26.3751 26.2567 0 endloop @@ -41589,13 +41589,13 @@ solid OpenSCAD_Model facet normal -0.0334453 -0.999441 -0 outer loop vertex -24.8316 26.205 0 - vertex -26.3751 26.2567 -0.1 - vertex -24.8316 26.205 -0.1 + vertex -26.3751 26.2567 -0.2 + vertex -24.8316 26.205 -0.2 endloop endfacet facet normal -0.00940958 -0.999956 0 outer loop - vertex -24.8316 26.205 -0.1 + vertex -24.8316 26.205 -0.2 vertex -23.1385 26.1891 0 vertex -24.8316 26.205 0 endloop @@ -41603,13 +41603,13 @@ solid OpenSCAD_Model facet normal -0.00940958 -0.999956 -0 outer loop vertex -23.1385 26.1891 0 - vertex -24.8316 26.205 -0.1 - vertex -23.1385 26.1891 -0.1 + vertex -24.8316 26.205 -0.2 + vertex -23.1385 26.1891 -0.2 endloop endfacet facet normal 0.0248422 -0.999691 0 outer loop - vertex -23.1385 26.1891 -0.1 + vertex -23.1385 26.1891 -0.2 vertex -22.5186 26.2045 0 vertex -23.1385 26.1891 0 endloop @@ -41617,13 +41617,13 @@ solid OpenSCAD_Model facet normal 0.0248422 -0.999691 0 outer loop vertex -22.5186 26.2045 0 - vertex -23.1385 26.1891 -0.1 - vertex -22.5186 26.2045 -0.1 + vertex -23.1385 26.1891 -0.2 + vertex -22.5186 26.2045 -0.2 endloop endfacet facet normal 0.066912 -0.997759 0 outer loop - vertex -22.5186 26.2045 -0.1 + vertex -22.5186 26.2045 -0.2 vertex -22.0356 26.2369 0 vertex -22.5186 26.2045 0 endloop @@ -41631,13 +41631,13 @@ solid OpenSCAD_Model facet normal 0.066912 -0.997759 0 outer loop vertex -22.0356 26.2369 0 - vertex -22.5186 26.2045 -0.1 - vertex -22.0356 26.2369 -0.1 + vertex -22.5186 26.2045 -0.2 + vertex -22.0356 26.2369 -0.2 endloop endfacet facet normal 0.139914 -0.990164 0 outer loop - vertex -22.0356 26.2369 -0.1 + vertex -22.0356 26.2369 -0.2 vertex -21.6785 26.2874 0 vertex -22.0356 26.2369 0 endloop @@ -41645,13 +41645,13 @@ solid OpenSCAD_Model facet normal 0.139914 -0.990164 0 outer loop vertex -21.6785 26.2874 0 - vertex -22.0356 26.2369 -0.1 - vertex -21.6785 26.2874 -0.1 + vertex -22.0356 26.2369 -0.2 + vertex -21.6785 26.2874 -0.2 endloop endfacet facet normal 0.276553 -0.960999 0 outer loop - vertex -21.6785 26.2874 -0.1 + vertex -21.6785 26.2874 -0.2 vertex -21.4368 26.3569 0 vertex -21.6785 26.2874 0 endloop @@ -41659,13 +41659,13 @@ solid OpenSCAD_Model facet normal 0.276553 -0.960999 0 outer loop vertex -21.4368 26.3569 0 - vertex -21.6785 26.2874 -0.1 - vertex -21.4368 26.3569 -0.1 + vertex -21.6785 26.2874 -0.2 + vertex -21.4368 26.3569 -0.2 endloop endfacet facet normal 0.462821 -0.886452 0 outer loop - vertex -21.4368 26.3569 -0.1 + vertex -21.4368 26.3569 -0.2 vertex -21.3558 26.3992 0 vertex -21.4368 26.3569 0 endloop @@ -41673,13 +41673,13 @@ solid OpenSCAD_Model facet normal 0.462821 -0.886452 0 outer loop vertex -21.3558 26.3992 0 - vertex -21.4368 26.3569 -0.1 - vertex -21.3558 26.3992 -0.1 + vertex -21.4368 26.3569 -0.2 + vertex -21.3558 26.3992 -0.2 endloop endfacet facet normal 0.645311 -0.76392 0 outer loop - vertex -21.3558 26.3992 -0.1 + vertex -21.3558 26.3992 -0.2 vertex -21.2997 26.4466 0 vertex -21.3558 26.3992 0 endloop @@ -41687,55 +41687,55 @@ solid OpenSCAD_Model facet normal 0.645311 -0.76392 0 outer loop vertex -21.2997 26.4466 0 - vertex -21.3558 26.3992 -0.1 - vertex -21.2997 26.4466 -0.1 + vertex -21.3558 26.3992 -0.2 + vertex -21.2997 26.4466 -0.2 endloop endfacet facet normal 0.84984 -0.527041 0 outer loop vertex -21.2997 26.4466 0 - vertex -21.2669 26.4994 -0.1 + vertex -21.2669 26.4994 -0.2 vertex -21.2669 26.4994 0 endloop endfacet facet normal 0.84984 -0.527041 0 outer loop - vertex -21.2669 26.4994 -0.1 + vertex -21.2669 26.4994 -0.2 vertex -21.2997 26.4466 0 - vertex -21.2997 26.4466 -0.1 + vertex -21.2997 26.4466 -0.2 endloop endfacet facet normal 0.98379 -0.179322 0 outer loop vertex -21.2669 26.4994 0 - vertex -21.2563 26.5576 -0.1 + vertex -21.2563 26.5576 -0.2 vertex -21.2563 26.5576 0 endloop endfacet facet normal 0.98379 -0.179322 0 outer loop - vertex -21.2563 26.5576 -0.1 + vertex -21.2563 26.5576 -0.2 vertex -21.2669 26.4994 0 - vertex -21.2669 26.4994 -0.1 + vertex -21.2669 26.4994 -0.2 endloop endfacet facet normal 0.837844 0.54591 0 outer loop vertex -21.2563 26.5576 0 - vertex -21.2799 26.5937 -0.1 + vertex -21.2799 26.5937 -0.2 vertex -21.2799 26.5937 0 endloop endfacet facet normal 0.837844 0.54591 0 outer loop - vertex -21.2799 26.5937 -0.1 + vertex -21.2799 26.5937 -0.2 vertex -21.2563 26.5576 0 - vertex -21.2563 26.5576 -0.1 + vertex -21.2563 26.5576 -0.2 endloop endfacet facet normal 0.505324 0.86293 -0 outer loop - vertex -21.2799 26.5937 -0.1 + vertex -21.2799 26.5937 -0.2 vertex -21.3473 26.6332 0 vertex -21.2799 26.5937 0 endloop @@ -41743,13 +41743,13 @@ solid OpenSCAD_Model facet normal 0.505324 0.86293 0 outer loop vertex -21.3473 26.6332 0 - vertex -21.2799 26.5937 -0.1 - vertex -21.3473 26.6332 -0.1 + vertex -21.2799 26.5937 -0.2 + vertex -21.3473 26.6332 -0.2 endloop endfacet facet normal 0.321132 0.947035 -0 outer loop - vertex -21.3473 26.6332 -0.1 + vertex -21.3473 26.6332 -0.2 vertex -21.5951 26.7172 0 vertex -21.3473 26.6332 0 endloop @@ -41757,13 +41757,13 @@ solid OpenSCAD_Model facet normal 0.321132 0.947035 0 outer loop vertex -21.5951 26.7172 0 - vertex -21.3473 26.6332 -0.1 - vertex -21.5951 26.7172 -0.1 + vertex -21.3473 26.6332 -0.2 + vertex -21.5951 26.7172 -0.2 endloop endfacet facet normal 0.218663 0.9758 -0 outer loop - vertex -21.5951 26.7172 -0.1 + vertex -21.5951 26.7172 -0.2 vertex -21.9618 26.7994 0 vertex -21.5951 26.7172 0 endloop @@ -41771,13 +41771,13 @@ solid OpenSCAD_Model facet normal 0.218663 0.9758 0 outer loop vertex -21.9618 26.7994 0 - vertex -21.5951 26.7172 -0.1 - vertex -21.9618 26.7994 -0.1 + vertex -21.5951 26.7172 -0.2 + vertex -21.9618 26.7994 -0.2 endloop endfacet facet normal 0.154639 0.987971 -0 outer loop - vertex -21.9618 26.7994 -0.1 + vertex -21.9618 26.7994 -0.2 vertex -22.4095 26.8695 0 vertex -21.9618 26.7994 0 endloop @@ -41785,13 +41785,13 @@ solid OpenSCAD_Model facet normal 0.154639 0.987971 0 outer loop vertex -22.4095 26.8695 0 - vertex -21.9618 26.7994 -0.1 - vertex -22.4095 26.8695 -0.1 + vertex -21.9618 26.7994 -0.2 + vertex -22.4095 26.8695 -0.2 endloop endfacet facet normal 0.17991 0.983683 -0 outer loop - vertex -22.4095 26.8695 -0.1 + vertex -22.4095 26.8695 -0.2 vertex -22.8078 26.9423 0 vertex -22.4095 26.8695 0 endloop @@ -41799,13 +41799,13 @@ solid OpenSCAD_Model facet normal 0.17991 0.983683 0 outer loop vertex -22.8078 26.9423 0 - vertex -22.4095 26.8695 -0.1 - vertex -22.8078 26.9423 -0.1 + vertex -22.4095 26.8695 -0.2 + vertex -22.8078 26.9423 -0.2 endloop endfacet facet normal 0.273496 0.961873 -0 outer loop - vertex -22.8078 26.9423 -0.1 + vertex -22.8078 26.9423 -0.2 vertex -23.1972 27.0531 0 vertex -22.8078 26.9423 0 endloop @@ -41813,13 +41813,13 @@ solid OpenSCAD_Model facet normal 0.273496 0.961873 0 outer loop vertex -23.1972 27.0531 0 - vertex -22.8078 26.9423 -0.1 - vertex -23.1972 27.0531 -0.1 + vertex -22.8078 26.9423 -0.2 + vertex -23.1972 27.0531 -0.2 endloop endfacet facet normal 0.356994 0.934107 -0 outer loop - vertex -23.1972 27.0531 -0.1 + vertex -23.1972 27.0531 -0.2 vertex -23.56 27.1917 0 vertex -23.1972 27.0531 0 endloop @@ -41827,13 +41827,13 @@ solid OpenSCAD_Model facet normal 0.356994 0.934107 0 outer loop vertex -23.56 27.1917 0 - vertex -23.1972 27.0531 -0.1 - vertex -23.56 27.1917 -0.1 + vertex -23.1972 27.0531 -0.2 + vertex -23.56 27.1917 -0.2 endloop endfacet facet normal 0.441429 0.897296 -0 outer loop - vertex -23.56 27.1917 -0.1 + vertex -23.56 27.1917 -0.2 vertex -23.8785 27.3484 0 vertex -23.56 27.1917 0 endloop @@ -41841,13 +41841,13 @@ solid OpenSCAD_Model facet normal 0.441429 0.897296 0 outer loop vertex -23.8785 27.3484 0 - vertex -23.56 27.1917 -0.1 - vertex -23.8785 27.3484 -0.1 + vertex -23.56 27.1917 -0.2 + vertex -23.8785 27.3484 -0.2 endloop endfacet facet normal 0.540697 0.841217 -0 outer loop - vertex -23.8785 27.3484 -0.1 + vertex -23.8785 27.3484 -0.2 vertex -24.1346 27.513 0 vertex -23.8785 27.3484 0 endloop @@ -41855,13 +41855,13 @@ solid OpenSCAD_Model facet normal 0.540697 0.841217 0 outer loop vertex -24.1346 27.513 0 - vertex -23.8785 27.3484 -0.1 - vertex -24.1346 27.513 -0.1 + vertex -23.8785 27.3484 -0.2 + vertex -24.1346 27.513 -0.2 endloop endfacet facet normal 0.678607 0.734501 -0 outer loop - vertex -24.1346 27.513 -0.1 + vertex -24.1346 27.513 -0.2 vertex -24.3107 27.6757 0 vertex -24.1346 27.513 0 endloop @@ -41869,69 +41869,69 @@ solid OpenSCAD_Model facet normal 0.678607 0.734501 0 outer loop vertex -24.3107 27.6757 0 - vertex -24.1346 27.513 -0.1 - vertex -24.3107 27.6757 -0.1 + vertex -24.1346 27.513 -0.2 + vertex -24.3107 27.6757 -0.2 endloop endfacet facet normal 0.828129 0.560537 0 outer loop vertex -24.3107 27.6757 0 - vertex -24.3632 27.7532 -0.1 + vertex -24.3632 27.7532 -0.2 vertex -24.3632 27.7532 0 endloop endfacet facet normal 0.828129 0.560537 0 outer loop - vertex -24.3632 27.7532 -0.1 + vertex -24.3632 27.7532 -0.2 vertex -24.3107 27.6757 0 - vertex -24.3107 27.6757 -0.1 + vertex -24.3107 27.6757 -0.2 endloop endfacet facet normal 0.943401 0.331655 0 outer loop vertex -24.3632 27.7532 0 - vertex -24.3889 27.8265 -0.1 + vertex -24.3889 27.8265 -0.2 vertex -24.3889 27.8265 0 endloop endfacet facet normal 0.943401 0.331655 0 outer loop - vertex -24.3889 27.8265 -0.1 + vertex -24.3889 27.8265 -0.2 vertex -24.3632 27.7532 0 - vertex -24.3632 27.7532 -0.1 + vertex -24.3632 27.7532 -0.2 endloop endfacet facet normal 0.998917 -0.0465292 0 outer loop vertex -24.3889 27.8265 0 - vertex -24.3858 27.8943 -0.1 + vertex -24.3858 27.8943 -0.2 vertex -24.3858 27.8943 0 endloop endfacet facet normal 0.998917 -0.0465292 0 outer loop - vertex -24.3858 27.8943 -0.1 + vertex -24.3858 27.8943 -0.2 vertex -24.3889 27.8265 0 - vertex -24.3889 27.8265 -0.1 + vertex -24.3889 27.8265 -0.2 endloop endfacet facet normal 0.871924 -0.489641 0 outer loop vertex -24.3858 27.8943 0 - vertex -24.3515 27.9554 -0.1 + vertex -24.3515 27.9554 -0.2 vertex -24.3515 27.9554 0 endloop endfacet facet normal 0.871924 -0.489641 0 outer loop - vertex -24.3515 27.9554 -0.1 + vertex -24.3515 27.9554 -0.2 vertex -24.3858 27.8943 0 - vertex -24.3858 27.8943 -0.1 + vertex -24.3858 27.8943 -0.2 endloop endfacet facet normal 0.330372 -0.943851 0 outer loop - vertex -24.3515 27.9554 -0.1 + vertex -24.3515 27.9554 -0.2 vertex -24.2923 27.9761 0 vertex -24.3515 27.9554 0 endloop @@ -41939,13 +41939,13 @@ solid OpenSCAD_Model facet normal 0.330372 -0.943851 0 outer loop vertex -24.2923 27.9761 0 - vertex -24.3515 27.9554 -0.1 - vertex -24.2923 27.9761 -0.1 + vertex -24.3515 27.9554 -0.2 + vertex -24.2923 27.9761 -0.2 endloop endfacet facet normal 0.0962711 -0.995355 0 outer loop - vertex -24.2923 27.9761 -0.1 + vertex -24.2923 27.9761 -0.2 vertex -24.1643 27.9885 0 vertex -24.2923 27.9761 0 endloop @@ -41953,13 +41953,13 @@ solid OpenSCAD_Model facet normal 0.0962711 -0.995355 0 outer loop vertex -24.1643 27.9885 0 - vertex -24.2923 27.9761 -0.1 - vertex -24.1643 27.9885 -0.1 + vertex -24.2923 27.9761 -0.2 + vertex -24.1643 27.9885 -0.2 endloop endfacet facet normal 0.00166914 -0.999999 0 outer loop - vertex -24.1643 27.9885 -0.1 + vertex -24.1643 27.9885 -0.2 vertex -23.7335 27.9892 0 vertex -24.1643 27.9885 0 endloop @@ -41967,13 +41967,13 @@ solid OpenSCAD_Model facet normal 0.00166914 -0.999999 0 outer loop vertex -23.7335 27.9892 0 - vertex -24.1643 27.9885 -0.1 - vertex -23.7335 27.9892 -0.1 + vertex -24.1643 27.9885 -0.2 + vertex -23.7335 27.9892 -0.2 endloop endfacet facet normal -0.048866 -0.998805 0 outer loop - vertex -23.7335 27.9892 -0.1 + vertex -23.7335 27.9892 -0.2 vertex -23.1232 27.9594 0 vertex -23.7335 27.9892 0 endloop @@ -41981,13 +41981,13 @@ solid OpenSCAD_Model facet normal -0.048866 -0.998805 -0 outer loop vertex -23.1232 27.9594 0 - vertex -23.7335 27.9892 -0.1 - vertex -23.1232 27.9594 -0.1 + vertex -23.7335 27.9892 -0.2 + vertex -23.1232 27.9594 -0.2 endloop endfacet facet normal -0.0805478 -0.996751 0 outer loop - vertex -23.1232 27.9594 -0.1 + vertex -23.1232 27.9594 -0.2 vertex -22.3975 27.9007 0 vertex -23.1232 27.9594 0 endloop @@ -41995,13 +41995,13 @@ solid OpenSCAD_Model facet normal -0.0805478 -0.996751 -0 outer loop vertex -22.3975 27.9007 0 - vertex -23.1232 27.9594 -0.1 - vertex -22.3975 27.9007 -0.1 + vertex -23.1232 27.9594 -0.2 + vertex -22.3975 27.9007 -0.2 endloop endfacet facet normal -0.115526 -0.993304 0 outer loop - vertex -22.3975 27.9007 -0.1 + vertex -22.3975 27.9007 -0.2 vertex -21.4599 27.7917 0 vertex -22.3975 27.9007 0 endloop @@ -42009,13 +42009,13 @@ solid OpenSCAD_Model facet normal -0.115526 -0.993304 -0 outer loop vertex -21.4599 27.7917 0 - vertex -22.3975 27.9007 -0.1 - vertex -21.4599 27.7917 -0.1 + vertex -22.3975 27.9007 -0.2 + vertex -21.4599 27.7917 -0.2 endloop endfacet facet normal -0.170472 -0.985363 0 outer loop - vertex -21.4599 27.7917 -0.1 + vertex -21.4599 27.7917 -0.2 vertex -21.1001 27.7294 0 vertex -21.4599 27.7917 0 endloop @@ -42023,13 +42023,13 @@ solid OpenSCAD_Model facet normal -0.170472 -0.985363 -0 outer loop vertex -21.1001 27.7294 0 - vertex -21.4599 27.7917 -0.1 - vertex -21.1001 27.7294 -0.1 + vertex -21.4599 27.7917 -0.2 + vertex -21.1001 27.7294 -0.2 endloop endfacet facet normal -0.23059 -0.973051 0 outer loop - vertex -21.1001 27.7294 -0.1 + vertex -21.1001 27.7294 -0.2 vertex -20.7979 27.6578 0 vertex -21.1001 27.7294 0 endloop @@ -42037,13 +42037,13 @@ solid OpenSCAD_Model facet normal -0.23059 -0.973051 -0 outer loop vertex -20.7979 27.6578 0 - vertex -21.1001 27.7294 -0.1 - vertex -20.7979 27.6578 -0.1 + vertex -21.1001 27.7294 -0.2 + vertex -20.7979 27.6578 -0.2 endloop endfacet facet normal -0.312278 -0.949991 0 outer loop - vertex -20.7979 27.6578 -0.1 + vertex -20.7979 27.6578 -0.2 vertex -20.5419 27.5737 0 vertex -20.7979 27.6578 0 endloop @@ -42051,13 +42051,13 @@ solid OpenSCAD_Model facet normal -0.312278 -0.949991 -0 outer loop vertex -20.5419 27.5737 0 - vertex -20.7979 27.6578 -0.1 - vertex -20.5419 27.5737 -0.1 + vertex -20.7979 27.6578 -0.2 + vertex -20.5419 27.5737 -0.2 endloop endfacet facet normal -0.411473 -0.911422 0 outer loop - vertex -20.5419 27.5737 -0.1 + vertex -20.5419 27.5737 -0.2 vertex -20.3206 27.4738 0 vertex -20.5419 27.5737 0 endloop @@ -42065,13 +42065,13 @@ solid OpenSCAD_Model facet normal -0.411473 -0.911422 -0 outer loop vertex -20.3206 27.4738 0 - vertex -20.5419 27.5737 -0.1 - vertex -20.3206 27.4738 -0.1 + vertex -20.5419 27.5737 -0.2 + vertex -20.3206 27.4738 -0.2 endloop endfacet facet normal -0.51473 -0.857352 0 outer loop - vertex -20.3206 27.4738 -0.1 + vertex -20.3206 27.4738 -0.2 vertex -20.1227 27.3549 0 vertex -20.3206 27.4738 0 endloop @@ -42079,13 +42079,13 @@ solid OpenSCAD_Model facet normal -0.51473 -0.857352 -0 outer loop vertex -20.1227 27.3549 0 - vertex -20.3206 27.4738 -0.1 - vertex -20.1227 27.3549 -0.1 + vertex -20.3206 27.4738 -0.2 + vertex -20.1227 27.3549 -0.2 endloop endfacet facet normal -0.604059 -0.79694 0 outer loop - vertex -20.1227 27.3549 -0.1 + vertex -20.1227 27.3549 -0.2 vertex -19.9368 27.2141 0 vertex -20.1227 27.3549 0 endloop @@ -42093,13 +42093,13 @@ solid OpenSCAD_Model facet normal -0.604059 -0.79694 -0 outer loop vertex -19.9368 27.2141 0 - vertex -20.1227 27.3549 -0.1 - vertex -19.9368 27.2141 -0.1 + vertex -20.1227 27.3549 -0.2 + vertex -19.9368 27.2141 -0.2 endloop endfacet facet normal -0.64002 -0.768358 0 outer loop - vertex -19.9368 27.2141 -0.1 + vertex -19.9368 27.2141 -0.2 vertex -19.3233 26.703 0 vertex -19.9368 27.2141 0 endloop @@ -42107,13 +42107,13 @@ solid OpenSCAD_Model facet normal -0.64002 -0.768358 -0 outer loop vertex -19.3233 26.703 0 - vertex -19.9368 27.2141 -0.1 - vertex -19.3233 26.703 -0.1 + vertex -19.9368 27.2141 -0.2 + vertex -19.3233 26.703 -0.2 endloop endfacet facet normal 0.254038 -0.967194 0 outer loop - vertex -19.3233 26.703 -0.1 + vertex -19.3233 26.703 -0.2 vertex -16.9758 27.3196 0 vertex -19.3233 26.703 0 endloop @@ -42121,13 +42121,13 @@ solid OpenSCAD_Model facet normal 0.254038 -0.967194 0 outer loop vertex -16.9758 27.3196 0 - vertex -19.3233 26.703 -0.1 - vertex -16.9758 27.3196 -0.1 + vertex -19.3233 26.703 -0.2 + vertex -16.9758 27.3196 -0.2 endloop endfacet facet normal 0.236306 -0.971679 0 outer loop - vertex -16.9758 27.3196 -0.1 + vertex -16.9758 27.3196 -0.2 vertex -16.0674 27.5405 0 vertex -16.9758 27.3196 0 endloop @@ -42135,13 +42135,13 @@ solid OpenSCAD_Model facet normal 0.236306 -0.971679 0 outer loop vertex -16.0674 27.5405 0 - vertex -16.9758 27.3196 -0.1 - vertex -16.0674 27.5405 -0.1 + vertex -16.9758 27.3196 -0.2 + vertex -16.0674 27.5405 -0.2 endloop endfacet facet normal 0.186349 -0.982484 0 outer loop - vertex -16.0674 27.5405 -0.1 + vertex -16.0674 27.5405 -0.2 vertex -15.2259 27.7001 0 vertex -16.0674 27.5405 0 endloop @@ -42149,13 +42149,13 @@ solid OpenSCAD_Model facet normal 0.186349 -0.982484 0 outer loop vertex -15.2259 27.7001 0 - vertex -16.0674 27.5405 -0.1 - vertex -15.2259 27.7001 -0.1 + vertex -16.0674 27.5405 -0.2 + vertex -15.2259 27.7001 -0.2 endloop endfacet facet normal 0.119004 -0.992894 0 outer loop - vertex -15.2259 27.7001 -0.1 + vertex -15.2259 27.7001 -0.2 vertex -14.4014 27.7989 0 vertex -15.2259 27.7001 0 endloop @@ -42163,13 +42163,13 @@ solid OpenSCAD_Model facet normal 0.119004 -0.992894 0 outer loop vertex -14.4014 27.7989 0 - vertex -15.2259 27.7001 -0.1 - vertex -14.4014 27.7989 -0.1 + vertex -15.2259 27.7001 -0.2 + vertex -14.4014 27.7989 -0.2 endloop endfacet facet normal 0.0448493 -0.998994 0 outer loop - vertex -14.4014 27.7989 -0.1 + vertex -14.4014 27.7989 -0.2 vertex -13.5445 27.8374 0 vertex -14.4014 27.7989 0 endloop @@ -42177,13 +42177,13 @@ solid OpenSCAD_Model facet normal 0.0448493 -0.998994 0 outer loop vertex -13.5445 27.8374 0 - vertex -14.4014 27.7989 -0.1 - vertex -13.5445 27.8374 -0.1 + vertex -14.4014 27.7989 -0.2 + vertex -13.5445 27.8374 -0.2 endloop endfacet facet normal -0.0227723 -0.999741 0 outer loop - vertex -13.5445 27.8374 -0.1 + vertex -13.5445 27.8374 -0.2 vertex -12.6053 27.816 0 vertex -13.5445 27.8374 0 endloop @@ -42191,13 +42191,13 @@ solid OpenSCAD_Model facet normal -0.0227723 -0.999741 -0 outer loop vertex -12.6053 27.816 0 - vertex -13.5445 27.8374 -0.1 - vertex -12.6053 27.816 -0.1 + vertex -13.5445 27.8374 -0.2 + vertex -12.6053 27.816 -0.2 endloop endfacet facet normal -0.0752121 -0.997168 0 outer loop - vertex -12.6053 27.816 -0.1 + vertex -12.6053 27.816 -0.2 vertex -11.5342 27.7352 0 vertex -12.6053 27.816 0 endloop @@ -42205,13 +42205,13 @@ solid OpenSCAD_Model facet normal -0.0752121 -0.997168 -0 outer loop vertex -11.5342 27.7352 0 - vertex -12.6053 27.816 -0.1 - vertex -11.5342 27.7352 -0.1 + vertex -12.6053 27.816 -0.2 + vertex -11.5342 27.7352 -0.2 endloop endfacet facet normal -0.110844 -0.993838 0 outer loop - vertex -11.5342 27.7352 -0.1 + vertex -11.5342 27.7352 -0.2 vertex -10.2816 27.5955 0 vertex -11.5342 27.7352 0 endloop @@ -42219,13 +42219,13 @@ solid OpenSCAD_Model facet normal -0.110844 -0.993838 -0 outer loop vertex -10.2816 27.5955 0 - vertex -11.5342 27.7352 -0.1 - vertex -10.2816 27.5955 -0.1 + vertex -11.5342 27.7352 -0.2 + vertex -10.2816 27.5955 -0.2 endloop endfacet facet normal -0.132367 -0.991201 0 outer loop - vertex -10.2816 27.5955 -0.1 + vertex -10.2816 27.5955 -0.2 vertex -8.79778 27.3973 0 vertex -10.2816 27.5955 0 endloop @@ -42233,13 +42233,13 @@ solid OpenSCAD_Model facet normal -0.132367 -0.991201 -0 outer loop vertex -8.79778 27.3973 0 - vertex -10.2816 27.5955 -0.1 - vertex -8.79778 27.3973 -0.1 + vertex -10.2816 27.5955 -0.2 + vertex -8.79778 27.3973 -0.2 endloop endfacet facet normal -0.122316 -0.992491 0 outer loop - vertex -8.79778 27.3973 -0.1 + vertex -8.79778 27.3973 -0.2 vertex -7.89877 27.2865 0 vertex -8.79778 27.3973 0 endloop @@ -42247,13 +42247,13 @@ solid OpenSCAD_Model facet normal -0.122316 -0.992491 -0 outer loop vertex -7.89877 27.2865 0 - vertex -8.79778 27.3973 -0.1 - vertex -7.89877 27.2865 -0.1 + vertex -8.79778 27.3973 -0.2 + vertex -7.89877 27.2865 -0.2 endloop endfacet facet normal -0.0652699 -0.997868 0 outer loop - vertex -7.89877 27.2865 -0.1 + vertex -7.89877 27.2865 -0.2 vertex -7.24334 27.2437 0 vertex -7.89877 27.2865 0 endloop @@ -42261,13 +42261,13 @@ solid OpenSCAD_Model facet normal -0.0652699 -0.997868 -0 outer loop vertex -7.24334 27.2437 0 - vertex -7.89877 27.2865 -0.1 - vertex -7.24334 27.2437 -0.1 + vertex -7.89877 27.2865 -0.2 + vertex -7.24334 27.2437 -0.2 endloop endfacet facet normal 0.0157984 -0.999875 0 outer loop - vertex -7.24334 27.2437 -0.1 + vertex -7.24334 27.2437 -0.2 vertex -6.99768 27.2475 0 vertex -7.24334 27.2437 0 endloop @@ -42275,13 +42275,13 @@ solid OpenSCAD_Model facet normal 0.0157984 -0.999875 0 outer loop vertex -6.99768 27.2475 0 - vertex -7.24334 27.2437 -0.1 - vertex -6.99768 27.2475 -0.1 + vertex -7.24334 27.2437 -0.2 + vertex -6.99768 27.2475 -0.2 endloop endfacet facet normal 0.104958 -0.994477 0 outer loop - vertex -6.99768 27.2475 -0.1 + vertex -6.99768 27.2475 -0.2 vertex -6.80178 27.2682 0 vertex -6.99768 27.2475 0 endloop @@ -42289,13 +42289,13 @@ solid OpenSCAD_Model facet normal 0.104958 -0.994477 0 outer loop vertex -6.80178 27.2682 0 - vertex -6.99768 27.2475 -0.1 - vertex -6.80178 27.2682 -0.1 + vertex -6.99768 27.2475 -0.2 + vertex -6.80178 27.2682 -0.2 endloop endfacet facet normal 0.242196 -0.970227 0 outer loop - vertex -6.80178 27.2682 -0.1 + vertex -6.80178 27.2682 -0.2 vertex -6.65192 27.3056 0 vertex -6.80178 27.2682 0 endloop @@ -42303,13 +42303,13 @@ solid OpenSCAD_Model facet normal 0.242196 -0.970227 0 outer loop vertex -6.65192 27.3056 0 - vertex -6.80178 27.2682 -0.1 - vertex -6.65192 27.3056 -0.1 + vertex -6.80178 27.2682 -0.2 + vertex -6.65192 27.3056 -0.2 endloop endfacet facet normal 0.449315 -0.893373 0 outer loop - vertex -6.65192 27.3056 -0.1 + vertex -6.65192 27.3056 -0.2 vertex -6.54439 27.3597 0 vertex -6.65192 27.3056 0 endloop @@ -42317,209 +42317,209 @@ solid OpenSCAD_Model facet normal 0.449315 -0.893373 0 outer loop vertex -6.54439 27.3597 0 - vertex -6.65192 27.3056 -0.1 - vertex -6.54439 27.3597 -0.1 + vertex -6.65192 27.3056 -0.2 + vertex -6.54439 27.3597 -0.2 endloop endfacet facet normal 0.709468 -0.704738 0 outer loop vertex -6.54439 27.3597 0 - vertex -6.44763 27.4571 -0.1 + vertex -6.44763 27.4571 -0.2 vertex -6.44763 27.4571 0 endloop endfacet facet normal 0.709468 -0.704738 0 outer loop - vertex -6.44763 27.4571 -0.1 + vertex -6.44763 27.4571 -0.2 vertex -6.54439 27.3597 0 - vertex -6.54439 27.3597 -0.1 + vertex -6.54439 27.3597 -0.2 endloop endfacet facet normal 0.90334 -0.428926 0 outer loop vertex -6.44763 27.4571 0 - vertex -6.37156 27.6173 -0.1 + vertex -6.37156 27.6173 -0.2 vertex -6.37156 27.6173 0 endloop endfacet facet normal 0.90334 -0.428926 0 outer loop - vertex -6.37156 27.6173 -0.1 + vertex -6.37156 27.6173 -0.2 vertex -6.44763 27.4571 0 - vertex -6.44763 27.4571 -0.1 + vertex -6.44763 27.4571 -0.2 endloop endfacet facet normal 0.975305 -0.220862 0 outer loop vertex -6.37156 27.6173 0 - vertex -6.31368 27.8729 -0.1 + vertex -6.31368 27.8729 -0.2 vertex -6.31368 27.8729 0 endloop endfacet facet normal 0.975305 -0.220862 0 outer loop - vertex -6.31368 27.8729 -0.1 + vertex -6.31368 27.8729 -0.2 vertex -6.37156 27.6173 0 - vertex -6.37156 27.6173 -0.1 + vertex -6.37156 27.6173 -0.2 endloop endfacet facet normal 0.994005 -0.109334 0 outer loop vertex -6.31368 27.8729 0 - vertex -6.27149 28.2565 -0.1 + vertex -6.27149 28.2565 -0.2 vertex -6.27149 28.2565 0 endloop endfacet facet normal 0.994005 -0.109334 0 outer loop - vertex -6.27149 28.2565 -0.1 + vertex -6.27149 28.2565 -0.2 vertex -6.31368 27.8729 0 - vertex -6.31368 27.8729 -0.1 + vertex -6.31368 27.8729 -0.2 endloop endfacet facet normal 0.998582 -0.0532268 0 outer loop vertex -6.27149 28.2565 0 - vertex -6.24249 28.8007 -0.1 + vertex -6.24249 28.8007 -0.2 vertex -6.24249 28.8007 0 endloop endfacet facet normal 0.998582 -0.0532268 0 outer loop - vertex -6.24249 28.8007 -0.1 + vertex -6.24249 28.8007 -0.2 vertex -6.27149 28.2565 0 - vertex -6.27149 28.2565 -0.1 + vertex -6.27149 28.2565 -0.2 endloop endfacet facet normal 0.999691 -0.0248385 0 outer loop vertex -6.24249 28.8007 0 - vertex -6.22417 29.538 -0.1 + vertex -6.22417 29.538 -0.2 vertex -6.22417 29.538 0 endloop endfacet facet normal 0.999691 -0.0248385 0 outer loop - vertex -6.22417 29.538 -0.1 + vertex -6.22417 29.538 -0.2 vertex -6.24249 28.8007 0 - vertex -6.24249 28.8007 -0.1 + vertex -6.24249 28.8007 -0.2 endloop endfacet facet normal 0.999978 -0.00667916 0 outer loop vertex -6.22417 29.538 0 - vertex -6.20957 31.7226 -0.1 + vertex -6.20957 31.7226 -0.2 vertex -6.20957 31.7226 0 endloop endfacet facet normal 0.999978 -0.00667916 0 outer loop - vertex -6.20957 31.7226 -0.1 + vertex -6.20957 31.7226 -0.2 vertex -6.22417 29.538 0 - vertex -6.22417 29.538 -0.1 + vertex -6.22417 29.538 -0.2 endloop endfacet facet normal 0.999955 -0.00944041 0 outer loop vertex -6.20957 31.7226 0 - vertex -6.19415 33.3563 -0.1 + vertex -6.19415 33.3563 -0.2 vertex -6.19415 33.3563 0 endloop endfacet facet normal 0.999955 -0.00944041 0 outer loop - vertex -6.19415 33.3563 -0.1 + vertex -6.19415 33.3563 -0.2 vertex -6.20957 31.7226 0 - vertex -6.20957 31.7226 -0.1 + vertex -6.20957 31.7226 -0.2 endloop endfacet facet normal 0.999658 -0.0261462 0 outer loop vertex -6.19415 33.3563 0 - vertex -6.15766 34.7516 -0.1 + vertex -6.15766 34.7516 -0.2 vertex -6.15766 34.7516 0 endloop endfacet facet normal 0.999658 -0.0261462 0 outer loop - vertex -6.15766 34.7516 -0.1 + vertex -6.15766 34.7516 -0.2 vertex -6.19415 33.3563 0 - vertex -6.19415 33.3563 -0.1 + vertex -6.19415 33.3563 -0.2 endloop endfacet facet normal 0.998669 -0.0515827 0 outer loop vertex -6.15766 34.7516 0 - vertex -6.10555 35.7605 -0.1 + vertex -6.10555 35.7605 -0.2 vertex -6.10555 35.7605 0 endloop endfacet facet normal 0.998669 -0.0515827 0 outer loop - vertex -6.10555 35.7605 -0.1 + vertex -6.10555 35.7605 -0.2 vertex -6.15766 34.7516 0 - vertex -6.15766 34.7516 -0.1 + vertex -6.15766 34.7516 -0.2 endloop endfacet facet normal 0.995383 -0.0959818 0 outer loop vertex -6.10555 35.7605 0 - vertex -6.07534 36.0738 -0.1 + vertex -6.07534 36.0738 -0.2 vertex -6.07534 36.0738 0 endloop endfacet facet normal 0.995383 -0.0959818 0 outer loop - vertex -6.07534 36.0738 -0.1 + vertex -6.07534 36.0738 -0.2 vertex -6.10555 35.7605 0 - vertex -6.10555 35.7605 -0.1 + vertex -6.10555 35.7605 -0.2 endloop endfacet facet normal 0.980771 -0.195161 0 outer loop vertex -6.07534 36.0738 0 - vertex -6.04327 36.2349 -0.1 + vertex -6.04327 36.2349 -0.2 vertex -6.04327 36.2349 0 endloop endfacet facet normal 0.980771 -0.195161 0 outer loop - vertex -6.04327 36.2349 -0.1 + vertex -6.04327 36.2349 -0.2 vertex -6.07534 36.0738 0 - vertex -6.07534 36.0738 -0.1 + vertex -6.07534 36.0738 -0.2 endloop endfacet facet normal 0.887411 -0.460979 0 outer loop vertex -6.04327 36.2349 0 - vertex -5.92579 36.4611 -0.1 + vertex -5.92579 36.4611 -0.2 vertex -5.92579 36.4611 0 endloop endfacet facet normal 0.887411 -0.460979 0 outer loop - vertex -5.92579 36.4611 -0.1 + vertex -5.92579 36.4611 -0.2 vertex -6.04327 36.2349 0 - vertex -6.04327 36.2349 -0.1 + vertex -6.04327 36.2349 -0.2 endloop endfacet facet normal 0.77348 -0.633821 0 outer loop vertex -5.92579 36.4611 0 - vertex -5.86569 36.5344 -0.1 + vertex -5.86569 36.5344 -0.2 vertex -5.86569 36.5344 0 endloop endfacet facet normal 0.77348 -0.633821 0 outer loop - vertex -5.86569 36.5344 -0.1 + vertex -5.86569 36.5344 -0.2 vertex -5.92579 36.4611 0 - vertex -5.92579 36.4611 -0.1 + vertex -5.92579 36.4611 -0.2 endloop endfacet facet normal 0.607425 -0.794377 0 outer loop - vertex -5.86569 36.5344 -0.1 + vertex -5.86569 36.5344 -0.2 vertex -5.80457 36.5812 0 vertex -5.86569 36.5344 0 endloop @@ -42527,13 +42527,13 @@ solid OpenSCAD_Model facet normal 0.607425 -0.794377 0 outer loop vertex -5.80457 36.5812 0 - vertex -5.86569 36.5344 -0.1 - vertex -5.80457 36.5812 -0.1 + vertex -5.86569 36.5344 -0.2 + vertex -5.80457 36.5812 -0.2 endloop endfacet facet normal 0.306429 -0.951894 0 outer loop - vertex -5.80457 36.5812 -0.1 + vertex -5.80457 36.5812 -0.2 vertex -5.74234 36.6012 0 vertex -5.80457 36.5812 0 endloop @@ -42541,13 +42541,13 @@ solid OpenSCAD_Model facet normal 0.306429 -0.951894 0 outer loop vertex -5.74234 36.6012 0 - vertex -5.80457 36.5812 -0.1 - vertex -5.74234 36.6012 -0.1 + vertex -5.80457 36.5812 -0.2 + vertex -5.74234 36.6012 -0.2 endloop endfacet facet normal -0.106116 -0.994354 0 outer loop - vertex -5.74234 36.6012 -0.1 + vertex -5.74234 36.6012 -0.2 vertex -5.67893 36.5944 0 vertex -5.74234 36.6012 0 endloop @@ -42555,13 +42555,13 @@ solid OpenSCAD_Model facet normal -0.106116 -0.994354 -0 outer loop vertex -5.67893 36.5944 0 - vertex -5.74234 36.6012 -0.1 - vertex -5.67893 36.5944 -0.1 + vertex -5.74234 36.6012 -0.2 + vertex -5.67893 36.5944 -0.2 endloop endfacet facet normal -0.461592 -0.887092 0 outer loop - vertex -5.67893 36.5944 -0.1 + vertex -5.67893 36.5944 -0.2 vertex -5.61425 36.5608 0 vertex -5.67893 36.5944 0 endloop @@ -42569,13 +42569,13 @@ solid OpenSCAD_Model facet normal -0.461592 -0.887092 -0 outer loop vertex -5.61425 36.5608 0 - vertex -5.67893 36.5944 -0.1 - vertex -5.61425 36.5608 -0.1 + vertex -5.67893 36.5944 -0.2 + vertex -5.61425 36.5608 -0.2 endloop endfacet facet normal -0.67638 -0.736553 0 outer loop - vertex -5.61425 36.5608 -0.1 + vertex -5.61425 36.5608 -0.2 vertex -5.54821 36.5001 0 vertex -5.61425 36.5608 0 endloop @@ -42583,237 +42583,237 @@ solid OpenSCAD_Model facet normal -0.67638 -0.736553 -0 outer loop vertex -5.54821 36.5001 0 - vertex -5.61425 36.5608 -0.1 - vertex -5.54821 36.5001 -0.1 + vertex -5.61425 36.5608 -0.2 + vertex -5.54821 36.5001 -0.2 endloop endfacet facet normal -0.829388 -0.558673 0 outer loop - vertex -5.41174 36.2975 -0.1 + vertex -5.41174 36.2975 -0.2 vertex -5.54821 36.5001 0 - vertex -5.54821 36.5001 -0.1 + vertex -5.54821 36.5001 -0.2 endloop endfacet facet normal -0.829388 -0.558673 0 outer loop vertex -5.54821 36.5001 0 - vertex -5.41174 36.2975 -0.1 + vertex -5.41174 36.2975 -0.2 vertex -5.41174 36.2975 0 endloop endfacet facet normal -0.909006 -0.416783 0 outer loop - vertex -5.26884 35.9859 -0.1 + vertex -5.26884 35.9859 -0.2 vertex -5.41174 36.2975 0 - vertex -5.41174 36.2975 -0.1 + vertex -5.41174 36.2975 -0.2 endloop endfacet facet normal -0.909006 -0.416783 0 outer loop vertex -5.41174 36.2975 0 - vertex -5.26884 35.9859 -0.1 + vertex -5.26884 35.9859 -0.2 vertex -5.26884 35.9859 0 endloop endfacet facet normal -0.942118 -0.335281 0 outer loop - vertex -5.11886 35.5644 -0.1 + vertex -5.11886 35.5644 -0.2 vertex -5.26884 35.9859 0 - vertex -5.26884 35.9859 -0.1 + vertex -5.26884 35.9859 -0.2 endloop endfacet facet normal -0.942118 -0.335281 0 outer loop vertex -5.26884 35.9859 0 - vertex -5.11886 35.5644 -0.1 + vertex -5.11886 35.5644 -0.2 vertex -5.11886 35.5644 0 endloop endfacet facet normal -0.958738 -0.28429 0 outer loop - vertex -4.96111 35.0324 -0.1 + vertex -4.96111 35.0324 -0.2 vertex -5.11886 35.5644 0 - vertex -5.11886 35.5644 -0.1 + vertex -5.11886 35.5644 -0.2 endloop endfacet facet normal -0.958738 -0.28429 0 outer loop vertex -5.11886 35.5644 0 - vertex -4.96111 35.0324 -0.1 + vertex -4.96111 35.0324 -0.2 vertex -4.96111 35.0324 0 endloop endfacet facet normal -0.959965 -0.280118 0 outer loop - vertex -4.73722 34.2652 -0.1 + vertex -4.73722 34.2652 -0.2 vertex -4.96111 35.0324 0 - vertex -4.96111 35.0324 -0.1 + vertex -4.96111 35.0324 -0.2 endloop endfacet facet normal -0.959965 -0.280118 0 outer loop vertex -4.96111 35.0324 0 - vertex -4.73722 34.2652 -0.1 + vertex -4.73722 34.2652 -0.2 vertex -4.73722 34.2652 0 endloop endfacet facet normal -0.950901 -0.309494 0 outer loop - vertex -4.49616 33.5245 -0.1 + vertex -4.49616 33.5245 -0.2 vertex -4.73722 34.2652 0 - vertex -4.73722 34.2652 -0.1 + vertex -4.73722 34.2652 -0.2 endloop endfacet facet normal -0.950901 -0.309494 0 outer loop vertex -4.73722 34.2652 0 - vertex -4.49616 33.5245 -0.1 + vertex -4.49616 33.5245 -0.2 vertex -4.49616 33.5245 0 endloop endfacet facet normal -0.940636 -0.339418 0 outer loop - vertex -4.23933 32.8128 -0.1 + vertex -4.23933 32.8128 -0.2 vertex -4.49616 33.5245 0 - vertex -4.49616 33.5245 -0.1 + vertex -4.49616 33.5245 -0.2 endloop endfacet facet normal -0.940636 -0.339418 0 outer loop vertex -4.49616 33.5245 0 - vertex -4.23933 32.8128 -0.1 + vertex -4.23933 32.8128 -0.2 vertex -4.23933 32.8128 0 endloop endfacet facet normal -0.928971 -0.370153 0 outer loop - vertex -3.96814 32.1322 -0.1 + vertex -3.96814 32.1322 -0.2 vertex -4.23933 32.8128 0 - vertex -4.23933 32.8128 -0.1 + vertex -4.23933 32.8128 -0.2 endloop endfacet facet normal -0.928971 -0.370153 0 outer loop vertex -4.23933 32.8128 0 - vertex -3.96814 32.1322 -0.1 + vertex -3.96814 32.1322 -0.2 vertex -3.96814 32.1322 0 endloop endfacet facet normal -0.915636 -0.402008 0 outer loop - vertex -3.68399 31.485 -0.1 + vertex -3.68399 31.485 -0.2 vertex -3.96814 32.1322 0 - vertex -3.96814 32.1322 -0.1 + vertex -3.96814 32.1322 -0.2 endloop endfacet facet normal -0.915636 -0.402008 0 outer loop vertex -3.96814 32.1322 0 - vertex -3.68399 31.485 -0.1 + vertex -3.68399 31.485 -0.2 vertex -3.68399 31.485 0 endloop endfacet facet normal -0.900273 -0.435326 0 outer loop - vertex -3.38828 30.8734 -0.1 + vertex -3.38828 30.8734 -0.2 vertex -3.68399 31.485 0 - vertex -3.68399 31.485 -0.1 + vertex -3.68399 31.485 -0.2 endloop endfacet facet normal -0.900273 -0.435326 0 outer loop vertex -3.68399 31.485 0 - vertex -3.38828 30.8734 -0.1 + vertex -3.38828 30.8734 -0.2 vertex -3.38828 30.8734 0 endloop endfacet facet normal -0.882395 -0.47051 0 outer loop - vertex -3.08241 30.2998 -0.1 + vertex -3.08241 30.2998 -0.2 vertex -3.38828 30.8734 0 - vertex -3.38828 30.8734 -0.1 + vertex -3.38828 30.8734 -0.2 endloop endfacet facet normal -0.882395 -0.47051 0 outer loop vertex -3.38828 30.8734 0 - vertex -3.08241 30.2998 -0.1 + vertex -3.08241 30.2998 -0.2 vertex -3.08241 30.2998 0 endloop endfacet facet normal -0.861349 -0.508014 0 outer loop - vertex -2.7678 29.7664 -0.1 + vertex -2.7678 29.7664 -0.2 vertex -3.08241 30.2998 0 - vertex -3.08241 30.2998 -0.1 + vertex -3.08241 30.2998 -0.2 endloop endfacet facet normal -0.861349 -0.508014 0 outer loop vertex -3.08241 30.2998 0 - vertex -2.7678 29.7664 -0.1 + vertex -2.7678 29.7664 -0.2 vertex -2.7678 29.7664 0 endloop endfacet facet normal -0.83625 -0.548349 0 outer loop - vertex -2.44583 29.2754 -0.1 + vertex -2.44583 29.2754 -0.2 vertex -2.7678 29.7664 0 - vertex -2.7678 29.7664 -0.1 + vertex -2.7678 29.7664 -0.2 endloop endfacet facet normal -0.83625 -0.548349 0 outer loop vertex -2.7678 29.7664 0 - vertex -2.44583 29.2754 -0.1 + vertex -2.44583 29.2754 -0.2 vertex -2.44583 29.2754 0 endloop endfacet facet normal -0.805875 -0.592086 0 outer loop - vertex -2.11792 28.8291 -0.1 + vertex -2.11792 28.8291 -0.2 vertex -2.44583 29.2754 0 - vertex -2.44583 29.2754 -0.1 + vertex -2.44583 29.2754 -0.2 endloop endfacet facet normal -0.805875 -0.592086 0 outer loop vertex -2.44583 29.2754 0 - vertex -2.11792 28.8291 -0.1 + vertex -2.11792 28.8291 -0.2 vertex -2.11792 28.8291 0 endloop endfacet facet normal -0.768548 -0.639792 0 outer loop - vertex -1.78547 28.4297 -0.1 + vertex -1.78547 28.4297 -0.2 vertex -2.11792 28.8291 0 - vertex -2.11792 28.8291 -0.1 + vertex -2.11792 28.8291 -0.2 endloop endfacet facet normal -0.768548 -0.639792 0 outer loop vertex -2.11792 28.8291 0 - vertex -1.78547 28.4297 -0.1 + vertex -1.78547 28.4297 -0.2 vertex -1.78547 28.4297 0 endloop endfacet facet normal -0.721954 -0.691941 0 outer loop - vertex -1.44988 28.0795 -0.1 + vertex -1.44988 28.0795 -0.2 vertex -1.78547 28.4297 0 - vertex -1.78547 28.4297 -0.1 + vertex -1.78547 28.4297 -0.2 endloop endfacet facet normal -0.721954 -0.691941 0 outer loop vertex -1.78547 28.4297 0 - vertex -1.44988 28.0795 -0.1 + vertex -1.44988 28.0795 -0.2 vertex -1.44988 28.0795 0 endloop endfacet facet normal -0.662916 -0.748694 0 outer loop - vertex -1.44988 28.0795 -0.1 + vertex -1.44988 28.0795 -0.2 vertex -1.11256 27.7809 0 vertex -1.44988 28.0795 0 endloop @@ -42821,13 +42821,13 @@ solid OpenSCAD_Model facet normal -0.662916 -0.748694 -0 outer loop vertex -1.11256 27.7809 0 - vertex -1.44988 28.0795 -0.1 - vertex -1.11256 27.7809 -0.1 + vertex -1.44988 28.0795 -0.2 + vertex -1.11256 27.7809 -0.2 endloop endfacet facet normal -0.5872 -0.809442 0 outer loop - vertex -1.11256 27.7809 -0.1 + vertex -1.11256 27.7809 -0.2 vertex -0.7749 27.5359 0 vertex -1.11256 27.7809 0 endloop @@ -42835,13 +42835,13 @@ solid OpenSCAD_Model facet normal -0.5872 -0.809442 -0 outer loop vertex -0.7749 27.5359 0 - vertex -1.11256 27.7809 -0.1 - vertex -0.7749 27.5359 -0.1 + vertex -1.11256 27.7809 -0.2 + vertex -0.7749 27.5359 -0.2 endloop endfacet facet normal -0.48954 -0.871981 0 outer loop - vertex -0.7749 27.5359 -0.1 + vertex -0.7749 27.5359 -0.2 vertex -0.438314 27.347 0 vertex -0.7749 27.5359 0 endloop @@ -42849,13 +42849,13 @@ solid OpenSCAD_Model facet normal -0.48954 -0.871981 -0 outer loop vertex -0.438314 27.347 0 - vertex -0.7749 27.5359 -0.1 - vertex -0.438314 27.347 -0.1 + vertex -0.7749 27.5359 -0.2 + vertex -0.438314 27.347 -0.2 endloop endfacet facet normal -0.364353 -0.931261 0 outer loop - vertex -0.438314 27.347 -0.1 + vertex -0.438314 27.347 -0.2 vertex -0.104203 27.2162 0 vertex -0.438314 27.347 0 endloop @@ -42863,13 +42863,13 @@ solid OpenSCAD_Model facet normal -0.364353 -0.931261 -0 outer loop vertex -0.104203 27.2162 0 - vertex -0.438314 27.347 -0.1 - vertex -0.104203 27.2162 -0.1 + vertex -0.438314 27.347 -0.2 + vertex -0.104203 27.2162 -0.2 endloop endfacet facet normal -0.248562 -0.968616 0 outer loop - vertex -0.104203 27.2162 -0.1 + vertex -0.104203 27.2162 -0.2 vertex 0.215611 27.1342 0 vertex -0.104203 27.2162 0 endloop @@ -42877,13 +42877,13 @@ solid OpenSCAD_Model facet normal -0.248562 -0.968616 -0 outer loop vertex 0.215611 27.1342 0 - vertex -0.104203 27.2162 -0.1 - vertex 0.215611 27.1342 -0.1 + vertex -0.104203 27.2162 -0.2 + vertex 0.215611 27.1342 -0.2 endloop endfacet facet normal -0.161031 -0.986949 0 outer loop - vertex 0.215611 27.1342 -0.1 + vertex 0.215611 27.1342 -0.2 vertex 0.505992 27.0868 0 vertex 0.215611 27.1342 0 endloop @@ -42891,13 +42891,13 @@ solid OpenSCAD_Model facet normal -0.161031 -0.986949 -0 outer loop vertex 0.505992 27.0868 0 - vertex 0.215611 27.1342 -0.1 - vertex 0.505992 27.0868 -0.1 + vertex 0.215611 27.1342 -0.2 + vertex 0.505992 27.0868 -0.2 endloop endfacet facet normal -0.0401535 -0.999194 0 outer loop - vertex 0.505992 27.0868 -0.1 + vertex 0.505992 27.0868 -0.2 vertex 0.734953 27.0776 0 vertex 0.505992 27.0868 0 endloop @@ -42905,13 +42905,13 @@ solid OpenSCAD_Model facet normal -0.0401535 -0.999194 -0 outer loop vertex 0.734953 27.0776 0 - vertex 0.505992 27.0868 -0.1 - vertex 0.734953 27.0776 -0.1 + vertex 0.505992 27.0868 -0.2 + vertex 0.734953 27.0776 -0.2 endloop endfacet facet normal 0.1315 -0.991316 0 outer loop - vertex 0.734953 27.0776 -0.1 + vertex 0.734953 27.0776 -0.2 vertex 0.816408 27.0884 0 vertex 0.734953 27.0776 0 endloop @@ -42919,13 +42919,13 @@ solid OpenSCAD_Model facet normal 0.1315 -0.991316 0 outer loop vertex 0.816408 27.0884 0 - vertex 0.734953 27.0776 -0.1 - vertex 0.816408 27.0884 -0.1 + vertex 0.734953 27.0776 -0.2 + vertex 0.816408 27.0884 -0.2 endloop endfacet facet normal 0.371587 -0.928398 0 outer loop - vertex 0.816408 27.0884 -0.1 + vertex 0.816408 27.0884 -0.2 vertex 0.870515 27.1101 0 vertex 0.816408 27.0884 0 endloop @@ -42933,293 +42933,293 @@ solid OpenSCAD_Model facet normal 0.371587 -0.928398 0 outer loop vertex 0.870515 27.1101 0 - vertex 0.816408 27.0884 -0.1 - vertex 0.870515 27.1101 -0.1 + vertex 0.816408 27.0884 -0.2 + vertex 0.870515 27.1101 -0.2 endloop endfacet facet normal 0.819454 -0.573145 0 outer loop vertex 0.870515 27.1101 0 - vertex 0.908598 27.1645 -0.1 + vertex 0.908598 27.1645 -0.2 vertex 0.908598 27.1645 0 endloop endfacet facet normal 0.819454 -0.573145 0 outer loop - vertex 0.908598 27.1645 -0.1 + vertex 0.908598 27.1645 -0.2 vertex 0.870515 27.1101 0 - vertex 0.870515 27.1101 -0.1 + vertex 0.870515 27.1101 -0.2 endloop endfacet facet normal 0.947054 -0.321074 0 outer loop vertex 0.908598 27.1645 0 - vertex 0.944126 27.2693 -0.1 + vertex 0.944126 27.2693 -0.2 vertex 0.944126 27.2693 0 endloop endfacet facet normal 0.947054 -0.321074 0 outer loop - vertex 0.944126 27.2693 -0.1 + vertex 0.944126 27.2693 -0.2 vertex 0.908598 27.1645 0 - vertex 0.908598 27.1645 -0.1 + vertex 0.908598 27.1645 -0.2 endloop endfacet facet normal 0.984285 -0.17659 0 outer loop vertex 0.944126 27.2693 0 - vertex 1.00441 27.6053 -0.1 + vertex 1.00441 27.6053 -0.2 vertex 1.00441 27.6053 0 endloop endfacet facet normal 0.984285 -0.17659 0 outer loop - vertex 1.00441 27.6053 -0.1 + vertex 1.00441 27.6053 -0.2 vertex 0.944126 27.2693 0 - vertex 0.944126 27.2693 -0.1 + vertex 0.944126 27.2693 -0.2 endloop endfacet facet normal 0.996161 -0.0875344 0 outer loop vertex 1.00441 27.6053 0 - vertex 1.04514 28.0688 -0.1 + vertex 1.04514 28.0688 -0.2 vertex 1.04514 28.0688 0 endloop endfacet facet normal 0.996161 -0.0875344 0 outer loop - vertex 1.04514 28.0688 -0.1 + vertex 1.04514 28.0688 -0.2 vertex 1.00441 27.6053 0 - vertex 1.00441 27.6053 -0.1 + vertex 1.00441 27.6053 -0.2 endloop endfacet facet normal 0.999619 -0.0276007 0 outer loop vertex 1.04514 28.0688 0 - vertex 1.0601 28.6106 -0.1 + vertex 1.0601 28.6106 -0.2 vertex 1.0601 28.6106 0 endloop endfacet facet normal 0.999619 -0.0276007 0 outer loop - vertex 1.0601 28.6106 -0.1 + vertex 1.0601 28.6106 -0.2 vertex 1.04514 28.0688 0 - vertex 1.04514 28.0688 -0.1 + vertex 1.04514 28.0688 -0.2 endloop endfacet facet normal 0.999546 -0.0301211 0 outer loop vertex 1.0601 28.6106 0 - vertex 1.07949 29.2543 -0.1 + vertex 1.07949 29.2543 -0.2 vertex 1.07949 29.2543 0 endloop endfacet facet normal 0.999546 -0.0301211 0 outer loop - vertex 1.07949 29.2543 -0.1 + vertex 1.07949 29.2543 -0.2 vertex 1.0601 28.6106 0 - vertex 1.0601 28.6106 -0.1 + vertex 1.0601 28.6106 -0.2 endloop endfacet facet normal 0.995652 -0.0931476 0 outer loop vertex 1.07949 29.2543 0 - vertex 1.13903 29.8907 -0.1 + vertex 1.13903 29.8907 -0.2 vertex 1.13903 29.8907 0 endloop endfacet facet normal 0.995652 -0.0931476 0 outer loop - vertex 1.13903 29.8907 -0.1 + vertex 1.13903 29.8907 -0.2 vertex 1.07949 29.2543 0 - vertex 1.07949 29.2543 -0.1 + vertex 1.07949 29.2543 -0.2 endloop endfacet facet normal 0.987491 -0.157674 0 outer loop vertex 1.13903 29.8907 0 - vertex 1.24074 30.5277 -0.1 + vertex 1.24074 30.5277 -0.2 vertex 1.24074 30.5277 0 endloop endfacet facet normal 0.987491 -0.157674 0 outer loop - vertex 1.24074 30.5277 -0.1 + vertex 1.24074 30.5277 -0.2 vertex 1.13903 29.8907 0 - vertex 1.13903 29.8907 -0.1 + vertex 1.13903 29.8907 -0.2 endloop endfacet facet normal 0.975385 -0.220507 0 outer loop vertex 1.24074 30.5277 0 - vertex 1.38662 31.173 -0.1 + vertex 1.38662 31.173 -0.2 vertex 1.38662 31.173 0 endloop endfacet facet normal 0.975385 -0.220507 0 outer loop - vertex 1.38662 31.173 -0.1 + vertex 1.38662 31.173 -0.2 vertex 1.24074 30.5277 0 - vertex 1.24074 30.5277 -0.1 + vertex 1.24074 30.5277 -0.2 endloop endfacet facet normal 0.960327 -0.278878 0 outer loop vertex 1.38662 31.173 0 - vertex 1.57871 31.8344 -0.1 + vertex 1.57871 31.8344 -0.2 vertex 1.57871 31.8344 0 endloop endfacet facet normal 0.960327 -0.278878 0 outer loop - vertex 1.57871 31.8344 -0.1 + vertex 1.57871 31.8344 -0.2 vertex 1.38662 31.173 0 - vertex 1.38662 31.173 -0.1 + vertex 1.38662 31.173 -0.2 endloop endfacet facet normal 0.943682 -0.330853 0 outer loop vertex 1.57871 31.8344 0 - vertex 1.81903 32.5199 -0.1 + vertex 1.81903 32.5199 -0.2 vertex 1.81903 32.5199 0 endloop endfacet facet normal 0.943682 -0.330853 0 outer loop - vertex 1.81903 32.5199 -0.1 + vertex 1.81903 32.5199 -0.2 vertex 1.57871 31.8344 0 - vertex 1.57871 31.8344 -0.1 + vertex 1.57871 31.8344 -0.2 endloop endfacet facet normal 0.926833 -0.375474 0 outer loop vertex 1.81903 32.5199 0 - vertex 2.10958 33.2371 -0.1 + vertex 2.10958 33.2371 -0.2 vertex 2.10958 33.2371 0 endloop endfacet facet normal 0.926833 -0.375474 0 outer loop - vertex 2.10958 33.2371 -0.1 + vertex 2.10958 33.2371 -0.2 vertex 1.81903 32.5199 0 - vertex 1.81903 32.5199 -0.1 + vertex 1.81903 32.5199 -0.2 endloop endfacet facet normal 0.910903 -0.412619 0 outer loop vertex 2.10958 33.2371 0 - vertex 2.4524 33.9939 -0.1 + vertex 2.4524 33.9939 -0.2 vertex 2.4524 33.9939 0 endloop endfacet facet normal 0.910903 -0.412619 0 outer loop - vertex 2.4524 33.9939 -0.1 + vertex 2.4524 33.9939 -0.2 vertex 2.10958 33.2371 0 - vertex 2.10958 33.2371 -0.1 + vertex 2.10958 33.2371 -0.2 endloop endfacet facet normal 0.897899 -0.440202 0 outer loop vertex 2.4524 33.9939 0 - vertex 2.84738 34.7996 -0.1 + vertex 2.84738 34.7996 -0.2 vertex 2.84738 34.7996 0 endloop endfacet facet normal 0.897899 -0.440202 0 outer loop - vertex 2.84738 34.7996 -0.1 + vertex 2.84738 34.7996 -0.2 vertex 2.4524 33.9939 0 - vertex 2.4524 33.9939 -0.1 + vertex 2.4524 33.9939 -0.2 endloop endfacet facet normal 0.887623 -0.460571 0 outer loop vertex 2.84738 34.7996 0 - vertex 3.26543 35.6052 -0.1 + vertex 3.26543 35.6052 -0.2 vertex 3.26543 35.6052 0 endloop endfacet facet normal 0.887623 -0.460571 0 outer loop - vertex 3.26543 35.6052 -0.1 + vertex 3.26543 35.6052 -0.2 vertex 2.84738 34.7996 0 - vertex 2.84738 34.7996 -0.1 + vertex 2.84738 34.7996 -0.2 endloop endfacet facet normal 0.877821 -0.478989 0 outer loop vertex 3.26543 35.6052 0 - vertex 3.68699 36.3778 -0.1 + vertex 3.68699 36.3778 -0.2 vertex 3.68699 36.3778 0 endloop endfacet facet normal 0.877821 -0.478989 0 outer loop - vertex 3.68699 36.3778 -0.1 + vertex 3.68699 36.3778 -0.2 vertex 3.26543 35.6052 0 - vertex 3.26543 35.6052 -0.1 + vertex 3.26543 35.6052 -0.2 endloop endfacet facet normal 0.867241 -0.497888 0 outer loop vertex 3.68699 36.3778 0 - vertex 4.09252 37.0842 -0.1 + vertex 4.09252 37.0842 -0.2 vertex 4.09252 37.0842 0 endloop endfacet facet normal 0.867241 -0.497888 0 outer loop - vertex 4.09252 37.0842 -0.1 + vertex 4.09252 37.0842 -0.2 vertex 3.68699 36.3778 0 - vertex 3.68699 36.3778 -0.1 + vertex 3.68699 36.3778 -0.2 endloop endfacet facet normal 0.853923 -0.520399 0 outer loop vertex 4.09252 37.0842 0 - vertex 4.46246 37.6912 -0.1 + vertex 4.46246 37.6912 -0.2 vertex 4.46246 37.6912 0 endloop endfacet facet normal 0.853923 -0.520399 0 outer loop - vertex 4.46246 37.6912 -0.1 + vertex 4.46246 37.6912 -0.2 vertex 4.09252 37.0842 0 - vertex 4.09252 37.0842 -0.1 + vertex 4.09252 37.0842 -0.2 endloop endfacet facet normal 0.833342 -0.552757 0 outer loop vertex 4.46246 37.6912 0 - vertex 4.77727 38.1658 -0.1 + vertex 4.77727 38.1658 -0.2 vertex 4.77727 38.1658 0 endloop endfacet facet normal 0.833342 -0.552757 0 outer loop - vertex 4.77727 38.1658 -0.1 + vertex 4.77727 38.1658 -0.2 vertex 4.46246 37.6912 0 - vertex 4.46246 37.6912 -0.1 + vertex 4.46246 37.6912 -0.2 endloop endfacet facet normal 0.789667 -0.613535 0 outer loop vertex 4.77727 38.1658 0 - vertex 5.01738 38.4749 -0.1 + vertex 5.01738 38.4749 -0.2 vertex 5.01738 38.4749 0 endloop endfacet facet normal 0.789667 -0.613535 0 outer loop - vertex 5.01738 38.4749 -0.1 + vertex 5.01738 38.4749 -0.2 vertex 4.77727 38.1658 0 - vertex 4.77727 38.1658 -0.1 + vertex 4.77727 38.1658 -0.2 endloop endfacet facet normal 0.690746 -0.723097 0 outer loop - vertex 5.01738 38.4749 -0.1 + vertex 5.01738 38.4749 -0.2 vertex 5.10332 38.557 0 vertex 5.01738 38.4749 0 endloop @@ -43227,13 +43227,13 @@ solid OpenSCAD_Model facet normal 0.690746 -0.723097 0 outer loop vertex 5.10332 38.557 0 - vertex 5.01738 38.4749 -0.1 - vertex 5.10332 38.557 -0.1 + vertex 5.01738 38.4749 -0.2 + vertex 5.10332 38.557 -0.2 endloop endfacet facet normal 0.426773 -0.904359 0 outer loop - vertex 5.10332 38.557 -0.1 + vertex 5.10332 38.557 -0.2 vertex 5.16325 38.5852 0 vertex 5.10332 38.557 0 endloop @@ -43241,13 +43241,13 @@ solid OpenSCAD_Model facet normal 0.426773 -0.904359 0 outer loop vertex 5.16325 38.5852 0 - vertex 5.10332 38.557 -0.1 - vertex 5.16325 38.5852 -0.1 + vertex 5.10332 38.557 -0.2 + vertex 5.16325 38.5852 -0.2 endloop endfacet facet normal -0.22248 -0.974937 0 outer loop - vertex 5.16325 38.5852 -0.1 + vertex 5.16325 38.5852 -0.2 vertex 5.20457 38.5758 0 vertex 5.16325 38.5852 0 endloop @@ -43255,139 +43255,139 @@ solid OpenSCAD_Model facet normal -0.22248 -0.974937 -0 outer loop vertex 5.20457 38.5758 0 - vertex 5.16325 38.5852 -0.1 - vertex 5.20457 38.5758 -0.1 + vertex 5.16325 38.5852 -0.2 + vertex 5.20457 38.5758 -0.2 endloop endfacet facet normal -0.944948 0.327219 0 outer loop - vertex 7.1242 19.0144 -0.1 + vertex 7.1242 19.0144 -0.2 vertex 7.15267 19.0966 0 - vertex 7.15267 19.0966 -0.1 + vertex 7.15267 19.0966 -0.2 endloop endfacet facet normal -0.944948 0.327219 0 outer loop vertex 7.15267 19.0966 0 - vertex 7.1242 19.0144 -0.1 + vertex 7.1242 19.0144 -0.2 vertex 7.1242 19.0144 0 endloop endfacet facet normal -0.999677 -0.0254292 0 outer loop - vertex 7.1273 18.8927 -0.1 + vertex 7.1273 18.8927 -0.2 vertex 7.1242 19.0144 0 - vertex 7.1242 19.0144 -0.1 + vertex 7.1242 19.0144 -0.2 endloop endfacet facet normal -0.999677 -0.0254292 0 outer loop vertex 7.1242 19.0144 0 - vertex 7.1273 18.8927 -0.1 + vertex 7.1273 18.8927 -0.2 vertex 7.1273 18.8927 0 endloop endfacet facet normal -0.971548 -0.236844 0 outer loop - vertex 7.16351 18.7442 -0.1 + vertex 7.16351 18.7442 -0.2 vertex 7.1273 18.8927 0 - vertex 7.1273 18.8927 -0.1 + vertex 7.1273 18.8927 -0.2 endloop endfacet facet normal -0.971548 -0.236844 0 outer loop vertex 7.1273 18.8927 0 - vertex 7.16351 18.7442 -0.1 + vertex 7.16351 18.7442 -0.2 vertex 7.16351 18.7442 0 endloop endfacet facet normal -0.922269 -0.38655 0 outer loop - vertex 7.29207 18.4374 -0.1 + vertex 7.29207 18.4374 -0.2 vertex 7.16351 18.7442 0 - vertex 7.16351 18.7442 -0.1 + vertex 7.16351 18.7442 -0.2 endloop endfacet facet normal -0.922269 -0.38655 0 outer loop vertex 7.16351 18.7442 0 - vertex 7.29207 18.4374 -0.1 + vertex 7.29207 18.4374 -0.2 vertex 7.29207 18.4374 0 endloop endfacet facet normal -0.894309 -0.44745 0 outer loop - vertex 7.49889 18.0241 -0.1 + vertex 7.49889 18.0241 -0.2 vertex 7.29207 18.4374 0 - vertex 7.29207 18.4374 -0.1 + vertex 7.29207 18.4374 -0.2 endloop endfacet facet normal -0.894309 -0.44745 0 outer loop vertex 7.29207 18.4374 0 - vertex 7.49889 18.0241 -0.1 + vertex 7.49889 18.0241 -0.2 vertex 7.49889 18.0241 0 endloop endfacet facet normal -0.872312 -0.488949 0 outer loop - vertex 8.03973 17.0592 -0.1 + vertex 8.03973 17.0592 -0.2 vertex 7.49889 18.0241 0 - vertex 7.49889 18.0241 -0.1 + vertex 7.49889 18.0241 -0.2 endloop endfacet facet normal -0.872312 -0.488949 0 outer loop vertex 7.49889 18.0241 0 - vertex 8.03973 17.0592 -0.1 + vertex 8.03973 17.0592 -0.2 vertex 8.03973 17.0592 0 endloop endfacet facet normal -0.84697 -0.53164 0 outer loop - vertex 8.57086 16.213 -0.1 + vertex 8.57086 16.213 -0.2 vertex 8.03973 17.0592 0 - vertex 8.03973 17.0592 -0.1 + vertex 8.03973 17.0592 -0.2 endloop endfacet facet normal -0.84697 -0.53164 0 outer loop vertex 8.03973 17.0592 0 - vertex 8.57086 16.213 -0.1 + vertex 8.57086 16.213 -0.2 vertex 8.57086 16.213 0 endloop endfacet facet normal -0.805848 -0.592122 0 outer loop - vertex 8.76553 15.9481 -0.1 + vertex 8.76553 15.9481 -0.2 vertex 8.57086 16.213 0 - vertex 8.57086 16.213 -0.1 + vertex 8.57086 16.213 -0.2 endloop endfacet facet normal -0.805848 -0.592122 0 outer loop vertex 8.57086 16.213 0 - vertex 8.76553 15.9481 -0.1 + vertex 8.76553 15.9481 -0.2 vertex 8.76553 15.9481 0 endloop endfacet facet normal -0.732738 -0.680511 0 outer loop - vertex 8.83337 15.875 -0.1 + vertex 8.83337 15.875 -0.2 vertex 8.76553 15.9481 0 - vertex 8.76553 15.9481 -0.1 + vertex 8.76553 15.9481 -0.2 endloop endfacet facet normal -0.732738 -0.680511 0 outer loop vertex 8.76553 15.9481 0 - vertex 8.83337 15.875 -0.1 + vertex 8.83337 15.875 -0.2 vertex 8.83337 15.875 0 endloop endfacet facet normal -0.509392 -0.860535 0 outer loop - vertex 8.83337 15.875 -0.1 + vertex 8.83337 15.875 -0.2 vertex 8.87708 15.8492 0 vertex 8.83337 15.875 0 endloop @@ -43395,13 +43395,13 @@ solid OpenSCAD_Model facet normal -0.509392 -0.860535 -0 outer loop vertex 8.87708 15.8492 0 - vertex 8.83337 15.875 -0.1 - vertex 8.87708 15.8492 -0.1 + vertex 8.83337 15.875 -0.2 + vertex 8.87708 15.8492 -0.2 endloop endfacet facet normal 0.216566 -0.976268 0 outer loop - vertex 8.87708 15.8492 -0.1 + vertex 8.87708 15.8492 -0.2 vertex 8.99158 15.8746 0 vertex 8.87708 15.8492 0 endloop @@ -43409,13 +43409,13 @@ solid OpenSCAD_Model facet normal 0.216566 -0.976268 0 outer loop vertex 8.99158 15.8746 0 - vertex 8.87708 15.8492 -0.1 - vertex 8.99158 15.8746 -0.1 + vertex 8.87708 15.8492 -0.2 + vertex 8.99158 15.8746 -0.2 endloop endfacet facet normal 0.333607 -0.942712 0 outer loop - vertex 8.99158 15.8746 -0.1 + vertex 8.99158 15.8746 -0.2 vertex 9.19116 15.9452 0 vertex 8.99158 15.8746 0 endloop @@ -43423,13 +43423,13 @@ solid OpenSCAD_Model facet normal 0.333607 -0.942712 0 outer loop vertex 9.19116 15.9452 0 - vertex 8.99158 15.8746 -0.1 - vertex 9.19116 15.9452 -0.1 + vertex 8.99158 15.8746 -0.2 + vertex 9.19116 15.9452 -0.2 endloop endfacet facet normal 0.395815 -0.91833 0 outer loop - vertex 9.19116 15.9452 -0.1 + vertex 9.19116 15.9452 -0.2 vertex 9.73318 16.1788 0 vertex 9.19116 15.9452 0 endloop @@ -43437,13 +43437,13 @@ solid OpenSCAD_Model facet normal 0.395815 -0.91833 0 outer loop vertex 9.73318 16.1788 0 - vertex 9.19116 15.9452 -0.1 - vertex 9.73318 16.1788 -0.1 + vertex 9.19116 15.9452 -0.2 + vertex 9.73318 16.1788 -0.2 endloop endfacet facet normal 0.425917 -0.904762 0 outer loop - vertex 9.73318 16.1788 -0.1 + vertex 9.73318 16.1788 -0.2 vertex 10.4375 16.5104 0 vertex 9.73318 16.1788 0 endloop @@ -43451,27 +43451,27 @@ solid OpenSCAD_Model facet normal 0.425917 -0.904762 0 outer loop vertex 10.4375 16.5104 0 - vertex 9.73318 16.1788 -0.1 - vertex 10.4375 16.5104 -0.1 + vertex 9.73318 16.1788 -0.2 + vertex 10.4375 16.5104 -0.2 endloop endfacet facet normal 0.716732 0.697349 0 outer loop vertex 10.4375 16.5104 0 - vertex 9.77546 17.1908 -0.1 + vertex 9.77546 17.1908 -0.2 vertex 9.77546 17.1908 0 endloop endfacet facet normal 0.716732 0.697349 0 outer loop - vertex 9.77546 17.1908 -0.1 + vertex 9.77546 17.1908 -0.2 vertex 10.4375 16.5104 0 - vertex 10.4375 16.5104 -0.1 + vertex 10.4375 16.5104 -0.2 endloop endfacet facet normal 0.695522 0.718505 -0 outer loop - vertex 9.77546 17.1908 -0.1 + vertex 9.77546 17.1908 -0.2 vertex 9.46246 17.4938 0 vertex 9.77546 17.1908 0 endloop @@ -43479,13 +43479,13 @@ solid OpenSCAD_Model facet normal 0.695522 0.718505 0 outer loop vertex 9.46246 17.4938 0 - vertex 9.77546 17.1908 -0.1 - vertex 9.46246 17.4938 -0.1 + vertex 9.77546 17.1908 -0.2 + vertex 9.46246 17.4938 -0.2 endloop endfacet facet normal 0.663067 0.74856 -0 outer loop - vertex 9.46246 17.4938 -0.1 + vertex 9.46246 17.4938 -0.2 vertex 9.09841 17.8163 0 vertex 9.46246 17.4938 0 endloop @@ -43493,13 +43493,13 @@ solid OpenSCAD_Model facet normal 0.663067 0.74856 0 outer loop vertex 9.09841 17.8163 0 - vertex 9.46246 17.4938 -0.1 - vertex 9.09841 17.8163 -0.1 + vertex 9.46246 17.4938 -0.2 + vertex 9.09841 17.8163 -0.2 endloop endfacet facet normal 0.6264 0.779502 -0 outer loop - vertex 9.09841 17.8163 -0.1 + vertex 9.09841 17.8163 -0.2 vertex 8.31493 18.4459 0 vertex 9.09841 17.8163 0 endloop @@ -43507,13 +43507,13 @@ solid OpenSCAD_Model facet normal 0.6264 0.779502 0 outer loop vertex 8.31493 18.4459 0 - vertex 9.09841 17.8163 -0.1 - vertex 8.31493 18.4459 -0.1 + vertex 9.09841 17.8163 -0.2 + vertex 8.31493 18.4459 -0.2 endloop endfacet facet normal 0.58921 0.80798 -0 outer loop - vertex 8.31493 18.4459 -0.1 + vertex 8.31493 18.4459 -0.2 vertex 7.9444 18.7161 0 vertex 8.31493 18.4459 0 endloop @@ -43521,13 +43521,13 @@ solid OpenSCAD_Model facet normal 0.58921 0.80798 0 outer loop vertex 7.9444 18.7161 0 - vertex 8.31493 18.4459 -0.1 - vertex 7.9444 18.7161 -0.1 + vertex 8.31493 18.4459 -0.2 + vertex 7.9444 18.7161 -0.2 endloop endfacet facet normal 0.554709 0.832044 -0 outer loop - vertex 7.9444 18.7161 -0.1 + vertex 7.9444 18.7161 -0.2 vertex 7.62063 18.9319 0 vertex 7.9444 18.7161 0 endloop @@ -43535,13 +43535,13 @@ solid OpenSCAD_Model facet normal 0.554709 0.832044 0 outer loop vertex 7.62063 18.9319 0 - vertex 7.9444 18.7161 -0.1 - vertex 7.62063 18.9319 -0.1 + vertex 7.9444 18.7161 -0.2 + vertex 7.62063 18.9319 -0.2 endloop endfacet facet normal 0.492817 0.870133 -0 outer loop - vertex 7.62063 18.9319 -0.1 + vertex 7.62063 18.9319 -0.2 vertex 7.36805 19.075 0 vertex 7.62063 18.9319 0 endloop @@ -43549,13 +43549,13 @@ solid OpenSCAD_Model facet normal 0.492817 0.870133 0 outer loop vertex 7.36805 19.075 0 - vertex 7.62063 18.9319 -0.1 - vertex 7.36805 19.075 -0.1 + vertex 7.62063 18.9319 -0.2 + vertex 7.36805 19.075 -0.2 endloop endfacet facet normal 0.313373 0.94963 -0 outer loop - vertex 7.36805 19.075 -0.1 + vertex 7.36805 19.075 -0.2 vertex 7.21113 19.1268 0 vertex 7.36805 19.075 0 endloop @@ -43563,13 +43563,13 @@ solid OpenSCAD_Model facet normal 0.313373 0.94963 0 outer loop vertex 7.21113 19.1268 0 - vertex 7.36805 19.075 -0.1 - vertex 7.21113 19.1268 -0.1 + vertex 7.36805 19.075 -0.2 + vertex 7.21113 19.1268 -0.2 endloop endfacet facet normal -0.458832 0.888523 0 outer loop - vertex 7.21113 19.1268 -0.1 + vertex 7.21113 19.1268 -0.2 vertex 7.15267 19.0966 0 vertex 7.21113 19.1268 0 endloop @@ -43577,13 +43577,13 @@ solid OpenSCAD_Model facet normal -0.458832 0.888523 0 outer loop vertex 7.15267 19.0966 0 - vertex 7.21113 19.1268 -0.1 - vertex 7.15267 19.0966 -0.1 + vertex 7.21113 19.1268 -0.2 + vertex 7.15267 19.0966 -0.2 endloop endfacet facet normal -0.0478819 0.998853 0 outer loop - vertex -14.6988 24.986 -0.1 + vertex -14.6988 24.986 -0.2 vertex -15.4289 24.9511 0 vertex -14.6988 24.986 0 endloop @@ -43591,13 +43591,13 @@ solid OpenSCAD_Model facet normal -0.0478819 0.998853 0 outer loop vertex -15.4289 24.9511 0 - vertex -14.6988 24.986 -0.1 - vertex -15.4289 24.9511 -0.1 + vertex -14.6988 24.986 -0.2 + vertex -15.4289 24.9511 -0.2 endloop endfacet facet normal -0.102501 0.994733 0 outer loop - vertex -15.4289 24.9511 -0.1 + vertex -15.4289 24.9511 -0.2 vertex -16.0762 24.8844 0 vertex -15.4289 24.9511 0 endloop @@ -43605,13 +43605,13 @@ solid OpenSCAD_Model facet normal -0.102501 0.994733 0 outer loop vertex -16.0762 24.8844 0 - vertex -15.4289 24.9511 -0.1 - vertex -16.0762 24.8844 -0.1 + vertex -15.4289 24.9511 -0.2 + vertex -16.0762 24.8844 -0.2 endloop endfacet facet normal -0.186067 0.982537 0 outer loop - vertex -16.0762 24.8844 -0.1 + vertex -16.0762 24.8844 -0.2 vertex -16.599 24.7853 0 vertex -16.0762 24.8844 0 endloop @@ -43619,13 +43619,13 @@ solid OpenSCAD_Model facet normal -0.186067 0.982537 0 outer loop vertex -16.599 24.7853 0 - vertex -16.0762 24.8844 -0.1 - vertex -16.599 24.7853 -0.1 + vertex -16.0762 24.8844 -0.2 + vertex -16.599 24.7853 -0.2 endloop endfacet facet normal -0.197458 0.980311 0 outer loop - vertex -16.599 24.7853 -0.1 + vertex -16.599 24.7853 -0.2 vertex -17.1707 24.6702 0 vertex -16.599 24.7853 0 endloop @@ -43633,13 +43633,13 @@ solid OpenSCAD_Model facet normal -0.197458 0.980311 0 outer loop vertex -17.1707 24.6702 0 - vertex -16.599 24.7853 -0.1 - vertex -17.1707 24.6702 -0.1 + vertex -16.599 24.7853 -0.2 + vertex -17.1707 24.6702 -0.2 endloop endfacet facet normal -0.159115 0.98726 0 outer loop - vertex -17.1707 24.6702 -0.1 + vertex -17.1707 24.6702 -0.2 vertex -18.0818 24.5233 0 vertex -17.1707 24.6702 0 endloop @@ -43647,13 +43647,13 @@ solid OpenSCAD_Model facet normal -0.159115 0.98726 0 outer loop vertex -18.0818 24.5233 0 - vertex -17.1707 24.6702 -0.1 - vertex -18.0818 24.5233 -0.1 + vertex -17.1707 24.6702 -0.2 + vertex -18.0818 24.5233 -0.2 endloop endfacet facet normal -0.140489 0.990082 0 outer loop - vertex -18.0818 24.5233 -0.1 + vertex -18.0818 24.5233 -0.2 vertex -19.207 24.3637 0 vertex -18.0818 24.5233 0 endloop @@ -43661,13 +43661,13 @@ solid OpenSCAD_Model facet normal -0.140489 0.990082 0 outer loop vertex -19.207 24.3637 0 - vertex -18.0818 24.5233 -0.1 - vertex -19.207 24.3637 -0.1 + vertex -18.0818 24.5233 -0.2 + vertex -19.207 24.3637 -0.2 endloop endfacet facet normal -0.125539 0.992089 0 outer loop - vertex -19.207 24.3637 -0.1 + vertex -19.207 24.3637 -0.2 vertex -20.4207 24.2101 0 vertex -19.207 24.3637 0 endloop @@ -43675,13 +43675,13 @@ solid OpenSCAD_Model facet normal -0.125539 0.992089 0 outer loop vertex -20.4207 24.2101 0 - vertex -19.207 24.3637 -0.1 - vertex -20.4207 24.2101 -0.1 + vertex -19.207 24.3637 -0.2 + vertex -20.4207 24.2101 -0.2 endloop endfacet facet normal -0.117788 0.993039 0 outer loop - vertex -20.4207 24.2101 -0.1 + vertex -20.4207 24.2101 -0.2 vertex -23.3692 23.8604 0 vertex -20.4207 24.2101 0 endloop @@ -43689,13 +43689,13 @@ solid OpenSCAD_Model facet normal -0.117788 0.993039 0 outer loop vertex -23.3692 23.8604 0 - vertex -20.4207 24.2101 -0.1 - vertex -23.3692 23.8604 -0.1 + vertex -20.4207 24.2101 -0.2 + vertex -23.3692 23.8604 -0.2 endloop endfacet facet normal -0.645441 -0.76381 0 outer loop - vertex -23.3692 23.8604 -0.1 + vertex -23.3692 23.8604 -0.2 vertex -22.6524 23.2546 0 vertex -23.3692 23.8604 0 endloop @@ -43703,13 +43703,13 @@ solid OpenSCAD_Model facet normal -0.645441 -0.76381 -0 outer loop vertex -22.6524 23.2546 0 - vertex -23.3692 23.8604 -0.1 - vertex -22.6524 23.2546 -0.1 + vertex -23.3692 23.8604 -0.2 + vertex -22.6524 23.2546 -0.2 endloop endfacet facet normal -0.595678 -0.803224 0 outer loop - vertex -22.6524 23.2546 -0.1 + vertex -22.6524 23.2546 -0.2 vertex -22.3422 23.0246 0 vertex -22.6524 23.2546 0 endloop @@ -43717,13 +43717,13 @@ solid OpenSCAD_Model facet normal -0.595678 -0.803224 -0 outer loop vertex -22.3422 23.0246 0 - vertex -22.6524 23.2546 -0.1 - vertex -22.3422 23.0246 -0.1 + vertex -22.6524 23.2546 -0.2 + vertex -22.3422 23.0246 -0.2 endloop endfacet facet normal -0.490603 -0.871383 0 outer loop - vertex -22.3422 23.0246 -0.1 + vertex -22.3422 23.0246 -0.2 vertex -22.0315 22.8497 0 vertex -22.3422 23.0246 0 endloop @@ -43731,13 +43731,13 @@ solid OpenSCAD_Model facet normal -0.490603 -0.871383 -0 outer loop vertex -22.0315 22.8497 0 - vertex -22.3422 23.0246 -0.1 - vertex -22.0315 22.8497 -0.1 + vertex -22.3422 23.0246 -0.2 + vertex -22.0315 22.8497 -0.2 endloop endfacet facet normal -0.350196 -0.936677 0 outer loop - vertex -22.0315 22.8497 -0.1 + vertex -22.0315 22.8497 -0.2 vertex -21.755 22.7463 0 vertex -22.0315 22.8497 0 endloop @@ -43745,13 +43745,13 @@ solid OpenSCAD_Model facet normal -0.350196 -0.936677 -0 outer loop vertex -21.755 22.7463 0 - vertex -22.0315 22.8497 -0.1 - vertex -21.755 22.7463 -0.1 + vertex -22.0315 22.8497 -0.2 + vertex -21.755 22.7463 -0.2 endloop endfacet facet normal -0.169545 -0.985522 0 outer loop - vertex -21.755 22.7463 -0.1 + vertex -21.755 22.7463 -0.2 vertex -21.6404 22.7266 0 vertex -21.755 22.7463 0 endloop @@ -43759,13 +43759,13 @@ solid OpenSCAD_Model facet normal -0.169545 -0.985522 -0 outer loop vertex -21.6404 22.7266 0 - vertex -21.755 22.7463 -0.1 - vertex -21.6404 22.7266 -0.1 + vertex -21.755 22.7463 -0.2 + vertex -21.6404 22.7266 -0.2 endloop endfacet facet normal 0.0467747 -0.998905 0 outer loop - vertex -21.6404 22.7266 -0.1 + vertex -21.6404 22.7266 -0.2 vertex -21.5474 22.7309 0 vertex -21.6404 22.7266 0 endloop @@ -43773,13 +43773,13 @@ solid OpenSCAD_Model facet normal 0.0467747 -0.998905 0 outer loop vertex -21.5474 22.7309 0 - vertex -21.6404 22.7266 -0.1 - vertex -21.5474 22.7309 -0.1 + vertex -21.6404 22.7266 -0.2 + vertex -21.5474 22.7309 -0.2 endloop endfacet facet normal 0.160131 -0.987096 0 outer loop - vertex -21.5474 22.7309 -0.1 + vertex -21.5474 22.7309 -0.2 vertex -20.7318 22.8633 0 vertex -21.5474 22.7309 0 endloop @@ -43787,13 +43787,13 @@ solid OpenSCAD_Model facet normal 0.160131 -0.987096 0 outer loop vertex -20.7318 22.8633 0 - vertex -21.5474 22.7309 -0.1 - vertex -20.7318 22.8633 -0.1 + vertex -21.5474 22.7309 -0.2 + vertex -20.7318 22.8633 -0.2 endloop endfacet facet normal 0.141843 -0.989889 0 outer loop - vertex -20.7318 22.8633 -0.1 + vertex -20.7318 22.8633 -0.2 vertex -19.3158 23.0662 0 vertex -20.7318 22.8633 0 endloop @@ -43801,13 +43801,13 @@ solid OpenSCAD_Model facet normal 0.141843 -0.989889 0 outer loop vertex -19.3158 23.0662 0 - vertex -20.7318 22.8633 -0.1 - vertex -19.3158 23.0662 -0.1 + vertex -20.7318 22.8633 -0.2 + vertex -19.3158 23.0662 -0.2 endloop endfacet facet normal 0.145154 -0.989409 0 outer loop - vertex -19.3158 23.0662 -0.1 + vertex -19.3158 23.0662 -0.2 vertex -17.0412 23.3999 0 vertex -19.3158 23.0662 0 endloop @@ -43815,13 +43815,13 @@ solid OpenSCAD_Model facet normal 0.145154 -0.989409 0 outer loop vertex -17.0412 23.3999 0 - vertex -19.3158 23.0662 -0.1 - vertex -17.0412 23.3999 -0.1 + vertex -19.3158 23.0662 -0.2 + vertex -17.0412 23.3999 -0.2 endloop endfacet facet normal 0.153306 -0.988179 0 outer loop - vertex -17.0412 23.3999 -0.1 + vertex -17.0412 23.3999 -0.2 vertex -14.1612 23.8467 0 vertex -17.0412 23.3999 0 endloop @@ -43829,13 +43829,13 @@ solid OpenSCAD_Model facet normal 0.153306 -0.988179 0 outer loop vertex -14.1612 23.8467 0 - vertex -17.0412 23.3999 -0.1 - vertex -14.1612 23.8467 -0.1 + vertex -17.0412 23.3999 -0.2 + vertex -14.1612 23.8467 -0.2 endloop endfacet facet normal 0.152324 -0.988331 0 outer loop - vertex -14.1612 23.8467 -0.1 + vertex -14.1612 23.8467 -0.2 vertex -10.5711 24.4 0 vertex -14.1612 23.8467 0 endloop @@ -43843,13 +43843,13 @@ solid OpenSCAD_Model facet normal 0.152324 -0.988331 0 outer loop vertex -10.5711 24.4 0 - vertex -14.1612 23.8467 -0.1 - vertex -10.5711 24.4 -0.1 + vertex -14.1612 23.8467 -0.2 + vertex -10.5711 24.4 -0.2 endloop endfacet facet normal 0.28937 -0.957217 0 outer loop - vertex -10.5711 24.4 -0.1 + vertex -10.5711 24.4 -0.2 vertex -10.5349 24.4109 0 vertex -10.5711 24.4 0 endloop @@ -43857,27 +43857,27 @@ solid OpenSCAD_Model facet normal 0.28937 -0.957217 0 outer loop vertex -10.5349 24.4109 0 - vertex -10.5711 24.4 -0.1 - vertex -10.5349 24.4109 -0.1 + vertex -10.5711 24.4 -0.2 + vertex -10.5349 24.4109 -0.2 endloop endfacet facet normal 0.978613 0.20571 0 outer loop vertex -10.5349 24.4109 0 - vertex -10.5394 24.4322 -0.1 + vertex -10.5394 24.4322 -0.2 vertex -10.5394 24.4322 0 endloop endfacet facet normal 0.978613 0.20571 0 outer loop - vertex -10.5394 24.4322 -0.1 + vertex -10.5394 24.4322 -0.2 vertex -10.5349 24.4109 0 - vertex -10.5349 24.4109 -0.1 + vertex -10.5349 24.4109 -0.2 endloop endfacet facet normal 0.497201 0.867635 -0 outer loop - vertex -10.5394 24.4322 -0.1 + vertex -10.5394 24.4322 -0.2 vertex -10.6591 24.5009 0 vertex -10.5394 24.4322 0 endloop @@ -43885,13 +43885,13 @@ solid OpenSCAD_Model facet normal 0.497201 0.867635 0 outer loop vertex -10.6591 24.5009 0 - vertex -10.5394 24.4322 -0.1 - vertex -10.6591 24.5009 -0.1 + vertex -10.5394 24.4322 -0.2 + vertex -10.6591 24.5009 -0.2 endloop endfacet facet normal 0.356744 0.934202 -0 outer loop - vertex -10.6591 24.5009 -0.1 + vertex -10.6591 24.5009 -0.2 vertex -10.9077 24.5958 0 vertex -10.6591 24.5009 0 endloop @@ -43899,13 +43899,13 @@ solid OpenSCAD_Model facet normal 0.356744 0.934202 0 outer loop vertex -10.9077 24.5958 0 - vertex -10.6591 24.5009 -0.1 - vertex -10.9077 24.5958 -0.1 + vertex -10.6591 24.5009 -0.2 + vertex -10.9077 24.5958 -0.2 endloop endfacet facet normal 0.299009 0.95425 -0 outer loop - vertex -10.9077 24.5958 -0.1 + vertex -10.9077 24.5958 -0.2 vertex -11.2625 24.7069 0 vertex -10.9077 24.5958 0 endloop @@ -43913,13 +43913,13 @@ solid OpenSCAD_Model facet normal 0.299009 0.95425 0 outer loop vertex -11.2625 24.7069 0 - vertex -10.9077 24.5958 -0.1 - vertex -11.2625 24.7069 -0.1 + vertex -10.9077 24.5958 -0.2 + vertex -11.2625 24.7069 -0.2 endloop endfacet facet normal 0.214726 0.976674 -0 outer loop - vertex -11.2625 24.7069 -0.1 + vertex -11.2625 24.7069 -0.2 vertex -11.7825 24.8213 0 vertex -11.2625 24.7069 0 endloop @@ -43927,13 +43927,13 @@ solid OpenSCAD_Model facet normal 0.214726 0.976674 0 outer loop vertex -11.7825 24.8213 0 - vertex -11.2625 24.7069 -0.1 - vertex -11.7825 24.8213 -0.1 + vertex -11.2625 24.7069 -0.2 + vertex -11.7825 24.8213 -0.2 endloop endfacet facet normal 0.131639 0.991298 -0 outer loop - vertex -11.7825 24.8213 -0.1 + vertex -11.7825 24.8213 -0.2 vertex -12.4277 24.907 0 vertex -11.7825 24.8213 0 endloop @@ -43941,13 +43941,13 @@ solid OpenSCAD_Model facet normal 0.131639 0.991298 0 outer loop vertex -12.4277 24.907 0 - vertex -11.7825 24.8213 -0.1 - vertex -12.4277 24.907 -0.1 + vertex -11.7825 24.8213 -0.2 + vertex -12.4277 24.907 -0.2 endloop endfacet facet normal 0.0771921 0.997016 -0 outer loop - vertex -12.4277 24.907 -0.1 + vertex -12.4277 24.907 -0.2 vertex -13.1566 24.9634 0 vertex -12.4277 24.907 0 endloop @@ -43955,13 +43955,13 @@ solid OpenSCAD_Model facet normal 0.0771921 0.997016 0 outer loop vertex -13.1566 24.9634 0 - vertex -12.4277 24.907 -0.1 - vertex -13.1566 24.9634 -0.1 + vertex -12.4277 24.907 -0.2 + vertex -13.1566 24.9634 -0.2 endloop endfacet facet normal 0.0344425 0.999407 -0 outer loop - vertex -13.1566 24.9634 -0.1 + vertex -13.1566 24.9634 -0.2 vertex -13.9275 24.99 0 vertex -13.1566 24.9634 0 endloop @@ -43969,13 +43969,13 @@ solid OpenSCAD_Model facet normal 0.0344425 0.999407 0 outer loop vertex -13.9275 24.99 0 - vertex -13.1566 24.9634 -0.1 - vertex -13.9275 24.99 -0.1 + vertex -13.1566 24.9634 -0.2 + vertex -13.9275 24.99 -0.2 endloop endfacet facet normal -0.00506693 0.999987 0 outer loop - vertex -13.9275 24.99 -0.1 + vertex -13.9275 24.99 -0.2 vertex -14.6988 24.986 0 vertex -13.9275 24.99 0 endloop @@ -43983,22 +43983,22 @@ solid OpenSCAD_Model facet normal -0.00506693 0.999987 0 outer loop vertex -14.6988 24.986 0 - vertex -13.9275 24.99 -0.1 - vertex -14.6988 24.986 -0.1 + vertex -13.9275 24.99 -0.2 + vertex -14.6988 24.986 -0.2 endloop endfacet facet normal -1 0 0 outer loop - vertex -110 -110 -3 - vertex -110 110 0 - vertex -110 110 -3 + 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 -110 110 0 - vertex -110 -110 -3 - vertex -110 -110 0 + 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 @@ -44283,7 +44283,7 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -39.1186 25.4589 0 vertex -39.13 25.5984 0 endloop @@ -52858,42 +52858,42 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.9993 -20.1225 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.9745 -19.9807 0 vertex 47.9993 -20.1225 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.9233 -19.8512 0 vertex 47.9745 -19.9807 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.845 -19.7221 0 vertex 47.9233 -19.8512 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.7384 -19.5813 0 vertex 47.845 -19.7221 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 47.6302 -19.4614 0 vertex 47.7384 -19.5813 0 endloop @@ -52902,7 +52902,7 @@ solid OpenSCAD_Model outer loop vertex 27.4995 15.0808 0 vertex 47.6302 -19.4614 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -53031,6 +53031,13 @@ solid OpenSCAD_Model vertex 42.1149 -19.4743 0 endloop endfacet + facet normal 0 0 1 + outer loop + vertex 44.9905 -19.265 0 + vertex 41.7426 -19.1572 0 + vertex 44.6026 -19.3768 0 + endloop + endfacet facet normal -0 -0 1 outer loop vertex 41.9051 -19.2238 0 @@ -53059,13 +53066,6 @@ solid OpenSCAD_Model vertex 43.8201 -19.7253 0 endloop endfacet - facet normal -0 -0 1 - outer loop - vertex 42.1149 -19.4743 0 - vertex 43.8201 -19.7253 0 - vertex 42.0297 -19.3306 0 - endloop - endfacet facet normal -0 -0 1 outer loop vertex 42.0297 -19.3306 0 @@ -53108,11 +53108,11 @@ solid OpenSCAD_Model vertex 41.156 -19.2119 0 endloop endfacet - facet normal -0 -0 1 + facet normal 0 0 1 outer loop - vertex 30.3649 -19.705 0 - vertex 38.4916 -20.1181 0 + vertex 39.5298 -19.7361 0 vertex 29.9546 -19.4981 0 + vertex 38.4916 -20.1181 0 endloop endfacet facet normal 0 0 1 @@ -53311,11 +53311,11 @@ solid OpenSCAD_Model vertex 35.2304 -21.2043 0 endloop endfacet - facet normal 0 0 1 + facet normal -0 -0 1 outer loop - vertex 39.5298 -19.7361 0 - vertex 29.9546 -19.4981 0 + vertex 30.3649 -19.705 0 vertex 38.4916 -20.1181 0 + vertex 29.9546 -19.4981 0 endloop endfacet facet normal -0 0 1 @@ -53325,16 +53325,16 @@ solid OpenSCAD_Model vertex 26.9324 1.61996 0 endloop endfacet - facet normal 0 0 1 + facet normal -0 -0 1 outer loop - vertex 44.9905 -19.265 0 - vertex 41.7426 -19.1572 0 - vertex 44.6026 -19.3768 0 + vertex 42.1149 -19.4743 0 + vertex 43.8201 -19.7253 0 + vertex 42.0297 -19.3306 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 27.4227 15.3534 0 vertex 27.4995 15.0808 0 endloop @@ -53343,7 +53343,7 @@ solid OpenSCAD_Model outer loop vertex 26.5691 18.3624 0 vertex 27.4227 15.3534 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal -0 -0 1 @@ -53404,35 +53404,35 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 26.4859 18.624 0 vertex 26.5691 18.3624 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 26.3832 18.8665 0 vertex 26.4859 18.624 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 26.2605 19.0904 0 vertex 26.3832 18.8665 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 26.1176 19.296 0 vertex 26.2605 19.0904 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 25.9541 19.4837 0 vertex 26.1176 19.296 0 endloop @@ -53441,7 +53441,7 @@ solid OpenSCAD_Model outer loop vertex 21.4677 24.3609 0 vertex 25.9541 19.4837 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -53600,14 +53600,14 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 21.2873 24.568 0 vertex 21.4677 24.3609 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 21.0733 24.7691 0 vertex 21.2873 24.568 0 endloop @@ -53616,7 +53616,7 @@ solid OpenSCAD_Model outer loop vertex 15.4091 30.0386 0 vertex 21.0733 24.7691 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -53754,7 +53754,7 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 15.3672 30.0768 0 vertex 15.4091 30.0386 0 endloop @@ -53763,7 +53763,7 @@ solid OpenSCAD_Model outer loop vertex 5.23504 38.5484 0 vertex 15.3672 30.0768 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -54081,13 +54081,6 @@ solid OpenSCAD_Model vertex 5.39739 26.9794 0 endloop endfacet - facet normal -0 -0 1 - outer loop - vertex 6.07308 26.3793 0 - vertex 7.12606 25.9588 0 - vertex 5.73586 26.6445 0 - endloop - endfacet facet normal -0 0 1 outer loop vertex 5.25596 38.2865 0 @@ -54102,6 +54095,13 @@ solid OpenSCAD_Model vertex 5.02596 37.5856 0 endloop endfacet + facet normal -0 -0 1 + outer loop + vertex 6.07308 26.3793 0 + vertex 7.12606 25.9588 0 + vertex 5.73586 26.6445 0 + endloop + endfacet facet normal 0 0 1 outer loop vertex 7.12606 25.9588 0 @@ -54125,23 +54125,23 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 5.20457 38.5758 0 vertex 5.23504 38.5484 0 endloop endfacet facet normal 0 0 1 outer loop - vertex 110 110 0 + vertex 117.5 117.5 0 vertex 5.16325 38.5852 0 vertex 5.20457 38.5758 0 endloop endfacet facet normal -0 0 1 outer loop - vertex -110 110 0 + vertex -117.5 117.5 0 vertex 5.16325 38.5852 0 - vertex 110 110 0 + vertex 117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -54414,7 +54414,7 @@ solid OpenSCAD_Model outer loop vertex -5.74234 36.6012 0 vertex 5.16325 38.5852 0 - vertex -110 110 0 + vertex -117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -54713,16 +54713,16 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex -16.9758 27.3196 0 - vertex -20.3206 27.4738 0 - vertex -20.1227 27.3549 0 + vertex -5.74234 36.6012 0 + vertex -117.5 117.5 0 + vertex -5.80457 36.5812 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -5.74234 36.6012 0 - vertex -110 110 0 - vertex -5.80457 36.5812 0 + vertex -16.9758 27.3196 0 + vertex -20.3206 27.4738 0 + vertex -20.1227 27.3549 0 endloop endfacet facet normal 0 0 1 @@ -54746,13 +54746,6 @@ solid OpenSCAD_Model vertex -20.7979 27.6578 0 endloop endfacet - facet normal 0 -0 1 - outer loop - vertex -31.0145 27.539 0 - vertex -5.80457 36.5812 0 - vertex -110 110 0 - endloop - endfacet facet normal 0 0 1 outer loop vertex -6.04327 36.2349 0 @@ -54760,6 +54753,13 @@ solid OpenSCAD_Model vertex -21.1001 27.7294 0 endloop endfacet + facet normal 0 -0 1 + outer loop + vertex -31.0145 27.539 0 + vertex -5.80457 36.5812 0 + vertex -117.5 117.5 0 + endloop + endfacet facet normal 0 0 1 outer loop vertex -5.92579 36.4611 0 @@ -54991,17 +54991,10 @@ solid OpenSCAD_Model vertex -31.1289 27.5158 0 endloop endfacet - facet normal 0 0 1 - outer loop - vertex -31.2795 27.2229 0 - vertex -37.0225 24.5398 0 - vertex -36.6025 24.2541 0 - endloop - endfacet facet normal 0 0 1 outer loop vertex -31.0145 27.539 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -31.1289 27.5158 0 endloop endfacet @@ -55012,6 +55005,13 @@ solid OpenSCAD_Model vertex -37.776 25.1404 0 endloop endfacet + facet normal 0 0 1 + outer loop + vertex -31.272 27.3506 0 + vertex -37.776 25.1404 0 + vertex -37.4147 24.8357 0 + endloop + endfacet facet normal 0 0 1 outer loop vertex -31.272 27.3506 0 @@ -55021,9 +55021,9 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex -31.272 27.3506 0 - vertex -37.776 25.1404 0 - vertex -37.4147 24.8357 0 + vertex -31.2795 27.2229 0 + vertex -37.0225 24.5398 0 + vertex -36.6025 24.2541 0 endloop endfacet facet normal 0 0 1 @@ -55044,7 +55044,7 @@ solid OpenSCAD_Model outer loop vertex -38.9416 25.8595 0 vertex -31.1289 27.5158 0 - vertex -110 110 0 + vertex -117.5 117.5 0 endloop endfacet facet normal 0 0 1 @@ -55175,7 +55175,7 @@ solid OpenSCAD_Model endfacet facet normal 0 0 1 outer loop - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -39.13 25.5984 0 vertex -39.1175 25.7085 0 endloop @@ -55246,98 +55246,98 @@ solid OpenSCAD_Model facet normal 0 0 1 outer loop vertex -39.1186 25.4589 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -47.9322 -37.0315 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.984 -37.1977 0 - vertex -110 110 0 + vertex -117.5 117.5 0 endloop endfacet facet normal 0 0 1 outer loop vertex -47.9322 -37.0315 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -47.984 -37.1977 0 endloop endfacet facet normal 0 0 1 outer loop vertex -39.0817 25.7888 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -39.1175 25.7085 0 endloop endfacet facet normal 0 0 1 outer loop vertex -39.0229 25.8392 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -39.0817 25.7888 0 endloop endfacet facet normal 0 0 1 outer loop vertex -38.9416 25.8595 0 - vertex -110 110 0 + vertex -117.5 117.5 0 vertex -39.0229 25.8392 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.9987 -20.2887 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.9993 -20.1225 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.9737 -20.4912 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.9987 -20.2887 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.8542 -21.0531 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.9737 -20.4912 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.7155 -21.5429 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.8542 -21.0531 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.5422 -21.9981 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.7155 -21.5429 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.3383 -22.4165 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.5422 -21.9981 0 endloop endfacet facet normal -0 0 1 outer loop vertex 47.1074 -22.796 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.3383 -22.4165 0 endloop endfacet facet normal -0 0 1 outer loop vertex 46.8534 -23.1343 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 47.1074 -22.796 0 endloop endfacet @@ -55555,83 +55555,83 @@ solid OpenSCAD_Model outer loop vertex 46.8534 -23.1343 0 vertex 38.0668 -37.4245 0 - vertex 110 -110 0 + vertex 38.0057 -37.5705 0 endloop endfacet - facet normal -0 0 1 + facet normal 0 0 1 outer loop + vertex 46.8534 -23.1343 0 vertex 38.0057 -37.5705 0 - vertex 110 -110 0 - vertex 38.0668 -37.4245 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal -0 0 1 outer loop vertex 37.9137 -37.6957 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 38.0057 -37.5705 0 endloop endfacet facet normal -0 0 1 outer loop vertex 37.7849 -37.8018 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 37.9137 -37.6957 0 endloop endfacet facet normal -0 0 1 outer loop vertex 37.6132 -37.8903 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 37.7849 -37.8018 0 endloop endfacet facet normal -0 0 1 outer loop vertex 37.3927 -37.9628 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 37.6132 -37.8903 0 endloop endfacet facet normal -0 0 1 outer loop vertex 37.1174 -38.0208 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 37.3927 -37.9628 0 endloop endfacet facet normal -0 0 1 outer loop vertex 36.7812 -38.066 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 37.1174 -38.0208 0 endloop endfacet facet normal -0 0 1 outer loop vertex 35.9024 -38.1241 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 36.7812 -38.066 0 endloop endfacet facet normal -0 0 1 outer loop vertex 34.7085 -38.1497 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 35.9024 -38.1241 0 endloop endfacet facet normal -0 0 1 outer loop vertex 33.1514 -38.1555 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 34.7085 -38.1497 0 endloop endfacet facet normal 0 0 1 outer loop vertex 31.1824 -38.1409 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 33.1514 -38.1555 0 endloop endfacet @@ -55800,27 +55800,27 @@ solid OpenSCAD_Model outer loop vertex 31.1824 -38.1409 0 vertex 20.3202 -38.5182 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal -0 0 1 outer loop vertex 19.7403 -38.5689 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 20.3202 -38.5182 0 endloop endfacet facet normal -0 0 1 outer loop vertex 19.1073 -38.5852 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 19.7403 -38.5689 0 endloop endfacet facet normal 0 0 1 outer loop vertex 18.4669 -38.5591 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 19.1073 -38.5852 0 endloop endfacet @@ -56122,13 +56122,13 @@ solid OpenSCAD_Model outer loop vertex 18.4669 -38.5591 0 vertex 5.34756 -38.4712 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal -0 0 1 outer loop vertex 5.17491 -38.475 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 5.34756 -38.4712 0 endloop endfacet @@ -56248,13 +56248,13 @@ solid OpenSCAD_Model outer loop vertex 5.17491 -38.475 0 vertex 0.291868 -38.543 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop vertex -0.355246 -38.538 0 - vertex 110 -110 0 + vertex 117.5 -117.5 0 vertex 0.291868 -38.543 0 endloop endfacet @@ -56507,26 +56507,26 @@ solid OpenSCAD_Model outer loop vertex -0.355246 -38.538 0 vertex -9.84865 -38.1451 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -9.84865 -38.1451 0 vertex -11.9896 -38.1555 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -11.9896 -38.1555 0 vertex -14.1677 -38.1469 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -14.1677 -38.1469 0 vertex -14.8486 -38.1282 0 endloop @@ -56661,26 +56661,26 @@ solid OpenSCAD_Model outer loop vertex -14.8486 -38.1282 0 vertex -18.0369 -38.1201 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -18.0369 -38.1201 0 vertex -18.7028 -38.1359 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -18.7028 -38.1359 0 vertex -20.8109 -38.1301 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -20.8109 -38.1301 0 vertex -23.4866 -38.0828 0 endloop @@ -56759,54 +56759,54 @@ solid OpenSCAD_Model outer loop vertex -23.4866 -38.0828 0 vertex -28.2718 -38.1638 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -28.2718 -38.1638 0 vertex -37.6203 -38.1325 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -37.6203 -38.1325 0 vertex -41.2883 -38.1087 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -41.2883 -38.1087 0 vertex -44.3648 -38.0673 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -44.3648 -38.0673 0 vertex -46.5272 -38.014 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -46.5272 -38.014 0 vertex -47.1648 -37.9848 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.1648 -37.9848 0 vertex -47.4529 -37.9547 0 endloop endfacet facet normal 0 0 1 outer loop - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.4529 -37.9547 0 vertex -47.6522 -37.8745 0 endloop @@ -56814,42 +56814,42 @@ solid OpenSCAD_Model facet normal 0 0 1 outer loop vertex -47.984 -37.1977 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.9993 -37.3583 0 endloop endfacet facet normal 0 0 1 outer loop vertex -0.355246 -38.538 0 - vertex -110 -110 0 - vertex 110 -110 0 + vertex -117.5 -117.5 0 + vertex 117.5 -117.5 0 endloop endfacet facet normal 0 0 1 outer loop vertex -47.8044 -37.7712 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.6522 -37.8745 0 endloop endfacet facet normal 0 0 1 outer loop vertex -47.9115 -37.6485 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.8044 -37.7712 0 endloop endfacet facet normal 0 0 1 outer loop vertex -47.9758 -37.5097 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.9115 -37.6485 0 endloop endfacet facet normal 0 0 1 outer loop vertex -47.9993 -37.3583 0 - vertex -110 -110 0 + vertex -117.5 -117.5 0 vertex -47.9758 -37.5097 0 endloop endfacet @@ -58717,58 +58717,58 @@ solid OpenSCAD_Model endfacet facet normal 1 -0 0 outer loop - vertex 110 -110 0 - vertex 110 110 -3 - vertex 110 110 0 + 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 110 110 -3 - vertex 110 -110 0 - vertex 110 -110 -3 - endloop - endfacet - facet normal 0 0 -1 - outer loop - vertex -110 -110 -3 - vertex 110 110 -3 - vertex 110 -110 -3 - endloop - endfacet - facet normal -0 0 -1 - outer loop - vertex 110 110 -3 - vertex -110 -110 -3 - vertex -110 110 -3 - endloop - endfacet - facet normal 0 -1 0 - outer loop - vertex -110 -110 -3 - vertex 110 -110 0 - vertex -110 -110 0 - endloop - endfacet - facet normal 0 -1 -0 - outer loop - vertex 110 -110 0 - vertex -110 -110 -3 - vertex 110 -110 -3 + 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 110 110 -3 - vertex -110 110 0 - vertex 110 110 0 + 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 -110 110 0 - vertex 110 110 -3 - vertex -110 110 -3 + vertex -117.5 117.5 0 + vertex 117.5 117.5 -3 + vertex -117.5 117.5 -3 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -117.5 -117.5 -3 + vertex 117.5 117.5 -3 + vertex 117.5 -117.5 -3 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 117.5 117.5 -3 + 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/qml/AboutDialog.qml b/resources/qml/AboutDialog.qml index 5d3b1d1544..9a7e53260b 100644 --- a/resources/qml/AboutDialog.qml +++ b/resources/qml/AboutDialog.qml @@ -19,6 +19,18 @@ UM.Dialog width: minimumWidth height: minimumHeight + Rectangle + { + width: parent.width + 2 * margin // margin from Dialog.qml + height: version.y + version.height + margin + + anchors.top: parent.top + anchors.topMargin: - margin + anchors.horizontalCenter: parent.horizontalCenter + + color: UM.Theme.getColor("viewport_background") + } + Image { id: logo @@ -42,6 +54,7 @@ UM.Dialog text: catalog.i18nc("@label","version: %1").arg(UM.Application.version) font: UM.Theme.getFont("large") + color: UM.Theme.getColor("text") anchors.right : logo.right anchors.top: logo.bottom anchors.topMargin: (UM.Theme.getSize("default_margin").height / 2) | 0 @@ -75,6 +88,7 @@ UM.Dialog ScrollView { + id: credits anchors.top: creditsNotes.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height @@ -128,7 +142,11 @@ UM.Dialog projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" }); projectsModel.append({ name:"NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" }); projectsModel.append({ name:"NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" }); + projectsModel.append({ name:"Shapely", description: catalog.i18nc("@label", "Support library for handling planar objects"), license: "BSD", url: "https://github.com/Toblerity/Shapely" }); + projectsModel.append({ name:"Trimesh", description: catalog.i18nc("@label", "Support library for handling triangular meshes"), license: "MIT", url: "https://trimsh.org" }); + projectsModel.append({ name:"NetworkX", description: catalog.i18nc("@label", "Support library for analysis of complex networks"), license: "3-clause BSD", url: "https://networkx.github.io/" }); projectsModel.append({ name:"libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "LGPLv3", url: "https://github.com/ultimaker/libsavitar" }); + projectsModel.append({ name:"libCharon", description: catalog.i18nc("@label", "Support library for file metadata and streaming"), license: "LGPLv3", url: "https://github.com/ultimaker/libcharon" }); projectsModel.append({ name:"PySerial", description: catalog.i18nc("@label", "Serial communication library"), license: "Python", url: "http://pyserial.sourceforge.net/" }); projectsModel.append({ name:"python-zeroconf", description: catalog.i18nc("@label", "ZeroConf discovery library"), license: "LGPL", url: "https://github.com/jstasiak/python-zeroconf" }); projectsModel.append({ name:"Clipper", description: catalog.i18nc("@label", "Polygon clipping library"), license: "Boost", url: "http://www.angusj.com/delphi/clipper.php" }); diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 82c177951d..892386d9e7 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -75,6 +75,7 @@ Item Action { id:toggleFullScreenAction + shortcut: StandardKey.FullScreen; text: catalog.i18nc("@action:inmenu","Toggle Full Screen"); iconName: "view-fullscreen"; } @@ -420,7 +421,7 @@ Item Action { id: browsePackagesAction - text: catalog.i18nc("@action:menu", "Browse packages...") + text: catalog.i18nc("@action:menu", "&Marketplace") iconName: "plugins_browse" } diff --git a/resources/qml/AddMachineDialog.qml b/resources/qml/AddMachineDialog.qml index a635f1f8d1..2b49ce9c31 100644 --- a/resources/qml/AddMachineDialog.qml +++ b/resources/qml/AddMachineDialog.qml @@ -79,6 +79,7 @@ UM.Dialog section.property: "section" section.delegate: Button { + id: machineSectionButton text: section width: machineList.width style: ButtonStyle @@ -214,6 +215,7 @@ UM.Dialog Button { + id: addPrinterButton text: catalog.i18nc("@action:button", "Add Printer") anchors.bottom: parent.bottom anchors.right: parent.right diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b9febdeb32..029149f1d0 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import UM 1.3 as UM -import Cura 1.0 as Cura +import Cura 1.1 as Cura import "Menus" @@ -21,7 +21,6 @@ UM.MainWindow property bool showPrintMonitor: false backgroundColor: UM.Theme.getColor("viewport_background") - // This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage // It should be phased out in newer plugin versions. Connections @@ -104,11 +103,13 @@ UM.MainWindow title: catalog.i18nc("@title:menu menubar:toplevel","&File"); MenuItem { + id: newProjectMenu action: Cura.Actions.newProject; } MenuItem { + id: openMenu action: Cura.Actions.open; } @@ -148,6 +149,7 @@ UM.MainWindow MenuItem { + id: exportSelectionMenu text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection..."); enabled: UM.Selection.hasSelection; iconName: "document-save-as"; @@ -156,7 +158,11 @@ UM.MainWindow MenuSeparator { } - MenuItem { action: Cura.Actions.reloadAll; } + MenuItem + { + id: reloadAllMenu + action: Cura.Actions.reloadAll; + } MenuSeparator { } @@ -277,13 +283,14 @@ UM.MainWindow Menu { id: plugin_menu - title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox") + title: catalog.i18nc("@title:menu menubar:toplevel", "&Marketplace") MenuItem { action: Cura.Actions.browsePackages } } Menu { + id: preferencesMenu title: catalog.i18nc("@title:menu menubar:toplevel","P&references"); MenuItem { action: Cura.Actions.preferences; } @@ -291,7 +298,7 @@ UM.MainWindow Menu { - //: Help menu + id: helpMenu title: catalog.i18nc("@title:menu menubar:toplevel","&Help"); MenuItem { action: Cura.Actions.showProfileFolder; } diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 31ca84d66e..1a5b604886 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -86,7 +86,7 @@ Item { printJobTextfield.focus = false; } validator: RegExpValidator { - regExp: /^[^\\ \/ \*\?\|\[\]]*$/ + regExp: /^[^\\\/\*\?\|\[\]]*$/ } style: TextFieldStyle{ textColor: UM.Theme.getColor("text_scene"); diff --git a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml index c34dc2a484..8116b6def1 100644 --- a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml +++ b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml @@ -18,17 +18,17 @@ Menu Instantiator { - model: settingVisibilityPresetsModel + model: settingVisibilityPresetsModel.items MenuItem { - text: model.name + text: modelData.name checkable: true - checked: model.id == settingVisibilityPresetsModel.activePreset + checked: modelData.presetId == settingVisibilityPresetsModel.activePreset exclusiveGroup: group onTriggered: { - settingVisibilityPresetsModel.setActivePreset(model.id); + settingVisibilityPresetsModel.setActivePreset(modelData.presetId); } } diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml index 6bbb0b1e2e..12d4ffd7dd 100644 --- a/resources/qml/Menus/ViewMenu.qml +++ b/resources/qml/Menus/ViewMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Ultimaker B.V. +// Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,9 +9,8 @@ import Cura 1.0 as Cura Menu { - title: catalog.i18nc("@title:menu menubar:toplevel", "&View"); + title: catalog.i18nc("@title:menu menubar:toplevel", "&View") id: base - enabled: !PrintInformation.preSliced property var multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel() @@ -26,11 +25,15 @@ Menu checked: model.active exclusiveGroup: group onTriggered: UM.Controller.setActiveView(model.id) + enabled: !PrintInformation.preSliced } onObjectAdded: base.insertItem(index, object) onObjectRemoved: base.removeItem(object) } - ExclusiveGroup { id: group } + ExclusiveGroup + { + id: group + } MenuSeparator {} @@ -44,33 +47,47 @@ Menu MenuItem { action: Cura.Actions.viewRightSideCamera; } } - MenuSeparator { + MenuSeparator + { visible: UM.Preferences.getValue("cura/use_multi_build_plate") } Menu { id: buildPlateMenu; - title: catalog.i18nc("@action:inmenu menubar:view","&Build plate"); + title: catalog.i18nc("@action:inmenu menubar:view","&Build plate") visible: UM.Preferences.getValue("cura/use_multi_build_plate") Instantiator { model: base.multiBuildPlateModel - MenuItem { + MenuItem + { text: base.multiBuildPlateModel.getItem(index).name; - onTriggered: Cura.SceneController.setActiveBuildPlate(base.multiBuildPlateModel.getItem(index).buildPlateNumber); - checkable: true; - checked: base.multiBuildPlateModel.getItem(index).buildPlateNumber == base.multiBuildPlateModel.activeBuildPlate; - exclusiveGroup: buildPlateGroup; + onTriggered: Cura.SceneController.setActiveBuildPlate(base.multiBuildPlateModel.getItem(index).buildPlateNumber) + checkable: true + checked: base.multiBuildPlateModel.getItem(index).buildPlateNumber == base.multiBuildPlateModel.activeBuildPlate + exclusiveGroup: buildPlateGroup visible: UM.Preferences.getValue("cura/use_multi_build_plate") } - onObjectAdded: buildPlateMenu.insertItem(index, object); + onObjectAdded: buildPlateMenu.insertItem(index, object) onObjectRemoved: buildPlateMenu.removeItem(object) } - ExclusiveGroup { id: buildPlateGroup; } + ExclusiveGroup + { + id: buildPlateGroup + } } MenuSeparator {} - MenuItem { action: Cura.Actions.expandSidebar; } + MenuItem + { + action: Cura.Actions.expandSidebar + } + + MenuSeparator {} + MenuItem + { + action: Cura.Actions.toggleFullScreen + } } diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index d751d3f101..bba2cf764a 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -13,6 +13,7 @@ UM.PreferencesPage { //: General configuration page title title: catalog.i18nc("@title:tab","General") + id: generalPreferencesPage function setDefaultLanguage(languageCode) { @@ -170,7 +171,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" }) @@ -283,9 +284,6 @@ UM.PreferencesPage } } - - - Label { id: languageCaption @@ -308,7 +306,7 @@ UM.PreferencesPage width: childrenRect.width; height: childrenRect.height; - text: catalog.i18nc("@info:tooltip","Slice automatically when changing settings.") + text: catalog.i18nc("@info:tooltip", "Slice automatically when changing settings.") CheckBox { @@ -316,7 +314,7 @@ UM.PreferencesPage checked: boolCheck(UM.Preferences.getValue("general/auto_slice")) onClicked: UM.Preferences.setValue("general/auto_slice", checked) - text: catalog.i18nc("@option:check","Slice automatically"); + text: catalog.i18nc("@option:check", "Slice automatically"); } } @@ -330,7 +328,7 @@ UM.PreferencesPage Label { font.bold: true - text: catalog.i18nc("@label","Viewport behavior") + text: catalog.i18nc("@label", "Viewport behavior") } UM.TooltipArea @@ -338,7 +336,7 @@ UM.PreferencesPage width: childrenRect.width; height: childrenRect.height; - text: catalog.i18nc("@info:tooltip","Highlight unsupported areas of the model in red. Without support these areas will not print properly.") + text: catalog.i18nc("@info:tooltip", "Highlight unsupported areas of the model in red. Without support these areas will not print properly.") CheckBox { @@ -347,14 +345,14 @@ UM.PreferencesPage checked: boolCheck(UM.Preferences.getValue("view/show_overhang")) onClicked: UM.Preferences.setValue("view/show_overhang", checked) - text: catalog.i18nc("@option:check","Display overhang"); + text: catalog.i18nc("@option:check", "Display overhang"); } } UM.TooltipArea { width: childrenRect.width; height: childrenRect.height; - text: catalog.i18nc("@info:tooltip","Moves the camera so the model is in the center of the view when a model is selected") + text: catalog.i18nc("@info:tooltip", "Moves the camera so the model is in the center of the view when a model is selected") CheckBox { @@ -368,12 +366,12 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width; height: childrenRect.height; - text: catalog.i18nc("@info:tooltip","Should the default zoom behavior of cura be inverted?") + text: catalog.i18nc("@info:tooltip", "Should the default zoom behavior of cura be inverted?") CheckBox { id: invertZoomCheckbox - text: catalog.i18nc("@action:button","Invert the direction of camera zoom."); + text: catalog.i18nc("@action:button", "Invert the direction of camera zoom."); checked: boolCheck(UM.Preferences.getValue("view/invert_zoom")) onClicked: UM.Preferences.setValue("view/invert_zoom", checked) } diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index a474b52838..a5af17f47a 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -41,6 +41,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 } MouseArea { diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 0f39a3c047..8896d0611e 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -110,24 +110,25 @@ UM.PreferencesPage right: parent.right } - model: settingVisibilityPresetsModel + model: settingVisibilityPresetsModel.items textRole: "name" currentIndex: { - // Load previously selected preset. - var index = settingVisibilityPresetsModel.find("id", settingVisibilityPresetsModel.activePreset) - if (index == -1) + for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) { - return 0 + if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset) + { + currentIndex = i; + return; + } } - - return index + return -1 } onActivated: { - var preset_id = settingVisibilityPresetsModel.getItem(index).id; + var preset_id = settingVisibilityPresetsModel.items[index].id; settingVisibilityPresetsModel.setActivePreset(preset_id); } } diff --git a/resources/qml/PrepareSidebar.qml b/resources/qml/PrepareSidebar.qml index 78b6a22ef9..fe0fb033f7 100644 --- a/resources/qml/PrepareSidebar.qml +++ b/resources/qml/PrepareSidebar.qml @@ -14,7 +14,7 @@ Rectangle { id: base - property int currentModeIndex + property int currentModeIndex: -1 property bool hideSettings: PrintInformation.preSliced property bool hideView: Cura.MachineManager.activeMachineName == "" @@ -262,7 +262,6 @@ Rectangle ListView { id: modesList - property var index: 0 model: modesListModel delegate: wizardDelegate anchors.top: parent.top @@ -582,13 +581,17 @@ Rectangle tooltipText: catalog.i18nc("@tooltip", "Custom Print Setup

Print with finegrained control over every last bit of the slicing process."), item: sidebarAdvanced }) - sidebarContents.replace(modesListModel.get(base.currentModeIndex).item, { "immediate": true }) var index = Math.round(UM.Preferences.getValue("cura/active_mode")) - if(index) + + if(index != null && !isNaN(index)) { currentModeIndex = index; } + else + { + currentModeIndex = 0; + } } UM.SettingPropertyProvider diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 3bfcea7025..12e95d1e89 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -44,7 +44,7 @@ Column Repeater { id: extrudersRepeater - model: activePrinter!=null ? activePrinter.extruders : null + model: activePrinter != null ? activePrinter.extruders : null ExtruderBox { diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml index 960509cd24..188e7ede40 100644 --- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml +++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml @@ -14,11 +14,19 @@ Item implicitHeight: Math.floor(childrenRect.height + UM.Theme.getSize("default_margin").height * 2) property var outputDevice: null + Connections + { + target: Cura.MachineManager + onGlobalContainerChanged: + { + outputDevice = Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null; + } + } + Rectangle { height: childrenRect.height color: UM.Theme.getColor("setting_category") - property var activePrinter: outputDevice != null ? outputDevice.activePrinter : null Label { @@ -28,7 +36,7 @@ Item anchors.left: parent.left anchors.top: parent.top anchors.margins: UM.Theme.getSize("default_margin").width - text: outputDevice != null ? activePrinter.name : "" + text: outputDevice != null ? outputDevice.activePrinter.name : "" } Label diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml index 419285d893..e3202323eb 100644 --- a/resources/qml/Settings/SettingCategory.qml +++ b/resources/qml/Settings/SettingCategory.qml @@ -16,6 +16,7 @@ Button anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width background: Rectangle { + id: backgroundRectangle implicitHeight: UM.Theme.getSize("section").height color: { if (base.color) { @@ -35,6 +36,7 @@ Button Behavior on color { ColorAnimation { duration: 50; } } Rectangle { + id: backgroundLiningRectangle height: UM.Theme.getSize("default_lining").height width: parent.width anchors.bottom: parent.bottom @@ -68,6 +70,7 @@ Button anchors.left: parent.left Label { + id: settingNameLabel anchors { left: parent.left @@ -76,6 +79,7 @@ Button verticalCenter: parent.verticalCenter; } text: definition.label + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("setting_category") color: diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 5d283d5ebb..76d458e427 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/resources/qml/Settings/SettingComboBox.qml @@ -73,6 +73,7 @@ SettingItem anchors.right: downArrow.left text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") @@ -115,6 +116,7 @@ SettingItem anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width text: modelData.value + textFormat: Text.PlainText renderType: Text.NativeRendering color: control.contentItem.color font: UM.Theme.getFont("default") diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 4c00a60d0e..a9427f863a 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -145,6 +145,7 @@ SettingItem rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 34bf9df921..785562cff5 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -115,6 +115,7 @@ Item { text: definition.label elide: Text.ElideMiddle; renderType: Text.NativeRendering + textFormat: Text.PlainText color: UM.Theme.getColor("setting_control_text"); opacity: (definition.visible) ? 1 : 0.5 @@ -260,12 +261,6 @@ Item { // entry (user container) are set, we can simply remove the container. propertyProvider.removeFromContainer(0) } - else if(last_entry - 1 == base.stackLevel) - { - // Another special case. The setting that is overriden is only 1 instance container deeper, - // so we can remove it. - propertyProvider.removeFromContainer(last_entry - 1) - } else { // Put that entry into the "top" instance container. diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 2d4f25125f..a3c1422b30 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -140,6 +140,7 @@ SettingItem rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width text: control.currentText + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") @@ -199,6 +200,7 @@ SettingItem anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width text: model.name + textFormat: Text.PlainText renderType: Text.NativeRendering color: { diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index c2c04ce36c..15782829d3 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -94,6 +94,7 @@ SettingItem anchors.verticalCenter: parent.verticalCenter text: definition.unit + textFormat: Text.PlainText renderType: Text.NativeRendering color: UM.Theme.getColor("setting_unit") font: UM.Theme.getFont("default") diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index e17f11bf99..da50b430ac 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -39,10 +39,11 @@ Item Label { id: globalProfileLabel - text: catalog.i18nc("@label","Profile:"); + text: catalog.i18nc("@label","Profile:") + textFormat: Text.PlainText width: Math.round(parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width - 2) - font: UM.Theme.getFont("default"); - color: UM.Theme.getColor("text"); + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") verticalAlignment: Text.AlignVCenter anchors.top: parent.top anchors.bottom: parent.bottom diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index e962d7fc8f..ddb42f44c6 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -784,8 +784,10 @@ Item Label { id: gradualInfillLabel + height: parent.height anchors.left: enableGradualInfillCheckBox.right anchors.leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2) + verticalAlignment: Text.AlignVCenter; text: catalog.i18nc("@label", "Enable gradual") font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") @@ -1116,6 +1118,7 @@ Item { id: platformAdhesionType containerStack: Cura.MachineManager.activeMachine + removeUnusedValue: false //Doesn't work with settings that are resolved. key: "adhesion_type" watchedProperties: [ "value", "enabled" ] storeIndex: 0 diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 24e94beb88..1b3a7aac55 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -117,7 +117,7 @@ UM.Dialog height: childrenRect.height Label { - text: catalog.i18nc("@action:label", Cura.MachineManager.activeMachineNetworkGroupName != "" ? "Printer Group" : "Name") + text: Cura.MachineManager.activeMachineNetworkGroupName != "" ? catalog.i18nc("@action:label", "Printer Group") : catalog.i18nc("@action:label", "Name") width: Math.floor(scroll.width / 3) | 0 } Label 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 new file mode 100644 index 0000000000..f5baa55029 --- /dev/null +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = 0 +material = generic_abs + +[values] +cool_fan_enabled = False +adhesion_type = brim 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 new file mode 100644 index 0000000000..bd613c6aad --- /dev/null +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = High +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = high +weight = 2 +material = generic_abs + +[values] +cool_fan_enabled = False +adhesion_type = brim 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 new file mode 100644 index 0000000000..7cff1db4d2 --- /dev/null +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Normal +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 1 +material = generic_abs + +[values] +cool_fan_enabled = False +adhesion_type = brim + diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg new file mode 100644 index 0000000000..c0114e3d6c --- /dev/null +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = 0 +global_quality = True + +[values] +layer_height = 0.3 + diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg new file mode 100644 index 0000000000..4a0993412a --- /dev/null +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = High +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = high +weight = 2 +global_quality = True + +[values] +layer_height = 0.15 + diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg new file mode 100644 index 0000000000..eeb1d699e4 --- /dev/null +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 1 +global_quality = True + +[values] +layer_height = 0.2 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 new file mode 100644 index 0000000000..3cd0226bd4 --- /dev/null +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = 0 +material = generic_hips + +[values] + 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 new file mode 100644 index 0000000000..ff5c6bee2f --- /dev/null +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = high +weight = 2 +material = generic_hips + +[values] + 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 new file mode 100644 index 0000000000..c4701ae246 --- /dev/null +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 1 +material = generic_hips + +[values] + 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 new file mode 100644 index 0000000000..5e0c3e204a --- /dev/null +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = 0 +material = generic_petg + +[values] +material_print_temperature = =default_material_print_temperature + 35 +material_bed_temperature = 70 +cool_fan_enabled = False + +speed_print = 30 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 new file mode 100644 index 0000000000..57a89c4ec2 --- /dev/null +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = High +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = high +weight = 2 +material = generic_petg + +[values] +material_print_temperature = =default_material_print_temperature + 35 +material_bed_temperature = 70 +cool_fan_enabled = False + +speed_print = 30 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 new file mode 100644 index 0000000000..14a4607ceb --- /dev/null +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Normal +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 1 +material = generic_petg + +[values] +material_print_temperature = =default_material_print_temperature + 35 +material_bed_temperature = 70 +cool_fan_enabled = False + +speed_print = 30 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 new file mode 100644 index 0000000000..eae9e3b5ef --- /dev/null +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = 0 +material = generic_pla + +[values] + + 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 new file mode 100644 index 0000000000..c856fc66a7 --- /dev/null +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = high +weight = 2 +material = generic_pla + +[values] + 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 new file mode 100644 index 0000000000..be33bfe53a --- /dev/null +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = anycubic_4max + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 1 +material = generic_pla + +[values] + diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index b059b3c65f..be83533e0b 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -25,7 +25,6 @@ support_angle = 60 support_enable = True support_interface_enable = True support_pattern = triangles -support_roof_enable = True support_type = everywhere support_use_towers = False support_xy_distance = 0.7 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 6a6c605c00..5ca8a6e4ef 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -25,7 +25,6 @@ support_angle = 60 support_enable = True support_interface_enable = True support_pattern = triangles -support_roof_enable = True support_type = everywhere support_use_towers = False support_xy_distance = 0.7 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index 7cba03853f..f542952fab 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -25,7 +25,6 @@ support_angle = 60 support_enable = True support_interface_enable = True support_pattern = triangles -support_roof_enable = True support_type = everywhere support_use_towers = False support_xy_distance = 0.7 diff --git a/resources/quality/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx_k25/tizyx_k25_normal.inst.cfg index 8c6349d27a..8b066f139f 100644 --- a/resources/quality/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -17,8 +17,6 @@ cool_fan_speed_0 = 100 fill_outline_gaps = True infill_angles = [0,90 ] infill_sparse_density = 15 -layer_height = 0.2 -layer_height_0 = 0.25 material_diameter = 1.75 retraction_amount = 2.5 retraction_min_travel = 2 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 a1fc6b7e6f..df7f0fdf02 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 @@ -26,6 +27,7 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) top_bottom_thickness = 1 wall_thickness = 1 +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 ac21cce120..cf330dc984 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 @@ -25,6 +26,7 @@ speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) top_bottom_thickness = 1 wall_thickness = 1 +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 290ee6c4db..705c9c4105 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 @@ -21,6 +22,7 @@ material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 816238fe69..7010d292b2 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 @@ -12,7 +12,9 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 20 +support_brim_enable = True 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 58d5d58802..325609362f 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 @@ -12,8 +12,10 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 15 +support_brim_enable = True support_infill_sparse_thickness = 0.3 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 3d7a54564a..a0507299fb 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 @@ -12,6 +12,8 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False +support_brim_enable = True support_infill_sparse_thickness = 0.18 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 ffd99ed9ef..086f811b36 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 @@ -12,5 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False +support_brim_enable = True 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 51c27f6a14..28556ca7bf 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 @@ -12,5 +12,7 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 +support_brim_enable = True 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 3f645a2a50..9ad5499f18 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 @@ -12,6 +12,8 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False layer_height = 0.4 material_standby_temperature = 100 +support_brim_enable = True support_interface_height = 0.9 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 285b9bb9ed..e616214704 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 @@ -12,7 +12,9 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False layer_height = 0.3 material_standby_temperature = 100 +support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_height = 1.2 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 1c316da6ba..254afbc109 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 @@ -26,6 +27,7 @@ speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) top_bottom_thickness = 1 wall_thickness = 1 +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 2913a021f0..39bedce77f 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 @@ -25,6 +26,7 @@ speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) top_bottom_thickness = 1 wall_thickness = 1 +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 65c922fe6f..c87d590650 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 @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 @@ -22,6 +23,7 @@ material_print_temperature = =default_material_print_temperature - 10 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) +support_brim_enable = True support_interface_enable = True support_interface_density = =min(extruderValues('material_surface_energy')) support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric' 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 3997943db1..73639be0b6 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 @@ -12,7 +12,9 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 20 +support_brim_enable = True 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 52fcca9934..5da25be32d 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 @@ -12,8 +12,10 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 15 +support_brim_enable = True support_infill_sparse_thickness = 0.3 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 bc183a4549..36634af2c8 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 @@ -12,6 +12,8 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False +support_brim_enable = True support_infill_sparse_thickness = 0.18 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 0d5cc5bcfc..f76c4c944a 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 @@ -12,5 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False +support_brim_enable = True 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 465c526f2c..e4e3ab772a 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 @@ -12,5 +12,7 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 +support_brim_enable = True 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 b3f6df39f9..5e78e51014 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 @@ -12,5 +12,7 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False material_standby_temperature = 100 +support_brim_enable = True support_interface_height = 0.9 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 d6ef272a4d..5af09aebcc 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 @@ -12,6 +12,8 @@ material = generic_pva variant = BB 0.8 [values] +brim_replaces_support = False material_standby_temperature = 100 +support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_height = 1.2 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 new file mode 100644 index 0000000000..99b4b142fa --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = -3 +material = generic_cffcpe +variant = CC 0.6 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size * (0.58/0.6) +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width 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 new file mode 100644 index 0000000000..80c383aa8d --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = -3 +material = generic_cffpa +variant = CC 0.6 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size * (0.58/0.6) +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width 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 new file mode 100644 index 0000000000..c94d239c81 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = -3 +material = generic_gffcpe +variant = CC 0.6 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size * (0.58/0.6) +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width 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 new file mode 100644 index 0000000000..e7d4d1955b --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = -3 +material = generic_gffpa +variant = CC 0.6 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size * (0.58/0.6) +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 0ca2cbab70..437790ef74 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -110,7 +110,6 @@ material_extrusion_cool_down_speed default_material_bed_temperature material_bed_temperature material_bed_temperature_layer_0 -material_diameter material_adhesion_tendency material_surface_energy material_flow @@ -360,7 +359,6 @@ coasting_min_volume coasting_speed skin_alternate_rotation cross_infill_pocket_size -cross_infill_apply_pockets_alternatingly spaghetti_infill_enabled spaghetti_infill_stepped spaghetti_max_infill_angle diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 26e6c2ac8b..39546b6370 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -221,6 +221,26 @@ "quality_slider_available": [255, 255, 255, 255], "quality_slider_handle": [255, 255, 255, 255], "quality_slider_handle_hover": [127, 127, 127, 255], - "quality_slider_text": [255, 255, 255, 255] + "quality_slider_text": [255, 255, 255, 255], + + "monitor_card_background_inactive": [43, 48, 52, 255], + "monitor_card_background": [43, 48, 52, 255], + "monitor_context_menu_background": [80, 84, 87, 255], + "monitor_context_menu_dots": [0, 167, 233, 255], + "monitor_context_menu_highlight": [0, 167, 233, 255], + "monitor_image_overlay": [255, 255, 255, 255], + "monitor_lining_heavy": [255, 255, 255, 255], + "monitor_lining_light": [102, 102, 102, 255], + "monitor_pill_background": [102, 102, 102, 255], + "monitor_placeholder_image": [102, 102, 102, 255], + "monitor_printer_icon": [255, 255, 255, 255], + "monitor_progress_background_text": [102, 102, 102, 255], + "monitor_progress_background": [80, 84, 87, 255], + "monitor_progress_fill_inactive": [216, 216, 216, 255], + "monitor_progress_fill_text": [0, 0, 0, 255], + "monitor_progress_fill": [216, 216, 216, 255], + "monotir_printer_icon_inactive": [154, 154, 154, 255], + "monitor_skeleton_fill": [31, 36, 39, 255], + "monitor_skeleton_fill_dark": [31, 36, 39, 255] } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 43d892c34c..25c9a678c1 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -323,10 +323,27 @@ "favorites_header_text_hover": [31, 36, 39, 255], "favorites_row_selected": [196, 239, 255, 255], - "monitor_text_inactive": [154, 154, 154, 255], - "monitor_background_inactive": [240, 240, 240, 255], - "monitor_background_active": [255, 255, 255, 255], - "monitor_lining_inactive": [230, 230, 230, 255] + "monitor_card_background_inactive": [240, 240, 240, 255], + "monitor_card_background": [255, 255, 255, 255], + "monitor_context_menu_background": [255, 255, 255, 255], + "monitor_context_menu_dots": [154, 154, 154, 255], + "monitor_context_menu_highlight": [245, 245, 245, 255], + "monitor_image_overlay": [0, 0, 0, 255], + "monitor_lining_heavy": [0, 0, 0, 255], + "monitor_lining_light": [230, 230, 230, 255], + "monitor_pill_background": [245, 245, 245, 255], + "monitor_placeholder_image": [230, 230, 230, 255], + "monitor_printer_icon_inactive": [154, 154, 154, 255], + "monitor_printer_icon": [12, 169, 227, 255], + "monitor_progress_background_text": [0,0,0,255], + "monitor_progress_background": [245, 245, 245, 255], + "monitor_progress_fill_inactive": [154, 154, 154, 255], + "monitor_progress_fill_text": [255,255,255,255], + "monitor_progress_fill": [12, 169, 227, 255], + "monitor_shadow": [0, 0, 0, 63], + "monitor_skeleton_fill": [245, 245, 245, 255], + "monitor_skeleton_fill_dark": [216, 216, 216, 255], + "monitor_text_inactive": [154, 154, 154, 255] }, "sizes": { @@ -476,6 +493,12 @@ "toolbox_action_button": [8.0, 2.5], "toolbox_loader": [2.0, 2.0], - "drop_shadow_radius": [1.0, 1.0] + "monitor_config_override_box": [1.0, 14.0], + "monitor_extruder_circle": [2.75, 2.75], + "monitor_text_line": [1.16, 1.16], + "monitor_thick_lining": [0.16, 0.16], + "monitor_corner_radius": [0.3, 0.3], + "monitor_shadow_radius": [0.4, 0.4], + "monitor_shadow_offset": [0.15, 0.15] } } diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx_k25_0.2.inst.cfg new file mode 100644 index 0000000000..cd9f1bcbd1 --- /dev/null +++ b/resources/variants/tizyx_k25_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx_k25_0.3.inst.cfg new file mode 100644 index 0000000000..8b34d23bf6 --- /dev/null +++ b/resources/variants/tizyx_k25_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx_k25_0.4.inst.cfg new file mode 100644 index 0000000000..c147eb0ad0 --- /dev/null +++ b/resources/variants/tizyx_k25_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx_k25_0.5.inst.cfg new file mode 100644 index 0000000000..14102fb2c7 --- /dev/null +++ b/resources/variants/tizyx_k25_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx_k25_0.6.inst.cfg new file mode 100644 index 0000000000..00f69f71f4 --- /dev/null +++ b/resources/variants/tizyx_k25_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx_k25_0.8.inst.cfg new file mode 100644 index 0000000000..c80f5e70d2 --- /dev/null +++ b/resources/variants/tizyx_k25_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx_k25_1.0.inst.cfg new file mode 100644 index 0000000000..ce8593b1e8 --- /dev/null +++ b/resources/variants/tizyx_k25_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0 mm +version = 4 +definition = tizyx_k25 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg new file mode 100644 index 0000000000..d41d08118a --- /dev/null +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -0,0 +1,47 @@ +[general] +name = CC 0.6 +version = 4 +definition = ultimaker_s5 + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = CC 0.6 +machine_nozzle_size = 0.6 +material_print_temperature = =default_material_print_temperature + 10 +raft_acceleration = =acceleration_print +raft_airgap = 0.3 +raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 +raft_interface_line_spacing = =raft_interface_line_width + 0.2 +raft_interface_line_width = =line_width * 2 +raft_interface_thickness = =layer_height * 1.5 +raft_jerk = =jerk_print +raft_margin = 15 +raft_surface_layers = 2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 45 +speed_support = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel_layer_0 = 50 +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_x = =speed_wall +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 +wall_thickness = =line_width * 3 diff --git a/scripts/check_gcode_buffer.py b/scripts/check_gcode_buffer.py index d3410096c5..2024ce2214 100755 --- a/scripts/check_gcode_buffer.py +++ b/scripts/check_gcode_buffer.py @@ -351,7 +351,7 @@ class CommandBuffer: self.previous_feedrate = [0, 0, 0, 0] self.previous_nominal_feedrate = 0 - print("Time Frame: %s" % self._detection_time_frame) + print("Command speed: %s" % buffer_filling_rate) print("Code Limit: %s" % self._code_count_limit) self._bad_frame_ranges = [] diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index f8052aa4bb..0f1579f78b 100755 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -15,6 +15,7 @@ import UM.Settings.SettingDefinition #To add settings to the definition. from cura.Settings.cura_empty_instance_containers import empty_container + ## Gets an instance container with a specified container type. # # \param container_type The type metadata for the instance container. @@ -24,22 +25,27 @@ def getInstanceContainer(container_type) -> InstanceContainer: container.setMetaDataEntry("type", container_type) return container + class DefinitionContainerSubClass(DefinitionContainer): def __init__(self): super().__init__(container_id = "SubDefinitionContainer") + class InstanceContainerSubClass(InstanceContainer): def __init__(self, container_type): super().__init__(container_id = "SubInstanceContainer") self.setMetaDataEntry("type", container_type) + #############################START OF TEST CASES################################ + ## Tests whether adding a container is properly forbidden. def test_addContainer(global_stack): with pytest.raises(InvalidOperationError): global_stack.addContainer(unittest.mock.MagicMock()) + ## Tests adding extruders to the global stack. def test_addExtruder(global_stack): mock_definition = unittest.mock.MagicMock() @@ -67,6 +73,7 @@ def test_addExtruder(global_stack): # global_stack.addExtruder(unittest.mock.MagicMock()) assert len(global_stack.extruders) == 2 #Didn't add the faulty extruder. + #Tests setting user changes profiles to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -77,6 +84,7 @@ def test_constrainUserChangesInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.userChanges = container + #Tests setting user changes profiles. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "user"), @@ -85,6 +93,7 @@ def test_constrainUserChangesInvalid(container, global_stack): def test_constrainUserChangesValid(container, global_stack): global_stack.userChanges = container #Should not give an error. + #Tests setting quality changes profiles to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -95,6 +104,7 @@ def test_constrainQualityChangesInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.qualityChanges = container + #Test setting quality changes profiles. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "quality_changes"), @@ -103,6 +113,7 @@ def test_constrainQualityChangesInvalid(container, global_stack): def test_constrainQualityChangesValid(container, global_stack): global_stack.qualityChanges = container #Should not give an error. + #Tests setting quality profiles to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -113,6 +124,7 @@ def test_constrainQualityInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.quality = container + #Test setting quality profiles. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "quality"), @@ -121,6 +133,7 @@ def test_constrainQualityInvalid(container, global_stack): def test_constrainQualityValid(container, global_stack): global_stack.quality = container #Should not give an error. + #Tests setting materials to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -131,6 +144,7 @@ def test_constrainMaterialInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.material = container + #Test setting materials. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "material"), @@ -139,6 +153,7 @@ def test_constrainMaterialInvalid(container, global_stack): def test_constrainMaterialValid(container, global_stack): global_stack.material = container #Should not give an error. + #Tests setting variants to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -149,6 +164,7 @@ def test_constrainVariantInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.variant = container + #Test setting variants. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "variant"), @@ -157,6 +173,7 @@ def test_constrainVariantInvalid(container, global_stack): def test_constrainVariantValid(container, global_stack): global_stack.variant = container #Should not give an error. + #Tests setting definition changes profiles to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong container type"), @@ -167,6 +184,7 @@ def test_constrainDefinitionChangesInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.definitionChanges = container + #Test setting definition changes profiles. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "definition_changes"), @@ -175,6 +193,7 @@ def test_constrainDefinitionChangesInvalid(container, global_stack): def test_constrainDefinitionChangesValid(container, global_stack): global_stack.definitionChanges = container #Should not give an error. + #Tests setting definitions to invalid containers. @pytest.mark.parametrize("container", [ getInstanceContainer(container_type = "wrong class"), @@ -184,6 +203,7 @@ def test_constrainDefinitionInvalid(container, global_stack): with pytest.raises(InvalidContainerError): #Invalid container, should raise an error. global_stack.definition = container + #Test setting definitions. @pytest.mark.parametrize("container", [ DefinitionContainer(container_id = "DefinitionContainer"), @@ -192,6 +212,7 @@ def test_constrainDefinitionInvalid(container, global_stack): def test_constrainDefinitionValid(container, global_stack): global_stack.definition = container #Should not give an error. + ## Tests whether deserialising completes the missing containers with empty ones. The initial containers are just the # definition and the definition_changes (that cannot be empty after CURA-5281) def test_deserializeCompletesEmptyContainers(global_stack): @@ -207,6 +228,7 @@ def test_deserializeCompletesEmptyContainers(global_stack): continue assert global_stack.getContainer(container_type_index) == empty_container #All others need to be empty. + ## Tests whether an instance container with the wrong type gets removed when deserialising. def test_deserializeRemovesWrongInstanceContainer(global_stack): global_stack._containers[cura.Settings.CuraContainerStack._ContainerIndexes.Quality] = getInstanceContainer(container_type = "wrong type") @@ -217,6 +239,7 @@ def test_deserializeRemovesWrongInstanceContainer(global_stack): assert global_stack.quality == global_stack._empty_instance_container #Replaced with empty. + ## Tests whether a container with the wrong class gets removed when deserialising. def test_deserializeRemovesWrongContainerClass(global_stack): global_stack._containers[cura.Settings.CuraContainerStack._ContainerIndexes.Quality] = DefinitionContainer(container_id = "wrong class") @@ -227,6 +250,7 @@ def test_deserializeRemovesWrongContainerClass(global_stack): assert global_stack.quality == global_stack._empty_instance_container #Replaced with empty. + ## Tests whether an instance container in the definition spot results in an error. def test_deserializeWrongDefinitionClass(global_stack): global_stack._containers[cura.Settings.CuraContainerStack._ContainerIndexes.Definition] = getInstanceContainer(container_type = "definition") #Correct type but wrong class. @@ -235,6 +259,7 @@ def test_deserializeWrongDefinitionClass(global_stack): with pytest.raises(UM.Settings.ContainerStack.InvalidContainerStackError): #Must raise an error that there is no definition container. global_stack.deserialize("") + ## Tests whether an instance container with the wrong type is moved into the correct slot by deserialising. def test_deserializeMoveInstanceContainer(global_stack): global_stack._containers[cura.Settings.CuraContainerStack._ContainerIndexes.Quality] = getInstanceContainer(container_type = "material") #Not in the correct spot. @@ -246,6 +271,7 @@ def test_deserializeMoveInstanceContainer(global_stack): assert global_stack.quality == empty_container assert global_stack.material != empty_container + ## Tests whether a definition container in the wrong spot is moved into the correct spot by deserialising. def test_deserializeMoveDefinitionContainer(global_stack): global_stack._containers[cura.Settings.CuraContainerStack._ContainerIndexes.Material] = DefinitionContainer(container_id = "some definition") #Not in the correct spot. @@ -256,6 +282,7 @@ def test_deserializeMoveDefinitionContainer(global_stack): assert global_stack.material == empty_container assert global_stack.definition != empty_container + ## Tests whether getProperty properly applies the stack-like behaviour on its containers. def test_getPropertyFallThrough(global_stack): #A few instance container mocks to put in the stack. @@ -298,6 +325,7 @@ def test_getPropertyFallThrough(global_stack): global_stack.userChanges = mock_layer_heights[container_indexes.UserChanges] assert global_stack.getProperty("layer_height", "value") == container_indexes.UserChanges + ## In definitions, test whether having no resolve allows us to find the value. def test_getPropertyNoResolveInDefinition(global_stack): value = unittest.mock.MagicMock() #Just sets the value for bed temperature. @@ -307,6 +335,7 @@ def test_getPropertyNoResolveInDefinition(global_stack): global_stack.definition = value assert global_stack.getProperty("material_bed_temperature", "value") == 10 #No resolve, so fall through to value. + ## In definitions, when the value is asked and there is a resolve function, it must get the resolve first. def test_getPropertyResolveInDefinition(global_stack): resolve_and_value = unittest.mock.MagicMock() #Sets the resolve and value for bed temperature. @@ -316,6 +345,7 @@ def test_getPropertyResolveInDefinition(global_stack): global_stack.definition = resolve_and_value assert global_stack.getProperty("material_bed_temperature", "value") == 7.5 #Resolve wins in the definition. + ## In instance containers, when the value is asked and there is a resolve function, it must get the value first. def test_getPropertyResolveInInstance(global_stack): container_indices = cura.Settings.CuraContainerStack._ContainerIndexes @@ -342,6 +372,7 @@ def test_getPropertyResolveInInstance(global_stack): global_stack.userChanges = instance_containers[container_indices.UserChanges] assert global_stack.getProperty("material_bed_temperature", "value") == 5 + ## Tests whether the value in instances gets evaluated before the resolve in definitions. def test_getPropertyInstancesBeforeResolve(global_stack): value = unittest.mock.MagicMock() #Sets just the value. @@ -356,6 +387,7 @@ def test_getPropertyInstancesBeforeResolve(global_stack): assert global_stack.getProperty("material_bed_temperature", "value") == 10 + ## Tests whether the hasUserValue returns true for settings that are changed in the user-changes container. def test_hasUserValueUserChanges(global_stack): container = unittest.mock.MagicMock() @@ -367,6 +399,7 @@ def test_hasUserValueUserChanges(global_stack): assert not global_stack.hasUserValue("infill_sparse_density") assert not global_stack.hasUserValue("") + ## Tests whether the hasUserValue returns true for settings that are changed in the quality-changes container. def test_hasUserValueQualityChanges(global_stack): container = unittest.mock.MagicMock() @@ -378,6 +411,7 @@ def test_hasUserValueQualityChanges(global_stack): assert not global_stack.hasUserValue("infill_sparse_density") assert not global_stack.hasUserValue("") + ## Tests whether a container in some other place on the stack is correctly not recognised as user value. def test_hasNoUserValue(global_stack): container = unittest.mock.MagicMock() @@ -387,21 +421,25 @@ def test_hasNoUserValue(global_stack): assert not global_stack.hasUserValue("layer_height") #However this container is quality, so it's not a user value. + ## Tests whether inserting a container is properly forbidden. def test_insertContainer(global_stack): with pytest.raises(InvalidOperationError): global_stack.insertContainer(0, unittest.mock.MagicMock()) + ## Tests whether removing a container is properly forbidden. def test_removeContainer(global_stack): with pytest.raises(InvalidOperationError): global_stack.removeContainer(unittest.mock.MagicMock()) + ## Tests whether changing the next stack is properly forbidden. def test_setNextStack(global_stack): with pytest.raises(InvalidOperationError): global_stack.setNextStack(unittest.mock.MagicMock()) + ## Tests setting properties directly on the global stack. @pytest.mark.parametrize("key, property, value", [ ("layer_height", "value", 0.1337), @@ -415,6 +453,7 @@ def test_setPropertyUser(key, property, value, global_stack): user_changes.getMetaDataEntry = unittest.mock.MagicMock(return_value = "user") global_stack.userChanges = user_changes - global_stack.setProperty(key, property, value) #The actual test. + global_stack.setProperty(key, property, value) # The actual test. - global_stack.userChanges.setProperty.assert_called_once_with(key, property, value, None, False) #Make sure that the user container gets a setProperty call. \ No newline at end of file + # Make sure that the user container gets a setProperty call. + global_stack.userChanges.setProperty.assert_called_once_with(key, property, value, None, False) \ No newline at end of file diff --git a/tests/Settings/TestSettingVisibilityPresets.py b/tests/Settings/TestSettingVisibilityPresets.py new file mode 100644 index 0000000000..b82aa62ea7 --- /dev/null +++ b/tests/Settings/TestSettingVisibilityPresets.py @@ -0,0 +1,89 @@ +from unittest.mock import MagicMock + +import os.path + +from UM.Preferences import Preferences +from UM.Resources import Resources +from cura.CuraApplication import CuraApplication +from cura.Machines.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel +from cura.Settings.SettingVisibilityPreset import SettingVisibilityPreset + +setting_visibility_preset_test_settings = {"test", "zomg", "derp", "yay", "whoo"} + +Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources"))) +Resources.addStorageType(CuraApplication.ResourceTypes.SettingVisibilityPreset, "setting_visibility") + + +def test_createVisibilityPresetFromLocalFile(): + # Simple creation test. This is seperated from the visibilityFromPrevious, since we can't check for the contents + # of the other profiles, since they might change over time. + visibility_preset = SettingVisibilityPreset() + + visibility_preset.loadFromFile(os.path.join(os.path.dirname(os.path.abspath(__file__)), "setting_visiblity_preset_test.cfg")) + assert setting_visibility_preset_test_settings == set(visibility_preset.settings) + + assert visibility_preset.name == "test" + assert visibility_preset.weight == 1 + assert visibility_preset.settings.count("yay") == 1 # It's in the file twice but we should load it once. + +def test_visibilityFromPrevious(): + # This test checks that all settings in basic are in advanced and all settings in advanced are in expert. + + visibility_model = SettingVisibilityPresetsModel(Preferences()) + + basic_visibility = visibility_model.getVisibilityPresetById("basic") + advanced_visibility = visibility_model.getVisibilityPresetById("advanced") + expert_visibility = visibility_model.getVisibilityPresetById("expert") + + # Check if there are settings that are in basic, but not in advanced. + settings_not_in_advanced = set(basic_visibility.settings) - set(advanced_visibility.settings) + assert len(settings_not_in_advanced) == 0 # All settings in basic should be in advanced + + # Check if there are settings that are in advanced, but not in expert. + settings_not_in_expert = set(advanced_visibility.settings) - set(expert_visibility.settings) + assert len(settings_not_in_expert) == 0 # All settings in advanced should be in expert. + + +def test_setActivePreset(): + preferences = Preferences() + visibility_model = SettingVisibilityPresetsModel(preferences) + visibility_model.activePresetChanged = MagicMock() + # Ensure that we start off with basic (since we didn't change anyting just yet!) + assert visibility_model.activePreset == "basic" + + # Everything should be the same. + visibility_model.setActivePreset("basic") + assert visibility_model.activePreset == "basic" + assert visibility_model.activePresetChanged.emit.call_count == 0 # No events should be sent. + + # Change it to existing type (should work...) + visibility_model.setActivePreset("advanced") + assert visibility_model.activePreset == "advanced" + assert visibility_model.activePresetChanged.emit.call_count == 1 + + # Change to unknown preset. Shouldn't do anything. + visibility_model.setActivePreset("OMGZOMGNOPE") + assert visibility_model.activePreset == "advanced" + assert visibility_model.activePresetChanged.emit.call_count == 1 + + +def test_preferenceChanged(): + preferences = Preferences() + # Set the visible_settings to something silly + preferences.addPreference("general/visible_settings", "omgzomg") + visibility_model = SettingVisibilityPresetsModel(preferences) + visibility_model.activePresetChanged = MagicMock() + + assert visibility_model.activePreset == "custom" # This should make the model start at "custom + assert visibility_model.activePresetChanged.emit.call_count == 0 + + + basic_visibility = visibility_model.getVisibilityPresetById("basic") + new_visibility_string = ";".join(basic_visibility.settings) + preferences.setValue("general/visible_settings", new_visibility_string) + + # Fake a signal emit (since we didn't create the application, our own signals are not fired) + visibility_model._onPreferencesChanged("general/visible_settings") + # Set the visibility settings to basic + assert visibility_model.activePreset == "basic" + assert visibility_model.activePresetChanged.emit.call_count == 1 diff --git a/tests/Settings/setting_visiblity_preset_test.cfg b/tests/Settings/setting_visiblity_preset_test.cfg new file mode 100644 index 0000000000..0a89bf6b14 --- /dev/null +++ b/tests/Settings/setting_visiblity_preset_test.cfg @@ -0,0 +1,11 @@ +[general] +name = test +weight = 1 + +[test] +zomg +derp +yay + +[whoo] +yay \ No newline at end of file diff --git a/tests/TestMachineAction.py b/tests/TestMachineAction.py index 7121fcc218..5d1805b707 100755 --- a/tests/TestMachineAction.py +++ b/tests/TestMachineAction.py @@ -5,6 +5,19 @@ import pytest from cura.MachineAction import MachineAction from cura.MachineActionManager import NotUniqueMachineActionError, UnknownMachineActionError +from cura.Settings.GlobalStack import GlobalStack + + +@pytest.fixture() +def global_stack(): + gs = GlobalStack("test_global_stack") + gs._metadata = { + "supported_actions": ["supported_action_1", "supported_action_2"], + "required_actions": ["required_action_1", "required_action_2"], + "first_start_actions": ["first_start_actions_1", "first_start_actions_2"] + } + return gs + class Machine: def __init__(self, key = ""): @@ -13,6 +26,32 @@ class Machine: def getKey(self): return self._key + +def test_addDefaultMachineActions(machine_action_manager, global_stack): + # The actions need to be registered first as "available actions" in the manager, + # same as the "machine_action" type does when registering a plugin. + all_actions = [] + for action_key_list in global_stack._metadata.values(): + for key in action_key_list: + all_actions.append(MachineAction(key = key)) + for action in all_actions: + machine_action_manager.addMachineAction(action) + + # Only the actions in the definition that were registered first will be added to the machine. + # For the sake of this test, all the actions were previouly added. + machine_action_manager.addDefaultMachineActions(global_stack) + definition_id = global_stack.getDefinition().getId() + + support_action_keys = [a.getKey() for a in machine_action_manager.getSupportedActions(definition_id)] + assert support_action_keys == global_stack.getMetaDataEntry("supported_actions") + + required_action_keys = [a.getKey() for a in machine_action_manager.getRequiredActions(definition_id)] + assert required_action_keys == global_stack.getMetaDataEntry("required_actions") + + first_start_action_keys = [a.getKey() for a in machine_action_manager.getFirstStartActions(definition_id)] + assert first_start_action_keys == global_stack.getMetaDataEntry("first_start_actions") + + def test_addMachineAction(machine_action_manager): test_action = MachineAction(key = "test_action") @@ -44,7 +83,7 @@ def test_addMachineAction(machine_action_manager): assert machine_action_manager.getSupportedActions(test_machine) == [test_action, test_action_2] # Check that the machine has no required actions yet. - assert machine_action_manager.getRequiredActions(test_machine) == set() + assert machine_action_manager.getRequiredActions(test_machine) == list() ## Ensure that only known actions can be added. with pytest.raises(UnknownMachineActionError): @@ -65,12 +104,3 @@ def test_addMachineAction(machine_action_manager): machine_action_manager.addFirstStartAction(test_machine, "test_action") machine_action_manager.addFirstStartAction(test_machine, "test_action") assert machine_action_manager.getFirstStartActions(test_machine) == [test_action, test_action] - - # Check if inserting an action works - machine_action_manager.addFirstStartAction(test_machine, "test_action_2", index = 1) - assert machine_action_manager.getFirstStartActions(test_machine) == [test_action, test_action_2, test_action] - - # Check that adding a unknown action doesn't change anything. - machine_action_manager.addFirstStartAction(test_machine, "key_that_doesnt_exist", index = 1) - assert machine_action_manager.getFirstStartActions(test_machine) == [test_action, test_action_2, test_action] - diff --git a/tests/TestOAuth2.py b/tests/TestOAuth2.py new file mode 100644 index 0000000000..608d529e9f --- /dev/null +++ b/tests/TestOAuth2.py @@ -0,0 +1,133 @@ +import webbrowser +from unittest.mock import MagicMock, patch + +from UM.Preferences import Preferences +from cura.OAuth2.AuthorizationHelpers import AuthorizationHelpers +from cura.OAuth2.AuthorizationService import AuthorizationService +from cura.OAuth2.LocalAuthorizationServer import LocalAuthorizationServer +from cura.OAuth2.Models import OAuth2Settings, AuthenticationResponse, UserProfile + +CALLBACK_PORT = 32118 +OAUTH_ROOT = "https://account.ultimaker.com" +CLOUD_API_ROOT = "https://api.ultimaker.com" + +OAUTH_SETTINGS = OAuth2Settings( + OAUTH_SERVER_URL= OAUTH_ROOT, + CALLBACK_PORT=CALLBACK_PORT, + CALLBACK_URL="http://localhost:{}/callback".format(CALLBACK_PORT), + CLIENT_ID="", + CLIENT_SCOPES="", + AUTH_DATA_PREFERENCE_KEY="test/auth_data", + AUTH_SUCCESS_REDIRECT="{}/app/auth-success".format(OAUTH_ROOT), + AUTH_FAILED_REDIRECT="{}/app/auth-error".format(OAUTH_ROOT) + ) + +FAILED_AUTH_RESPONSE = AuthenticationResponse(success = False, err_message = "FAILURE!") + +SUCCESFULL_AUTH_RESPONSE = AuthenticationResponse(access_token = "beep", refresh_token = "beep?") + +MALFORMED_AUTH_RESPONSE = AuthenticationResponse() + + +def test_cleanAuthService() -> None: + # Ensure that when setting up an AuthorizationService, no data is set. + authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) + authorization_service.initialize() + assert authorization_service.getUserProfile() is None + assert authorization_service.getAccessToken() is None + + +def test_failedLogin() -> None: + authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) + authorization_service.onAuthenticationError.emit = MagicMock() + authorization_service.onAuthStateChanged.emit = MagicMock() + authorization_service.initialize() + + # Let the service think there was a failed response + authorization_service._onAuthStateChanged(FAILED_AUTH_RESPONSE) + + # Check that the error signal was triggered + assert authorization_service.onAuthenticationError.emit.call_count == 1 + + # Since nothing changed, this should still be 0. + assert authorization_service.onAuthStateChanged.emit.call_count == 0 + + # Validate that there is no user profile or token + assert authorization_service.getUserProfile() is None + assert authorization_service.getAccessToken() is None + + +@patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()) +def test_storeAuthData(get_user_profile) -> None: + preferences = Preferences() + authorization_service = AuthorizationService(OAUTH_SETTINGS, preferences) + authorization_service.initialize() + + # Write stuff to the preferences. + authorization_service._storeAuthData(SUCCESFULL_AUTH_RESPONSE) + preference_value = preferences.getValue(OAUTH_SETTINGS.AUTH_DATA_PREFERENCE_KEY) + # Check that something was actually put in the preferences + assert preference_value is not None and preference_value != {} + + # Create a second auth service, so we can load the data. + second_auth_service = AuthorizationService(OAUTH_SETTINGS, preferences) + second_auth_service.initialize() + second_auth_service.loadAuthDataFromPreferences() + assert second_auth_service.getAccessToken() == SUCCESFULL_AUTH_RESPONSE.access_token + + +@patch.object(LocalAuthorizationServer, "stop") +@patch.object(LocalAuthorizationServer, "start") +@patch.object(webbrowser, "open_new") +def test_localAuthServer(webbrowser_open, start_auth_server, stop_auth_server) -> None: + preferences = Preferences() + authorization_service = AuthorizationService(OAUTH_SETTINGS, preferences) + authorization_service.startAuthorizationFlow() + assert webbrowser_open.call_count == 1 + + # Ensure that the Authorization service tried to start the server. + assert start_auth_server.call_count == 1 + assert stop_auth_server.call_count == 0 + authorization_service._onAuthStateChanged(FAILED_AUTH_RESPONSE) + + # Ensure that it stopped the server. + assert stop_auth_server.call_count == 1 + + +def test_loginAndLogout() -> None: + preferences = Preferences() + authorization_service = AuthorizationService(OAUTH_SETTINGS, preferences) + authorization_service.onAuthenticationError.emit = MagicMock() + authorization_service.onAuthStateChanged.emit = MagicMock() + authorization_service.initialize() + + # Let the service think there was a succesfull response + with patch.object(AuthorizationHelpers, "parseJWT", return_value=UserProfile()): + authorization_service._onAuthStateChanged(SUCCESFULL_AUTH_RESPONSE) + + # Ensure that the error signal was not triggered + assert authorization_service.onAuthenticationError.emit.call_count == 0 + + # Since we said that it went right this time, validate that we got a signal. + assert authorization_service.onAuthStateChanged.emit.call_count == 1 + assert authorization_service.getUserProfile() is not None + assert authorization_service.getAccessToken() == "beep" + + # Check that we stored the authentication data, so next time the user won't have to log in again. + assert preferences.getValue("test/auth_data") is not None + + # We're logged in now, also check if logging out works + authorization_service.deleteAuthData() + assert authorization_service.onAuthStateChanged.emit.call_count == 2 + assert authorization_service.getUserProfile() is None + + # Ensure the data is gone after we logged out. + assert preferences.getValue("test/auth_data") == "{}" + + +def test_wrongServerResponses() -> None: + authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) + authorization_service.initialize() + with patch.object(AuthorizationHelpers, "parseJWT", return_value=UserProfile()): + authorization_service._onAuthStateChanged(MALFORMED_AUTH_RESPONSE) + assert authorization_service.getUserProfile() is None diff --git a/tests/TestPrintInformation.py b/tests/TestPrintInformation.py new file mode 100644 index 0000000000..a226a437c6 --- /dev/null +++ b/tests/TestPrintInformation.py @@ -0,0 +1,107 @@ + +from cura import PrintInformation + +from unittest.mock import MagicMock, patch +from UM.Application import Application +from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType + + +def getPrintInformation(printer_name) -> PrintInformation: + + mock_application = MagicMock() + + global_container_stack = MagicMock() + global_container_stack.definition.getName = MagicMock(return_value=printer_name) + mock_application.getGlobalContainerStack = MagicMock(return_value=global_container_stack) + + multiBuildPlateModel = MagicMock() + multiBuildPlateModel.maxBuildPlate = 0 + mock_application.getMultiBuildPlateModel = MagicMock(return_value=multiBuildPlateModel) + + Application.getInstance = MagicMock(return_type=mock_application) + + with patch("json.loads", lambda x: {}): + print_information = PrintInformation.PrintInformation(mock_application) + + return print_information + +def setup_module(): + MimeTypeDatabase.addMimeType( + MimeType( + name="application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + comment="3MF", + suffixes=["3mf"] + ) + ) + + MimeTypeDatabase.addMimeType( + MimeType( + name="application/x-cura-gcode-file", + comment="Cura GCode File", + suffixes=["gcode"] + ) + ) + + + +def test_setProjectName(): + + print_information = getPrintInformation("ultimaker") + + # Test simple name + project_name = ["HelloWorld",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test the name with one dot + project_name = ["Hello.World",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test the name with two dot + project_name = ["Hello.World.World",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test the name with dot at the beginning + project_name = [".Hello.World",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test the name with underline + project_name = ["Hello_World",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test gcode extension + project_name = ["Hello_World",".gcode"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] == print_information._job_name + + # Test empty project name + project_name = ["",""] + print_information.setProjectName(project_name[0] + project_name[1]) + assert print_information.UNTITLED_JOB_NAME == print_information._job_name + + # Test wrong file extension + project_name = ["Hello_World",".test"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert "UM_" + project_name[0] != print_information._job_name + +def test_setJobName(): + + print_information = getPrintInformation("ultimaker") + + print_information._abbr_machine = "UM" + print_information.setJobName("UM_HelloWorld", is_user_specified_job_name=False) + + +def test_defineAbbreviatedMachineName(): + printer_name = "Test" + + print_information = getPrintInformation(printer_name) + + # Test not ultimaker printer, name suffix should have first letter from the printer name + project_name = ["HelloWorld",".3mf"] + print_information.setProjectName(project_name[0] + project_name[1]) + assert printer_name[0] + "_" + project_name[0] == print_information._job_name \ No newline at end of file diff --git a/tests/conftest.py b/tests/conftest.py index ad0bc609ee..b21b32b028 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,6 @@ from cura.CuraApplication import CuraApplication from cura.MachineActionManager import MachineActionManager - # Create a CuraApplication object that will be shared among all tests. It needs to be initialized. # Since we need to use it more that once, we create the application the first time and use its instance afterwards. @pytest.fixture()