diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f6cf0692f7..e93a23d01c 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -88,7 +88,7 @@ class CuraApplication(QtApplication): SettingDefinition.addSupportedProperty("settable_per_extruder", DefinitionPropertyType.Any, default = True, read_only = True) SettingDefinition.addSupportedProperty("settable_per_meshgroup", DefinitionPropertyType.Any, default = True, read_only = True) SettingDefinition.addSupportedProperty("settable_globally", DefinitionPropertyType.Any, default = True, read_only = True) - SettingDefinition.addSupportedProperty("global_inherits_stack", DefinitionPropertyType.Function, default = "-1") + SettingDefinition.addSupportedProperty("limit_to_extruder", DefinitionPropertyType.Function, default = "-1") SettingDefinition.addSupportedProperty("resolve", DefinitionPropertyType.Function, default = None) SettingDefinition.addSettingType("extruder", None, str, Validator) diff --git a/plugins/CuraEngineBackend/Cura.proto b/plugins/CuraEngineBackend/Cura.proto index e26b3040f0..d5407f22c8 100644 --- a/plugins/CuraEngineBackend/Cura.proto +++ b/plugins/CuraEngineBackend/Cura.proto @@ -13,7 +13,7 @@ message Slice repeated ObjectList object_lists = 1; // The meshgroups to be printed one after another SettingList global_settings = 2; // The global settings used for the whole print job repeated Extruder extruders = 3; // The settings sent to each extruder object - repeated SettingExtruder global_inherits_stack = 4; //From which stack the setting would inherit if not defined in a stack. + repeated SettingExtruder limit_to_extruder = 4; //From which stack the setting would inherit if not defined in a stack. } message Extruder diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index d737e684ad..b952fed8d5 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -245,16 +245,16 @@ class StartSliceJob(Job): ## Sends for some settings which extruder they should fallback to if not # set. # - # This is only set for settings that have the global_inherits_stack + # This is only set for settings that have the limit_to_extruder # property. # # \param stack The global stack with all settings, from which to read the - # global_inherits_stack property. + # limit_to_extruder property. def _buildGlobalInheritsStackMessage(self, stack): for key in stack.getAllKeys(): - extruder = int(round(float(stack.getProperty(key, "global_inherits_stack")))) + extruder = int(round(float(stack.getProperty(key, "limit_to_extruder")))) if extruder >= 0: #Set to a specific extruder. - setting_extruder = self._slice_message.addRepeatedMessage("global_inherits_stack") + setting_extruder = self._slice_message.addRepeatedMessage("limit_to_extruder") setting_extruder.name = key setting_extruder.extruder = extruder diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py index 555b7cf8a7..fde186566f 100644 --- a/plugins/LayerView/LayerView.py +++ b/plugins/LayerView/LayerView.py @@ -16,6 +16,7 @@ from UM.Scene.SceneNode import SceneNode from UM.View.RenderBatch import RenderBatch from UM.View.GL.OpenGL import OpenGL from UM.Message import Message +from UM.Application import Application from cura.ConvexHullNode import ConvexHullNode @@ -46,6 +47,7 @@ class LayerView(View): self._top_layers_job = None self._activity = False self._old_max_layers = 0 + self._global_container_stack = None Preferences.getInstance().addPreference("view/top_layer_count", 5) Preferences.getInstance().addPreference("view/only_show_top_layers", False) @@ -55,7 +57,7 @@ class LayerView(View): self._only_show_top_layers = bool(Preferences.getInstance().getValue("view/only_show_top_layers")) self._busy = False - self.wireprint_warning_message = Message(catalog.i18nc("@info:status", "Cura does not accurately display layers when Wire Printing is enabled")) + self._wireprint_warning_message = Message(catalog.i18nc("@info:status", "Cura does not accurately display layers when Wire Printing is enabled")) def getActivity(self): return self._activity @@ -192,6 +194,33 @@ class LayerView(View): self.setLayer(self._current_layer_num - 1) return True + if event.type == Event.ViewActivateEvent: + Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) + self._onGlobalStackChanged() + + elif event.type == Event.ViewDeactivateEvent: + self._wireprint_warning_message.hide() + Application.getInstance().globalContainerStackChanged.disconnect(self._onGlobalStackChanged) + if self._global_container_stack: + self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) + + def _onGlobalStackChanged(self): + if self._global_container_stack: + self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) + self._global_container_stack = Application.getInstance().getGlobalContainerStack() + if self._global_container_stack: + self._global_container_stack.propertyChanged.connect(self._onPropertyChanged) + self._onPropertyChanged("wireframe_enabled", "value") + else: + self._wireprint_warning_message.hide() + + def _onPropertyChanged(self, key, property_name): + if key == "wireframe_enabled" and property_name == "value": + if self._global_container_stack.getProperty("wireframe_enabled", "value"): + self._wireprint_warning_message.show() + else: + self._wireprint_warning_message.hide() + def _startUpdateTopLayers(self): if self._top_layers_job: self._top_layers_job.finished.disconnect(self._updateCurrentLayerMesh) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py index 25c2290b37..56cec25db8 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py @@ -60,12 +60,12 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand if definition: new_instance = SettingInstance(definition, settings) stack_nr = -1 - if definition.global_inherits_stack and self._stack.getProperty("machine_extruder_count", "value") > 1: + if definition.limit_to_extruder and self._stack.getProperty("machine_extruder_count", "value") > 1: #Obtain the value from the correct container stack. Only once, upon adding the setting. - stack_nr = str(int(round(float(self._stack.getProperty(item, "global_inherits_stack"))))) #Stack to get the setting from. Round it and remove the fractional part. + stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder"))))) #Stack to get the setting from. Round it and remove the fractional part. if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value"): #Property not defined, but we have an extruder number. stack_nr = str(int(round(float(self._stack.getProperty("extruder_nr", "value"))))) - if stack_nr in ExtruderManager.getInstance().extruderIds: #We have either a global_inherits_stack or an extruder_nr. + if stack_nr in ExtruderManager.getInstance().extruderIds: #We have either a limit_to_extruder or an extruder_nr. stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0] else: stack = UM.Application.getInstance().getGlobalContainerStack() diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 301192f804..eae6593fb8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -654,7 +654,7 @@ "type": "float", "enabled": "support_enable", "value": "line_width", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -668,7 +668,7 @@ "maximum_value_warning": "machine_nozzle_size * 2", "type": "float", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable')", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "value": "line_width", "settable_per_mesh": false, "settable_per_extruder": true @@ -1470,7 +1470,7 @@ "value": "speed_print", "enabled": "support_enable", "settable_per_mesh": false, - "global_inherits_stack": "support_extruder_nr", + "limit_to_extruder": "support_extruder_nr", "settable_per_extruder": true, "children": { @@ -1486,7 +1486,7 @@ "maximum_value_warning": "150", "value": "speed_support", "enabled": "support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1501,7 +1501,7 @@ "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "value": "speed_support / 1.5", "settable_per_mesh": false, "settable_per_extruder": true @@ -1593,7 +1593,7 @@ "enabled": "adhesion_type == \"skirt\" or adhesion_type == \"brim\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "max_feedrate_z_override": { @@ -1743,7 +1743,7 @@ "value": "acceleration_print", "enabled": "acceleration_enabled and support_enable", "settable_per_mesh": false, - "global_inherits_stack": "support_extruder_nr", + "limit_to_extruder": "support_extruder_nr", "settable_per_extruder": true, "children": { "acceleration_support_infill": { @@ -1757,7 +1757,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "enabled": "acceleration_enabled and support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1772,7 +1772,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "enabled": "acceleration_enabled and extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true } @@ -1862,7 +1862,7 @@ "maximum_value_warning": "10000", "enabled": "acceleration_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "jerk_enabled": { @@ -1965,7 +1965,7 @@ "enabled": "jerk_enabled and support_enable", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "support_extruder_nr", + "limit_to_extruder": "support_extruder_nr", "children": { "jerk_support_infill": { "label": "Support Infill Jerk", @@ -1978,7 +1978,7 @@ "minimum_value_warning": "5", "maximum_value_warning": "50", "enabled": "jerk_enabled and support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1993,7 +1993,7 @@ "minimum_value_warning": "5", "maximum_value_warning": "50", "enabled": "jerk_enabled and extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true } @@ -2083,7 +2083,7 @@ "value": "jerk_layer_0", "enabled": "jerk_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } }, @@ -2313,7 +2313,7 @@ "minimum_value": "0", "maximum_value": "90", "default_value": 50, - "global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true }, @@ -2332,7 +2332,7 @@ }, "default_value": "zigzag", "enabled": "support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2343,7 +2343,7 @@ "type": "bool", "default_value": true, "enabled": "support_enable and (support_pattern == 'zigzag')", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2357,7 +2357,7 @@ "maximum_value_warning": "100", "default_value": 15, "enabled": "support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true, "children": { @@ -2371,7 +2371,7 @@ "default_value": 2.66, "enabled": "support_enable", "value": "(support_line_width * 100) / support_infill_rate * (2 if support_pattern == \"grid\" else (3 if support_pattern == \"triangles\" else 1))", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true } @@ -2386,7 +2386,7 @@ "minimum_value": "0", "maximum_value_warning": "10", "default_value": 0.1, - "global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true, "children": @@ -2402,7 +2402,7 @@ "type": "float", "enabled": "support_enable", "value": "extruderValue(support_extruder_nr, 'support_z_distance')", - "global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "settable_per_mesh": true }, "support_bottom_distance": @@ -2414,7 +2414,7 @@ "maximum_value_warning": "10", "default_value": 0.1, "value": "extruderValue(support_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", - "global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "type": "float", "enabled": "support_enable and support_type == 'everywhere'", "settable_per_mesh": true @@ -2430,7 +2430,7 @@ "minimum_value": "0", "maximum_value_warning": "10", "default_value": 0.7, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true }, @@ -2443,7 +2443,7 @@ "z_overrides_xy": "Z overrides X/Y" }, "default_value": "z_overrides_xy", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true }, @@ -2456,7 +2456,7 @@ "maximum_value_warning": "10", "default_value": 0.2, "value": "machine_nozzle_size / 2", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_xy_overrides_z') == 'z_overrides_xy'", "settable_per_mesh": true }, @@ -2467,7 +2467,7 @@ "unit": "mm", "type": "float", "default_value": 0.3, - "global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr", "minimum_value": "0", "maximum_value_warning": "1.0", "enabled": "support_enable", @@ -2480,7 +2480,7 @@ "unit": "mm", "type": "float", "default_value": 2.0, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "minimum_value_warning": "0", "maximum_value_warning": "10", "enabled": "support_enable", @@ -2493,7 +2493,7 @@ "unit": "mm", "type": "float", "default_value": 0.2, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "minimum_value_warning": "-0.5", "maximum_value_warning": "5.0", "enabled": "support_enable", @@ -2505,7 +2505,7 @@ "description": "Generate a dense interface between the model and the support. This will create a skin at the top of the support on which the model is printed and at the bottom of the support, where it rests on the model.", "type": "bool", "default_value": false, - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true }, @@ -2517,7 +2517,7 @@ "type": "float", "default_value": 1, "minimum_value": "0", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "maximum_value_warning": "10", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": true, @@ -2532,7 +2532,7 @@ "default_value": 1, "value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')", "minimum_value": "0", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "maximum_value_warning": "10", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": true @@ -2547,7 +2547,7 @@ "value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')", "minimum_value": "0", "minimum_value_warning": "extruderValue(support_interface_extruder_nr, 'support_bottom_stair_step_height')", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "maximum_value_warning": "10", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": true @@ -2563,7 +2563,7 @@ "default_value": 0.3, "minimum_value": "0", "maximum_value_warning": "support_interface_height", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": true }, @@ -2576,7 +2576,7 @@ "default_value": 100, "minimum_value": "0", "maximum_value_warning": "100", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2591,7 +2591,7 @@ "default_value": 0.4, "minimum_value": "0", "value": "0 if support_interface_density == 0 else (support_interface_line_width * 100) / support_interface_density * (2 if support_interface_pattern == \"grid\" else (3 if support_interface_pattern == \"triangles\" else 1))", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": false, "settable_per_extruder": true @@ -2612,7 +2612,7 @@ "zigzag": "Zig Zag" }, "default_value": "concentric", - "global_inherits_stack": "support_interface_extruder_nr", + "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", "settable_per_mesh": false, "settable_per_extruder": true @@ -2623,7 +2623,7 @@ "description": "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof.", "type": "bool", "default_value": true, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true }, @@ -2634,7 +2634,7 @@ "unit": "mm", "type": "float", "default_value": 3.0, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "minimum_value": "0", "maximum_value_warning": "10", "enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_use_towers')", @@ -2647,7 +2647,7 @@ "unit": "mm", "type": "float", "default_value": 3.0, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "minimum_value": "0", "maximum_value_warning": "10", "maximum_value": "extruderValue(support_infill_extruder_nr, 'support_tower_diameter')", @@ -2663,7 +2663,7 @@ "minimum_value": "0", "maximum_value": "90", "default_value": 65, - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_use_towers')", "settable_per_mesh": true } @@ -2730,7 +2730,7 @@ "enabled": "adhesion_type == \"skirt\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "skirt_gap": { @@ -2744,7 +2744,7 @@ "enabled": "adhesion_type == \"skirt\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "skirt_brim_minimal_length": { @@ -2772,7 +2772,7 @@ "enabled": "adhesion_type == \"brim\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr", + "limit_to_extruder": "adhesion_extruder_nr", "children": { "brim_line_count": @@ -2787,7 +2787,7 @@ "enabled": "adhesion_type == \"brim\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } }, @@ -2800,7 +2800,7 @@ "enabled": "adhesion_type == \"brim\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_margin": { @@ -2812,7 +2812,7 @@ "minimum_value_warning": "0", "maximum_value_warning": "10", "enabled": "adhesion_type == \"raft\"", - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_airgap": { @@ -2826,7 +2826,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "layer_0_z_overlap": { "label": "Initial Layer Z Overlap", @@ -2840,7 +2840,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_surface_layers": { @@ -2853,7 +2853,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_surface_thickness": { @@ -2868,7 +2868,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_surface_line_width": { @@ -2883,7 +2883,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_surface_line_spacing": { @@ -2898,7 +2898,7 @@ "value": "raft_surface_line_width", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_thickness": { @@ -2913,7 +2913,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_line_width": { @@ -2928,7 +2928,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_line_spacing": { @@ -2943,7 +2943,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_thickness": { @@ -2958,7 +2958,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_line_width": { @@ -2973,7 +2973,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_line_spacing": { @@ -2988,7 +2988,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_speed": { @@ -3004,7 +3004,7 @@ "value": "speed_print / 60 * 30", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr", + "limit_to_extruder": "adhesion_extruder_nr", "children": { "raft_surface_speed": @@ -3021,7 +3021,7 @@ "value": "raft_speed", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_speed": { @@ -3037,7 +3037,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_speed": { @@ -3053,7 +3053,7 @@ "value": "0.75 * raft_speed", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } }, @@ -3069,7 +3069,7 @@ "value": "acceleration_print", "enabled": "adhesion_type == \"raft\" and acceleration_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr", + "limit_to_extruder": "adhesion_extruder_nr", "children": { "raft_surface_acceleration": { "label": "Raft Top Print Acceleration", @@ -3083,7 +3083,7 @@ "maximum_value_warning": "10000", "enabled": "adhesion_type == \"raft\" and acceleration_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_acceleration": { "label": "Raft Middle Print Acceleration", @@ -3097,7 +3097,7 @@ "maximum_value_warning": "10000", "enabled": "adhesion_type == \"raft\" and acceleration_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_acceleration": { "label": "Raft Base Print Acceleration", @@ -3111,7 +3111,7 @@ "maximum_value_warning": "10000", "enabled": "adhesion_type == \"raft\" and acceleration_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } }, @@ -3127,7 +3127,7 @@ "value": "jerk_print", "enabled": "adhesion_type == \"raft\" and jerk_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr", + "limit_to_extruder": "adhesion_extruder_nr", "children": { "raft_surface_jerk": { "label": "Raft Top Print Jerk", @@ -3141,7 +3141,7 @@ "maximum_value_warning": "100", "enabled": "adhesion_type == \"raft\" and jerk_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_jerk": { "label": "Raft Middle Print Jerk", @@ -3155,7 +3155,7 @@ "maximum_value_warning": "50", "enabled": "adhesion_type == \"raft\" and jerk_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_jerk": { "label": "Raft Base Print Jerk", @@ -3169,7 +3169,7 @@ "maximum_value_warning": "50", "enabled": "adhesion_type == \"raft\" and jerk_enabled", "settable_per_mesh": false, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } }, @@ -3184,7 +3184,7 @@ "settable_per_mesh": false, "settable_per_extruder": true, "enabled": "adhesion_type == \"raft\"", - "global_inherits_stack": "adhesion_extruder_nr", + "limit_to_extruder": "adhesion_extruder_nr", "children": { "raft_surface_fan_speed": @@ -3200,7 +3200,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_interface_fan_speed": { @@ -3215,7 +3215,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" }, "raft_base_fan_speed": { @@ -3230,7 +3230,7 @@ "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true, - "global_inherits_stack": "adhesion_extruder_nr" + "limit_to_extruder": "adhesion_extruder_nr" } } } @@ -3706,7 +3706,7 @@ "maximum_value": "90", "default_value": 30, "enabled": "support_conical_enabled and support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true }, "support_conical_min_width": @@ -3720,7 +3720,7 @@ "maximum_value_warning": "100.0", "type": "float", "enabled": "support_conical_enabled and support_enable", - "global_inherits_stack": "support_infill_extruder_nr", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true }, "magic_fuzzy_skin_enabled": diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 79724282cc..fddd237b88 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: 2016-08-24 15:40+0200\n" +"POT-Creation-Date: 2016-09-13 17:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -113,15 +113,15 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:143 msgctxt "@info:status" -msgid "Printer is busy or not connected. Unable to start a new job." +msgid "Unable to start a new job because the printer is busy or not connected." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:109 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:111 msgctxt "@info" -msgid "Cannot update firmware, there were no connected printers found." +msgid "Unable to update firmware because there are no printers connected." msgstr "" -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:123 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:125 #, python-format msgctxt "@info" msgid "Could not find firmware required for the printer at %s." @@ -193,7 +193,7 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py:52 #, python-brace-format msgctxt "@info:status" -msgid "Failed to eject {0}. Maybe it is still in use?" +msgid "Failed to eject {0}. Another program may be using the drive." msgstr "" #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:69 @@ -235,13 +235,14 @@ msgctxt "@info:whatsthis" msgid "Submits anonymous slice info. Can be disabled through preferences." msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:68 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:73 msgctxt "@info" msgid "" -"Cura automatically sends slice info. You can disable this in preferences" +"Cura collects anonymised slicing statistics. You can disable this in " +"preferences" msgstr "" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:69 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:74 msgctxt "@action:button" msgid "Dismiss" msgstr "" @@ -301,6 +302,11 @@ msgctxt "@item:inlistbox" msgid "Layers" msgstr "" +#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.py:58 +msgctxt "@info:status" +msgid "Cura does not accurately display layers when Wire Printing is enabled" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:14 msgctxt "@label" msgid "Version Upgrade 2.1 to 2.2" @@ -346,14 +352,18 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:230 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:232 msgctxt "@info:status" -msgid "Unable to slice. Please check your setting values for errors." +msgid "" +"Unable to slice with the current settings. Please check your settings for " +"errors." msgstr "" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:239 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:241 msgctxt "@info:status" -msgid "Unable to slice. No suitable models found." +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/__init__.py:13 @@ -455,7 +465,7 @@ msgctxt "@action" msgid "Select upgrades" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:8 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:10 msgctxt "@action" msgid "Upgrade Firmware" msgstr "" @@ -480,14 +490,24 @@ msgctxt "@info:whatsthis" msgid "Provides support for importing Cura profiles." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:305 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:81 +#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:286 +msgctxt "@item:material" +msgid "No material loaded" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:293 +msgctxt "@item:material" +msgid "Unknown material" +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:342 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:79 msgctxt "@title:window" msgid "File Already Exists" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:306 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:82 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:343 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:80 #, python-brace-format msgctxt "@label" msgid "" @@ -495,40 +515,54 @@ msgid "" "overwrite it?" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:602 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:548 +msgctxt "@info:status" +msgid "" +"The selected material is imcompatible with the selected machine or " +"configuration." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:666 msgctxt "@label" msgid "You made changes to the following setting(s):" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:607 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:671 msgctxt "@window:title" msgid "Switched profiles" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:607 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:671 msgctxt "@label" msgid "Do you want to transfer your changed settings to this profile?" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:608 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:672 msgctxt "@label" msgid "" "If you transfer your settings they will override settings in the profile." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:656 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:765 msgctxt "@label" msgid "Nozzle" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:97 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:966 +msgctxt "@info:status" +msgid "" +"Unable to find a quality profile for this combination. Default settings will " +"be used instead." +msgstr "" + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:95 #, python-brace-format msgctxt "@info:status" msgid "" "Failed to export profile to {0}: {1}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:102 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:100 #, python-brace-format msgctxt "@info:status" msgid "" @@ -536,14 +570,14 @@ msgid "" "failure." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:105 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:103 #, python-brace-format msgctxt "@info:status" msgid "Exported profile to {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:130 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:128 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status" msgid "" @@ -551,31 +585,31 @@ msgid "" "message>" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:152 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:155 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:155 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:158 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profiles {0}" msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:158 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:161 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type." msgstr "" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:163 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 msgctxt "@label" msgid "Custom profile" msgstr "" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:213 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:240 msgctxt "@info:status" msgid "" "The build volume height has been reduced due to the value of the \"Print " @@ -606,17 +640,17 @@ msgctxt "@info:progress" msgid "Loading machines..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:384 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:390 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:418 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:424 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:532 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:536 #, python-format msgctxt "@info" msgid "%(width).1f x %(depth).1f x %(height).1f mm" @@ -727,8 +761,8 @@ msgstr "" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:39 #: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:105 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:425 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:117 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:77 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" @@ -889,22 +923,23 @@ msgctxt "@label" msgid "Print model with" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:276 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:274 msgctxt "@action:button" msgid "Select settings" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:316 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:314 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:340 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:91 msgctxt "@label:textbox" msgid "Filter..." msgstr "" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:364 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:362 msgctxt "@label:checkbox" msgid "Show all" msgstr "" @@ -935,17 +970,17 @@ msgctxt "@action:button" msgid "Start Build Plate Leveling" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:76 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:74 msgctxt "@action:button" msgid "Move to Next Position" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:26 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:27 msgctxt "@title" msgid "Upgrade Firmware" msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:37 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:38 msgctxt "@label" msgid "" "Firmware is the piece of software running directly on your 3D printer. This " @@ -953,23 +988,26 @@ msgid "" "makes your printer work." msgstr "" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:47 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:48 msgctxt "@label" msgid "" -"The firmware shipping with new Ultimakers works, but upgrades have been made " -"to make better prints, and make calibration easier." +"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:57 -msgctxt "@label" -msgid "" -"Cura requires these new features and thus your firmware will most likely " -"need to be upgraded. You can do so now." -msgstr "" - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:69 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:62 msgctxt "@action:button" -msgid "Upgrade to Marlin Firmware" +msgid "Automatically upgrade Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:72 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "" + +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:83 +msgctxt "@title:window" +msgid "Select custom firmware" msgstr "" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 @@ -1082,128 +1120,160 @@ msgctxt "@label" msgid "Everything is in order! You're done with your CheckUp." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:84 msgctxt "@label:MonitorStatus" msgid "Not connected to a printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:79 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:86 msgctxt "@label:MonitorStatus" msgid "Printer does not accept commands" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:92 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:189 +msgctxt "@label:MonitorStatus" +msgid "In maintenance. Please check the printer" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:97 msgctxt "@label:MonitorStatus" msgid "Lost connection with the printer" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:179 msgctxt "@label:MonitorStatus" msgid "Printing..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:181 msgctxt "@label:MonitorStatus" msgid "Paused" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:91 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:183 msgctxt "@label:MonitorStatus" msgid "Preparing..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:93 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:105 msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:162 -msgctxt "@label:" -msgid "Abort Print" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:253 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:262 -msgctxt "@label:" -msgid "Pause" -msgstr "" - -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:255 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:209 msgctxt "@label:" msgid "Resume" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:213 +msgctxt "@label:" +msgid "Pause" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:242 +msgctxt "@label:" +msgid "Abort Print" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:252 +msgctxt "@window:title" +msgid "Abort print" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:254 +msgctxt "@label" +msgid "Are you sure you want to abort the print?" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:47 msgctxt "@label" -msgid "Brand" +msgid "Display Name" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:57 msgctxt "@label" +msgid "Brand" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:67 +msgctxt "@label" msgid "Material Type" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:66 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:76 msgctxt "@label" msgid "Color" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:110 msgctxt "@label" msgid "Properties" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:112 msgctxt "@label" msgid "Density" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:115 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:125 msgctxt "@label" msgid "Diameter" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:138 msgctxt "@label" msgid "Filament Cost" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:147 msgctxt "@label" msgid "Filament weight" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:157 msgctxt "@label" msgid "Filament length" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:156 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:166 msgctxt "@label" msgid "Cost per Meter (Approx.)" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:171 msgctxt "@label" msgid "%1/m" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:167 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:177 msgctxt "@label" msgid "Description" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:180 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:190 msgctxt "@label" msgid "Adhesion Information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:208 msgctxt "@label" msgid "Print settings" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +msgctxt "@title:tab" +msgid "Setting Visibility" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:44 +msgctxt "@label:textbox" +msgid "Check all" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:26 msgctxt "@title:column" msgid "Setting" @@ -1219,185 +1289,195 @@ msgctxt "@title:column" msgid "Current" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:44 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:45 msgctxt "@title:column" msgid "Unit" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:429 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:430 msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:70 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:72 msgctxt "@label" msgid "Interface" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:79 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:81 msgctxt "@label" msgid "Language:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:91 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:93 msgctxt "@item:inlistbox" msgid "English" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:92 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:94 msgctxt "@item:inlistbox" msgid "Finnish" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:93 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:95 msgctxt "@item:inlistbox" msgid "French" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:96 msgctxt "@item:inlistbox" msgid "German" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:97 msgctxt "@item:inlistbox" msgid "Italian" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:96 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:98 msgctxt "@item:inlistbox" msgid "Dutch" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:99 msgctxt "@item:inlistbox" msgid "Spanish" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 msgctxt "@label" msgid "" "You will need to restart the application for language changes to have effect." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 msgctxt "@label" msgid "Viewport behavior" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:160 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:167 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:169 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:176 msgctxt "@info:tooltip" msgid "" "Moves the camera so the model is in the center of the view when an model is " "selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:179 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:181 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:190 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:193 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:195 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:203 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:208 +msgctxt "@option:check" +msgid "Automatically drop models to the build plate" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +msgctxt "@info:tooltip" msgid "" "Display 5 top layers in layer view or only the top-most layer. Rendering 5 " "layers takes longer, but may show more information." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@action:button" msgid "Display five top layers in layer view" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:240 msgctxt "@info:tooltip" msgid "Should only the top layers be displayed in layerview?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:231 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:245 msgctxt "@option:check" msgid "Only display top layer(s) in layer view" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:261 msgctxt "@label" msgid "Opening files" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 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:258 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:272 msgctxt "@option:check" msgid "Scale large models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:281 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:272 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:286 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:295 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:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:300 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:303 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@label" msgid "Privacy" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:315 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 msgctxt "@option:check" msgid "Check for updates on start" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:325 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -1405,196 +1485,242 @@ msgid "" "stored." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:330 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:344 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:14 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:431 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:15 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:435 msgctxt "@title:tab" msgid "Printers" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:65 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:37 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:127 msgctxt "@action:button" msgid "Activate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:44 msgctxt "@action:button" msgid "Add" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:49 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:92 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:50 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:111 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:152 msgctxt "@action:button" msgid "Remove" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:56 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:57 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:118 msgctxt "@action:button" msgid "Rename" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 msgctxt "@label" -msgid "Type" +msgid "Printer type:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:154 +msgctxt "@label" +msgid "Connection:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:21 +msgctxt "@info:status" +msgid "The printer is not connected." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:165 +msgctxt "@label" +msgid "State:" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:185 +msgctxt "@label:MonitorStatus" +msgid "Waiting for someone to clear the build plate" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:191 +msgctxt "@label:MonitorStatus" +msgid "Aborting print..." +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:194 +msgctxt "@label:MonitorStatus" +msgid "Waiting for a printjob" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:435 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:439 msgctxt "@title:tab" msgid "Profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:49 msgctxt "@label" msgid "Protected profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:49 msgctxt "@label" msgid "Custom profiles" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:80 msgctxt "@label" msgid "Create" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:96 msgctxt "@label" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:106 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:159 msgctxt "@action:button" msgid "Import" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:113 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:166 msgctxt "@action:button" msgid "Export" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@action:button" msgid "Update profile with current settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:189 msgctxt "@action:button" msgid "Discard current settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:206 msgctxt "@action:label" msgid "" "This profile uses the defaults specified by the printer, so it has no " "settings in the list below." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:213 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:229 msgctxt "@title:tab" msgid "Global Settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:271 +msgctxt "@title:window" +msgid "Rename Profile" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:284 +msgctxt "@title:window" +msgid "Create Profile" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:298 +msgctxt "@title:window" +msgid "Duplicate Profile" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:312 msgctxt "@window:title" msgid "Import Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:320 msgctxt "@title:window" msgid "Import Profile" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:296 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:348 msgctxt "@title:window" msgid "Export Profile" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:437 msgctxt "@title:tab" msgid "Materials" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:106 msgctxt "" "@action:label %1 is printer name, %2 is how this printer names variants, %3 " "is variant name" msgid "Printer: %1, %2: %3" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:58 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:110 msgctxt "@action:label %1 is printer name" msgid "Printer: %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:82 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:134 msgctxt "@action:button" msgid "Duplicate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:189 msgctxt "@action:button" msgid "Edit" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:210 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:218 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:264 msgctxt "@title:window" msgid "Import Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:219 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:265 msgctxt "@info:status" msgid "" "Could not import material %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:269 msgctxt "@info:status" msgid "Successfully imported material %1" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:241 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:302 msgctxt "@title:window" msgid "Export Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:306 msgctxt "@info:status" msgid "" "Failed to export material to %1: %2" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:266 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:312 msgctxt "@info:status" msgid "Successfully exported material to %1" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:701 msgctxt "@title:window" msgid "Add Printer" msgstr "" @@ -1641,7 +1767,6 @@ msgid "Hide this setting" msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:209 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:menu" msgid "Configure setting visiblity..." msgstr "" @@ -1694,26 +1819,32 @@ msgid "" "Click to restore the calculated value." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:190 msgctxt "@label:listbox" msgid "Print Setup" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:261 msgctxt "@label" msgid "Printer Monitor" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:377 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:382 msgctxt "@title:tab" msgid "Simple" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:378 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 msgctxt "@title:tab" msgid "Advanced" msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 +#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 +msgctxt "@title:menuitem %1 is the value from the printer" +msgid "Automatic: %1" +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" @@ -1724,11 +1855,6 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:21 -msgctxt "@label" -msgid "The printer is not connected." -msgstr "" - #: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:31 msgctxt "@label" msgid "Temperatures" @@ -1764,151 +1890,161 @@ msgctxt "@label" msgid "Estimated time left" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:62 msgctxt "@action:inmenu" msgid "Toggle Fu&ll Screen" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:69 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:89 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:97 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:109 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:110 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:116 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:117 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current settings" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 msgctxt "@action:inmenu menubar:help" msgid "&About..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:edit" msgid "Delete &Selection" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:187 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:201 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:211 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:231 msgctxt "@action:inmenu" msgid "&Duplicate Model" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:238 msgctxt "@action:inmenu menubar:edit" msgid "&Select All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:248 msgctxt "@action:inmenu menubar:edit" msgid "&Clear Build Plate" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:257 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:file" msgid "Re&load All Models" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model &Transformations" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:279 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:280 msgctxt "@action:inmenu menubar:file" msgid "&Open File..." msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:288 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "" +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:296 +msgctxt "@action:inmenu menubar:help" +msgid "Show Configuration Folder" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:303 +msgctxt "@action:menu" +msgid "Configure setting visibility..." +msgstr "" + #: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:24 msgctxt "@label:PrintjobStatus" msgid "Please load a 3d model" @@ -2016,12 +2152,17 @@ msgctxt "@action:button" msgid "Open File" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:363 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:364 msgctxt "@action:button" msgid "View Mode" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:433 +msgctxt "@title:tab" +msgid "Settings" +msgstr "" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:642 msgctxt "@title:window" msgid "Open file" msgstr "" @@ -2141,12 +2282,12 @@ msgctxt "@label" msgid "Material" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:276 msgctxt "@label" msgid "Profile:" msgstr "" -#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:301 +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:313 msgctxt "@tooltip" msgid "" "Some setting values are different from the values stored in the profile.\n" diff --git a/resources/i18n/en/cura.po b/resources/i18n/en/cura.po index 741cd142d8..3e711b9674 100644 --- a/resources/i18n/en/cura.po +++ b/resources/i18n/en/cura.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-24 15:40+0200\n" -"PO-Revision-Date: 2016-08-24 15:40+0200\n" +"POT-Creation-Date: 2016-09-13 17:49+0200\n" +"PO-Revision-Date: 2016-09-13 17:49+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en\n" @@ -116,15 +116,16 @@ msgstr "Connected via USB" #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:143 msgctxt "@info:status" -msgid "Printer is busy or not connected. Unable to start a new job." -msgstr "Printer is busy or not connected. Unable to start a new job." +msgid "Unable to start a new job because the printer is busy or not connected." +msgstr "" +"Unable to start a new job because the printer is busy or not connected." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:109 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:111 msgctxt "@info" -msgid "Cannot update firmware, there were no connected printers found." -msgstr "Cannot update firmware, there were no connected printers found." +msgid "Unable to update firmware because there are no printers connected." +msgstr "Unable to update firmware because there are no printers connected." -#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:123 +#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:125 #, python-format msgctxt "@info" msgid "Could not find firmware required for the printer at %s." @@ -196,8 +197,8 @@ msgstr "Ejected {0}. You can now safely remove the drive." #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py:52 #, python-brace-format msgctxt "@info:status" -msgid "Failed to eject {0}. Maybe it is still in use?" -msgstr "Failed to eject {0}. Maybe it is still in use?" +msgid "Failed to eject {0}. Another program may be using the drive." +msgstr "Failed to eject {0}. Another program may be using the drive." #: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:69 msgctxt "@item:intext" @@ -238,14 +239,16 @@ msgctxt "@info:whatsthis" msgid "Submits anonymous slice info. Can be disabled through preferences." msgstr "Submits anonymous slice info. Can be disabled through preferences." -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:68 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:73 msgctxt "@info" msgid "" -"Cura automatically sends slice info. You can disable this in preferences" +"Cura collects anonymised slicing statistics. You can disable this in " +"preferences" msgstr "" -"Cura automatically sends slice info. You can disable this in preferences" +"Cura collects anonymised slicing statistics. You can disable this in " +"preferences" -#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:69 +#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:74 msgctxt "@action:button" msgid "Dismiss" msgstr "Dismiss" @@ -305,6 +308,11 @@ msgctxt "@item:inlistbox" msgid "Layers" msgstr "Layers" +#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.py:58 +msgctxt "@info:status" +msgid "Cura does not accurately display layers when Wire Printing is enabled" +msgstr "Cura does not accurately display layers when Wire Printing is enabled" + #: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:14 msgctxt "@label" msgid "Version Upgrade 2.1 to 2.2" @@ -350,15 +358,23 @@ msgctxt "@item:inlistbox" msgid "GIF Image" msgstr "GIF Image" -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:230 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:232 msgctxt "@info:status" -msgid "Unable to slice. Please check your setting values for errors." -msgstr "Unable to slice. Please check your setting values for errors." +msgid "" +"Unable to slice with the current settings. Please check your settings for " +"errors." +msgstr "" +"Unable to slice with the current settings. Please check your settings for " +"errors." -#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:239 +#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:241 msgctxt "@info:status" -msgid "Unable to slice. No suitable models found." -msgstr "Unable to slice. No suitable models found." +msgid "" +"Nothing to slice because none of the models fit the build volume. Please " +"scale or rotate models to fit." +msgstr "" +"Nothing to slice because none of the models fit the build volume. Please " +"scale or rotate models to fit." #: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/__init__.py:13 msgctxt "@label" @@ -461,7 +477,7 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Select upgrades" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:8 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:10 msgctxt "@action" msgid "Upgrade Firmware" msgstr "Upgrade Firmware" @@ -486,14 +502,24 @@ msgctxt "@info:whatsthis" msgid "Provides support for importing Cura profiles." msgstr "Provides support for importing Cura profiles." -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:305 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:81 +#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:286 +msgctxt "@item:material" +msgid "No material loaded" +msgstr "No material loaded" + +#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:293 +msgctxt "@item:material" +msgid "Unknown material" +msgstr "Unknown material" + +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:342 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:79 msgctxt "@title:window" msgid "File Already Exists" msgstr "File Already Exists" -#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:306 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:82 +#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:343 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:80 #, python-brace-format msgctxt "@label" msgid "" @@ -503,34 +529,52 @@ msgstr "" "The file {0} already exists. Are you sure you want to " "overwrite it?" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:602 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:548 +msgctxt "@info:status" +msgid "" +"The selected material is imcompatible with the selected machine or " +"configuration." +msgstr "" +"The selected material is imcompatible with the selected machine or " +"configuration." + +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:666 msgctxt "@label" msgid "You made changes to the following setting(s):" msgstr "You made changes to the following setting(s):" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:607 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:671 msgctxt "@window:title" msgid "Switched profiles" msgstr "Switched profiles" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:607 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:671 msgctxt "@label" msgid "Do you want to transfer your changed settings to this profile?" msgstr "Do you want to transfer your changed settings to this profile?" -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:608 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:672 msgctxt "@label" msgid "" "If you transfer your settings they will override settings in the profile." msgstr "" "If you transfer your settings they will override settings in the profile." -#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:656 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:765 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:97 +#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:966 +msgctxt "@info:status" +msgid "" +"Unable to find a quality profile for this combination. Default settings will " +"be used instead." +msgstr "" +"Unable to find a quality profile for this combination. Default settings will " +"be used instead." + +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:95 #, python-brace-format msgctxt "@info:status" msgid "" @@ -538,7 +582,7 @@ msgid "" msgstr "" "Failed to export profile to {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:102 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:100 #, python-brace-format msgctxt "@info:status" msgid "" @@ -548,14 +592,14 @@ msgstr "" "Failed to export profile to {0}: Writer plugin reported " "failure." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:105 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:103 #, python-brace-format msgctxt "@info:status" msgid "Exported profile to {0}" msgstr "Exported profile to {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:130 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:140 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:128 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:139 #, python-brace-format msgctxt "@info:status" msgid "" @@ -565,31 +609,31 @@ msgstr "" "Failed to import profile from {0}: {1}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:152 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:145 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:155 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}" msgstr "Successfully imported profile {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:155 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:158 #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profiles {0}" msgstr "Successfully imported profiles {0}" -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:158 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:161 #, python-brace-format msgctxt "@info:status" msgid "Profile {0} has an unknown file type." msgstr "Profile {0} has an unknown file type." -#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:163 +#: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:166 msgctxt "@label" msgid "Custom profile" msgstr "Custom profile" -#: /home/ruben/Projects/Cura/cura/BuildVolume.py:213 +#: /home/ruben/Projects/Cura/cura/BuildVolume.py:240 msgctxt "@info:status" msgid "" "The build volume height has been reduced due to the value of the \"Print " @@ -626,17 +670,17 @@ msgctxt "@info:progress" msgid "Loading machines..." msgstr "Loading machines..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:384 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:390 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Setting up scene..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:418 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:424 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Loading interface..." -#: /home/ruben/Projects/Cura/cura/CuraApplication.py:532 +#: /home/ruben/Projects/Cura/cura/CuraApplication.py:536 #, python-format msgctxt "@info" msgid "%(width).1f x %(depth).1f x %(height).1f mm" @@ -747,8 +791,8 @@ msgstr "End Gcode" #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:39 #: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:105 -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:425 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:117 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:423 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:120 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:77 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38 msgctxt "@action:button" @@ -913,22 +957,23 @@ msgctxt "@label" msgid "Print model with" msgstr "Print model with" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:276 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:274 msgctxt "@action:button" msgid "Select settings" msgstr "Select settings" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:316 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:314 msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Select Settings to Customize for this model" -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:340 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:338 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:91 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filter..." -#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:364 +#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:362 msgctxt "@label:checkbox" msgid "Show all" msgstr "Show all" @@ -965,17 +1010,17 @@ msgctxt "@action:button" msgid "Start Build Plate Leveling" msgstr "Start Build Plate Leveling" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:76 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/BedLevelMachineAction.qml:74 msgctxt "@action:button" msgid "Move to Next Position" msgstr "Move to Next Position" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:26 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:27 msgctxt "@title" msgid "Upgrade Firmware" msgstr "Upgrade Firmware" -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:37 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:38 msgctxt "@label" msgid "" "Firmware is the piece of software running directly on your 3D printer. This " @@ -986,28 +1031,29 @@ msgstr "" "firmware controls the step motors, regulates the temperature and ultimately " "makes your printer work." -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:47 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:48 msgctxt "@label" msgid "" -"The firmware shipping with new Ultimakers works, but upgrades have been made " -"to make better prints, and make calibration easier." +"The firmware shipping with new printers works, but new versions tend to have " +"more features and improvements." msgstr "" -"The firmware shipping with new Ultimakers works, but upgrades have been made " -"to make better prints, and make calibration easier." +"The firmware shipping with new printers works, but new versions tend to have " +"more features and improvements." -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:57 -msgctxt "@label" -msgid "" -"Cura requires these new features and thus your firmware will most likely " -"need to be upgraded. You can do so now." -msgstr "" -"Cura requires these new features and thus your firmware will most likely " -"need to be upgraded. You can do so now." - -#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:69 +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:62 msgctxt "@action:button" -msgid "Upgrade to Marlin Firmware" -msgstr "Upgrade to Marlin Firmware" +msgid "Automatically upgrade Firmware" +msgstr "Automatically upgrade Firmware" + +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:72 +msgctxt "@action:button" +msgid "Upload custom Firmware" +msgstr "Upload custom Firmware" + +#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml:83 +msgctxt "@title:window" +msgid "Select custom firmware" +msgstr "Select custom firmware" #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25 msgctxt "@title" @@ -1121,128 +1167,160 @@ msgctxt "@label" msgid "Everything is in order! You're done with your CheckUp." msgstr "Everything is in order! You're done with your CheckUp." -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:77 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:84 msgctxt "@label:MonitorStatus" msgid "Not connected to a printer" msgstr "Not connected to a printer" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:79 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:86 msgctxt "@label:MonitorStatus" msgid "Printer does not accept commands" msgstr "Printer does not accept commands" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:85 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:92 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:189 +msgctxt "@label:MonitorStatus" +msgid "In maintenance. Please check the printer" +msgstr "In maintenance. Please check the printer" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:97 msgctxt "@label:MonitorStatus" msgid "Lost connection with the printer" msgstr "Lost connection with the printer" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:87 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:179 msgctxt "@label:MonitorStatus" msgid "Printing..." msgstr "Printing..." -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:89 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:101 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:181 msgctxt "@label:MonitorStatus" msgid "Paused" msgstr "Paused" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:91 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:183 msgctxt "@label:MonitorStatus" msgid "Preparing..." msgstr "Preparing..." -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:93 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:105 msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Please remove the print" -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:162 -msgctxt "@label:" -msgid "Abort Print" -msgstr "Abort Print" - -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:253 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:262 -msgctxt "@label:" -msgid "Pause" -msgstr "Pause" - -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:255 -#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:209 msgctxt "@label:" msgid "Resume" msgstr "Resume" +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:213 +msgctxt "@label:" +msgid "Pause" +msgstr "Pause" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:242 +msgctxt "@label:" +msgid "Abort Print" +msgstr "Abort Print" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:252 +msgctxt "@window:title" +msgid "Abort print" +msgstr "Abort print" + +#: /home/ruben/Projects/Cura/resources/qml/MonitorButton.qml:254 +msgctxt "@label" +msgid "Are you sure you want to abort the print?" +msgstr "Are you sure you want to abort the print?" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:47 msgctxt "@label" +msgid "Display Name" +msgstr "Display Name" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:57 +msgctxt "@label" msgid "Brand" msgstr "Brand" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:57 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:67 msgctxt "@label" msgid "Material Type" msgstr "Material Type" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:66 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:76 msgctxt "@label" msgid "Color" msgstr "Color" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:100 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:110 msgctxt "@label" msgid "Properties" msgstr "Properties" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:102 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:112 msgctxt "@label" msgid "Density" msgstr "Density" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:115 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:125 msgctxt "@label" msgid "Diameter" msgstr "Diameter" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:128 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:138 msgctxt "@label" msgid "Filament Cost" msgstr "Filament Cost" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:137 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:147 msgctxt "@label" msgid "Filament weight" msgstr "Filament weight" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:147 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:157 msgctxt "@label" msgid "Filament length" msgstr "Filament length" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:156 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:166 msgctxt "@label" msgid "Cost per Meter (Approx.)" msgstr "Cost per Meter (Approx.)" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:171 msgctxt "@label" msgid "%1/m" msgstr "%1/m" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:167 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:177 msgctxt "@label" msgid "Description" msgstr "Description" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:180 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:190 msgctxt "@label" msgid "Adhesion Information" msgstr "Adhesion Information" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:198 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:208 msgctxt "@label" msgid "Print settings" msgstr "Print settings" +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +msgctxt "@title:tab" +msgid "Setting Visibility" +msgstr "Setting Visibility" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:44 +msgctxt "@label:textbox" +msgid "Check all" +msgstr "Check all" + #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:26 msgctxt "@title:column" msgid "Setting" @@ -1258,75 +1336,75 @@ msgctxt "@title:column" msgid "Current" msgstr "Current" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:44 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:45 msgctxt "@title:column" msgid "Unit" msgstr "Unit" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:429 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:430 msgctxt "@title:tab" msgid "General" msgstr "General" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:70 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:72 msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:79 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:81 msgctxt "@label" msgid "Language:" msgstr "Language:" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:91 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:93 msgctxt "@item:inlistbox" msgid "English" msgstr "English" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:92 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:94 msgctxt "@item:inlistbox" msgid "Finnish" msgstr "Finnish" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:93 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:95 msgctxt "@item:inlistbox" msgid "French" msgstr "French" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:94 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:96 msgctxt "@item:inlistbox" msgid "German" msgstr "German" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:95 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:97 msgctxt "@item:inlistbox" msgid "Italian" msgstr "Italian" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:96 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:98 msgctxt "@item:inlistbox" msgid "Dutch" msgstr "Dutch" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:97 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:99 msgctxt "@item:inlistbox" msgid "Spanish" msgstr "Spanish" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137 msgctxt "@label" msgid "" "You will need to restart the application for language changes to have effect." msgstr "" "You will need to restart the application for language changes to have effect." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:150 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:152 msgctxt "@label" msgid "Viewport behavior" msgstr "Viewport behavior" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:158 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:160 msgctxt "@info:tooltip" msgid "" "Highlight unsupported areas of the model in red. Without support these areas " @@ -1335,12 +1413,12 @@ msgstr "" "Highlight unsupported areas of the model in red. Without support these areas " "will not print properly." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:167 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:169 msgctxt "@option:check" msgid "Display overhang" msgstr "Display overhang" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:174 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:176 msgctxt "@info:tooltip" msgid "" "Moves the camera so the model is in the center of the view when an model is " @@ -1349,25 +1427,35 @@ msgstr "" "Moves the camera so the model is in the center of the view when an model is " "selected" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:179 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:181 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Center camera when item is selected" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:188 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:190 msgctxt "@info:tooltip" msgid "" "Should models on the platform be moved so that they no longer intersect?" msgstr "" "Should models on the platform be moved so that they no longer intersect?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:193 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:195 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Ensure models are kept apart" #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:203 msgctxt "@info:tooltip" +msgid "Should models on the platform be moved down to touch the build plate?" +msgstr "Should models on the platform be moved down to touch the build plate?" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +msgctxt "@option:check" +msgid "Automatically drop models to the build plate" +msgstr "Automatically drop models to the build plate" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:217 +msgctxt "@info:tooltip" msgid "" "Display 5 top layers in layer view or only the top-most layer. Rendering 5 " "layers takes longer, but may show more information." @@ -1375,37 +1463,37 @@ msgstr "" "Display 5 top layers in layer view or only the top-most layer. Rendering 5 " "layers takes longer, but may show more information." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@action:button" msgid "Display five top layers in layer view" msgstr "Display five top layers in layer view" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:226 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:240 msgctxt "@info:tooltip" msgid "Should only the top layers be displayed in layerview?" msgstr "Should only the top layers be displayed in layerview?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:231 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:245 msgctxt "@option:check" msgid "Only display top layer(s) in layer view" msgstr "Only display top layer(s) in layer view" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:261 msgctxt "@label" msgid "Opening files" msgstr "Opening files" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:253 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Should models be scaled to the build volume if they are too large?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:258 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:272 msgctxt "@option:check" msgid "Scale large models" msgstr "Scale large models" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:281 msgctxt "@info:tooltip" msgid "" "An model may appear extremely small if its unit is for example in meters " @@ -1414,12 +1502,12 @@ msgstr "" "An model may appear extremely small if its unit is for example in meters " "rather than millimeters. Should these models be scaled up?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:286 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Scale extremely small models" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:281 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:295 msgctxt "@info:tooltip" msgid "" "Should a prefix based on the printer name be added to the print job name " @@ -1428,27 +1516,27 @@ msgstr "" "Should a prefix based on the printer name be added to the print job name " "automatically?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:286 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:300 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Add machine prefix to job name" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:303 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:317 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Should Cura check for updates when the program is started?" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:315 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:329 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Check for updates on start" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:325 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:339 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -1459,101 +1547,132 @@ msgstr "" "models, IP addresses or other personally identifiable information is sent or " "stored." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:330 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:344 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Send (anonymous) print information" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:14 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:431 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:15 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:435 msgctxt "@title:tab" msgid "Printers" msgstr "Printers" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:36 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:65 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:75 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:37 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:71 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:127 msgctxt "@action:button" msgid "Activate" msgstr "Activate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:43 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:44 msgctxt "@action:button" msgid "Add" msgstr "Add" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:49 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:92 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:105 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:50 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:111 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:152 msgctxt "@action:button" msgid "Remove" msgstr "Remove" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:56 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:99 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:57 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:118 msgctxt "@action:button" msgid "Rename" msgstr "Rename" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:134 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:146 msgctxt "@label" -msgid "Type" -msgstr "Type" +msgid "Printer type:" +msgstr "Printer type:" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:154 +msgctxt "@label" +msgid "Connection:" +msgstr "Connection:" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:159 +#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:21 +msgctxt "@info:status" +msgid "The printer is not connected." +msgstr "The printer is not connected." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:165 +msgctxt "@label" +msgid "State:" +msgstr "State:" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:185 +msgctxt "@label:MonitorStatus" +msgid "Waiting for someone to clear the build plate" +msgstr "Waiting for someone to clear the build plate" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:191 +msgctxt "@label:MonitorStatus" +msgid "Aborting print..." +msgstr "Aborting print..." + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:194 +msgctxt "@label:MonitorStatus" +msgid "Waiting for a printjob" +msgstr "Waiting for a printjob" #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:435 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:439 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:49 msgctxt "@label" msgid "Protected profiles" msgstr "Protected profiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:47 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:49 msgctxt "@label" msgid "Custom profiles" msgstr "Custom profiles" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:80 msgctxt "@label" msgid "Create" msgstr "Create" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:72 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:96 msgctxt "@label" msgid "Duplicate" msgstr "Duplicate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:106 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:112 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:129 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:159 msgctxt "@action:button" msgid "Import" msgstr "Import" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:113 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:118 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:135 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:166 msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:121 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:142 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Printer: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:154 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:181 msgctxt "@action:button" msgid "Update profile with current settings" msgstr "Update profile with current settings" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:162 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:189 msgctxt "@action:button" msgid "Discard current settings" msgstr "Discard current settings" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:206 msgctxt "@action:label" msgid "" "This profile uses the defaults specified by the printer, so it has no " @@ -1562,97 +1681,112 @@ msgstr "" "This profile uses the defaults specified by the printer, so it has no " "settings in the list below." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:213 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Your current settings match the selected profile." -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:202 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:229 msgctxt "@title:tab" msgid "Global Settings" msgstr "Global Settings" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:271 +msgctxt "@title:window" +msgid "Rename Profile" +msgstr "Rename Profile" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:284 +msgctxt "@title:window" +msgid "Create Profile" +msgstr "Create Profile" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:298 +msgctxt "@title:window" +msgid "Duplicate Profile" +msgstr "Duplicate Profile" + +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:312 msgctxt "@window:title" msgid "Import Profile" msgstr "Import Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:268 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:320 msgctxt "@title:window" msgid "Import Profile" msgstr "Import Profile" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:296 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:348 msgctxt "@title:window" msgid "Export Profile" msgstr "Export Profile" #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:15 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:433 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:437 msgctxt "@title:tab" msgid "Materials" msgstr "Materials" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:54 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:106 msgctxt "" "@action:label %1 is printer name, %2 is how this printer names variants, %3 " "is variant name" msgid "Printer: %1, %2: %3" msgstr "Printer: %1, %2: %3" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:58 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:110 msgctxt "@action:label %1 is printer name" msgid "Printer: %1" msgstr "Printer: %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:82 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:134 msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicate" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:143 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:189 msgctxt "@action:button" msgid "Edit" msgstr "Edit" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:210 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:218 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:264 msgctxt "@title:window" msgid "Import Material" msgstr "Import Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:219 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:265 msgctxt "@info:status" msgid "" "Could not import material %1: %2" msgstr "" "Could not import material %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:223 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:269 msgctxt "@info:status" msgid "Successfully imported material %1" msgstr "Successfully imported material %1" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:241 -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:302 msgctxt "@title:window" msgid "Export Material" msgstr "Export Material" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:260 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:306 msgctxt "@info:status" msgid "" "Failed to export material to %1: %2" msgstr "" "Failed to export material to %1: %2" -#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:266 +#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:312 msgctxt "@info:status" msgid "Successfully exported material to %1" msgstr "Successfully exported material to %1" #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18 -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:691 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:701 msgctxt "@title:window" msgid "Add Printer" msgstr "Add Printer" @@ -1700,7 +1834,6 @@ msgid "Hide this setting" msgstr "Hide this setting" #: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:209 -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:295 msgctxt "@action:menu" msgid "Configure setting visiblity..." msgstr "Configure setting visiblity..." @@ -1766,26 +1899,32 @@ msgstr "" "\n" "Click to restore the calculated value." -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:185 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:190 msgctxt "@label:listbox" msgid "Print Setup" msgstr "Print Setup" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:256 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:261 msgctxt "@label" msgid "Printer Monitor" msgstr "Printer Monitor" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:377 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:382 msgctxt "@title:tab" msgid "Simple" msgstr "Simple" -#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:378 +#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 msgctxt "@title:tab" msgid "Advanced" msgstr "Advanced" +#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 +#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 +msgctxt "@title:menuitem %1 is the value from the printer" +msgid "Automatic: %1" +msgstr "Automatic: %1" + #: /home/ruben/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" @@ -1796,11 +1935,6 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Open &Recent" -#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:21 -msgctxt "@label" -msgid "The printer is not connected." -msgstr "The printer is not connected." - #: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:31 msgctxt "@label" msgid "Temperatures" @@ -1836,151 +1970,161 @@ msgctxt "@label" msgid "Estimated time left" msgstr "Estimated time left" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:61 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:62 msgctxt "@action:inmenu" msgid "Toggle Fu&ll Screen" msgstr "Toggle Fu&ll Screen" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:68 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:69 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Undo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:78 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:79 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Redo" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:88 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:89 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Quit" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:96 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:97 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configure Cura..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:103 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Add Printer..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:109 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:110 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Manage Pr&inters..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:116 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:117 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Manage Materials..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings" msgstr "&Update profile with current settings" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current settings" msgstr "&Discard current settings" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:140 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:141 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings..." msgstr "&Create profile from current settings..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Manage Profiles..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Show Online &Documentation" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:161 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:162 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Report a &Bug" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:169 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:170 msgctxt "@action:inmenu menubar:help" msgid "&About..." msgstr "&About..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:176 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:177 msgctxt "@action:inmenu menubar:edit" msgid "Delete &Selection" msgstr "Delete &Selection" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:186 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:187 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Delete Model" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:194 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&nter Model on Platform" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:200 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:201 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Group Models" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:211 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Ungroup Models" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:220 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:221 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Merge Models" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:230 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:231 msgctxt "@action:inmenu" msgid "&Duplicate Model" msgstr "&Duplicate Model" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:237 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:238 msgctxt "@action:inmenu menubar:edit" msgid "&Select All Models" msgstr "&Select All Models" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:247 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:248 msgctxt "@action:inmenu menubar:edit" msgid "&Clear Build Plate" msgstr "&Clear Build Plate" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:257 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:258 msgctxt "@action:inmenu menubar:file" msgid "Re&load All Models" msgstr "Re&load All Models" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Reset All Model Positions" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:272 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model &Transformations" msgstr "Reset All Model &Transformations" -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:279 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:280 msgctxt "@action:inmenu menubar:file" msgid "&Open File..." msgstr "&Open File..." -#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:287 +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:288 msgctxt "@action:inmenu menubar:help" msgid "Show Engine &Log..." msgstr "Show Engine &Log..." +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:296 +msgctxt "@action:inmenu menubar:help" +msgid "Show Configuration Folder" +msgstr "Show Configuration Folder" + +#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:303 +msgctxt "@action:menu" +msgid "Configure setting visibility..." +msgstr "Configure setting visibility..." + #: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:24 msgctxt "@label:PrintjobStatus" msgid "Please load a 3d model" @@ -2088,12 +2232,17 @@ msgctxt "@action:button" msgid "Open File" msgstr "Open File" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:363 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:364 msgctxt "@action:button" msgid "View Mode" msgstr "View Mode" -#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:639 +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:433 +msgctxt "@title:tab" +msgid "Settings" +msgstr "Settings" + +#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:642 msgctxt "@title:window" msgid "Open file" msgstr "Open file" @@ -2223,12 +2372,12 @@ msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:264 +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:276 msgctxt "@label" msgid "Profile:" msgstr "Profile:" -#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:301 +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:313 msgctxt "@tooltip" msgid "" "Some setting values are different from the values stored in the profile.\n" diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 082363496a..0aac7d5197 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -48,13 +48,15 @@ Rectangle { if(!printerConnected || !printerAcceptsCommands) return UM.Theme.getColor("text"); - if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance") + + switch(Cura.MachineManager.printerOutputDevices[0].printerState) { - return UM.Theme.getColor("status_busy"); - } else if (Cura.MachineManager.printerOutputDevices[0].printerState == "error") - { - return UM.Theme.getColor("status_stopped"); + case "maintenance": + return UM.Theme.getColor("status_busy"); + case "error": + return UM.Theme.getColor("status_stopped"); } + switch(Cura.MachineManager.printerOutputDevices[0].jobState) { case "printing": diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 671f35f782..943f8e84bb 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -138,7 +138,7 @@ Item { { id: linkedSettingIcon; - visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.global_inherits_stack != "-1") && base.showLinkedSettingIcon + visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.limit_to_extruder != "-1") && base.showLinkedSettingIcon height: parent.height; width: height; diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index c50c2cc4e0..50e0ab804f 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -89,13 +89,13 @@ ScrollView } // Binding to ensure that the right containerstack ID is set for the provider. - // This ensures that if a setting has a global_inherits_stack id (for instance; Support speed points to the + // This ensures that if a setting has a limit_to_extruder id (for instance; Support speed points to the // extruder that actually prints the support, as that is the setting we need to use to calculate the value) Binding { target: provider property: "containerStackId" - when: model.settable_per_extruder || (inheritStackProvider.properties.global_inherits_stack != null && inheritStackProvider.properties.global_inherits_stack >= 0); + when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0); value: { if(!model.settable_per_extruder) @@ -103,10 +103,10 @@ ScrollView //Not settable per extruder, so we must pick global. return Cura.MachineManager.activeMachineId; } - if(inheritStackProvider.properties.global_inherits_stack != null && inheritStackProvider.properties.global_inherits_stack >= 0) + if(inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0) { - //We have global_inherits_stack, so pick that stack. - return ExtruderManager.extruderIds[String(inheritStackProvider.properties.global_inherits_stack)]; + //We have limit_to_extruder, so pick that stack. + return ExtruderManager.extruderIds[String(inheritStackProvider.properties.limit_to_extruder)]; } if(ExtruderManager.activeExtruderStackId) { @@ -125,7 +125,7 @@ ScrollView id: inheritStackProvider containerStackId: Cura.MachineManager.activeMachineId key: model.key - watchedProperties: [ "global_inherits_stack" ] + watchedProperties: [ "limit_to_extruder" ] } UM.SettingPropertyProvider diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index b76a41fc37..036f1283cc 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -149,7 +149,6 @@ Rectangle SidebarHeader { id: header width: parent.width - height: totalHeightHeader anchors.top: sidebarHeaderBar.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 867bd03b71..47c0fea9e3 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -14,7 +14,6 @@ Column { id: base; - property int totalHeightHeader: childrenRect.height property int currentExtruderIndex: ExtruderManager.activeExtruderIndex; spacing: UM.Theme.getSize("default_margin").height @@ -67,7 +66,7 @@ Column id: extrudersList property var index: 0 - visible: machineExtruderCount.properties.value > 1 + visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint height: UM.Theme.getSize("sidebar_header_mode_toggle").height boundsBehavior: Flickable.StopAtBounds @@ -168,7 +167,7 @@ Column id: variantRow height: UM.Theme.getSize("sidebar_setup").height - visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials + visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint anchors { @@ -261,6 +260,7 @@ Column { id: globalProfileRow height: UM.Theme.getSize("sidebar_setup").height + visible: !sidebar.monitoringPrint anchors {