Merge branch '3.3'

cura/CuraApplication.py

@@ -705,7 +705,7 @@ class CuraApplication(QtApplication):
         self._post_start_timer.timeout.connect(self._onPostStart)
         self._post_start_timer.start()
 
-
+        Logger.log("d", "Booting Cura took %s seconds", time.time() - self._boot_loading_time)
         self.exec_()
 
     def _onPostStart(self):

cura/Machines/MaterialManager.py

@@ -19,7 +19,10 @@ from .MaterialNode import MaterialNode
 from .MaterialGroup import MaterialGroup
 
 if TYPE_CHECKING:
+    from UM.Settings.DefinitionContainer import DefinitionContainer
+    from UM.Settings.InstanceContainer import InstanceContainer
     from cura.Settings.GlobalStack import GlobalStack
+    from cura.Settings.ExtruderStack import ExtruderStack
 
 
 #
@@ -243,7 +246,7 @@ class MaterialManager(QObject):
     #
     # Return a dict with all root material IDs (k) and ContainerNodes (v) that's suitable for the given setup.
     #
-    def getAvailableMaterials(self, machine_definition_id: str, extruder_variant_name: Optional[str],
+    def getAvailableMaterials(self, machine_definition: "DefinitionContainer", extruder_variant_name: Optional[str],
                               diameter: float) -> dict:
         # round the diameter to get the approximate diameter
         rounded_diameter = str(round(diameter))
@@ -251,6 +254,8 @@ class MaterialManager(QObject):
             Logger.log("i", "Cannot find materials with diameter [%s] (rounded to [%s])", diameter, rounded_diameter)
             return dict()
 
+        machine_definition_id = machine_definition.getId()
+
         # If there are variant materials, get the variant material
         machine_variant_material_map = self._diameter_machine_variant_material_map[rounded_diameter]
         machine_node = machine_variant_material_map.get(machine_definition_id)
@@ -265,10 +270,18 @@ class MaterialManager(QObject):
         #  1. variant-specific material
         #  2. machine-specific material
         #  3. generic material (for fdmprinter)
+        machine_exclude_materials = machine_definition.getMetaDataEntry("exclude_materials", [])
+
         material_id_metadata_dict = dict()
         for node in nodes_to_check:
             if node is not None:
                 for material_id, node in node.material_map.items():
+                    fallback_id = self.getFallbackMaterialIdByMaterialType(node.metadata["material"])
+                    if fallback_id in machine_exclude_materials:
+                        Logger.log("d", "Exclude material [%s] for machine [%s]",
+                                   material_id, machine_definition.getId())
+                        continue
+
                     if material_id not in material_id_metadata_dict:
                         material_id_metadata_dict[material_id] = node
 
@@ -279,14 +292,13 @@ class MaterialManager(QObject):
     #
     def getAvailableMaterialsForMachineExtruder(self, machine: "GlobalStack",
                                                 extruder_stack: "ExtruderStack") -> Optional[dict]:
-        machine_definition_id = machine.definition.getId()
         variant_name = None
         if extruder_stack.variant.getId() != "empty_variant":
             variant_name = extruder_stack.variant.getName()
         diameter = extruder_stack.approximateMaterialDiameter
 
         # Fetch the available materials (ContainerNode) for the current active machine and extruder setup.
-        return self.getAvailableMaterials(machine_definition_id, variant_name, diameter)
+        return self.getAvailableMaterials(machine.definition, variant_name, diameter)
 
     #
     # Gets MaterialNode for the given extruder and machine with the given material name.

cura/Machines/Models/GenericMaterialsModel.py

@@ -31,7 +31,6 @@ class GenericMaterialsModel(BaseMaterialsModel):
             self.setItems([])
             return
         extruder_stack = global_stack.extruders[extruder_position]
-        exclude_materials = set(global_stack.definition.getMetaDataEntry("exclude_materials", []))
 
         available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack,
                                                                                                  extruder_stack)
@@ -42,9 +41,6 @@ class GenericMaterialsModel(BaseMaterialsModel):
         item_list = []
         for root_material_id, container_node in available_material_dict.items():
             metadata = container_node.metadata
-            # Skip excluded materials
-            if metadata["id"] in exclude_materials:
-                continue
             # Only add results for generic materials
             if metadata["brand"].lower() != "generic":
                 continue

cura/Settings/MachineManager.py

