diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 02d5ff1c67..1b20cc63c0 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -208,7 +208,7 @@ class BuildVolume(SceneNode): "@info:status", "The build volume height has been reduced due to the value of the" " \"Print Sequence\" setting to prevent the gantry from colliding" - " with printed objects."), lifetime=10).show() + " with printed models."), lifetime=10).show() def getRaftThickness(self): return self._raft_thickness diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 70dcd300a4..bae4e9d427 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -236,7 +236,7 @@ class CuraEngineBackend(Backend): if job.getResult() == StartSliceJob.StartJobResult.NothingToSlice: if Application.getInstance().getPlatformActivity: - self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. No suitable objects found.")) + self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice. No suitable models found.")) self._error_message.show() self.backendStateChange.emit(BackendState.Error) else: diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 0930ae568e..72b5b7da95 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -31,7 +31,7 @@ Item { spacing: UM.Theme.getSize("default_margin").width Label { - text: catalog.i18nc("@label", "Print object with") + text: catalog.i18nc("@label", "Print model with") anchors.verticalCenter: extruderSelector.verticalCenter color: UM.Theme.getColor("setting_control_text") @@ -306,7 +306,7 @@ Item { UM.Dialog { id: settingPickDialog - title: catalog.i18nc("@title:window", "Select Settings to Customize for this object") + title: catalog.i18nc("@title:window", "Select Settings to Customize for this model") width: screenScaleFactor * 360; property string labelFilter: "" diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index 1779556ade..08b8de1452 100644 --- a/plugins/PerObjectSettingsTool/__init__.py +++ b/plugins/PerObjectSettingsTool/__init__.py @@ -11,15 +11,15 @@ i18n_catalog = i18nCatalog("cura") def getMetaData(): return { "plugin": { - "name": i18n_catalog.i18nc("@label", "Per Object Settings Tool"), + "name": i18n_catalog.i18nc("@label", "Per Model Settings Tool"), "author": "Ultimaker", "version": "1.0", - "description": i18n_catalog.i18nc("@info:whatsthis", "Provides the Per Object Settings."), + "description": i18n_catalog.i18nc("@info:whatsthis", "Provides the Per Model Settings."), "api": 3 }, "tool": { - "name": i18n_catalog.i18nc("@label", "Per Object Settings"), - "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Object Settings"), + "name": i18n_catalog.i18nc("@label", "Per Model Settings"), + "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Model Settings"), "icon": "setting_per_object", "tool_panel": "PerObjectSettingsPanel.qml", "weight": 3 diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.py b/plugins/UltimakerMachineActions/BedLevelMachineAction.py index 12df7d6843..c80a8ffc01 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.py +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.py @@ -10,7 +10,7 @@ catalog = i18nCatalog("cura") class BedLevelMachineAction(MachineAction): def __init__(self): - super().__init__("BedLevel", catalog.i18nc("@action", "Level bed")) + super().__init__("BedLevel", catalog.i18nc("@action", "Level build plate")) self._qml_url = "BedLevelMachineAction.qml" self._bed_level_position = 0 diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml index c7c4074120..7f35637516 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml @@ -24,7 +24,7 @@ Cura.MachineAction { id: pageTitle width: parent.width - text: catalog.i18nc("@title", "Bed Leveling") + text: catalog.i18nc("@title", "Build Plate Leveling") wrapMode: Text.WordWrap font.pointSize: 18; } @@ -44,7 +44,7 @@ Cura.MachineAction anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width wrapMode: Text.WordWrap - text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print bed height. The print bed height is right when the paper is slightly gripped by the tip of the nozzle.") + text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.") } Row @@ -59,7 +59,7 @@ Cura.MachineAction Button { id: startBedLevelingButton - text: catalog.i18nc("@action:button","Start Bed Leveling") + text: catalog.i18nc("@action:button","Start Build Plate Leveling") onClicked: { startBedLevelingButton.visible = false; diff --git a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml index 0bdbc27527..6832883c79 100644 --- a/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml @@ -220,7 +220,7 @@ Cura.MachineAction anchors.left: parent.left anchors.top: nozzleTempLabel.bottom wrapMode: Text.WordWrap - text: catalog.i18nc("@label","Bed temperature check:") + text: catalog.i18nc("@label","Build plate temperature check:") visible: checkupMachineAction.usbConnected && manager.hasHeatedBed } diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml index 234e53c0a6..a1c607658d 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml @@ -42,7 +42,7 @@ Cura.MachineAction anchors.top: pageDescription.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height - text: catalog.i18nc("@label", "Heated bed (official kit or self-built)") + text: catalog.i18nc("@label", "Heated Build Plate (official kit or self-built)") checked: manager.hasHeatedBed onClicked: checked ? manager.addHeatedBed() : manager.removeHeatedBed() } diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index bde24ee684..7c594e3eda 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -161,7 +161,7 @@ }, "platform_adhesion": { - "label": "Platform Adhesion", + "label": "Build Plate Adhesion", "type": "category", "icon": "category_adhesion", "description": "Adhesion", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 380faa397e..17203ea797 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -67,8 +67,8 @@ }, "material_bed_temp_wait": { - "label": "Wait for bed heatup", - "description": "Whether to insert a command to wait until the bed temperature is reached at the start.", + "label": "Wait for build plate heatup", + "description": "Whether to insert a command to wait until the build plate temperature is reached at the start.", "default_value": true, "type": "bool", "settable_per_mesh": false, @@ -127,8 +127,8 @@ }, "machine_heated_bed": { - "label": "Has heated bed", - "description": "Whether the machine has a heated bed present.", + "label": "Has heated build plate", + "description": "Whether the machine has a heated build plate present.", "default_value": false, "type": "bool", "settable_per_mesh": false, @@ -784,7 +784,7 @@ "wall_0_inset": { "label": "Outer Wall Inset", - "description": "Inset applied to the path of the outer wall. If the outer wall is smaller than the nozzle, and printed after the inner walls, use this offset to get the hole in the nozzle to overlap with the inner walls instead of the outside of the object.", + "description": "Inset applied to the path of the outer wall. If the outer wall is smaller than the nozzle, and printed after the inner walls, use this offset to get the hole in the nozzle to overlap with the inner walls instead of the outside of the model.", "unit": "mm", "type": "float", "default_value": 0.0, @@ -1085,8 +1085,8 @@ "settable_per_extruder": true }, "material_bed_temperature": { - "label": "Bed Temperature", - "description": "The temperature used for the heated bed. Set at 0 to pre-heat the printer manually.", + "label": "Build Plate Temperature", + "description": "The temperature used for the heated build plate. Set at 0 to pre-heat the printer manually.", "unit": "°C", "type": "float", "default_value": 60, @@ -1569,7 +1569,7 @@ "max_feedrate_z_override": { "label": "Maximum Z Speed", - "description": "The maximum speed with which the bed is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed.", + "description": "The maximum speed with which the build plate is moved. Setting this to zero causes the print to use the firmware defaults for the maximum z speed.", "unit": "mm/s", "type": "float", "default_value": 0, @@ -1582,7 +1582,7 @@ "speed_slowdown_layers": { "label": "Number of Slower Layers", - "description": "The first few layers are printed slower than the rest of the object, to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.", + "description": "The first few layers are printed slower than the rest of the model, to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.", "type": "int", "default_value": 2, "minimum_value": "0", @@ -2110,8 +2110,8 @@ { "cool_fan_enabled": { - "label": "Enable Cooling Fans", - "description": "Enables the cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs.", + "label": "Enable Print Cooling", + "description": "Enables the print cooling fans while printing. The fans improve print quality on layers with short layer times and bridging / overhangs.", "type": "bool", "default_value": true, "settable_per_mesh": false, @@ -2120,7 +2120,7 @@ "cool_fan_speed": { "label": "Fan Speed", - "description": "The speed at which the cooling fans spin.", + "description": "The speed at which the print cooling fans spin.", "unit": "%", "type": "float", "minimum_value": "0", @@ -2633,7 +2633,7 @@ }, "platform_adhesion": { - "label": "Platform Adhesion", + "label": "Build Plate Adhesion", "type": "category", "icon": "category_adhesion", "description": "Adhesion", @@ -2667,8 +2667,8 @@ }, "adhesion_type": { - "label": "Platform Adhesion Type", - "description": "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 object to prevent warping. Raft adds a thick grid with a roof below the object. Skirt is a line printed around the object, but not connected to the model.", + "label": "Build Plate Adhesion Type", + "description": "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.", "type": "enum", "options": { @@ -2683,7 +2683,7 @@ "skirt_line_count": { "label": "Skirt Line Count", - "description": "Multiple skirt lines help to prime your extrusion better for small objects. Setting this to 0 will disable the skirt.", + "description": "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt.", "type": "int", "default_value": 1, "minimum_value": "0", @@ -2761,7 +2761,7 @@ "raft_margin": { "label": "Raft Extra Margin", - "description": "If the raft is enabled, this is the extra raft area around the object which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.", + "description": "If the raft is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.", "unit": "mm", "type": "float", "default_value": 15, @@ -2772,7 +2772,7 @@ "raft_airgap": { "label": "Raft Air Gap", - "description": "The gap between the final raft layer and the first layer of the object. Only the first layer is raised by this amount to lower the bonding between the raft layer and the object. Makes it easier to peel off the raft.", + "description": "The gap between the final raft layer and the first layer of the model. Only the first layer is raised by this amount to lower the bonding between the raft layer and the model. Makes it easier to peel off the raft.", "unit": "mm", "type": "float", "default_value": 0.3, @@ -2784,7 +2784,7 @@ }, "layer_0_z_overlap": { "label": "Initial Layer Z Overlap", - "description": "Make the first and second layer of the object overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.", + "description": "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.", "unit": "mm", "type": "float", "default_value": 0.22, @@ -2798,7 +2798,7 @@ "raft_surface_layers": { "label": "Raft Top Layers", - "description": "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the object sits on. 2 layers result in a smoother top surface than 1.", + "description": "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the model sits on. 2 layers result in a smoother top surface than 1.", "type": "int", "default_value": 2, "minimum_value": "0", @@ -2866,7 +2866,7 @@ "raft_interface_line_width": { "label": "Raft Middle Line Width", - "description": "Width of the lines in the middle raft layer. Making the second layer extrude more causes the lines to stick to the bed.", + "description": "Width of the lines in the middle raft layer. Making the second layer extrude more causes the lines to stick to the build plate.", "unit": "mm", "type": "float", "default_value": 0.7, @@ -2894,7 +2894,7 @@ "raft_base_thickness": { "label": "Raft Base Thickness", - "description": "Layer thickness of the base raft layer. This should be a thick layer which sticks firmly to the printer bed.", + "description": "Layer thickness of the base raft layer. This should be a thick layer which sticks firmly to the printer build plate.", "unit": "mm", "type": "float", "default_value": 0.3, @@ -2908,7 +2908,7 @@ "raft_base_line_width": { "label": "Raft Base Line Width", - "description": "Width of the lines in the base raft layer. These should be thick lines to assist in bed adhesion.", + "description": "Width of the lines in the base raft layer. These should be thick lines to assist in build plate adhesion.", "unit": "mm", "type": "float", "default_value": 0.8, @@ -3181,7 +3181,7 @@ { "adhesion_extruder_nr": { - "label": "Platform Adhesion Extruder", + "label": "Build Plate Adhesion Extruder", "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", @@ -3310,7 +3310,7 @@ "multiple_mesh_overlap": { "label": "Dual Extrusion Overlap", - "description": "Make the objects printed with different extruder trains overlap a bit. This makes the different materials bond together better.", + "description": "Make the models printed with different extruder trains overlap a bit. This makes the different materials bond together better.", "type": "float", "unit": "mm", "default_value": 0.15, @@ -3321,7 +3321,7 @@ "ooze_shield_enabled": { "label": "Enable Ooze Shield", - "description": "Enable exterior ooze shield. This will create a shell around the object which is likely to wipe a second nozzle if it's at the same height as the first nozzle.", + "description": "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle.", "type": "bool", "default_value": false, "settable_per_mesh": false, @@ -3408,7 +3408,7 @@ "print_sequence": { "label": "Print Sequence", - "description": "Whether to print all objects one layer at a time or to wait for one object to finish, before moving on to the next. One at a time mode is only possible if all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes.", + "description": "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is only possible if all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes.", "type": "enum", "options": { @@ -3462,7 +3462,7 @@ "magic_spiralize": { "label": "Spiralize Outer Contour", - "description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid object into a single walled print with a solid bottom. This feature used to be called Joris in older versions.", + "description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions.", "type": "bool", "default_value": false, "settable_per_mesh": true @@ -3480,7 +3480,7 @@ "draft_shield_enabled": { "label": "Enable Draft Shield", - "description": "This will create a wall around the object, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", + "description": "This will create a wall around the model, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", "type": "bool", "default_value": false, "settable_per_mesh": false, @@ -3502,7 +3502,7 @@ "draft_shield_height_limitation": { "label": "Draft Shield Limitation", - "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the object or at a limited height.", + "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the model or at a limited height.", "type": "enum", "options": { @@ -3806,7 +3806,7 @@ "wireframe_printspeed_flat": { "label": "WP Horizontal Printing Speed", - "description": "Speed of printing the horizontal contours of the object. Only applies to Wire Printing.", + "description": "Speed of printing the horizontal contours of the model. Only applies to Wire Printing.", "unit": "mm/s", "type": "float", "default_value": 5, diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index ed88433e33..536ec289fe 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -183,7 +183,7 @@ Item Action { id: deleteObjectAction; - text: catalog.i18nc("@action:inmenu","Delete Object"); + text: catalog.i18nc("@action:inmenu","Delete Model"); enabled: UM.Controller.toolsEnabled; iconName: "edit-delete"; } @@ -191,13 +191,13 @@ Item Action { id: centerObjectAction; - text: catalog.i18nc("@action:inmenu","Ce&nter Object on Platform"); + text: catalog.i18nc("@action:inmenu","Ce&nter Model on Platform"); } Action { id: groupObjectsAction - text: catalog.i18nc("@action:inmenu menubar:edit","&Group Objects"); + text: catalog.i18nc("@action:inmenu menubar:edit","&Group Models"); enabled: UM.Scene.numObjectsSelected > 1 ? true: false iconName: "object-group" shortcut: "Ctrl+G"; @@ -207,7 +207,7 @@ Item Action { id: unGroupObjectsAction - text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Objects"); + text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Models"); enabled: UM.Scene.isGroupSelected iconName: "object-ungroup" shortcut: "Ctrl+Shift+G"; @@ -217,7 +217,7 @@ Item Action { id: mergeObjectsAction - text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Objects"); + text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Models"); enabled: UM.Scene.numObjectsSelected > 1 ? true: false iconName: "merge"; shortcut: "Ctrl+Alt+G"; @@ -227,14 +227,14 @@ Item Action { id: multiplyObjectAction; - text: catalog.i18nc("@action:inmenu","&Duplicate Object"); + text: catalog.i18nc("@action:inmenu","&Duplicate Model"); iconName: "edit-duplicate" } Action { id: selectAllAction; - text: catalog.i18nc("@action:inmenu menubar:edit","&Select All Objects"); + text: catalog.i18nc("@action:inmenu menubar:edit","&Select All Models"); enabled: UM.Controller.toolsEnabled; iconName: "edit-select-all"; shortcut: "Ctrl+A"; @@ -244,7 +244,7 @@ Item Action { id: deleteAllAction; - text: catalog.i18nc("@action:inmenu menubar:edit","&Clear Build Platform"); + text: catalog.i18nc("@action:inmenu menubar:edit","&Clear Build Plate"); enabled: UM.Controller.toolsEnabled; iconName: "edit-delete"; shortcut: "Ctrl+D"; @@ -254,7 +254,7 @@ Item Action { id: reloadAllAction; - text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Objects"); + text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Models"); iconName: "document-revert"; onTriggered: Printer.reloadAll(); } @@ -262,14 +262,14 @@ Item Action { id: resetAllTranslationAction; - text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object Positions"); + text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Model Positions"); onTriggered: Printer.resetAllTranslation(); } Action { id: resetAllAction; - text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object &Transformations"); + text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Model &Transformations"); onTriggered: Printer.resetAll(); } diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 07a188713f..001d2af8d4 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -168,7 +168,7 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width; height: childrenRect.height; - text: catalog.i18nc("@info:tooltip","Moves the camera so the object is in the center of the view when an object is selected") + text: catalog.i18nc("@info:tooltip","Moves the camera so the model is in the center of the view when an model is selected") CheckBox { @@ -182,12 +182,12 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect?") + text: catalog.i18nc("@info:tooltip", "Should models on the platform be moved so that they no longer intersect?") CheckBox { id: pushFreeCheckbox - text: catalog.i18nc("@option:check", "Ensure objects are kept apart") + text: catalog.i18nc("@option:check", "Ensure models are kept apart") checked: boolCheck(UM.Preferences.getValue("physics/automatic_push_free")) onCheckedChanged: UM.Preferences.setValue("physics/automatic_push_free", checked) } @@ -247,12 +247,12 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip","Should objects be scaled to the build volume if they are too large?") + text: catalog.i18nc("@info:tooltip","Should models be scaled to the build volume if they are too large?") CheckBox { id: scaleToFitCheckbox - text: catalog.i18nc("@option:check","Scale large objects") + text: catalog.i18nc("@option:check","Scale large models") checked: boolCheck(UM.Preferences.getValue("mesh/scale_to_fit")) onCheckedChanged: UM.Preferences.setValue("mesh/scale_to_fit", checked) } @@ -261,12 +261,12 @@ UM.PreferencesPage UM.TooltipArea { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip","An object may appear extremely small if its unit is for example in meters rather than millimeters. Should these objects be scaled up?") + text: catalog.i18nc("@info:tooltip","An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?") CheckBox { id: scaleTinyCheckbox - text: catalog.i18nc("@option:check","Scale extremely small objects") + text: catalog.i18nc("@option:check","Scale extremely small models") checked: boolCheck(UM.Preferences.getValue("mesh/scale_tiny_meshes")) onCheckedChanged: UM.Preferences.setValue("mesh/scale_tiny_meshes", checked) } diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 6460634d8d..02ec305910 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -14,6 +14,8 @@ Column id: printMonitor property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null + Cura.ExtrudersModel { id: extrudersModel } + Label { text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@label", "The printer is not connected.") @@ -34,7 +36,7 @@ Column delegate: Loader { sourceComponent: monitorItem - property string label: machineExtruderCount.properties.value > 1 ? catalog.i18nc("@label", "Hotend Temperature %1").arg(index + 1) : catalog.i18nc("@label", "Hotend Temperature") + property string label: machineExtruderCount.properties.value > 1 ? extrudersModel.getItem(index).name : catalog.i18nc("@label", "Hotend") property string value: printerConnected ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : "" } } @@ -44,7 +46,7 @@ Column delegate: Loader { sourceComponent: monitorItem - property string label: catalog.i18nc("@label", "Bed Temperature") + property string label: catalog.i18nc("@label", "Build plate") property string value: printerConnected ? Math.round(connectedPrinter.bedTemperature) + "°C" : "" } } diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index ac9642cc06..0272e063cb 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -216,7 +216,7 @@ Item anchors.verticalCenter: brimCheckBox.verticalCenter width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width //: Bed adhesion label - text: catalog.i18nc("@label:listbox", "Bed Adhesion:"); + text: catalog.i18nc("@label", "Helper Parts:"); font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text"); } @@ -264,7 +264,7 @@ Item anchors.verticalCenter: supportCheckBox.verticalCenter width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width //: Support label - text: catalog.i18nc("@label:listbox", "Support:"); + text: ""; font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text"); }