@@ -1170,7 +1170,7 @@ class MachineManager(QObject):
             context.context["evaluate_from_container_index"] = _ContainerIndexes.DefinitionChanges
             material_diameter = extruder.getProperty("material_diameter", "value", context)
             candidate_materials = self._material_manager.getAvailableMaterials(
-                self._global_container_stack.definition.getId(),
+                self._global_container_stack.definition,
                 current_variant_name,
                 material_diameter)
 

resources/definitions/fdmprinter.def.json

@@ -1218,7 +1218,7 @@
                 "optimize_wall_printing_order":
                 {
                     "label": "Optimize Wall Printing Order",
-                    "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization.",
+                    "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization. First layer is not optimized when choosing brim as build plate adhesion type.",
                     "type": "bool",
                     "default_value": false,
                     "settable_per_mesh": true

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

@@ -5288,7 +5288,7 @@ msgstr "Ancho máximo permitido de la cámara de aire por debajo de una línea d
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast label"
 msgid "Bridge Wall Coasting"
-msgstr "Depósito por inercia de la pared del puente"
+msgstr "Deslizamiento por la pared del puente"
 
 #: fdmprinter.def.json
 msgctxt "bridge_wall_coast description"

resources/i18n/fr_FR/cura.po

@@ -901,7 +901,7 @@ msgstr "Support"
 #: /home/ruben/Projects/Cura/cura/PrintInformation.py:103
 msgctxt "@tooltip"
 msgid "Skirt"
-msgstr "Jupe"
+msgstr "Contour"
 
 #: /home/ruben/Projects/Cura/cura/PrintInformation.py:104
 msgctxt "@tooltip"
@@ -1699,13 +1699,13 @@ msgstr "Afficher les tâches d'impression"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:37
 msgctxt "@label:status"
 msgid "Preparing to print"
-msgstr "Préparation..."
+msgstr "Préparation de l'impression"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:39
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:263
 msgctxt "@label:status"
 msgid "Printing"
-msgstr "Impression..."
+msgstr "Impression"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:41
 msgctxt "@label:status"
@@ -1746,7 +1746,7 @@ msgstr "Terminé"
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:392
 msgctxt "@label"
 msgid "Preparing to print"
-msgstr "Préparation de l'impression..."
+msgstr "Préparation de l'impression"
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml:273
 msgctxt "@label:status"
@@ -3733,7 +3733,7 @@ msgstr "&Plateau"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13
 msgctxt "@action:inmenu"
 msgid "Visible Settings"
-msgstr "Paramètres visibles :"
+msgstr "Paramètres visibles"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43
 msgctxt "@action:inmenu"
@@ -3767,7 +3767,7 @@ msgstr "Nombre de copies"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml:33
 msgctxt "@label:header configurations"
 msgid "Available configurations"
-msgstr "Configurations disponibles :"
+msgstr "Configurations disponibles"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml:28
 msgctxt "@label:extruder label"
@@ -4374,7 +4374,7 @@ msgstr "Journal du moteur"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr "Type d'imprimante :"
+msgstr "Type d'imprimante"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"

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

@@ -469,7 +469,7 @@ msgstr "Appliquer le décalage de l'extrudeuse au système de coordonnées."
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_z label"
 msgid "Extruder Prime Z Position"
-msgstr "Extrudeuse Position d'amorçage Z"
+msgstr "Extrudeuse position d'amorçage Z"
 
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_z description"
@@ -789,12 +789,12 @@ msgstr "Largeur d'une seule ligne de remplissage."
 #: fdmprinter.def.json
 msgctxt "skirt_brim_line_width label"
 msgid "Skirt/Brim Line Width"
-msgstr "Largeur des lignes de jupe/bordure"
+msgstr "Largeur des lignes de contour/bordure"
 
 #: fdmprinter.def.json
 msgctxt "skirt_brim_line_width description"
 msgid "Width of a single skirt or brim line."
-msgstr "Largeur d'une seule ligne de jupe ou de bordure."
+msgstr "Largeur d'une seule ligne de contour ou de bordure."
 
 #: fdmprinter.def.json
 msgctxt "support_line_width label"
@@ -2244,12 +2244,12 @@ msgstr "Vitesse des mouvements de déplacement dans la couche initiale. Une vale
 #: fdmprinter.def.json
 msgctxt "skirt_brim_speed label"
 msgid "Skirt/Brim Speed"
-msgstr "Vitesse d'impression de la jupe/bordure"
+msgstr "Vitesse d'impression du contour/bordure"
 
 #: fdmprinter.def.json
 msgctxt "skirt_brim_speed description"
 msgid "The speed at which the skirt and brim are printed. Normally this is done at the initial layer speed, but sometimes you might want to print the skirt or brim at a different speed."
-msgstr "La vitesse à laquelle la jupe et la bordure sont imprimées. Normalement, cette vitesse est celle de la couche initiale, mais il est parfois nécessaire d’imprimer la jupe ou la bordure à une vitesse différente."
+msgstr "La vitesse à laquelle le contour et la bordure sont imprimées. Normalement, cette vitesse est celle de la couche initiale, mais il est parfois nécessaire d’imprimer le contour ou la bordure à une vitesse différente."
 
 #: fdmprinter.def.json
 msgctxt "max_feedrate_z_override label"
@@ -2474,12 +2474,12 @@ msgstr "L'accélération pour les déplacements dans la couche initiale."
 #: fdmprinter.def.json
 msgctxt "acceleration_skirt_brim label"
 msgid "Skirt/Brim Acceleration"
-msgstr "Accélération de la jupe/bordure"
+msgstr "Accélération du contour/bordure"
 
 #: fdmprinter.def.json
 msgctxt "acceleration_skirt_brim description"
 msgid "The acceleration with which the skirt and brim are printed. Normally this is done with the initial layer acceleration, but sometimes you might want to print the skirt or brim at a different acceleration."
-msgstr "L'accélération selon laquelle la jupe et la bordure sont imprimées. Normalement, cette accélération est celle de la couche initiale, mais il est parfois nécessaire d’imprimer la jupe ou la bordure à une accélération différente."
+msgstr "L'accélération selon laquelle le contour et la bordure sont imprimées. Normalement, cette accélération est celle de la couche initiale, mais il est parfois nécessaire d’imprimer le contour ou la bordure à une accélération différente."
 
 #: fdmprinter.def.json
 msgctxt "jerk_enabled label"
@@ -2664,12 +2664,12 @@ msgstr "L'accélération pour les déplacements dans la couche initiale."
 #: fdmprinter.def.json
 msgctxt "jerk_skirt_brim label"
 msgid "Skirt/Brim Jerk"
-msgstr "Saccade de la jupe/bordure"
+msgstr "Saccade du contour/bordure"
 
 #: fdmprinter.def.json
 msgctxt "jerk_skirt_brim description"
 msgid "The maximum instantaneous velocity change with which the skirt and brim are printed."
-msgstr "Le changement instantané maximal de vitesse selon lequel la jupe et la bordure sont imprimées."
+msgstr "Le changement instantané maximal de vitesse selon lequel le contour et la bordure sont imprimées."
 
 #: fdmprinter.def.json
 msgctxt "travel label"
@@ -3569,7 +3569,7 @@ msgstr "Activer la goutte de préparation"
 #: fdmprinter.def.json
 msgctxt "prime_blob_enable description"
 msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time."
-msgstr "Préparer les filaments avec une goutte avant l'impression. Ce paramètre permet d'assurer que l'extrudeuse disposera de matériau prêt au niveau de la buse avant l'impression. La jupe/bordure d'impression peut également servir de préparation, auquel cas le fait de laisser ce paramètre désactivé permet de gagner un peu de temps."
+msgstr "Préparer les filaments avec une goutte avant l'impression. Ce paramètre permet d'assurer que l'extrudeuse disposera de matériau prêt au niveau de la buse avant l'impression. Le contour/bordure d'impression peut également servir de préparation, auquel cas le fait de laisser ce paramètre désactivé permet de gagner un peu de temps."
 
 #: fdmprinter.def.json
 msgctxt "extruder_prime_pos_x label"
@@ -3599,12 +3599,12 @@ msgstr "Type d'adhérence du plateau"
 #: fdmprinter.def.json
 msgctxt "adhesion_type description"
 msgid "Different options that help to improve both priming your extrusion and adhesion to the build plate. Brim adds a single layer flat area around the base of your model to prevent warping. Raft adds a thick grid with a roof below the model. Skirt is a line printed around the model, but not connected to the model."
-msgstr "Différentes options qui permettent d'améliorer la préparation de votre extrusion et l'adhérence au plateau. La bordure ajoute une zone plate d'une seule couche autour de la base de votre modèle, afin de l'empêcher de se redresser. Le radeau ajoute une grille épaisse avec un toit sous le modèle. La jupe est une ligne imprimée autour du modèle mais qui n'est pas rattachée au modèle."
+msgstr "Différentes options qui permettent d'améliorer la préparation de votre extrusion et l'adhérence au plateau. La bordure ajoute une zone plate d'une seule couche autour de la base de votre modèle, afin de l'empêcher de se redresser. Le radeau ajoute une grille épaisse avec un toit sous le modèle. Le contour est une ligne imprimée autour du modèle mais qui n'est pas rattachée au modèle."
 
 #: fdmprinter.def.json
 msgctxt "adhesion_type option skirt"
 msgid "Skirt"
-msgstr "Jupe"
+msgstr "Contour"
 
 #: fdmprinter.def.json
 msgctxt "adhesion_type option brim"
@@ -3629,39 +3629,39 @@ msgstr "Extrudeuse d'adhérence du plateau"
 #: fdmprinter.def.json
 msgctxt "adhesion_extruder_nr description"
 msgid "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion."
-msgstr "Le train d'extrudeuse à utiliser pour l'impression de la jupe/la bordure/du radeau. Cela est utilisé en multi-extrusion."
+msgstr "Le train d'extrudeuse à utiliser pour l'impression du contour/de la bordure/du radeau. Cela est utilisé en multi-extrusion."
 
 #: fdmprinter.def.json
 msgctxt "skirt_line_count label"
 msgid "Skirt Line Count"
-msgstr "Nombre de lignes de la jupe"
+msgstr "Nombre de lignes du contour"
 
 #: fdmprinter.def.json
 msgctxt "skirt_line_count description"
 msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt."
-msgstr "Une jupe à plusieurs lignes vous aide à mieux préparer votre extrusion pour les petits modèles. Définissez celle valeur sur 0 pour désactiver la jupe."
+msgstr "Un contour à plusieurs lignes vous aide à mieux préparer votre extrusion pour les petits modèles. Définissez celle valeur sur 0 pour désactiver le contour."
 
 #: fdmprinter.def.json
 msgctxt "skirt_gap label"
 msgid "Skirt Distance"
-msgstr "Distance de la jupe"
+msgstr "Distance du contour"
 
 #: fdmprinter.def.json
 msgctxt "skirt_gap description"
 msgid ""
 "The horizontal distance between the skirt and the first layer of the print.\n"
 "This is the minimum distance. Multiple skirt lines will extend outwards from this distance."
-msgstr "La distance horizontale entre la jupe et la première couche de l’impression.\nIl s’agit de la distance minimale séparant la jupe de l’objet. Si la jupe a d’autres lignes, celles-ci s’étendront vers l’extérieur."
+msgstr "La distance horizontale entre le contour et la première couche de l’impression.\nIl s’agit de la distance minimale séparant le contour de l’objet. Si le contour a d’autres lignes, celles-ci s’étendront vers l’extérieur."
 
 #: fdmprinter.def.json
 msgctxt "skirt_brim_minimal_length label"
 msgid "Skirt/Brim Minimum Length"
-msgstr "Longueur minimale de la jupe/bordure"
+msgstr "Longueur minimale du contour/bordure"
 
 #: fdmprinter.def.json
 msgctxt "skirt_brim_minimal_length description"
 msgid "The minimum length of the skirt or brim. If this length is not reached by all skirt or brim lines together, more skirt or brim lines will be added until the minimum length is reached. Note: If the line count is set to 0 this is ignored."
-msgstr "La longueur minimale de la jupe ou bordure. Si cette longueur n’est pas atteinte par toutes les lignes de jupe ou de bordure ensemble, d’autres lignes de jupe ou de bordure seront ajoutées afin d’atteindre la longueur minimale. Veuillez noter que si le nombre de lignes est défini sur 0, cette option est ignorée."
+msgstr "La longueur minimale du contour ou bordure. Si cette longueur n’est pas atteinte par toutes les lignes de contour ou de bordure ensemble, d’autres lignes de contour ou de bordure seront ajoutées afin d’atteindre la longueur minimale. Veuillez noter que si le nombre de lignes est défini sur 0, cette option est ignorée."
 
 #: fdmprinter.def.json
 msgctxt "brim_width label"
@@ -5582,8 +5582,8 @@ msgstr "Matrice de transformation à appliquer au modèle lors de son chargement
 #~ "The horizontal distance between the skirt and the first layer of the print.\n"
 #~ "This is the minimum distance, multiple skirt lines will extend outwards from this distance."
 #~ msgstr ""
-#~ "La distance horizontale entre la jupe et la première couche de l’impression.\n"
+#~ "La distance horizontale entre le contour 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."
+#~ "Il s’agit de la distance minimale séparant le contour de l’objet. Si le contour a d’autres lignes, celles-ci s’étendront vers l’extérieur."
 
 #~ msgctxt "z_offset_layer_0 label"
 #~ msgid "Initial Layer Z Offset"

resources/i18n/it_IT/cura.po

@@ -3731,7 +3731,7 @@ msgstr "&Piano di stampa"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13
 msgctxt "@action:inmenu"
 msgid "Visible Settings"
-msgstr "Impostazioni visibili:"
+msgstr "Impostazioni visibili"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43
 msgctxt "@action:inmenu"
@@ -4372,7 +4372,7 @@ msgstr "Log motore"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr "Tipo di stampante:"
+msgstr "Tipo di stampante"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"

resources/i18n/ja_JP/cura.po

@@ -157,7 +157,7 @@ msgstr "USBにて接続する"
 #: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:14
 msgctxt "X3G Writer File Description"
 msgid "X3G File"
-msgstr "X3Dファイル"
+msgstr "X3Gファイル"
 
 #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:14
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14
@@ -4708,7 +4708,7 @@ msgstr "Cura 3.2からCura 3.3のコンフィグレーションアップグレ
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "name"
 msgid "Version Upgrade 3.2 to 3.3"
-msgstr "3.2から2.6にバージョンアップグレート"
+msgstr "3.2から3.3にバージョンアップグレート"
 
 #: VersionUpgrade/VersionUpgrade25to26/plugin.json
 msgctxt "description"

resources/i18n/ko_KR/cura.po

@@ -155,7 +155,7 @@ msgstr "USB를 통해 연결"
 #: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:14
 msgctxt "X3G Writer File Description"
 msgid "X3G File"
-msgstr "X3D 파일"
+msgstr "X3G 파일"
 
 #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:14
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14
@@ -4699,12 +4699,12 @@ msgstr "G 코드 프로필 판독기"
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "description"
 msgid "Upgrades configurations from Cura 3.2 to Cura 3.3."
-msgstr "Cura 3.0에서 Cura 3.1로 구성을 업그레이드합니다."
+msgstr "Cura 3.2에서 Cura 3.3로 구성을 업그레이드합니다."
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "name"
 msgid "Version Upgrade 3.2 to 3.3"
-msgstr "버전 업그레이드 2.7에서 3.3"
+msgstr "버전 업그레이드 3.2에서 3.3"
 
 #: VersionUpgrade/VersionUpgrade25to26/plugin.json
 msgctxt "description"

resources/i18n/nl_NL/cura.po

@@ -153,7 +153,7 @@ msgstr "Aangesloten via USB"
 #: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:14
 msgctxt "X3G Writer File Description"
 msgid "X3G File"
-msgstr "X3D-bestand"
+msgstr "X3G-bestand"
 
 #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:14
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14
@@ -4372,7 +4372,7 @@ msgstr "Engine-logboek"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr "Type printer:"
+msgstr "Type printer"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"
@@ -4627,7 +4627,7 @@ msgstr "Nabewerking"
 #: SupportEraser/plugin.json
 msgctxt "description"
 msgid "Creates an eraser mesh to block the printing of support in certain places"
-msgstr "Hiermee maakt u een wisraster om het printen van een supportstructuur op bepaalde plekken te blokkeren"
+msgstr "Maakt een wissend model om het printen van een supportstructuur op bepaalde plekken te blokkeren"
 
 #: SupportEraser/plugin.json
 msgctxt "name"

resources/i18n/ru_RU/cura.po

@@ -4382,7 +4382,7 @@ msgstr "Журнал движка"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr "Тип принтера:"
+msgstr "Тип принтера"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"

resources/i18n/tr_TR/cura.po

@@ -3731,7 +3731,7 @@ msgstr "&Yapı levhası"
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13
 msgctxt "@action:inmenu"
 msgid "Visible Settings"
-msgstr "Görünür ayarlar:"
+msgstr "Görünür ayarlar"
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:43
 msgctxt "@action:inmenu"
@@ -4372,7 +4372,7 @@ msgstr "Motor Günlüğü"
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:58
 msgctxt "@label"
 msgid "Printer type"
-msgstr "Yazıcı türü:"
+msgstr "Yazıcı türü"
 
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:360
 msgctxt "@label"
@@ -4697,12 +4697,12 @@ msgstr "G-code Profil Okuyucu"
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "description"
 msgid "Upgrades configurations from Cura 3.2 to Cura 3.3."
-msgstr "Yapılandırmaları Cura 2.5’ten Cura 2.6’ya yükseltir."
+msgstr "Yapılandırmaları Cura 3.2’ten Cura 3.3’ya yükseltir."
 
 #: VersionUpgrade/VersionUpgrade32to33/plugin.json
 msgctxt "name"
 msgid "Version Upgrade 3.2 to 3.3"
-msgstr "3.0'dan 3.1'e Sürüm Yükseltme"
+msgstr "3.2'dan 3.3'e Sürüm Yükseltme"
 
 #: VersionUpgrade/VersionUpgrade25to26/plugin.json
 msgctxt "description"

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

@@ -56,7 +56,7 @@ msgctxt "machine_start_gcode description"
 msgid ""
 "G-code commands to be executed at the very start - separated by \n"
 "."
-msgstr "\n ile ayrılan, başlangıçta yürütülecek G-code komutları."
+msgstr " \n ile ayrılan, başlangıçta yürütülecek G-code komutları."
 
 #: fdmprinter.def.json
 msgctxt "machine_end_gcode label"
@@ -68,7 +68,7 @@ msgctxt "machine_end_gcode description"
 msgid ""
 "G-code commands to be executed at the very end - separated by \n"
 "."
-msgstr "\n ile ayrılan, bitişte yürütülecek G-code komutları."
+msgstr " \n ile ayrılan, bitişte yürütülecek G-code komutları."
 
 #: fdmprinter.def.json
 msgctxt "material_guid label"

resources/i18n/zh_CN/cura.po

@@ -155,7 +155,7 @@ msgstr "通过 USB 连接"
 #: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:14
 msgctxt "X3G Writer File Description"
 msgid "X3G File"
-msgstr "X3D 文件"
+msgstr "X3G 文件"
 
 #: /home/ruben/Projects/Cura/plugins/GCodeGzWriter/__init__.py:14
 #: /home/ruben/Projects/Cura/plugins/GCodeGzReader/__init__.py:14

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

@@ -1030,7 +1030,7 @@ msgstr "同心圆"
 #: fdmprinter.def.json
 msgctxt "top_bottom_pattern option zigzag"
 msgid "Zig Zag"
-msgstr "Zig Zag"
+msgstr "锯齿状"
 
 #: fdmprinter.def.json
 msgctxt "top_bottom_pattern_0 label"
@@ -1055,7 +1055,7 @@ msgstr "同心圆"
 #: fdmprinter.def.json
 msgctxt "top_bottom_pattern_0 option zigzag"
 msgid "Zig Zag"
-msgstr "Zig Zag"
+msgstr "锯齿状"
 
 #: fdmprinter.def.json
 msgctxt "skin_angles label"

resources/qml/SidebarSimple.qml

@@ -247,17 +247,19 @@ Item
                     {
                         function showTooltip (showTooltip)
                         {
-                            if (showTooltip) {
+                            if (showTooltip)
+                            {
                                 var content = catalog.i18nc("@tooltip", "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile")
                                 base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, customisedSettings.height), content)
                             }
-                            else {
+                            else
+                            {
                                 base.hideTooltip()
                             }
                         }
 
                         id: unavailableLineToolTip
-                        height: 20 // hovered area height
+                        height: 20 * screenScaleFactor // hovered area height
                         z: parent.z + 1 // should be higher, otherwise the area can be hovered
                         x: 0
                         anchors.verticalCenter: qualitySlider.verticalCenter
@@ -267,7 +269,8 @@ Item
                             id: leftArea
                             width:
                             {
-                                if (qualityModel.availableTotalTicks == 0) {
+                                if (qualityModel.availableTotalTicks == 0)
+                                {
                                     return qualityModel.qualitySliderStepWidth * qualityModel.totalTicks
                                 }
                                 return qualityModel.qualitySliderStepWidth * qualityModel.qualitySliderAvailableMin - 10